From 1eb143fad4e50670c9967fd55fd4c6274fdbe135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:15:01 +0200
Subject: [PATCH 01/71] fix(a11y): raise sub-44px tap targets to the mobile
 floor

Bring interactive elements that fell below the 44px iOS/WCAG touch
floor up to min-h-11 on phones (relaxing to the denser sm density on
larger screens), and add visible focus rings where they were missing:

- TimesOfDayChips remove button + API-token copy buttons gain an
  inset hit-area so the visual density stays tight while the tap
  target clears the floor.
- Dose-history row-actions menu trigger and the insights suggested-
  prompt chips raise to min-h-11 sm:min-h-9.
- Sortable table headers and the glucose advanced disclosure toggle
  gain a focus-visible ring and a phone tap floor.
---
 src/components/data-list/sortable-head.tsx           |  2 +-
 .../insights/glucose/glucose-advanced-disclosure.tsx |  2 +-
 src/components/insights/suggested-prompts.tsx        | 12 ++++++------
 src/components/medications/dose-history-ledger.tsx   |  2 +-
 .../medications/scheduling/TimesOfDayChips.tsx       |  2 +-
 .../medications/sections/api-tokens-row.tsx          |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/data-list/sortable-head.tsx b/src/components/data-list/sortable-head.tsx
index c02c0ac12..44730b408 100644
--- a/src/components/data-list/sortable-head.tsx
+++ b/src/components/data-list/sortable-head.tsx
@@ -32,7 +32,7 @@ export function SortableHead({
       <button
         type="button"
         onClick={() => onSort(column)}
-        className="hover:text-foreground inline-flex items-center gap-1 transition-colors"
+        className="hover:text-foreground focus-visible:ring-ring/50 inline-flex min-h-11 items-center gap-1 rounded-sm transition-colors focus-visible:ring-2 focus-visible:outline-none sm:min-h-0"
       >
         {label}
         {isActive ? (
diff --git a/src/components/insights/glucose/glucose-advanced-disclosure.tsx b/src/components/insights/glucose/glucose-advanced-disclosure.tsx
index 5be77f4ed..66d74d63d 100644
--- a/src/components/insights/glucose/glucose-advanced-disclosure.tsx
+++ b/src/components/insights/glucose/glucose-advanced-disclosure.tsx
@@ -63,7 +63,7 @@ export function GlucoseAdvancedDisclosure({
         aria-expanded={open}
         aria-controls={regionId}
         data-slot="glucose-advanced-toggle"
-        className="text-muted-foreground hover:text-foreground flex min-h-11 w-full items-center justify-between gap-2 text-sm font-medium transition-colors"
+        className="text-muted-foreground hover:text-foreground focus-visible:ring-ring/50 flex min-h-11 w-full items-center justify-between gap-2 rounded-sm text-sm font-medium transition-colors focus-visible:ring-2 focus-visible:outline-none"
       >
         <span>{t("insights.bloodGlucose.clinical.advanced.toggle")}</span>
         <ChevronDown
diff --git a/src/components/insights/suggested-prompts.tsx b/src/components/insights/suggested-prompts.tsx
index 5fe2abe2f..85b57b39a 100644
--- a/src/components/insights/suggested-prompts.tsx
+++ b/src/components/insights/suggested-prompts.tsx
@@ -85,14 +85,14 @@ export function SuggestedPrompts({
           type="button"
           onClick={() => onPick(prompt)}
           data-slot="insights-suggested-prompts-chip"
-          // v1.8.5 W4a — denser chips. The tap target stays comfortable
-          // (`min-h-9` ≈ 36 px, the WCAG/iOS floor) but the horizontal
-          // padding + type size drop a notch so the two prompts pack into
-          // fewer rows and the left column stops towering over the
-          // Health-Score card.
+          // v1.8.5 W4a — denser chips. The horizontal padding + type size
+          // drop a notch so the two prompts pack into fewer rows and the
+          // left column stops towering over the Health-Score card. The tap
+          // target clears the 44 px iOS/WCAG floor on phones (`min-h-11`)
+          // and relaxes to the denser 36 px from `sm` up.
           className={cn(
             "border-dracula-purple/18 hover:border-dracula-purple/40 hover:text-foreground",
-            "text-muted-foreground inline-flex min-h-9 items-center gap-1.5",
+            "text-muted-foreground inline-flex min-h-11 items-center gap-1.5 sm:min-h-9",
             "rounded-full border bg-transparent px-3 py-1.5 text-xs",
             "transition-colors focus-visible:ring-2 focus-visible:outline-none",
             "focus-visible:ring-dracula-purple/50",
diff --git a/src/components/medications/dose-history-ledger.tsx b/src/components/medications/dose-history-ledger.tsx
index 875f561c4..e94561ad5 100644
--- a/src/components/medications/dose-history-ledger.tsx
+++ b/src/components/medications/dose-history-ledger.tsx
@@ -669,7 +669,7 @@ function LedgerRowItem({
             <Button
               variant="ghost"
               size="icon-sm"
-              className="min-h-9 min-w-9"
+              className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
               aria-label={t("medications.detail.verlauf.rowActionsLabel", {
                 time: timeLabel,
               })}
diff --git a/src/components/medications/scheduling/TimesOfDayChips.tsx b/src/components/medications/scheduling/TimesOfDayChips.tsx
index a81b60371..3ae3b7f22 100644
--- a/src/components/medications/scheduling/TimesOfDayChips.tsx
+++ b/src/components/medications/scheduling/TimesOfDayChips.tsx
@@ -238,7 +238,7 @@ export function TimesOfDayChips({
                 disabled={disabled}
                 aria-label={`${t(`${i18nPrefix}.remove`)} ${time}`}
                 onClick={() => onRemove(time)}
-                className="focus-visible:ring-ring hover:bg-background inline-flex h-7 w-7 items-center justify-center rounded-sm focus-visible:ring-2 focus-visible:outline-none disabled:opacity-50"
+                className="focus-visible:ring-ring hover:bg-background relative inline-flex h-7 w-7 items-center justify-center rounded-sm before:absolute before:inset-[-8px] before:content-[''] focus-visible:ring-2 focus-visible:outline-none disabled:opacity-50"
                 data-slot="times-of-day-chip-remove"
               >
                 <X className="h-3.5 w-3.5" aria-hidden="true" />
diff --git a/src/components/medications/sections/api-tokens-row.tsx b/src/components/medications/sections/api-tokens-row.tsx
index 6d7b5f8e2..d2815bcc4 100644
--- a/src/components/medications/sections/api-tokens-row.tsx
+++ b/src/components/medications/sections/api-tokens-row.tsx
@@ -223,7 +223,7 @@ export function ApiTokensRow({
           onClick={() =>
             void copy(endpoint, t("medications.detail.api.urlCopied"))
           }
-          className="h-7 w-7 shrink-0"
+          className="relative h-7 w-7 shrink-0 before:absolute before:inset-[-8px] before:content-['']"
           aria-label={t("medications.detail.api.copyUrl")}
           data-slot="api-tokens-copy-url"
         >
@@ -328,7 +328,7 @@ export function ApiTokensRow({
               <Button
                 variant="ghost"
                 size="icon"
-                className="absolute top-1 right-1 h-7 w-7"
+                className="absolute top-1 right-1 h-7 w-7 before:absolute before:inset-[-8px] before:content-['']"
                 onClick={() =>
                   void copy(selectedExample.value, t("common.copied"))
                 }

From 722af873824e3fe8598bf1bc1589de95a84a40c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:15:14 +0200
Subject: [PATCH 02/71] fix(a11y): add a global prefers-reduced-motion backstop

Per-component motion-reduce gating stays in place with its tailored
static fallbacks; this adds a defensive catch-all so any animation or
transition that misses a per-component guard still collapses to near-
instant under reduced motion. Near-zero rather than zero keeps
animation/transition-end listeners firing so state machines don't
stall.
---
 src/app/globals.css | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/app/globals.css b/src/app/globals.css
index 417fb9536..e7892e703 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -889,3 +889,21 @@
     animation: none;
   }
 }
+
+/* ── Global reduced-motion backstop ──────────────────────────────────
+ * Defensive catch-all so any animation/transition we forget to gate
+ * per-component still collapses to near-instant when the user has asked
+ * for reduced motion. The per-component blocks above stay — they carry
+ * tailored static fallbacks (static dots, full-height bars). This is the
+ * floor, not a replacement. Near-zero (not 0) keeps JS animation-end /
+ * transition-end listeners firing so state machines don't stall. */
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+}

From 08d25e1cf0cd4442977a43560953cc59cf597d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:15:14 +0200
Subject: [PATCH 03/71] feat(pwa): richer install metadata in the web manifest

Add categories (health, medical, lifestyle) and extend display_override
to allow minimal-ui as a fallback. Maskable icons were already present.
Screenshots are deferred until narrow + wide capture assets exist.
---
 public/manifest.json                        | 3 ++-
 src/__tests__/sw-security-hardening.test.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/manifest.json b/public/manifest.json
index 0b6c6de85..399b9f08a 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -6,7 +6,8 @@
   "scope": "/",
   "start_url": "/",
   "display": "standalone",
-  "display_override": ["standalone"],
+  "display_override": ["standalone", "minimal-ui"],
+  "categories": ["health", "medical", "lifestyle"],
   "theme_color": "#282a36",
   "background_color": "#282a36",
   "icons": [
diff --git a/src/__tests__/sw-security-hardening.test.ts b/src/__tests__/sw-security-hardening.test.ts
index c082bb60e..4814e6f76 100644
--- a/src/__tests__/sw-security-hardening.test.ts
+++ b/src/__tests__/sw-security-hardening.test.ts
@@ -85,7 +85,8 @@ describe("public/manifest.json PWA identity hygiene (F-7, 2026-05-16)", () => {
     const manifest = JSON.parse(raw) as Record<string, unknown>;
     expect(manifest.scope).toBe("/");
     expect(manifest.id).toBe("/?source=pwa");
-    expect(manifest.display_override).toEqual(["standalone"]);
+    expect(manifest.display_override).toEqual(["standalone", "minimal-ui"]);
+    expect(manifest.categories).toEqual(["health", "medical", "lifestyle"]);
   });
 
   it("keeps the existing display/start_url contract", () => {

From b9035addf40957223fcff47eea6999b801cb5698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:15:14 +0200
Subject: [PATCH 04/71] ci: ignore the npm-bundled picomatch CVE in the
 container scan

CVE-2026-33671 (picomatch ReDoS, HIGH) is flagged only in the npm CLI's
own bundled copy inside the Node base image, used at image-build time,
not by our runtime. Our app dependency tree pins picomatch >= 4.0.4 via
a pnpm override, so the running app is not affected. Re-check when the
base image ships an npm whose bundled picomatch is >= 4.0.4.
---
 .trivyignore | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .trivyignore

diff --git a/.trivyignore b/.trivyignore
new file mode 100644
index 000000000..d0310907a
--- /dev/null
+++ b/.trivyignore
@@ -0,0 +1,14 @@
+# Trivy vulnerability ignore list.
+# One CVE id per line. Only suppress a finding that has NO upstream fix we
+# can apply; never suppress one with a fixed version available — bump instead.
+# Each entry names what it covers and the condition to re-check / remove it.
+
+# CVE-2026-33671 (picomatch ReDoS, HIGH) — flagged only in the npm CLI's
+# OWN bundled copy that ships inside the Node base image
+# (usr/local/lib/node_modules/npm/node_modules/picomatch, v4.0.3), used at
+# image-build time by npm, not by our runtime. Our application dependency
+# tree pins picomatch >= 4.0.4 via a pnpm override, so the running app is
+# not affected and the path is not reachable at runtime. Re-check when the
+# Node base image ships an npm build whose bundled picomatch is >= 4.0.4,
+# then drop this entry.
+CVE-2026-33671

From bb08aa42dc54da79f1113e1f50a72744b374e426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:18:48 +0200
Subject: [PATCH 05/71] feat(pwa): real offline read value via SW data cache +
 query persistence
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

An installed PWA opened offline rendered empty skeletons forever: the
service worker hard-excluded every /api/* path and there was no client
query persistence. Close both gaps for read value.

Service worker: add a stale-while-revalidate branch for an allowlist of
safe GET /api/* reads (dashboard snapshot + widgets, measurements,
medications, insights, analytics, version) in a release-versioned
healthlog-data cache. Two-layer refusal — a path deny guard for any
auth/token/session/login segment plus a body-level secret refusal for
hlk_/hlr_/sk- shapes and no-store responses — so a secret-shaped body or
an auth surface can never be persisted. Mutations stay network-only.

Client: add a dependency-free IndexedDB query persister that hydrates the
last successful reads before the first authenticated paint, build-version
and age gated, debounced on cache change, with an auth/session/admin/token
denylist. Cleared on logout alongside the SW page and data caches so a
shared device never leaks one account's data.

Offline banner now states it is showing last-synced data when a cached
snapshot is present. Bump release to v1.18.6.
---
 docs/api/openapi.yaml                         |   2 +-
 messages/de.json                              |   3 +-
 messages/en.json                              |   3 +-
 messages/es.json                              |   3 +-
 messages/fr.json                              |   3 +-
 messages/it.json                              |   3 +-
 messages/pl.json                              |   3 +-
 package.json                                  |   2 +-
 public/sw.js                                  | 123 ++++++++++++-
 .../layout/__tests__/offline-banner.test.tsx  |   9 +-
 src/components/layout/offline-banner.tsx      |  14 +-
 src/components/providers.tsx                  |  32 ++++
 src/hooks/use-auth.ts                         |  12 +-
 src/lib/pwa/__tests__/query-persister.test.ts | 141 +++++++++++++++
 src/lib/pwa/__tests__/sw-cache-policy.test.ts |  93 ++++++++++
 src/lib/pwa/query-persister.ts                | 169 ++++++++++++++++++
 src/lib/pwa/sw-cache-policy.ts                |  60 +++++++
 17 files changed, 660 insertions(+), 15 deletions(-)
 create mode 100644 src/lib/pwa/__tests__/query-persister.test.ts
 create mode 100644 src/lib/pwa/__tests__/sw-cache-policy.test.ts
 create mode 100644 src/lib/pwa/query-persister.ts
 create mode 100644 src/lib/pwa/sw-cache-policy.ts

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index 2490f1275..5fb3d8be5 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.1.0
 info:
   title: HealthLog API
-  version: 1.18.5
+  version: 1.18.6
   description: >-
     Self-hosted personal-health-tracking PWA — public API surface for the iOS native client and external ingest.
 
diff --git a/messages/de.json b/messages/de.json
index 945324bc9..0d6890d30 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Zurück zum Dashboard"
   },
   "offlineBanner": {
-    "message": "Keine Verbindung — Änderungen werden gespeichert, sobald du wieder online bist."
+    "message": "Keine Verbindung — Änderungen werden gespeichert, sobald du wieder online bist.",
+    "showingCached": "Zeigt deine zuletzt synchronisierten Daten."
   },
   "demoBanner": {
     "message": "Demo-Modus — Änderungen werden nicht gespeichert."
diff --git a/messages/en.json b/messages/en.json
index 9285cc541..0895bb5d8 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Back to dashboard"
   },
   "offlineBanner": {
-    "message": "No connection — your changes will save once you're back online."
+    "message": "No connection — your changes will save once you're back online.",
+    "showingCached": "Showing your last synced data."
   },
   "demoBanner": {
     "message": "Demo mode — changes are not saved."
diff --git a/messages/es.json b/messages/es.json
index 4eb44003b..ecc64c96c 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Volver al panel"
   },
   "offlineBanner": {
-    "message": "Sin conexión — tus cambios se guardarán cuando vuelvas a estar en línea."
+    "message": "Sin conexión — tus cambios se guardarán cuando vuelvas a estar en línea.",
+    "showingCached": "Mostrando tus últimos datos sincronizados."
   },
   "demoBanner": {
     "message": "Modo demo — los cambios no se guardan."
diff --git a/messages/fr.json b/messages/fr.json
index 4a61eb47d..ea1705a4a 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Retour au tableau de bord"
   },
   "offlineBanner": {
-    "message": "Pas de connexion — tes modifications seront enregistrées dès que tu seras de nouveau en ligne."
+    "message": "Pas de connexion — tes modifications seront enregistrées dès que tu seras de nouveau en ligne.",
+    "showingCached": "Affichage de tes dernières données synchronisées."
   },
   "demoBanner": {
     "message": "Mode démo — les modifications ne sont pas enregistrées."
diff --git a/messages/it.json b/messages/it.json
index 386325fff..3aef973cb 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Torna alla dashboard"
   },
   "offlineBanner": {
-    "message": "Nessuna connessione — le tue modifiche verranno salvate appena torni online."
+    "message": "Nessuna connessione — le tue modifiche verranno salvate appena torni online.",
+    "showingCached": "Vengono mostrati i tuoi ultimi dati sincronizzati."
   },
   "demoBanner": {
     "message": "Modalità demo — le modifiche non vengono salvate."
diff --git a/messages/pl.json b/messages/pl.json
index 853a30a39..d91c6f7bd 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -191,7 +191,8 @@
     "backToDashboard": "Powrót do panelu"
   },
   "offlineBanner": {
-    "message": "Brak połączenia — twoje zmiany zostaną zapisane, gdy ponownie pojawisz się online."
+    "message": "Brak połączenia — twoje zmiany zostaną zapisane, gdy ponownie pojawisz się online.",
+    "showingCached": "Wyświetlane są ostatnio zsynchronizowane dane."
   },
   "demoBanner": {
     "message": "Tryb demo — zmiany nie są zapisywane."
diff --git a/package.json b/package.json
index 6b434e375..7d097d9ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "healthlog",
-  "version": "1.18.5",
+  "version": "1.18.6",
   "description": "Self-hosted personal-health-tracking PWA with Withings integration, AI insights, and doctor-report PDF export.",
   "license": "PolyForm-Noncommercial-1.0.0",
   "homepage": "https://healthlog.dev",
diff --git a/public/sw.js b/public/sw.js
index 32d3f1aa6..8735e44b8 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -36,11 +36,60 @@ try {
 // v1.4.38.4 → v1.4.42. Do not hand-edit; bump `package.json` and rebuild.
 const CACHE_VERSION =
   (typeof self !== "undefined" && self.__APP_VERSION__) ||
-  /* @sw-version-fallback */ "v1.18.4";
+  /* @sw-version-fallback */ "v1.18.6";
 const STATIC_CACHE = `healthlog-static-${CACHE_VERSION}`;
 const PAGE_CACHE = `healthlog-pages-${CACHE_VERSION}`;
+// v1.18.6 — read-only data cache for a curated allowlist of safe GET `/api/*`
+// reads. Stale-while-revalidate: an installed PWA opened offline now renders
+// the LAST cached dashboard/series instead of empty skeletons forever.
+const DATA_CACHE = `healthlog-data-${CACHE_VERSION}`;
 const MAX_STATIC_ENTRIES = 150;
 const MAX_PAGE_ENTRIES = 30;
+const MAX_DATA_ENTRIES = 60;
+
+// Safe-GET read allowlist. ONLY idempotent reads that render the core views
+// and carry NO secret-shaped body. Auth, mutations and token endpoints are
+// never listed — and `isCacheableApiResponse` is a second, body-level guard
+// (mirrors the idempotency cache's `hlk_`/`hlr_`/`sk-` refusal) so a future
+// endpoint that slipped onto the list can still never persist a secret.
+// Matched by exact path or `<path>/` / `<path>?` prefix.
+const API_READ_ALLOWLIST = [
+  "/api/dashboard/snapshot",
+  "/api/dashboard/widgets",
+  "/api/measurements",
+  "/api/medications",
+  "/api/insights",
+  "/api/analytics",
+  "/api/version",
+];
+
+// Defence in depth: even an allowlisted path is refused if its pathname looks
+// like an auth/token/secret surface.
+const API_DENY_RE = /\/(auth|tokens?|sessions?|login|password|webauthn)(\/|$|\?)/i;
+
+function isAllowlistedApiRead(pathname) {
+  if (API_DENY_RE.test(pathname)) return false;
+  return API_READ_ALLOWLIST.some(
+    (p) =>
+      pathname === p ||
+      pathname.startsWith(p + "/") ||
+      pathname.startsWith(p + "?"),
+  );
+}
+
+// Body-level secret refusal: never persist a body carrying a token/secret-
+// shaped pattern even if the path was allowlisted by mistake.
+const SECRET_BODY_RE = /(hlk_|hlr_|sk-)[A-Za-z0-9_-]/;
+
+function isCacheableApiResponse(response, bodyText) {
+  if (!response || !response.ok) return false;
+  const cacheControl = response.headers.get("Cache-Control") || "";
+  if (/no-store/i.test(cacheControl)) return false;
+  if (typeof bodyText === "string" && SECRET_BODY_RE.test(bodyText)) {
+    return false;
+  }
+  return true;
+}
 
 // App shell files to precache on install
 const PRECACHE_URLS = ["/", "/logo-192.png", "/logo-512.png", "/favicon.svg"];
@@ -64,7 +113,10 @@ self.addEventListener("activate", (event) => {
         .then((keys) =>
           Promise.all(
             keys
-              .filter((k) => k !== STATIC_CACHE && k !== PAGE_CACHE)
+              .filter(
+                (k) =>
+                  k !== STATIC_CACHE && k !== PAGE_CACHE && k !== DATA_CACHE,
+              )
               .map((k) => caches.delete(k)),
           ),
         ),
@@ -87,8 +139,15 @@ self.addEventListener("fetch", (event) => {
   // Only handle same-origin GET requests
   if (request.method !== "GET" || url.origin !== self.location.origin) return;
 
-  // API calls — network only (never serve stale data)
-  if (url.pathname.startsWith("/api/")) return;
+  // API calls. Allowlisted safe GET reads use stale-while-revalidate so the
+  // installed PWA renders last-synced data offline; everything else (auth,
+  // mutations, anything not on the list) stays network-only.
+  if (url.pathname.startsWith("/api/")) {
+    if (isAllowlistedApiRead(url.pathname)) {
+      event.respondWith(staleWhileRevalidateApi(request));
+    }
+    return;
+  }
 
   // Next.js static assets — cache-first (immutable hashed filenames)
   if (url.pathname.startsWith("/_next/static/")) {
@@ -126,6 +185,62 @@ async function cacheFirst(request, cacheName) {
   return response;
 }
 
+/**
+ * Stale-while-revalidate for allowlisted safe GET `/api/*` reads.
+ *
+ * Serves the cached copy immediately (instant offline value) while a
+ * background fetch refreshes it. With no cache yet it awaits the network and,
+ * if that fails offline, returns a JSON 503 so the client's TanStack Query
+ * cache / IndexedDB persister (also added in v1.18.6) supplies the data.
+ *
+ * Caching is gated twice: `isAllowlistedApiRead` already filtered the path,
+ * and `isCacheableApiResponse` inspects the actual body so a `no-store` or
+ * secret-shaped (`hlk_`/`hlr_`/`sk-`) response is never persisted — the same
+ * refusal discipline the idempotency cache uses.
+ */
+async function staleWhileRevalidateApi(request) {
+  const cache = await caches.open(DATA_CACHE);
+  const cached = await cache.match(request);
+
+  const network = fetch(request)
+    .then(async (response) => {
+      // Read the body once to body-screen it, then reconstruct a fresh
+      // Response so both the cache.put and the return value have an
+      // unconsumed body.
+      const bodyText = await response
+        .clone()
+        .text()
+        .catch(() => undefined);
+      if (isCacheableApiResponse(response, bodyText)) {
+        const toStore = new Response(bodyText, {
+          status: response.status,
+          statusText: response.statusText,
+          headers: response.headers,
+        });
+        await cache.put(request, toStore);
+        trimCache(DATA_CACHE, MAX_DATA_ENTRIES);
+      }
+      return response;
+    })
+    .catch(() => null);
+
+  if (cached) {
+    // Refresh in the background; don't block the cached response on it.
+    return cached;
+  }
+
+  const fresh = await network;
+  if (fresh) return fresh;
+
+  return new Response(
+    JSON.stringify({ data: null, error: "offline", meta: { offline: true } }),
+    {
+      status: 503,
+      headers: { "Content-Type": "application/json; charset=utf-8" },
+    },
+  );
+}
+
 /**
  * Privacy gate for the navigation page cache. Most app routes are
  * client-fetch-only shells with no server-rendered PII (health JSON loads
diff --git a/src/components/layout/__tests__/offline-banner.test.tsx b/src/components/layout/__tests__/offline-banner.test.tsx
index a70a35ae9..af43498ce 100644
--- a/src/components/layout/__tests__/offline-banner.test.tsx
+++ b/src/components/layout/__tests__/offline-banner.test.tsx
@@ -13,6 +13,7 @@ import { join } from "node:path";
 
 import { describe, it, expect } from "vitest";
 import { renderToStaticMarkup } from "react-dom/server";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 import { I18nProvider } from "@/lib/i18n/context";
 import { OfflineBanner } from "../offline-banner";
@@ -27,8 +28,14 @@ function loadMessages(locale: string): { offlineBanner: { message: string } } {
 }
 
 function render(node: React.ReactNode, locale: "en" | "de" = "en") {
+  // v1.18.6 — the banner now reads the cached dashboard snapshot to decide
+  // whether to append the "showing last synced data" hint, so it needs a
+  // QueryClient in context.
+  const queryClient = new QueryClient();
   return renderToStaticMarkup(
-    <I18nProvider initialLocale={locale}>{node}</I18nProvider>,
+    <QueryClientProvider client={queryClient}>
+      <I18nProvider initialLocale={locale}>{node}</I18nProvider>
+    </QueryClientProvider>,
   );
 }
 
diff --git a/src/components/layout/offline-banner.tsx b/src/components/layout/offline-banner.tsx
index 23c0cff15..f95a247ec 100644
--- a/src/components/layout/offline-banner.tsx
+++ b/src/components/layout/offline-banner.tsx
@@ -2,8 +2,10 @@
 
 import { useEffect, useState } from "react";
 import { WifiOff } from "lucide-react";
+import { useQueryClient } from "@tanstack/react-query";
 
 import { useTranslations } from "@/lib/i18n/context";
+import { queryKeys } from "@/lib/query-keys";
 
 /**
  * v1.4.43 QoL (M5) — slim banner that surfaces "you're offline" while
@@ -25,6 +27,7 @@ import { useTranslations } from "@/lib/i18n/context";
  */
 export function OfflineBanner() {
   const { t } = useTranslations();
+  const queryClient = useQueryClient();
   // Initialise to `true` so the banner stays hidden during SSR + the
   // first client render. The effect below flips it true/false after
   // mount based on `navigator.onLine`. (We do NOT read navigator on
@@ -62,6 +65,12 @@ export function OfflineBanner() {
 
   if (isOnline) return null;
 
+  // v1.18.6 — when an offline install is showing last-synced data (the SW's
+  // allowlisted read cache + the IndexedDB query persister hydrated the
+  // dashboard snapshot), say so honestly rather than implying a blank screen.
+  const hasCachedData =
+    queryClient.getQueryData(queryKeys.dashboardSnapshot()) != null;
+
   return (
     <div
       role="status"
@@ -70,7 +79,10 @@ export function OfflineBanner() {
       className="bg-warning/15 border-warning/40 text-foreground flex items-center justify-center gap-2 border-b px-3 py-2 text-xs"
     >
       <WifiOff className="h-3.5 w-3.5 shrink-0" aria-hidden="true" />
-      <span className="text-center">{t("offlineBanner.message")}</span>
+      <span className="text-center">
+        {t("offlineBanner.message")}
+        {hasCachedData ? ` ${t("offlineBanner.showingCached")}` : ""}
+      </span>
     </div>
   );
 }
diff --git a/src/components/providers.tsx b/src/components/providers.tsx
index dfba33019..ad4e28da3 100644
--- a/src/components/providers.tsx
+++ b/src/components/providers.tsx
@@ -23,6 +23,12 @@ import { ServiceWorkerRegistrar } from "@/components/service-worker-registrar";
 import { isDashboardSnapshotEnabled } from "@/lib/dashboard/snapshot-flag";
 import { prefetchDashboardSnapshot } from "@/lib/queries/use-dashboard-snapshot";
 import { prefetchMedicationsList } from "@/lib/queries/prefetch-medications";
+import {
+  restorePersistedQueryCache,
+  startPersistingQueryCache,
+} from "@/lib/pwa/query-persister";
+
+const SHELL_VERSION = process.env.NEXT_PUBLIC_APP_VERSION ?? "";
 
 // ── Theme Context ────────────────────────────────────
 
@@ -147,6 +153,31 @@ function DashboardSnapshotPreloader() {
   return null;
 }
 
+// ── Offline query persistence ────────────────────────
+//
+// v1.18.6 — hydrate the last-synced query cache from IndexedDB before the
+// first authenticated paint, then debounce-persist successful reads back.
+// Combined with the service worker's allowlisted stale-while-revalidate API
+// branch, an installed PWA opened offline renders last-known data instead of
+// empty skeletons. Build-version + age gated; cleared on logout.
+function QueryPersistenceBridge() {
+  const queryClient = useQueryClient();
+  useEffect(() => {
+    let stop: (() => void) | undefined;
+    let cancelled = false;
+    void restorePersistedQueryCache(queryClient, SHELL_VERSION).finally(() => {
+      if (!cancelled) {
+        stop = startPersistingQueryCache(queryClient, SHELL_VERSION);
+      }
+    });
+    return () => {
+      cancelled = true;
+      stop?.();
+    };
+  }, [queryClient]);
+  return null;
+}
+
 // ── Root Providers ───────────────────────────────────
 
 export function Providers({
@@ -181,6 +212,7 @@ export function Providers({
           initialMessages={initialMessages}
         >
           <AppSettingsProvider>
+            <QueryPersistenceBridge />
             <DashboardSnapshotPreloader />
             {children}
             <Toaster position="bottom-right" richColors />
diff --git a/src/hooks/use-auth.ts b/src/hooks/use-auth.ts
index fefbbc258..d73adbca9 100644
--- a/src/hooks/use-auth.ts
+++ b/src/hooks/use-auth.ts
@@ -10,6 +10,7 @@ import { useTranslations } from "@/lib/i18n/context";
 import type { TimeFormatPreference } from "@/lib/format-locale";
 import { isTimeFormatPreference, storeTimeFormat } from "@/lib/time-format";
 import type { ModuleKey } from "@/lib/modules/registry";
+import { clearPersistedQueryCache } from "@/lib/pwa/query-persister";
 
 export interface AuthUser {
   id: string;
@@ -203,10 +204,19 @@ export function useLogout() {
       if (typeof caches !== "undefined") {
         void caches.keys().then((keys) => {
           for (const key of keys) {
-            if (key.startsWith("healthlog-pages-")) void caches.delete(key);
+            // v1.18.6 — also drop the offline read-data cache; it holds the
+            // last-synced health JSON and must never survive a logout.
+            if (
+              key.startsWith("healthlog-pages-") ||
+              key.startsWith("healthlog-data-")
+            ) {
+              void caches.delete(key);
+            }
           }
         });
       }
+      // Wipe the persisted IndexedDB query cache for the same reason.
+      void clearPersistedQueryCache();
       router.push("/auth/login");
     },
     // v1.16.4 — a network-failed logout used to do nothing at all (the
diff --git a/src/lib/pwa/__tests__/query-persister.test.ts b/src/lib/pwa/__tests__/query-persister.test.ts
new file mode 100644
index 000000000..8f085b01d
--- /dev/null
+++ b/src/lib/pwa/__tests__/query-persister.test.ts
@@ -0,0 +1,141 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { QueryClient } from "@tanstack/react-query";
+
+import {
+  clearPersistedQueryCache,
+  isPersistableKey,
+  restorePersistedQueryCache,
+  startPersistingQueryCache,
+} from "@/lib/pwa/query-persister";
+
+describe("isPersistableKey — what survives to disk", () => {
+  it("persists health-data query families", () => {
+    expect(isPersistableKey(["dashboard", "snapshot"])).toBe(true);
+    expect(isPersistableKey(["measurements", "list"])).toBe(true);
+    expect(isPersistableKey(["medications"])).toBe(true);
+  });
+
+  it("never persists auth / session / admin / token families", () => {
+    expect(isPersistableKey(["auth", "me"])).toBe(false);
+    expect(isPersistableKey(["session"])).toBe(false);
+    expect(isPersistableKey(["admin", "users"])).toBe(false);
+    expect(isPersistableKey(["tokens"])).toBe(false);
+    expect(isPersistableKey(["apiTokens"])).toBe(false);
+  });
+});
+
+describe("persister degrades gracefully without IndexedDB", () => {
+  const original = (globalThis as { indexedDB?: unknown }).indexedDB;
+
+  beforeEach(() => {
+    // jsdom/node here has no indexedDB; assert the guards no-op cleanly.
+    delete (globalThis as { indexedDB?: unknown }).indexedDB;
+  });
+
+  afterEach(() => {
+    if (original !== undefined) {
+      (globalThis as { indexedDB?: unknown }).indexedDB = original;
+    }
+  });
+
+  it("restore resolves without throwing", async () => {
+    const qc = new QueryClient();
+    await expect(
+      restorePersistedQueryCache(qc, "v1.18.6"),
+    ).resolves.toBeUndefined();
+  });
+
+  it("start returns a callable no-op unsubscribe", () => {
+    const qc = new QueryClient();
+    const stop = startPersistingQueryCache(qc, "v1.18.6");
+    expect(typeof stop).toBe("function");
+    expect(() => stop()).not.toThrow();
+  });
+
+  it("clear resolves without throwing", async () => {
+    await expect(clearPersistedQueryCache()).resolves.toBeUndefined();
+  });
+});
+
+describe("persister round-trips through a fake IndexedDB", () => {
+  const original = (globalThis as { indexedDB?: unknown }).indexedDB;
+
+  afterEach(() => {
+    if (original !== undefined) {
+      (globalThis as { indexedDB?: unknown }).indexedDB = original;
+    } else {
+      delete (globalThis as { indexedDB?: unknown }).indexedDB;
+    }
+    vi.restoreAllMocks();
+  });
+
+  it("hydrates a saved success result and skips a foreign build version", async () => {
+    // Minimal in-memory IDB shim covering the open/put/get/delete the
+    // persister uses. Avoids pulling a new dev dependency.
+    const store = new Map<string, unknown>();
+    const makeReq = (run: () => void) => {
+      const req: Record<string, unknown> = {};
+      queueMicrotask(() => {
+        run();
+        (req.onsuccess as (() => void) | undefined)?.();
+      });
+      return req;
+    };
+    const fakeDb = {
+      close() {},
+      transaction() {
+        return {
+          objectStore() {
+            return {
+              put(value: unknown, key: string) {
+                store.set(key, value);
+                return makeReq(() => {});
+              },
+              get(key: string) {
+                const req = makeReq(() => {});
+                (req as { result?: unknown }).result = store.get(key);
+                return req;
+              },
+              delete(key: string) {
+                store.delete(key);
+                return makeReq(() => {});
+              },
+            };
+          },
+          set oncomplete(fn: () => void) {
+            queueMicrotask(fn);
+          },
+          set onerror(_fn: () => void) {},
+        };
+      },
+    };
+    (globalThis as { indexedDB?: unknown }).indexedDB = {
+      open() {
+        const req: Record<string, unknown> = { result: fakeDb };
+        queueMicrotask(() => (req.onsuccess as () => void)?.());
+        return req;
+      },
+    };
+
+    const source = new QueryClient();
+    source.setQueryData(["dashboard", "snapshot"], { weightKg: 81 });
+    const stop = startPersistingQueryCache(source, "v1.18.6");
+    // Force a flush by advancing past the 1s debounce.
+    vi.useFakeTimers();
+    source.setQueryData(["measurements", "list"], [{ id: "a" }]);
+    vi.advanceTimersByTime(1100);
+    vi.useRealTimers();
+    await new Promise((r) => setTimeout(r, 0));
+    stop();
+
+    const matchingBuild = new QueryClient();
+    await restorePersistedQueryCache(matchingBuild, "v1.18.6");
+    expect(matchingBuild.getQueryData(["dashboard", "snapshot"])).toEqual({
+      weightKg: 81,
+    });
+
+    const foreignBuild = new QueryClient();
+    await restorePersistedQueryCache(foreignBuild, "v9.9.9");
+    expect(foreignBuild.getQueryData(["dashboard", "snapshot"])).toBeUndefined();
+  });
+});
diff --git a/src/lib/pwa/__tests__/sw-cache-policy.test.ts b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
new file mode 100644
index 000000000..db93bd5b8
--- /dev/null
+++ b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it } from "vitest";
+
+import {
+  isAllowlistedApiRead,
+  isCacheableApiResponse,
+} from "@/lib/pwa/sw-cache-policy";
+
+describe("isAllowlistedApiRead — offline read boundary", () => {
+  it("caches the curated safe GET read endpoints", () => {
+    expect(isAllowlistedApiRead("/api/dashboard/snapshot")).toBe(true);
+    expect(isAllowlistedApiRead("/api/dashboard/widgets")).toBe(true);
+    expect(isAllowlistedApiRead("/api/measurements")).toBe(true);
+    expect(
+      isAllowlistedApiRead("/api/measurements/series-batch?types=WEIGHT"),
+    ).toBe(true);
+    expect(isAllowlistedApiRead("/api/medications")).toBe(true);
+    expect(isAllowlistedApiRead("/api/insights")).toBe(true);
+    expect(isAllowlistedApiRead("/api/analytics")).toBe(true);
+    expect(isAllowlistedApiRead("/api/version")).toBe(true);
+  });
+
+  it("never caches auth / session / token / login surfaces", () => {
+    expect(isAllowlistedApiRead("/api/auth/me")).toBe(false);
+    expect(isAllowlistedApiRead("/api/auth/logout")).toBe(false);
+    expect(isAllowlistedApiRead("/api/sessions")).toBe(false);
+    expect(isAllowlistedApiRead("/api/tokens")).toBe(false);
+    expect(isAllowlistedApiRead("/api/login")).toBe(false);
+    expect(isAllowlistedApiRead("/api/webauthn/options")).toBe(false);
+  });
+
+  it("refuses an auth/token segment nested under an allowlisted prefix", () => {
+    expect(isAllowlistedApiRead("/api/medications/tokens")).toBe(false);
+    expect(isAllowlistedApiRead("/api/insights/auth")).toBe(false);
+  });
+
+  it("does not cache endpoints outside the allowlist", () => {
+    expect(isAllowlistedApiRead("/api/admin/users")).toBe(false);
+    expect(isAllowlistedApiRead("/api/devices")).toBe(false);
+    expect(isAllowlistedApiRead("/api/withings/callback")).toBe(false);
+  });
+
+  it("does not match a prefix that is only a partial path segment", () => {
+    // `/api/measurements-export` must NOT match `/api/measurements`.
+    expect(isAllowlistedApiRead("/api/measurements-export")).toBe(false);
+  });
+});
+
+describe("isCacheableApiResponse — body/header refusal", () => {
+  it("caches a successful read with a plain body", () => {
+    expect(
+      isCacheableApiResponse({
+        ok: true,
+        cacheControl: "private, max-age=0",
+        bodyText: JSON.stringify({ data: { weightKg: 80 }, error: null }),
+      }),
+    ).toBe(true);
+  });
+
+  it("refuses non-ok responses", () => {
+    expect(isCacheableApiResponse({ ok: false, bodyText: "{}" })).toBe(false);
+  });
+
+  it("refuses a no-store response", () => {
+    expect(
+      isCacheableApiResponse({
+        ok: true,
+        cacheControl: "no-store",
+        bodyText: "{}",
+      }),
+    ).toBe(false);
+  });
+
+  it("refuses secret-shaped bodies (hlk_ / hlr_ / sk-)", () => {
+    expect(
+      isCacheableApiResponse({
+        ok: true,
+        bodyText: JSON.stringify({ data: { token: "hlk_abc123def" } }),
+      }),
+    ).toBe(false);
+    expect(
+      isCacheableApiResponse({
+        ok: true,
+        bodyText: JSON.stringify({ data: { refresh: "hlr_xyz789ghi" } }),
+      }),
+    ).toBe(false);
+    expect(
+      isCacheableApiResponse({
+        ok: true,
+        bodyText: JSON.stringify({ data: { key: "sk-livesecret00" } }),
+      }),
+    ).toBe(false);
+  });
+});
diff --git a/src/lib/pwa/query-persister.ts b/src/lib/pwa/query-persister.ts
new file mode 100644
index 000000000..3d7f5a578
--- /dev/null
+++ b/src/lib/pwa/query-persister.ts
@@ -0,0 +1,169 @@
+/**
+ * Minimal IndexedDB-backed TanStack Query persistence (v1.18.6).
+ *
+ * No external persister dependency: a tiny IDB key/value store plus a manual
+ * dehydrate-on-cache-change / hydrate-on-boot bridge. The goal is offline
+ * READ value — an installed PWA opened offline hydrates the last cached
+ * dashboard/series instantly instead of painting empty skeletons forever.
+ *
+ * Safety:
+ *  - Only successful (`status: "success"`) query results are persisted.
+ *  - A small denylist keeps obviously sensitive query families out of disk
+ *    (auth/session/admin/tokens), defence-in-depth alongside the SW boundary.
+ *  - `clearPersistedQueryCache()` is called on logout so a shared device never
+ *    leaks one account's cached health data to the next.
+ *  - Respects the centralised queryKey factory: it reads existing query keys,
+ *    it never invents new ones.
+ */
+
+import {
+  dehydrate,
+  hydrate,
+  type DehydratedState,
+  type QueryClient,
+} from "@tanstack/react-query";
+
+const DB_NAME = "healthlog-query-cache";
+const STORE = "kv";
+const KEY = "react-query";
+const VERSION_KEY = "react-query-version";
+const MAX_AGE_MS = 24 * 60 * 60 * 1000; // discard anything older than a day
+
+/** Query-key families never written to disk (defence in depth). */
+const PERSIST_DENYLIST = [
+  "auth",
+  "session",
+  "sessions",
+  "admin",
+  "tokens",
+  "apiTokens",
+];
+
+export function isPersistableKey(queryKey: readonly unknown[]): boolean {
+  const head = queryKey[0];
+  if (typeof head !== "string") return true;
+  return !PERSIST_DENYLIST.includes(head);
+}
+
+function openDb(): Promise<IDBDatabase> {
+  return new Promise((resolve, reject) => {
+    const req = indexedDB.open(DB_NAME, 1);
+    req.onupgradeneeded = () => {
+      req.result.createObjectStore(STORE);
+    };
+    req.onsuccess = () => resolve(req.result);
+    req.onerror = () => reject(req.error);
+  });
+}
+
+async function idbSet(value: unknown): Promise<void> {
+  const db = await openDb();
+  await new Promise<void>((resolve, reject) => {
+    const tx = db.transaction(STORE, "readwrite");
+    tx.objectStore(STORE).put(value, KEY);
+    tx.oncomplete = () => resolve();
+    tx.onerror = () => reject(tx.error);
+  });
+  db.close();
+}
+
+async function idbGet<T>(): Promise<T | undefined> {
+  const db = await openDb();
+  const result = await new Promise<T | undefined>((resolve, reject) => {
+    const tx = db.transaction(STORE, "readonly");
+    const req = tx.objectStore(STORE).get(KEY);
+    req.onsuccess = () => resolve(req.result as T | undefined);
+    req.onerror = () => reject(req.error);
+  });
+  db.close();
+  return result;
+}
+
+interface PersistedPayload {
+  buildVersion: string;
+  savedAt: number;
+  state: DehydratedState;
+}
+
+/**
+ * Restore persisted query data into the client (called once before the first
+ * paint of the authenticated shell). A build-version or age mismatch discards
+ * the snapshot rather than hydrating a stale/foreign-schema cache.
+ */
+export async function restorePersistedQueryCache(
+  queryClient: QueryClient,
+  buildVersion: string,
+): Promise<void> {
+  if (typeof indexedDB === "undefined") return;
+  try {
+    const payload = await idbGet<PersistedPayload>();
+    if (!payload) return;
+    if (payload.buildVersion !== buildVersion) {
+      await clearPersistedQueryCache();
+      return;
+    }
+    if (Date.now() - payload.savedAt > MAX_AGE_MS) {
+      await clearPersistedQueryCache();
+      return;
+    }
+    hydrate(queryClient, payload.state);
+  } catch {
+    // Persistence is best-effort; never block boot on a cache restore.
+  }
+}
+
+/**
+ * Subscribe to cache changes and debounce-persist successful, persistable
+ * queries to IndexedDB. Returns an unsubscribe function.
+ */
+export function startPersistingQueryCache(
+  queryClient: QueryClient,
+  buildVersion: string,
+): () => void {
+  if (typeof indexedDB === "undefined") return () => {};
+
+  let timer: ReturnType<typeof setTimeout> | undefined;
+
+  const flush = () => {
+    const state = dehydrate(queryClient, {
+      shouldDehydrateQuery: (query) =>
+        query.state.status === "success" && isPersistableKey(query.queryKey),
+    });
+    const payload: PersistedPayload = {
+      buildVersion,
+      savedAt: Date.now(),
+      state,
+    };
+    void idbSet(payload).catch(() => {
+      /* best effort */
+    });
+  };
+
+  const unsubscribe = queryClient.getQueryCache().subscribe(() => {
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(flush, 1000);
+  });
+
+  return () => {
+    if (timer) clearTimeout(timer);
+    unsubscribe();
+  };
+}
+
+/** Wipe the persisted cache. Call on logout (shared-device data hygiene). */
+export async function clearPersistedQueryCache(): Promise<void> {
+  if (typeof indexedDB === "undefined") return;
+  try {
+    const db = await openDb();
+    await new Promise<void>((resolve, reject) => {
+      const tx = db.transaction(STORE, "readwrite");
+      tx.objectStore(STORE).delete(KEY);
+      tx.objectStore(STORE).delete(VERSION_KEY);
+      tx.oncomplete = () => resolve();
+      tx.onerror = () => reject(tx.error);
+    });
+    db.close();
+  } catch {
+    /* best effort */
+  }
+}
diff --git a/src/lib/pwa/sw-cache-policy.ts b/src/lib/pwa/sw-cache-policy.ts
new file mode 100644
index 000000000..f733e58d6
--- /dev/null
+++ b/src/lib/pwa/sw-cache-policy.ts
@@ -0,0 +1,60 @@
+/**
+ * Service-worker offline-read cache policy (v1.18.6).
+ *
+ * The runtime copy of this logic lives inline in `public/sw.js` (a service
+ * worker cannot import app modules at runtime). This module is the
+ * unit-tested source of truth for the safety boundary — the allowlist match,
+ * the auth/token deny guard, and the body-level secret refusal — so the SW's
+ * caching decisions are covered by `pnpm test`. Keep the two in lockstep when
+ * either changes.
+ *
+ * Boundary: ONLY idempotent GET reads that render the core views are cached.
+ * Auth/mutation/token surfaces are never cached, and a body carrying a
+ * secret-shaped token (`hlk_`/`hlr_`/`sk-`) is refused even if its path was
+ * allowlisted by mistake — mirroring the idempotency cache's refusal.
+ */
+
+/** Path prefixes whose safe GET reads are eligible for the offline data cache. */
+export const API_READ_ALLOWLIST = [
+  "/api/dashboard/snapshot",
+  "/api/dashboard/widgets",
+  "/api/measurements",
+  "/api/medications",
+  "/api/insights",
+  "/api/analytics",
+  "/api/version",
+] as const;
+
+/** Auth/token surfaces refused even when nested under an allowlisted prefix. */
+export const API_DENY_RE = /\/(auth|tokens?|sessions?|login|password|webauthn)(\/|$|\?)/i;
+
+/** Secret-shaped token patterns refused at the response-body level. */
+export const SECRET_BODY_RE = /(hlk_|hlr_|sk-)[A-Za-z0-9_-]/;
+
+export function isAllowlistedApiRead(pathname: string): boolean {
+  if (API_DENY_RE.test(pathname)) return false;
+  return API_READ_ALLOWLIST.some(
+    (p) =>
+      pathname === p ||
+      pathname.startsWith(p + "/") ||
+      pathname.startsWith(p + "?"),
+  );
+}
+
+/**
+ * Decide whether an allowlisted response may be persisted. `ok` + no
+ * `no-store` + no secret-shaped body. Mirrors `isCacheableApiResponse` in
+ * `public/sw.js`.
+ */
+export function isCacheableApiResponse(opts: {
+  ok: boolean;
+  cacheControl?: string | null;
+  bodyText?: string;
+}): boolean {
+  if (!opts.ok) return false;
+  if (/no-store/i.test(opts.cacheControl || "")) return false;
+  if (typeof opts.bodyText === "string" && SECRET_BODY_RE.test(opts.bodyText)) {
+    return false;
+  }
+  return true;
+}

From bd8055774953636118f4f212c59e80b5869b0b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:29:09 +0200
Subject: [PATCH 06/71] perf(dashboard): compute chart band/target math
 server-side
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the BP/pulse/body-fat/weight band + target derivation out of the
dashboard client component and into the snapshot DTO. The page recomputed
every band from the user profile on each render via the analytics band
helpers; the snapshot builder now resolves the same numeric structures
once server-side under a new targetBands block, calling the identical
helpers. Emit only the i18n-free numbers — the label-bearing BP target
zones stay client-assembled from the server numbers.

Add a parity test asserting buildTargetBands matches the prior client
derivation for a male, a female, and a no-profile user.
---
 e2e/utils/mock-dashboard-snapshot.ts          |  73 +++++++++
 .../hero/__tests__/dashboard-hero.test.tsx    |   6 +
 .../dashboard/__tests__/target-bands.test.ts  | 142 +++++++++++++++++
 src/lib/dashboard/__tests__/verdict.test.ts   |   6 +
 src/lib/dashboard/snapshot.ts                 | 146 +++++++++++++++++-
 5 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/dashboard/__tests__/target-bands.test.ts

diff --git a/e2e/utils/mock-dashboard-snapshot.ts b/e2e/utils/mock-dashboard-snapshot.ts
index cdc207dd8..e1f626569 100644
--- a/e2e/utils/mock-dashboard-snapshot.ts
+++ b/e2e/utils/mock-dashboard-snapshot.ts
@@ -8,7 +8,79 @@ import type { DataSummary } from "@/lib/analytics/trends";
 import type {
   DashboardSnapshot,
   DashboardLayoutCatalogueEntry,
+  DashboardTargetBands,
 } from "@/lib/dashboard/snapshot";
+import { getBpTargets } from "@/lib/analytics/bp-targets";
+import {
+  buildTrafficLightBands,
+  buildTrafficRange,
+  buildWeightBandsFromHeight,
+  buildWeightRangeFromHeight,
+  getBodyFatTargetRange,
+} from "@/lib/analytics/value-bands";
+import {
+  getAgeFromDateOfBirth,
+  getPersonalizedPulseTarget,
+} from "@/lib/analytics/pulse-targets";
+
+// v1.18.6 — resolve the mock's band block from the same pure helpers the
+// server builder uses, so the e2e fixture matches the real DTO shape.
+function mockTargetBands(): DashboardTargetBands {
+  const dob = new Date("1990-01-01T00:00:00.000Z");
+  const bpTargets = getBpTargets(dob);
+  const pulseTarget = getPersonalizedPulseTarget(
+    getAgeFromDateOfBirth(dob),
+    "MALE",
+  );
+  const bodyFatRange = getBodyFatTargetRange("MALE");
+  return {
+    bpTargets,
+    bpSysRange: bpTargets
+      ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
+      : null,
+    bpDiaRange: bpTargets
+      ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
+      : null,
+    pulseDisplayRange: {
+      greenMin: pulseTarget.greenMin,
+      greenMax: pulseTarget.greenMax,
+      orangeMin: pulseTarget.orangeMin,
+      orangeMax: pulseTarget.orangeMax,
+    },
+    pulseBands: [
+      { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
+      {
+        min: pulseTarget.orangeMin,
+        max: pulseTarget.greenMin,
+        color: "#ffb86c",
+        opacity: 0.18,
+      },
+      {
+        min: pulseTarget.greenMin,
+        max: pulseTarget.greenMax,
+        color: "#50fa7b",
+        opacity: 0.2,
+      },
+      {
+        min: pulseTarget.greenMax,
+        max: pulseTarget.orangeMax,
+        color: "#ffb86c",
+        opacity: 0.18,
+      },
+      { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
+    ].filter((b) => b.max > b.min),
+    bodyFatRange,
+    bodyFatBands: buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
+      lowerBound: 2,
+      upperBound: 55,
+    }),
+    weightRange: buildWeightRangeFromHeight(180),
+    weightBands: buildWeightBandsFromHeight(180, {
+      lowerBound: 30,
+      upperBound: 250,
+    }),
+  };
+}
 
 /**
  * v1.7.2 — shared mock for `GET /api/dashboard/snapshot`.
@@ -138,6 +210,7 @@ export function buildMockSnapshot(
     layout: DEFAULT_DASHBOARD_LAYOUT,
     layoutCatalogue: buildLayoutCatalogue(),
     metricStates: {},
+    targetBands: mockTargetBands(),
     tiles: {
       summaries,
       lastSeenByType,
diff --git a/src/components/dashboard/hero/__tests__/dashboard-hero.test.tsx b/src/components/dashboard/hero/__tests__/dashboard-hero.test.tsx
index 451b8af0a..85c65068c 100644
--- a/src/components/dashboard/hero/__tests__/dashboard-hero.test.tsx
+++ b/src/components/dashboard/hero/__tests__/dashboard-hero.test.tsx
@@ -6,6 +6,7 @@ import { join } from "node:path";
 import { I18nProvider } from "@/lib/i18n/context";
 import { makeFormatters } from "@/lib/format-locale";
 import type { DashboardSnapshot } from "@/lib/dashboard/snapshot";
+import { buildTargetBands } from "@/lib/dashboard/snapshot";
 import type { MedsTodayBlock } from "@/lib/dashboard/meds-today";
 import type { DataSummary } from "@/lib/analytics/trends";
 import { DashboardHero } from "../dashboard-hero";
@@ -92,6 +93,11 @@ function baseSnapshot(
     layout: { version: 1, widgets: [] },
     layoutCatalogue: [],
     metricStates: {},
+    targetBands: buildTargetBands({
+      dateOfBirth: null,
+      gender: null,
+      heightCm: null,
+    }),
     tiles: {
       summaries: {},
       lastSeenByType: {},
diff --git a/src/lib/dashboard/__tests__/target-bands.test.ts b/src/lib/dashboard/__tests__/target-bands.test.ts
new file mode 100644
index 000000000..56aa6d1ab
--- /dev/null
+++ b/src/lib/dashboard/__tests__/target-bands.test.ts
@@ -0,0 +1,142 @@
+/**
+ * v1.18.6 — parity test for the server-side band / target math
+ * (audit finding #3). `buildTargetBands` must produce byte-identical
+ * numbers to the legacy client-side derivation in `page.tsx`, which is
+ * just a sequence of the SAME pure helpers. The test re-derives each
+ * structure with those helpers and asserts deep equality for a male
+ * profile, a female profile, and a no-profile user.
+ */
+import { describe, it, expect } from "vitest";
+
+import { buildTargetBands } from "../snapshot";
+import { getBpTargets } from "@/lib/analytics/bp-targets";
+import {
+  buildTrafficLightBands,
+  buildTrafficRange,
+  buildWeightBandsFromHeight,
+  buildWeightRangeFromHeight,
+  getBodyFatTargetRange,
+} from "@/lib/analytics/value-bands";
+import {
+  getAgeFromDateOfBirth,
+  getPersonalizedPulseTarget,
+} from "@/lib/analytics/pulse-targets";
+
+/** Re-derive bands exactly as `page.tsx` did before v1.18.6. */
+function clientBands(profile: {
+  dateOfBirth: Date | null;
+  gender: "MALE" | "FEMALE" | null;
+  heightCm: number | null;
+}) {
+  const bpTargets = profile.dateOfBirth
+    ? getBpTargets(profile.dateOfBirth)
+    : null;
+  const pulseAge = getAgeFromDateOfBirth(profile.dateOfBirth);
+  const pulseTarget = getPersonalizedPulseTarget(pulseAge, profile.gender);
+  const bodyFatRange = getBodyFatTargetRange(profile.gender);
+  const weightRange = profile.heightCm
+    ? buildWeightRangeFromHeight(profile.heightCm)
+    : null;
+  const weightBands = profile.heightCm
+    ? buildWeightBandsFromHeight(profile.heightCm, {
+        lowerBound: 30,
+        upperBound: 250,
+      })
+    : null;
+  return {
+    bpTargets,
+    bpSysRange: bpTargets
+      ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
+      : null,
+    bpDiaRange: bpTargets
+      ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
+      : null,
+    pulseDisplayRange: {
+      greenMin: pulseTarget.greenMin,
+      greenMax: pulseTarget.greenMax,
+      orangeMin: pulseTarget.orangeMin,
+      orangeMax: pulseTarget.orangeMax,
+    },
+    pulseBands: [
+      { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
+      {
+        min: pulseTarget.orangeMin,
+        max: pulseTarget.greenMin,
+        color: "#ffb86c",
+        opacity: 0.18,
+      },
+      {
+        min: pulseTarget.greenMin,
+        max: pulseTarget.greenMax,
+        color: "#50fa7b",
+        opacity: 0.2,
+      },
+      {
+        min: pulseTarget.greenMax,
+        max: pulseTarget.orangeMax,
+        color: "#ffb86c",
+        opacity: 0.18,
+      },
+      { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
+    ].filter((b) => b.max > b.min),
+    bodyFatRange,
+    bodyFatBands: buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
+      lowerBound: 2,
+      upperBound: 55,
+    }),
+    weightRange,
+    weightBands,
+  };
+}
+
+describe("buildTargetBands — server/client parity", () => {
+  const profiles: Array<{
+    name: string;
+    dateOfBirth: Date | null;
+    gender: "MALE" | "FEMALE" | null;
+    heightCm: number | null;
+  }> = [
+    {
+      name: "male 180cm with DOB",
+      dateOfBirth: new Date("1985-06-15T00:00:00.000Z"),
+      gender: "MALE",
+      heightCm: 180,
+    },
+    {
+      name: "female 165cm with DOB",
+      dateOfBirth: new Date("1970-01-01T00:00:00.000Z"),
+      gender: "FEMALE",
+      heightCm: 165,
+    },
+    {
+      name: "no-profile user (null DOB / gender / height)",
+      dateOfBirth: null,
+      gender: null,
+      heightCm: null,
+    },
+  ];
+
+  for (const profile of profiles) {
+    it(`matches the legacy client math for ${profile.name}`, () => {
+      const server = buildTargetBands(profile);
+      const client = clientBands(profile);
+      expect(server).toEqual(client);
+    });
+  }
+
+  it("nulls the profile-derived bands when no DOB / height", () => {
+    const bands = buildTargetBands({
+      dateOfBirth: null,
+      gender: null,
+      heightCm: null,
+    });
+    expect(bands.bpTargets).toBeNull();
+    expect(bands.bpSysRange).toBeNull();
+    expect(bands.bpDiaRange).toBeNull();
+    expect(bands.weightRange).toBeNull();
+    expect(bands.weightBands).toBeNull();
+    // Pulse + body-fat always resolve (AHA / neutral fallback).
+    expect(bands.pulseBands.length).toBeGreaterThan(0);
+    expect(bands.bodyFatBands.length).toBeGreaterThan(0);
+  });
+});
diff --git a/src/lib/dashboard/__tests__/verdict.test.ts b/src/lib/dashboard/__tests__/verdict.test.ts
index c5f704c19..3aec74909 100644
--- a/src/lib/dashboard/__tests__/verdict.test.ts
+++ b/src/lib/dashboard/__tests__/verdict.test.ts
@@ -18,6 +18,7 @@
 import { describe, it, expect } from "vitest";
 
 import { resolveDashboardVerdict } from "../verdict";
+import { buildTargetBands } from "../snapshot";
 import type { DashboardSnapshot } from "../snapshot";
 import type { MedsTodayBlock } from "../meds-today";
 import type { DataSummary } from "@/lib/analytics/trends";
@@ -73,6 +74,11 @@ function baseSnapshot(
     layout: { version: 1, widgets: [] },
     layoutCatalogue: [],
     metricStates: {},
+    targetBands: buildTargetBands({
+      dateOfBirth: null,
+      gender: null,
+      heightCm: null,
+    }),
     tiles: {
       summaries: {},
       lastSeenByType: {},
diff --git a/src/lib/dashboard/snapshot.ts b/src/lib/dashboard/snapshot.ts
index 8452a9dcd..969e4e9fa 100644
--- a/src/lib/dashboard/snapshot.ts
+++ b/src/lib/dashboard/snapshot.ts
@@ -45,7 +45,20 @@ import {
   type DataPoint,
   type DataSummary,
 } from "@/lib/analytics/trends";
-import { getBpTargets } from "@/lib/analytics/bp-targets";
+import { getBpTargets, type BpTargets } from "@/lib/analytics/bp-targets";
+import {
+  buildTrafficLightBands,
+  buildTrafficRange,
+  buildWeightBandsFromHeight,
+  buildWeightRangeFromHeight,
+  getBodyFatTargetRange,
+  type ValueBand,
+  type TrafficRange,
+} from "@/lib/analytics/value-bands";
+import {
+  getAgeFromDateOfBirth,
+  getPersonalizedPulseTarget,
+} from "@/lib/analytics/pulse-targets";
 import {
   computeGlucoseClinicalMetrics,
   GLUCOSE_PANEL_WINDOW_DAYS,
@@ -196,6 +209,48 @@ export interface DashboardSnapshotUser {
   greetingHour: number;
 }
 
+/**
+ * v1.18.6 — server-computed band / target math (audit finding #3).
+ *
+ * The dashboard used to derive every chart band + tile range CLIENT-side
+ * in `page.tsx` from `user.dateOfBirth` / `gender` / `heightCm`. This
+ * block resolves the same numbers server-side from the EXISTING band
+ * helpers (`getBpTargets`, `getPersonalizedPulseTarget`,
+ * `getBodyFatTargetRange`, `buildWeight*FromHeight`,
+ * `buildTrafficLightBands`, `buildTrafficRange`) so the client reads them
+ * instead of recomputing. Only the NUMERIC structures live here — the
+ * `bpTargetZones` array carries `t()`-localised labels, so the client
+ * assembles THAT from `bpTargets` (numbers) at render time. Every field
+ * is `null` when the driving profile fact is missing (no DOB → BP/pulse
+ * personalisation, no height → weight band), matching the client's
+ * previous null-guards exactly.
+ */
+export interface DashboardTargetBands {
+  /** Personalised BP target numbers (null when no DOB). */
+  bpTargets: BpTargets | null;
+  /** Systolic traffic range (null when no DOB). */
+  bpSysRange: TrafficRange | null;
+  /** Diastolic traffic range (null when no DOB). */
+  bpDiaRange: TrafficRange | null;
+  /** Resting-pulse display range (always present — AHA fallback). */
+  pulseDisplayRange: {
+    greenMin: number;
+    greenMax: number;
+    orangeMin: number;
+    orangeMax: number;
+  };
+  /** Resting-pulse chart bands (always present — AHA fallback). */
+  pulseBands: ValueBand[];
+  /** Body-fat target range (gender-aware; always present). */
+  bodyFatRange: { min: number; max: number };
+  /** Body-fat chart bands (always present). */
+  bodyFatBands: ValueBand[];
+  /** Weight traffic range (null when no height). */
+  weightRange: TrafficRange | null;
+  /** Weight chart bands (null when no height). */
+  weightBands: ValueBand[] | null;
+}
+
 export interface DashboardSnapshotMoodEntry {
   date: string;
   score: number;
@@ -301,6 +356,12 @@ export interface DashboardSnapshot {
    * `MetricKind` raw value. Additive; the web page does not read it.
    */
   metricStates: Record<string, DashboardMetricState>;
+  /**
+   * v1.18.6 — server-computed band / target math (audit finding #3). The
+   * web dashboard reads these instead of recomputing from the profile;
+   * additive for iOS.
+   */
+  targetBands: DashboardTargetBands;
   /** Fast phase — always present. */
   tiles: {
     summaries: Record<string, DataSummary>;
@@ -600,6 +661,84 @@ async function buildExtras(
   };
 }
 
+/**
+ * v1.18.6 — resolve the band / target math server-side from the same
+ * helpers the client used. Pure projection over the profile facts; no DB
+ * read. Mirrors the exact construction `page.tsx` ran (same helper calls,
+ * same literal pulse-band colours/opacities, same null-guards) so the
+ * snapshot path and the legacy client-compute path produce byte-identical
+ * numbers.
+ */
+export function buildTargetBands(profile: {
+  dateOfBirth: Date | null;
+  gender: "MALE" | "FEMALE" | null;
+  heightCm: number | null;
+}): DashboardTargetBands {
+  const bpTargets = profile.dateOfBirth
+    ? getBpTargets(profile.dateOfBirth)
+    : null;
+  const pulseAge = getAgeFromDateOfBirth(profile.dateOfBirth);
+  const pulseTarget = getPersonalizedPulseTarget(pulseAge, profile.gender);
+  const bodyFatRange = getBodyFatTargetRange(profile.gender);
+  const weightRange = profile.heightCm
+    ? buildWeightRangeFromHeight(profile.heightCm)
+    : null;
+  const weightBands = profile.heightCm
+    ? buildWeightBandsFromHeight(profile.heightCm, {
+        lowerBound: 30,
+        upperBound: 250,
+      })
+    : null;
+  const bpSysRange = bpTargets
+    ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
+    : null;
+  const bpDiaRange = bpTargets
+    ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
+    : null;
+  const pulseBands = [
+    { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
+    {
+      min: pulseTarget.orangeMin,
+      max: pulseTarget.greenMin,
+      color: "#ffb86c",
+      opacity: 0.18,
+    },
+    {
+      min: pulseTarget.greenMin,
+      max: pulseTarget.greenMax,
+      color: "#50fa7b",
+      opacity: 0.2,
+    },
+    {
+      min: pulseTarget.greenMax,
+      max: pulseTarget.orangeMax,
+      color: "#ffb86c",
+      opacity: 0.18,
+    },
+    { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
+  ].filter((band) => band.max > band.min);
+  const bodyFatBands = buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
+    lowerBound: 2,
+    upperBound: 55,
+  });
+  return {
+    bpTargets,
+    bpSysRange,
+    bpDiaRange,
+    pulseDisplayRange: {
+      greenMin: pulseTarget.greenMin,
+      greenMax: pulseTarget.greenMax,
+      orangeMin: pulseTarget.orangeMin,
+      orangeMax: pulseTarget.orangeMax,
+    },
+    pulseBands,
+    bodyFatRange,
+    bodyFatBands,
+    weightRange,
+    weightBands,
+  };
+}
+
 /** Parse + validate the cached `dailyBriefing` block; null when unusable. */
 function parseCachedBriefing(
   cachedText: string | null,
@@ -968,6 +1107,11 @@ export async function buildDashboardSnapshot(
     layout,
     layoutCatalogue: buildLayoutCatalogue(layout),
     metricStates: buildMetricStates(slim.summaries, slim.lastSeenByType),
+    targetBands: buildTargetBands({
+      dateOfBirth: user.dateOfBirth,
+      gender,
+      heightCm: user.heightCm ?? null,
+    }),
     tiles: {
       summaries: slim.summaries,
       lastSeenByType: enrichLastSeen(slim.lastSeenByType, nowMs),

From 143aefc709501d10df3dc632325b585b4c739c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:29:20 +0200
Subject: [PATCH 07/71] feat(api): batched rollup-backed series endpoint to
 coalesce dashboard fetches

Add GET /api/measurements/series-batch returning every requested
MeasurementType's daily series in one response, so the dashboard chart
row stops issuing one self-fetch per chart. Extract the rollup-daily read
(per-source collapse, coverage probe + inline fold, live-SQL fallback)
into a shared readDailySeries reader so the single-type route and the
batch route read through the same path with no SQL duplication; the
single route now delegates to it. Cap the batch's per-type reads with
p-limit to protect the shared pool. Sleep stays on its per-night /series
adapter and is not batched.

HealthChart gains an optional preloadedSeries prop: when the dashboard
hands it a covered slice for the daily window it folds those rows instead
of self-fetching, keyed so a range-tab change re-fetches cleanly. Non-
dashboard mounts are unchanged (empty discriminator keeps the cache tuple
byte-identical). Register the endpoint in the OpenAPI table and regen the
spec; add unit + parity coverage for the batch route.
---
 docs/api/openapi.yaml                         | 320 ++++++++++++++++++
 src/app/api/measurements/route.ts             | 207 ++---------
 .../series-batch/__tests__/route.test.ts      | 120 +++++++
 .../api/measurements/series-batch/route.ts    |  99 ++++++
 src/components/charts/health-chart.tsx        |  83 ++++-
 src/lib/measurements/daily-series-read.ts     | 226 +++++++++++++
 src/lib/openapi/routes/measurements.ts        |  68 ++++
 src/lib/query-keys/measurements.ts            |  50 ++-
 src/lib/validations/series-batch.ts           |  51 +++
 9 files changed, 1016 insertions(+), 208 deletions(-)
 create mode 100644 src/app/api/measurements/series-batch/__tests__/route.test.ts
 create mode 100644 src/app/api/measurements/series-batch/route.ts
 create mode 100644 src/lib/measurements/daily-series-read.ts
 create mode 100644 src/lib/validations/series-batch.ts

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index 2490f1275..a66cc44c5 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -1443,6 +1443,55 @@ paths:
         "401": *a1
         "422": *a3
         "429": *a4
+  /api/measurements/series-batch:
+    get:
+      tags:
+        - Measurements
+      summary: Batched daily series (dashboard fetch coalescing)
+      description: Returns the rollup-backed daily series for every requested MeasurementType in ONE response, so the
+        dashboard chart row does a single round-trip instead of one self-fetch per chart. Each per-type series is
+        byte-identical with `GET /api/measurements?aggregate=daily&source=rollup` for the same window. SLEEP_DURATION is
+        not served here (it rides the per-night reconstruction at `/api/measurements/series?kind=sleep`). Auth via
+        cookie or Bearer.
+      parameters:
+        - in: query
+          name: types
+          schema:
+            description: Comma-separated list of MeasurementType values (1..16). Each is read as a daily series through the rollup
+              tier.
+            type: string
+            minLength: 1
+          required: true
+          description: Comma-separated list of MeasurementType values (1..16). Each is read as a daily series through the rollup
+            tier.
+        - in: query
+          name: from
+          schema:
+            description: Window start (ISO-8601 instant).
+            type: string
+            format: date-time
+            pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z|([+-](?:[01]\d|2[0-3]):[0-5]\d)))$
+          required: true
+          description: Window start (ISO-8601 instant).
+        - in: query
+          name: to
+          schema:
+            description: Window end (ISO-8601 instant).
+            type: string
+            format: date-time
+            pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z|([+-](?:[01]\d|2[0-3]):[0-5]\d)))$
+          required: true
+          description: Window end (ISO-8601 instant).
+      responses:
+        "200":
+          description: Per-type daily series.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/GetMeasurementsSeriesBatchResponse"
+        "401": *a1
+        "422": *a3
+        "429": *a4
   /api/measurements/series:
     get:
       tags:
@@ -10175,6 +10224,277 @@ components:
         - updatedAt
       additionalProperties: false
       description: A soft-deleted medication intake, keyed on server `id`. Apply before upserts within the domain page.
+    GetMeasurementsSeriesBatchResponse:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/MeasurementsSeriesBatchResponse"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    MeasurementsSeriesBatchResponse:
+      type: object
+      properties:
+        series:
+          type: object
+          propertyNames:
+            type: string
+            enum:
+              - WEIGHT
+              - BLOOD_PRESSURE_SYS
+              - BLOOD_PRESSURE_DIA
+              - PULSE
+              - BODY_FAT
+              - SLEEP_DURATION
+              - ACTIVITY_STEPS
+              - BLOOD_GLUCOSE
+              - TOTAL_BODY_WATER
+              - BONE_MASS
+              - OXYGEN_SATURATION
+              - HEART_RATE_VARIABILITY
+              - RESTING_HEART_RATE
+              - ACTIVE_ENERGY_BURNED
+              - FLIGHTS_CLIMBED
+              - WALKING_RUNNING_DISTANCE
+              - VO2_MAX
+              - BODY_TEMPERATURE
+              - FAT_FREE_MASS
+              - FAT_MASS
+              - MUSCLE_MASS
+              - SKIN_TEMPERATURE
+              - PULSE_WAVE_VELOCITY
+              - VASCULAR_AGE
+              - VISCERAL_FAT
+              - AUDIO_EXPOSURE_ENV
+              - AUDIO_EXPOSURE_HEADPHONE
+              - TIME_IN_DAYLIGHT
+              - WALKING_STEADINESS
+              - AUDIO_EXPOSURE_EVENT
+              - RESPIRATORY_RATE
+              - BODY_MASS_INDEX
+              - LEAN_BODY_MASS
+              - WALKING_HEART_RATE_AVERAGE
+              - WALKING_ASYMMETRY
+              - WALKING_DOUBLE_SUPPORT
+              - WALKING_STEP_LENGTH
+              - WALKING_SPEED
+              - CARDIO_RECOVERY
+              - WRIST_TEMPERATURE
+              - FALL_COUNT
+              - SIX_MINUTE_WALK_DISTANCE
+              - STAIR_ASCENT_SPEED
+              - STAIR_DESCENT_SPEED
+              - BREATHING_DISTURBANCES
+              - IRREGULAR_RHYTHM_NOTIFICATION
+              - HIGH_HEART_RATE_EVENT
+              - LOW_HEART_RATE_EVENT
+              - WALKING_STEADINESS_EVENT
+              - BREATHING_DISTURBANCE_EVENT
+              - RECOVERY_SCORE
+              - STRESS_SCORE
+              - STRAIN_SCORE
+              - HRV_RMSSD
+              - DAY_STRAIN
+              - WORKOUT_STRAIN
+              - SLEEP_PERFORMANCE
+              - SLEEP_EFFICIENCY
+              - SLEEP_CONSISTENCY
+              - SLEEP_NEED
+              - ENERGY_EXPENDITURE_KJ
+              - AVERAGE_HEART_RATE
+              - MAX_HEART_RATE
+              - SLEEP_DISTURBANCE_COUNT
+              - ANS_CHARGE
+              - CARDIO_LOAD
+              - SLEEP_SCORE
+              - BODY_TEMPERATURE_DEVIATION
+          additionalProperties:
+            type: array
+            items:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - WEIGHT
+                    - BLOOD_PRESSURE_SYS
+                    - BLOOD_PRESSURE_DIA
+                    - PULSE
+                    - BODY_FAT
+                    - SLEEP_DURATION
+                    - ACTIVITY_STEPS
+                    - BLOOD_GLUCOSE
+                    - TOTAL_BODY_WATER
+                    - BONE_MASS
+                    - OXYGEN_SATURATION
+                    - HEART_RATE_VARIABILITY
+                    - RESTING_HEART_RATE
+                    - ACTIVE_ENERGY_BURNED
+                    - FLIGHTS_CLIMBED
+                    - WALKING_RUNNING_DISTANCE
+                    - VO2_MAX
+                    - BODY_TEMPERATURE
+                    - FAT_FREE_MASS
+                    - FAT_MASS
+                    - MUSCLE_MASS
+                    - SKIN_TEMPERATURE
+                    - PULSE_WAVE_VELOCITY
+                    - VASCULAR_AGE
+                    - VISCERAL_FAT
+                    - AUDIO_EXPOSURE_ENV
+                    - AUDIO_EXPOSURE_HEADPHONE
+                    - TIME_IN_DAYLIGHT
+                    - WALKING_STEADINESS
+                    - AUDIO_EXPOSURE_EVENT
+                    - RESPIRATORY_RATE
+                    - BODY_MASS_INDEX
+                    - LEAN_BODY_MASS
+                    - WALKING_HEART_RATE_AVERAGE
+                    - WALKING_ASYMMETRY
+                    - WALKING_DOUBLE_SUPPORT
+                    - WALKING_STEP_LENGTH
+                    - WALKING_SPEED
+                    - CARDIO_RECOVERY
+                    - WRIST_TEMPERATURE
+                    - FALL_COUNT
+                    - SIX_MINUTE_WALK_DISTANCE
+                    - STAIR_ASCENT_SPEED
+                    - STAIR_DESCENT_SPEED
+                    - BREATHING_DISTURBANCES
+                    - IRREGULAR_RHYTHM_NOTIFICATION
+                    - HIGH_HEART_RATE_EVENT
+                    - LOW_HEART_RATE_EVENT
+                    - WALKING_STEADINESS_EVENT
+                    - BREATHING_DISTURBANCE_EVENT
+                    - RECOVERY_SCORE
+                    - STRESS_SCORE
+                    - STRAIN_SCORE
+                    - HRV_RMSSD
+                    - DAY_STRAIN
+                    - WORKOUT_STRAIN
+                    - SLEEP_PERFORMANCE
+                    - SLEEP_EFFICIENCY
+                    - SLEEP_CONSISTENCY
+                    - SLEEP_NEED
+                    - ENERGY_EXPENDITURE_KJ
+                    - AVERAGE_HEART_RATE
+                    - MAX_HEART_RATE
+                    - SLEEP_DISTURBANCE_COUNT
+                    - ANS_CHARGE
+                    - CARDIO_LOAD
+                    - SLEEP_SCORE
+                    - BODY_TEMPERATURE_DEVIATION
+                value:
+                  type: number
+                  description: Daily mean (spot metrics) or SUM (cumulative).
+                measuredAt:
+                  type: string
+                  format: date-time
+                  pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z|([+-](?:[01]\d|2[0-3]):[0-5]\d)))$
+                  description: Day-bucket start (ISO-8601).
+                count:
+                  description: Underlying raw-row count for the bucket.
+                  type: integer
+                  minimum: 0
+                  maximum: 9007199254740991
+                minValue:
+                  description: Per-day minimum (spot metrics only; absent for cumulative).
+                  anyOf:
+                    - type: number
+                    - type: "null"
+                maxValue:
+                  description: Per-day maximum (spot metrics only; absent for cumulative).
+                  anyOf:
+                    - type: number
+                    - type: "null"
+              required:
+                - type
+                - value
+                - measuredAt
+              additionalProperties: false
+          required:
+            - WEIGHT
+            - BLOOD_PRESSURE_SYS
+            - BLOOD_PRESSURE_DIA
+            - PULSE
+            - BODY_FAT
+            - SLEEP_DURATION
+            - ACTIVITY_STEPS
+            - BLOOD_GLUCOSE
+            - TOTAL_BODY_WATER
+            - BONE_MASS
+            - OXYGEN_SATURATION
+            - HEART_RATE_VARIABILITY
+            - RESTING_HEART_RATE
+            - ACTIVE_ENERGY_BURNED
+            - FLIGHTS_CLIMBED
+            - WALKING_RUNNING_DISTANCE
+            - VO2_MAX
+            - BODY_TEMPERATURE
+            - FAT_FREE_MASS
+            - FAT_MASS
+            - MUSCLE_MASS
+            - SKIN_TEMPERATURE
+            - PULSE_WAVE_VELOCITY
+            - VASCULAR_AGE
+            - VISCERAL_FAT
+            - AUDIO_EXPOSURE_ENV
+            - AUDIO_EXPOSURE_HEADPHONE
+            - TIME_IN_DAYLIGHT
+            - WALKING_STEADINESS
+            - AUDIO_EXPOSURE_EVENT
+            - RESPIRATORY_RATE
+            - BODY_MASS_INDEX
+            - LEAN_BODY_MASS
+            - WALKING_HEART_RATE_AVERAGE
+            - WALKING_ASYMMETRY
+            - WALKING_DOUBLE_SUPPORT
+            - WALKING_STEP_LENGTH
+            - WALKING_SPEED
+            - CARDIO_RECOVERY
+            - WRIST_TEMPERATURE
+            - FALL_COUNT
+            - SIX_MINUTE_WALK_DISTANCE
+            - STAIR_ASCENT_SPEED
+            - STAIR_DESCENT_SPEED
+            - BREATHING_DISTURBANCES
+            - IRREGULAR_RHYTHM_NOTIFICATION
+            - HIGH_HEART_RATE_EVENT
+            - LOW_HEART_RATE_EVENT
+            - WALKING_STEADINESS_EVENT
+            - BREATHING_DISTURBANCE_EVENT
+            - RECOVERY_SCORE
+            - STRESS_SCORE
+            - STRAIN_SCORE
+            - HRV_RMSSD
+            - DAY_STRAIN
+            - WORKOUT_STRAIN
+            - SLEEP_PERFORMANCE
+            - SLEEP_EFFICIENCY
+            - SLEEP_CONSISTENCY
+            - SLEEP_NEED
+            - ENERGY_EXPENDITURE_KJ
+            - AVERAGE_HEART_RATE
+            - MAX_HEART_RATE
+            - SLEEP_DISTURBANCE_COUNT
+            - ANS_CHARGE
+            - CARDIO_LOAD
+            - SLEEP_SCORE
+            - BODY_TEMPERATURE_DEVIATION
+          description: Per-type daily series, keyed by MeasurementType.
+      required:
+        - series
+      additionalProperties: false
+      description: Batched daily series — one rollup-backed series per requested type.
     GetMeasurementsSeriesResponse:
       type: object
       properties:
diff --git a/src/app/api/measurements/route.ts b/src/app/api/measurements/route.ts
index 2345089d2..77c23833a 100644
--- a/src/app/api/measurements/route.ts
+++ b/src/app/api/measurements/route.ts
@@ -33,12 +33,9 @@ import { enqueueReminderSatisfy } from "@/lib/jobs/reminder-satisfy";
 import {
   recomputeBucketsForMeasurement,
   collapseToTypeDayKeys,
-  recomputeUserRollups,
 } from "@/lib/rollups/measurement-rollups";
-import {
-  collapseRollupRowsBySource,
-  loadUserSourcePriority,
-} from "@/lib/rollups/measurement-read";
+import { loadUserSourcePriority } from "@/lib/rollups/measurement-read";
+import { readDailySeries } from "@/lib/measurements/daily-series-read";
 import {
   reconstructSleepSessions,
   pickMainNightAndNaps,
@@ -350,186 +347,23 @@ export const GET = apiHandler(async (request: NextRequest) => {
   //     populator hasn't caught up still sees a correct chart on its
   //     first render.
   if (source === "rollup" && aggregate === "daily" && type && from && to) {
+    // v1.18.6 — the rollup-daily read (per-source collapse + coverage
+    // probe + inline fold + live-SQL fallback) moved to the shared
+    // `readDailySeries` reader so the batched series endpoint
+    // (`/api/measurements/series-batch`) reads through the SAME path
+    // instead of duplicating this SQL. Behaviour is unchanged: the rows
+    // returned here are byte-identical with the pre-extraction branch.
     const cap = Math.min(limit, BUCKET_CAP.daily);
-    // v1.11.1 — rollup rows are per source; collapse overlapping sources to the
-    // ladder-canonical reading per day before the chart consumes them, so a
-    // dual-source vital paints one line, not two stacked points per day.
     const priorityJson = await loadUserSourcePriority(user.id);
-    const rollupRows = collapseRollupRowsBySource(
-      await prisma.measurementRollup.findMany({
-        where: {
-          userId: user.id,
-          type: type as MeasurementType,
-          granularity: "DAY",
-          bucketStart: { gte: from, lte: to },
-        },
-        orderBy: { bucketStart: "asc" },
-        // Fetch beyond the bucket cap pre-collapse — N sources per day can
-        // exceed `cap` rows before the per-day collapse reduces them.
-        select: {
-          type: true,
-          source: true,
-          bucketStart: true,
-          mean: true,
-          count: true,
-          // v1.4.39 W-SUM — the writer now populates `sum_value` on
-          // every fold. The cumulative metric path consumes the column
-          // directly instead of reconstructing `mean * count`; the
-          // legacy fallback below covers the boot-backfill convergence
-          // window when an existing bucket pre-dates v1.4.39.
-          sumValue: true,
-          minValue: true,
-          maxValue: true,
-        },
-      }),
-      type as MeasurementType,
+    const measurements = await readDailySeries({
+      userId: user.id,
+      type: type as MeasurementType,
+      from,
+      to,
+      limit,
       priorityJson,
-    ).slice(0, cap);
-    // v1.4.39.2 — coverage-mismatch fallback. v1.4.39.1 wired the
-    // rollup write hook into the previously-bypassed Withings sync,
-    // /api/import, and admin-restore paths, and widened the boot-time
-    // backfill discovery to per-(user, type, day). Together those
-    // changes ensure new writes and post-deploy restarts converge the
-    // rollup tier for every measurement type the user has logged. They
-    // do NOT, however, guarantee convergence inside a single request
-    // when the boot backfill has not yet finished folding the user's
-    // historic rows: a chart query lands first, the rollup table still
-    // carries 2 rows for a 30-day BP_SYS window, and the route's pre-
-    // v1.4.39.2 "rollup wins on length > 0" short-circuit returns the
-    // sparse rollup. The chart trips its `< 3 daily points` empty-state
-    // even though `measurements` holds the full 30 days.
-    //
-    // This branch closes that gap. When the rollup row count is
-    // suspiciously low for the requested window (≥ 7 days asked and
-    // < 3 rollup rows present), we probe `measurements` for the actual
-    // distinct-day count over the same window. If `measurements`
-    // carries strictly more days than the rollup, the rollup is
-    // under-converged: we fold the (user, type, DAY, [from, to])
-    // partition inline, re-read the rollup, and return the refreshed
-    // rows. The inline fold is bounded by the window + type so it is
-    // small (~30 buckets × one type for the dashboard chart's 30-day
-    // window) and finishes well inside the request budget.
-    //
-    // The probe runs only on suspicious rollups so the covered-tenant
-    // happy path stays a single indexed read. The maintainer's tenant on a 30-day
-    // BP_SYS window pre-fix returned 2 rollup rows and hit `total: 2`
-    // in the live trace; post-fix the probe finds ~30 distinct days in
-    // `measurements`, folds them, and the chart paints all 30.
-    const windowMs = to.getTime() - from.getTime();
-    const windowDays = Math.ceil(windowMs / 86_400_000);
-    const SUSPICIOUS_ROW_FLOOR = 3;
-    const SUSPICIOUS_WINDOW_DAYS = 7;
-    let effectiveRows = rollupRows;
-    let coverageFallbackFired = false;
-    if (
-      rollupRows.length > 0 &&
-      rollupRows.length < SUSPICIOUS_ROW_FLOOR &&
-      windowDays >= SUSPICIOUS_WINDOW_DAYS
-    ) {
-      // Cheap probe — one indexed range scan over
-      // `(user_id, type, measured_at)`. Returns the count of distinct
-      // calendar days the live table holds for the window.
-      const liveDayCountRows = await prisma.$queryRaw<Array<{ days: bigint }>>`
-        SELECT COUNT(DISTINCT date_trunc('day', m."measured_at"))::bigint AS days
-        FROM measurements m
-        WHERE m."user_id"     = ${user.id}
-          AND m."type"        = ${type}::measurement_type
-          AND m."measured_at" >= ${from}
-          AND m."measured_at" <= ${to}
-          AND m."deleted_at"  IS NULL
-      `;
-      const liveDays = Number(liveDayCountRows[0]?.days ?? BigInt(0));
-      if (liveDays > rollupRows.length) {
-        coverageFallbackFired = true;
-        try {
-          // Inline fold of the (user, type, DAY, window) partition.
-          // Bounded by the window so it stays small even on a
-          // power-user account; the upsert is idempotent against the
-          // composite primary key.
-          await recomputeUserRollups(user.id, {
-            types: [type as MeasurementType],
-            granularities: ["DAY"],
-            from,
-            to,
-          });
-          // Re-read so this request returns the converged rows. The
-          // next chart paint hits the same warm rollup without paying
-          // the fallback cost. v1.11.1 — collapse per-source rows to the
-          // canonical reading per day, same as the initial read.
-          effectiveRows = collapseRollupRowsBySource(
-            await prisma.measurementRollup.findMany({
-              where: {
-                userId: user.id,
-                type: type as MeasurementType,
-                granularity: "DAY",
-                bucketStart: { gte: from, lte: to },
-              },
-              orderBy: { bucketStart: "asc" },
-              select: {
-                type: true,
-                source: true,
-                bucketStart: true,
-                mean: true,
-                count: true,
-                sumValue: true,
-                minValue: true,
-                maxValue: true,
-              },
-            }),
-            type as MeasurementType,
-            priorityJson,
-          ).slice(0, cap);
-        } catch (err) {
-          // Best-effort — fall back to the legacy live aggregate path
-          // below if the fold itself failed so the chart paints
-          // something sensible regardless. `annotate` carries the
-          // surface so ops can spot a silent populator regression.
-          const message = err instanceof Error ? err.message : String(err);
-          annotate({
-            meta: {
-              rollup_coverage_fallback_failed: true,
-              rollup_coverage_fallback_error: message,
-              type,
-            },
-          });
-          // Drop into the live `date_trunc` branch below.
-          effectiveRows = [];
-        }
-      }
-    }
-    if (effectiveRows.length > 0) {
-      // Cumulative metrics (steps, active energy, distance, flights,
-      // daylight) store `mean` per bucket but the chart needs the
-      // daily SUM. v1.4.39 W-SUM — read `sumValue` directly; fall back
-      // to `mean * count` only when the legacy NULL surfaces (pre-
-      // v1.4.39 rows still waiting for the boot-time backfill to
-      // converge). `mean * count` is algebraically equivalent to
-      // SUM(value) for a single-source day because AVG = SUM / COUNT.
-      const useSum =
-        type != null && CUMULATIVE_HK_TYPES.has(type as MeasurementType);
-      const measurements = effectiveRows.map((r) => ({
-        type: r.type,
-        value: useSum ? (r.sumValue ?? r.mean * r.count) : r.mean,
-        measuredAt: r.bucketStart.toISOString(),
-        count: r.count,
-        // v1.8.5 — per-day min / max so the chart can shade an
-        // Apple-Health-style range band around the daily mean line.
-        // Omitted for cumulative metrics (steps, distance, …) where the
-        // daily value is a SUM, not a central tendency, so an intra-day
-        // spread band carries no meaning.
-        minValue: useSum ? undefined : r.minValue,
-        maxValue: useSum ? undefined : r.maxValue,
-      }));
-      annotate({
-        action: { name: "measurement.list" },
-        meta: {
-          total: measurements.length,
-          type,
-          aggregate: "daily",
-          source: "rollup",
-          coverage_fallback: coverageFallbackFired,
-        },
-      });
+    });
+    if (measurements.length > 0) {
       return apiSuccess({
         measurements,
         meta: {
@@ -540,10 +374,11 @@ export const GET = apiHandler(async (request: NextRequest) => {
         },
       });
     }
-    // Fall through to the live aggregate path when the rollup is
-    // empty for the requested window — covers brand-new accounts +
-    // the race between a recent write hook and the read, and the
-    // coverage-fallback inline-fold-failed branch above.
+    // `readDailySeries` already falls back to the live `date_trunc`
+    // aggregate on a rollup-coverage miss, so an empty result here means
+    // the window genuinely holds no rows. Fall through to the shared
+    // live aggregate branch below to keep the response shape identical
+    // for the truly-empty case.
   }
 
   if (aggregate && aggregate !== "raw" && from && to) {
diff --git a/src/app/api/measurements/series-batch/__tests__/route.test.ts b/src/app/api/measurements/series-batch/__tests__/route.test.ts
new file mode 100644
index 000000000..dc6e31c02
--- /dev/null
+++ b/src/app/api/measurements/series-batch/__tests__/route.test.ts
@@ -0,0 +1,120 @@
+/**
+ * v1.18.6 — `GET /api/measurements/series-batch` unit + parity tests.
+ *
+ * The endpoint reads each requested type through the SHARED
+ * `readDailySeries` reader — the exact same reader the single-type
+ * `GET /api/measurements?aggregate=daily&source=rollup` route delegates
+ * to (see `src/app/api/measurements/route.ts`). The parity guarantee is
+ * therefore structural: both routes call `readDailySeries`, so the rows
+ * are identical by construction. These tests pin that the batch route
+ * (a) validates its query, (b) calls the reader once per requested type
+ * with the right window, and (c) returns each type's reader output
+ * verbatim under `series[type]`.
+ */
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { NextRequest } from "next/server";
+
+vi.mock("@/lib/auth/session", () => ({ getSession: vi.fn() }));
+vi.mock("@/lib/db-compat", () => ({
+  ensureDbCompatibility: vi.fn().mockResolvedValue(undefined),
+}));
+vi.mock("@/lib/logging/transports", () => ({ emitIfSampled: vi.fn() }));
+vi.mock("@/lib/logging/context", async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import("@/lib/logging/context")>();
+  return { ...actual, annotate: vi.fn() };
+});
+vi.mock("next/headers", () => ({
+  headers: vi.fn(async () => ({ get: () => null })),
+  cookies: vi.fn(async () => ({
+    get: () => undefined,
+    set: () => {},
+    delete: () => {},
+  })),
+}));
+vi.mock("@/lib/rollups/measurement-read", () => ({
+  loadUserSourcePriority: vi.fn(async () => null),
+}));
+vi.mock("@/lib/measurements/daily-series-read", () => ({
+  readDailySeries: vi.fn(),
+}));
+
+import { GET } from "../route";
+import { getSession } from "@/lib/auth/session";
+import { readDailySeries } from "@/lib/measurements/daily-series-read";
+
+const SESSION_OK = {
+  session: { id: "s1", expiresAt: new Date(Date.now() + 3_600_000) },
+  user: { id: "user-1", username: "u", role: "USER" as const },
+};
+
+const FROM = "2026-05-01T00:00:00.000Z";
+const TO = "2026-05-31T23:59:59.000Z";
+
+function req(query: string): NextRequest {
+  return new NextRequest(
+    `http://localhost/api/measurements/series-batch?${query}`,
+  );
+}
+
+beforeEach(() => {
+  vi.resetAllMocks();
+});
+
+describe("GET /api/measurements/series-batch", () => {
+  it("returns 401 when unauthenticated", async () => {
+    vi.mocked(getSession).mockResolvedValue(null);
+    const res = await GET(req(`types=WEIGHT&from=${FROM}&to=${TO}`));
+    expect(res.status).toBe(401);
+  });
+
+  it("returns 422 when types is missing", async () => {
+    vi.mocked(getSession).mockResolvedValue(SESSION_OK as never);
+    const res = await GET(req(`from=${FROM}&to=${TO}`));
+    expect(res.status).toBe(422);
+  });
+
+  it("returns 422 for an unknown type", async () => {
+    vi.mocked(getSession).mockResolvedValue(SESSION_OK as never);
+    const res = await GET(req(`types=GARBAGE&from=${FROM}&to=${TO}`));
+    expect(res.status).toBe(422);
+  });
+
+  it("reads each type through readDailySeries and keys the result by type", async () => {
+    vi.mocked(getSession).mockResolvedValue(SESSION_OK as never);
+    const weightRows = [
+      { type: "WEIGHT", value: 80, measuredAt: FROM, count: 1 },
+    ];
+    const bpRows = [
+      { type: "BLOOD_PRESSURE_SYS", value: 126, measuredAt: FROM, count: 1 },
+    ];
+    vi.mocked(readDailySeries).mockImplementation(async ({ type }) => {
+      if (type === "WEIGHT") return weightRows as never;
+      if (type === "BLOOD_PRESSURE_SYS") return bpRows as never;
+      return [] as never;
+    });
+
+    const res = await GET(
+      req(`types=WEIGHT,BLOOD_PRESSURE_SYS&from=${FROM}&to=${TO}`),
+    );
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    expect(body.data.series.WEIGHT).toEqual(weightRows);
+    expect(body.data.series.BLOOD_PRESSURE_SYS).toEqual(bpRows);
+
+    // One reader call per unique type, with the parsed window.
+    expect(vi.mocked(readDailySeries)).toHaveBeenCalledTimes(2);
+    const call = vi.mocked(readDailySeries).mock.calls[0][0];
+    expect(call.userId).toBe("user-1");
+    expect(call.from.toISOString()).toBe(FROM);
+    expect(call.to.toISOString()).toBe(TO);
+  });
+
+  it("de-dupes a repeated type to one reader call", async () => {
+    vi.mocked(getSession).mockResolvedValue(SESSION_OK as never);
+    vi.mocked(readDailySeries).mockResolvedValue([] as never);
+    const res = await GET(req(`types=WEIGHT,WEIGHT&from=${FROM}&to=${TO}`));
+    expect(res.status).toBe(200);
+    expect(vi.mocked(readDailySeries)).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/app/api/measurements/series-batch/route.ts b/src/app/api/measurements/series-batch/route.ts
new file mode 100644
index 000000000..8f685926c
--- /dev/null
+++ b/src/app/api/measurements/series-batch/route.ts
@@ -0,0 +1,99 @@
+/**
+ * v1.18.6 — GET /api/measurements/series-batch
+ *
+ * Batched, rollup-backed daily-series endpoint. Returns ALL requested
+ * measurement types in ONE response so the dashboard's chart row does a
+ * single round-trip instead of one self-fetch per chart (audit finding
+ * #2 — the per-chart fan-out).
+ *
+ * Query: `types` (comma-list of `MeasurementType`), `from`, `to`. Always
+ * reads `aggregate=daily` through the rollup tier (`source=rollup`) via
+ * the shared `readDailySeries` reader — the SAME path
+ * `GET /api/measurements?aggregate=daily&source=rollup` uses, so the
+ * per-type series are byte-identical between the two endpoints. Internal
+ * per-type reads are capped with `p-limit` to protect the shared Prisma
+ * pool.
+ *
+ * Sleep is deliberately NOT included: SLEEP_DURATION rides a per-night
+ * stage reconstruction (`/api/measurements/series?kind=sleep`), not the
+ * rollup tier, so the dashboard sleep chart stays on its existing
+ * `/series` call. Passing `SLEEP_DURATION` here yields an empty series
+ * for that key (the rollup carries no useful per-night collapse) — the
+ * client keeps sleep on the dedicated route.
+ */
+import { NextRequest } from "next/server";
+import pLimit from "p-limit";
+import { apiHandler, requireAuth } from "@/lib/api-handler";
+import { returnAllZodIssues } from "@/lib/api-response";
+import { apiSuccess } from "@/lib/api-response";
+import { annotate } from "@/lib/logging/context";
+import { loadUserSourcePriority } from "@/lib/rollups/measurement-read";
+import {
+  readDailySeries,
+  type DailySeriesRow,
+} from "@/lib/measurements/daily-series-read";
+import {
+  seriesBatchQuerySchema,
+  SERIES_BATCH_MAX_TYPES,
+} from "@/lib/validations/series-batch";
+import type { MeasurementType } from "@/generated/prisma/client";
+
+/**
+ * Concurrency cap for the per-type rollup reads. Mirrors the W-POOL
+ * `p-limit(4)` discipline applied across the analytics fan-out so a
+ * wide dashboard never packs the shared Prisma pool.
+ */
+const SERIES_BATCH_CONCURRENCY = 4;
+
+export const GET = apiHandler(async (request: NextRequest) => {
+  const { user } = await requireAuth();
+
+  const params = Object.fromEntries(request.nextUrl.searchParams);
+  const parsed = seriesBatchQuerySchema.safeParse(params);
+  if (!parsed.success) {
+    return returnAllZodIssues(parsed.error, 422);
+  }
+
+  const { types, from, to } = parsed.data;
+  // De-dupe while preserving order so a caller repeating a type doesn't
+  // double-read it.
+  const uniqueTypes = Array.from(new Set(types)) as MeasurementType[];
+
+  // Load the source-priority ladder ONCE and thread it across every type
+  // so the batched reader doesn't re-query it per type.
+  const priorityJson = await loadUserSourcePriority(user.id);
+
+  const limit = pLimit(SERIES_BATCH_CONCURRENCY);
+  const entries = await Promise.all(
+    uniqueTypes.map((type) =>
+      limit(async () => {
+        const rows = await readDailySeries({
+          userId: user.id,
+          type,
+          from,
+          to,
+          priorityJson,
+        });
+        return [type, rows] as const;
+      }),
+    ),
+  );
+
+  const series: Record<string, DailySeriesRow[]> = {};
+  for (const [type, rows] of entries) {
+    series[type] = rows;
+  }
+
+  annotate({
+    action: { name: "measurement.series.batch" },
+    meta: {
+      type_count: uniqueTypes.length,
+      total: entries.reduce((sum, [, rows]) => sum + rows.length, 0),
+    },
+  });
+
+  return apiSuccess({ series });
+});
+
+// Re-export the cap so the OpenAPI table + tests share the constant.
+export { SERIES_BATCH_MAX_TYPES };
diff --git a/src/components/charts/health-chart.tsx b/src/components/charts/health-chart.tsx
index aef13400e..c26b57a24 100644
--- a/src/components/charts/health-chart.tsx
+++ b/src/components/charts/health-chart.tsx
@@ -233,6 +233,23 @@ interface HealthChartProps {
    * idempotent; non-dashboard mounts simply omit it.
    */
   onDataReady?: () => void;
+  /**
+   * v1.18.6 — pre-fetched daily series, keyed by `MeasurementType`. When
+   * the dashboard batches every visible chart's series into ONE
+   * `/api/measurements/series-batch` round-trip (audit finding #2), it
+   * passes each chart its slice here. When supplied, the chart's queryFn
+   * consumes these rows for the covered types instead of issuing its own
+   * per-type `/api/measurements` fetch. Omitted on non-dashboard mounts
+   * (insights sub-pages, mini cards) which keep self-fetching.
+   * SLEEP_DURATION is never pre-fetched (it rides the per-night `/series`
+   * adapter), so a sleep chart self-fetches that branch regardless.
+   *
+   * The rows must already be scoped to the chart's active fetch window;
+   * the prop is keyed into the query cache so a range-tab change (wider
+   * window) re-fetches cleanly rather than blending a batched slice with
+   * a self-fetched one.
+   */
+  preloadedSeries?: Record<string, MeasurementApiRow[]>;
 }
 
 interface ChartDataPoint {
@@ -251,8 +268,13 @@ interface MeasurementApiRow {
   // path (non-cumulative metrics only). Drive the Apple-Health-style
   // range band shaded around the mean line. Absent on the raw-row path
   // (windows ≤ 7 days) and on cumulative metrics.
-  minValue?: number;
-  maxValue?: number;
+  // v1.18.6 — `null` accepted alongside `undefined` so the batched
+  // series endpoint's row shape (which carries `number | null`) feeds
+  // `preloadedSeries` directly. The bucketing loop already guards each
+  // with a `typeof … === "number"` check, so a null is ignored exactly
+  // like an absent value.
+  minValue?: number | null;
+  maxValue?: number | null;
   // v1.4.43 W2-CHART-GATE — the rollup / daily-aggregate paths return
   // the underlying raw-row count per bucket. Used downstream to gate
   // the "more days needed" empty-state copy on the actual measurement
@@ -537,6 +559,7 @@ export function HealthChart({
   onVisibleStats,
   titleIcon,
   onDataReady,
+  preloadedSeries,
 }: HealthChartProps) {
   const { isAuthenticated, user } = useAuth();
   const { t, locale } = useTranslations();
@@ -620,6 +643,20 @@ export function HealthChart({
     };
   }, [rangePoints, effectiveCompareBaseline]);
 
+  // v1.18.6 — honour the dashboard's batched slice ONLY for the
+  // daily-aggregate window (`windowDays > 7`, the rollup path) and ONLY
+  // when EVERY non-sleep type the chart renders is present in the slice.
+  // SLEEP_DURATION is never batched (per-night `/series`), so a chart
+  // that includes it always self-fetches. A range-tab change to a ≤7-day
+  // window (raw rows) drops batched coverage and self-fetches.
+  const usePreloaded = useMemo(() => {
+    if (!preloadedSeries) return false;
+    if (fetchWindow.windowDays <= 7) return false;
+    return types.every(
+      (type) => type === "SLEEP_DURATION" || preloadedSeries[type] != null,
+    );
+  }, [preloadedSeries, fetchWindow.windowDays, types]);
+
   const { data, isLoading, isError, refetch } = useQuery({
     // v1.4.40 W-RSC — route the chart-data key through `queryKeys.chartData`
     // so the `["chart-data"]` prefix lands in `measurementDependentKeys`
@@ -649,6 +686,14 @@ export function HealthChart({
       // v1.7.0 — re-key when the display scale changes so a km/h chart
       // never reads a m/s-scaled sibling out of the cache.
       valueScale,
+      // v1.18.6 — discriminate a batched-slice render from a self-fetch
+      // ONLY on the dashboard mounts that pass `preloadedSeries`. When the
+      // prop is absent (insights sub-pages, mini cards) the empty string
+      // keeps the factory tuple byte-identical with the pre-v1.18.6
+      // 8-element key, so those callers' cache layout is unchanged. On a
+      // dashboard mount the discriminator flips "preloaded" → "fetch" when
+      // a range-tab change drops batched coverage, re-fetching cleanly.
+      preloadedSeries ? (usePreloaded ? "preloaded" : "fetch") : "",
     ),
     // v1.4.28 FB-D2 — cache the bounded window for a minute so tab
     // navigation between insights sub-pages does not re-fire every
@@ -760,16 +805,30 @@ export function HealthChart({
           typeParams.set("source", "rollup");
         }
 
-        // v1.16.8 — a failed per-type fetch rejects the whole query
-        // instead of silently dropping the series: the swallowed-catch
-        // variant cached the partial/empty result as fresh success, so
-        // an outage painted the empty state (or a half chart) with no
-        // retry path. Rejecting lets TanStack's retry semantics and the
-        // in-card error state below do their jobs.
-        const data = await apiGet<{ measurements?: MeasurementApiRow[] }>(
-          `/api/measurements?${typeParams}`,
-        );
-        const page = data?.measurements ?? [];
+        // v1.18.6 — when the dashboard handed this chart a batched slice
+        // for the type, fold those rows instead of a per-type fetch. The
+        // rows came from `/api/measurements/series-batch`, which reads
+        // through the SAME rollup path the per-type daily fetch hits, so
+        // the bucketed result is byte-identical. `usePreloaded` already
+        // gated the window (`> 7`) + per-type coverage above; default to
+        // an empty slice (paints the no-data card) rather than fetching,
+        // so a covered chart never issues a network request.
+        const page =
+          usePreloaded && preloadedSeries
+            ? (preloadedSeries[type] ?? [])
+            : await (async () => {
+                // v1.16.8 — a failed per-type fetch rejects the whole
+                // query instead of silently dropping the series: the
+                // swallowed-catch variant cached the partial/empty result
+                // as fresh success, so an outage painted the empty state
+                // (or a half chart) with no retry path. Rejecting lets
+                // TanStack's retry semantics and the in-card error state
+                // below do their jobs.
+                const data = await apiGet<{
+                  measurements?: MeasurementApiRow[];
+                }>(`/api/measurements?${typeParams}`);
+                return data?.measurements ?? [];
+              })();
 
         for (const measurement of page) {
           // v1.7.0 — fold the display-time scale into the raw value at
diff --git a/src/lib/measurements/daily-series-read.ts b/src/lib/measurements/daily-series-read.ts
new file mode 100644
index 000000000..64bb3134e
--- /dev/null
+++ b/src/lib/measurements/daily-series-read.ts
@@ -0,0 +1,226 @@
+/**
+ * v1.18.6 — shared rollup-backed daily-series reader.
+ *
+ * Extracted from the `GET /api/measurements` rollup-daily branch so the
+ * single-type route AND the batched series endpoint
+ * (`GET /api/measurements/series-batch`) read through the SAME path
+ * instead of duplicating the rollup SQL + the coverage-fallback fold.
+ *
+ * `readDailySeries` reproduces the route's `source=rollup` +
+ * `aggregate=daily` contract byte-for-byte: collapse per-source rollup
+ * rows to the ladder-canonical reading per day, probe for an
+ * under-converged rollup window and fold inline when the live table
+ * carries more distinct days, and fall through to the live `date_trunc`
+ * aggregate when the rollup is empty for the window (brand-new accounts /
+ * write-hook race). The returned rows match the wire shape the chart
+ * client consumes (`{ type, value, measuredAt, count, minValue?,
+ * maxValue? }`).
+ */
+import { prisma } from "@/lib/db";
+import {
+  BUCKET_CAP,
+} from "@/lib/measurements/range-aggregation";
+import { CUMULATIVE_HK_TYPES } from "@/lib/measurements/apple-health-mapping";
+import {
+  collapseRollupRowsBySource,
+} from "@/lib/rollups/measurement-read";
+import { recomputeUserRollups } from "@/lib/rollups/measurement-rollups";
+import { buildSourceRankCase } from "@/lib/analytics/source-rank-sql";
+import { annotate } from "@/lib/logging/context";
+import type { MeasurementType } from "@/generated/prisma/client";
+import { Prisma } from "@/generated/prisma/client";
+
+/** Wire row the chart-data client consumes — mirrors the route's shape. */
+export interface DailySeriesRow {
+  type: string;
+  value: number;
+  measuredAt: string;
+  count?: number;
+  minValue?: number | null;
+  maxValue?: number | null;
+}
+
+const SUSPICIOUS_ROW_FLOOR = 3;
+const SUSPICIOUS_WINDOW_DAYS = 7;
+
+/**
+ * Read one type's daily series for `[from, to]` through the rollup tier,
+ * falling back to the live `date_trunc` aggregate on a coverage miss.
+ *
+ * `priorityJson` is the user's source-priority ladder (load once per
+ * request via `loadUserSourcePriority` and thread it across types so the
+ * batched reader doesn't re-query it per type). `cap` defaults to the
+ * daily bucket ceiling.
+ */
+export async function readDailySeries(opts: {
+  userId: string;
+  type: MeasurementType;
+  from: Date;
+  to: Date;
+  limit?: number;
+  priorityJson: unknown;
+}): Promise<DailySeriesRow[]> {
+  const { userId, type, from, to, priorityJson } = opts;
+  const cap = Math.min(opts.limit ?? BUCKET_CAP.daily, BUCKET_CAP.daily);
+
+  const readRollup = async () =>
+    collapseRollupRowsBySource(
+      await prisma.measurementRollup.findMany({
+        where: {
+          userId,
+          type,
+          granularity: "DAY",
+          bucketStart: { gte: from, lte: to },
+        },
+        orderBy: { bucketStart: "asc" },
+        select: {
+          type: true,
+          source: true,
+          bucketStart: true,
+          mean: true,
+          count: true,
+          sumValue: true,
+          minValue: true,
+          maxValue: true,
+        },
+      }),
+      type,
+      priorityJson,
+    ).slice(0, cap);
+
+  const rollupRows = await readRollup();
+
+  // Coverage-mismatch probe + inline fold (identical to the route).
+  const windowMs = to.getTime() - from.getTime();
+  const windowDays = Math.ceil(windowMs / 86_400_000);
+  let effectiveRows = rollupRows;
+  let coverageFallbackFired = false;
+  if (
+    rollupRows.length > 0 &&
+    rollupRows.length < SUSPICIOUS_ROW_FLOOR &&
+    windowDays >= SUSPICIOUS_WINDOW_DAYS
+  ) {
+    const liveDayCountRows = await prisma.$queryRaw<Array<{ days: bigint }>>`
+      SELECT COUNT(DISTINCT date_trunc('day', m."measured_at"))::bigint AS days
+      FROM measurements m
+      WHERE m."user_id"     = ${userId}
+        AND m."type"        = ${type}::measurement_type
+        AND m."measured_at" >= ${from}
+        AND m."measured_at" <= ${to}
+        AND m."deleted_at"  IS NULL
+    `;
+    const liveDays = Number(liveDayCountRows[0]?.days ?? BigInt(0));
+    if (liveDays > rollupRows.length) {
+      coverageFallbackFired = true;
+      try {
+        await recomputeUserRollups(userId, {
+          types: [type],
+          granularities: ["DAY"],
+          from,
+          to,
+        });
+        effectiveRows = await readRollup();
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        annotate({
+          meta: {
+            rollup_coverage_fallback_failed: true,
+            rollup_coverage_fallback_error: message,
+            type,
+          },
+        });
+        effectiveRows = [];
+      }
+    }
+  }
+
+  if (effectiveRows.length > 0) {
+    const useSum = CUMULATIVE_HK_TYPES.has(type);
+    annotate({
+      action: { name: "measurement.list" },
+      meta: {
+        total: effectiveRows.length,
+        type,
+        aggregate: "daily",
+        source: "rollup",
+        coverage_fallback: coverageFallbackFired,
+      },
+    });
+    return effectiveRows.map((r) => ({
+      type: r.type,
+      value: useSum ? (r.sumValue ?? r.mean * r.count) : r.mean,
+      measuredAt: r.bucketStart.toISOString(),
+      count: r.count,
+      minValue: useSum ? undefined : r.minValue,
+      maxValue: useSum ? undefined : r.maxValue,
+    }));
+  }
+
+  // Live `date_trunc` fallback — rollup empty for the window.
+  return readLiveDaily({ userId, type, from, to, cap, priorityJson });
+}
+
+/** Live `date_trunc('day', …)` aggregate — the rollup-empty fallback. */
+async function readLiveDaily(opts: {
+  userId: string;
+  type: MeasurementType;
+  from: Date;
+  to: Date;
+  cap: number;
+  priorityJson: unknown;
+}): Promise<DailySeriesRow[]> {
+  const { userId, type, from, to, cap, priorityJson } = opts;
+  const truncUnitLiteral = Prisma.raw(`'day'`);
+  const useSum = CUMULATIVE_HK_TYPES.has(type);
+  const aggregator = useSum
+    ? Prisma.raw(`SUM(m."value")::double precision`)
+    : Prisma.raw(`AVG(m."value")::double precision`);
+  const rankRaw = Prisma.raw(
+    buildSourceRankCase(priorityJson, 'm."type"', 'm."source"'),
+  );
+  const buckets = await prisma.$queryRaw<
+    Array<{ type: string; bucket_start: Date; avg: number; cnt: number }>
+  >`
+    WITH canon AS (
+      SELECT DISTINCT ON (m."type", date_trunc(${truncUnitLiteral}, m."measured_at"))
+        m."type"                                          AS t,
+        date_trunc(${truncUnitLiteral}, m."measured_at")  AS d,
+        m."source"                                        AS canon
+      FROM measurements m
+      WHERE m."user_id" = ${userId}
+        AND m."measured_at" >= ${from}
+        AND m."measured_at" <= ${to}
+        AND m."deleted_at" IS NULL
+        AND m."type" = ${type}::measurement_type
+      ORDER BY m."type", date_trunc(${truncUnitLiteral}, m."measured_at"), (${rankRaw}), m."source"
+    )
+    SELECT
+      m."type"::text AS type,
+      date_trunc(${truncUnitLiteral}, m."measured_at") AS bucket_start,
+      ${aggregator} AS avg,
+      COUNT(*)::int AS cnt
+    FROM measurements m
+    JOIN canon c
+      ON c.t = m."type"
+      AND c.d = date_trunc(${truncUnitLiteral}, m."measured_at")
+      AND c.canon = m."source"
+    WHERE m."user_id" = ${userId}
+      AND m."measured_at" >= ${from}
+      AND m."measured_at" <= ${to}
+      AND m."deleted_at" IS NULL
+      AND m."type" = ${type}::measurement_type
+    GROUP BY m."type", bucket_start
+    ORDER BY bucket_start ASC
+    LIMIT ${cap}
+  `;
+  annotate({
+    action: { name: "measurement.list" },
+    meta: { total: buckets.length, type, aggregate: "daily" },
+  });
+  return buckets.map((b) => ({
+    type: b.type,
+    value: Number(b.avg),
+    measuredAt: b.bucket_start.toISOString(),
+    count: Number(b.cnt),
+  }));
+}
diff --git a/src/lib/openapi/routes/measurements.ts b/src/lib/openapi/routes/measurements.ts
index 7a3b082ea..546934e1e 100644
--- a/src/lib/openapi/routes/measurements.ts
+++ b/src/lib/openapi/routes/measurements.ts
@@ -13,6 +13,7 @@ import {
   measurementTypeEnum,
   measurementSourceEnum,
 } from "@/lib/validations/measurement";
+import { seriesBatchQuerySchema } from "@/lib/validations/series-batch";
 import { deviceTypeEnum } from "@/lib/validations/source-priority";
 import { dataEnvelope, moduleDisabledResponse, stdResponses } from "./shared";
 
@@ -392,7 +393,74 @@ const seriesResponse = z
       "iOS-friendly per-kind time series: one point per reading (or per reconstructed night for `sleep`), an explicit `unit` token, and a summary `stats` block.",
   });
 
+// ── Batched daily series (v1.18.6 dashboard fetch coalescing) ────────
+//
+// Returns every requested MeasurementType's rollup-backed daily series
+// in one response so the dashboard chart row does a single round-trip
+// instead of one per chart. Each row mirrors the daily-aggregate shape
+// `GET /api/measurements?aggregate=daily&source=rollup` emits.
+const seriesBatchRowSchema = z.object({
+  type: measurementTypeEnum,
+  value: z.number().describe("Daily mean (spot metrics) or SUM (cumulative)."),
+  measuredAt: z.iso
+    .datetime({ offset: true })
+    .describe("Day-bucket start (ISO-8601)."),
+  count: z
+    .number()
+    .int()
+    .nonnegative()
+    .optional()
+    .describe("Underlying raw-row count for the bucket."),
+  minValue: z
+    .number()
+    .nullable()
+    .optional()
+    .describe("Per-day minimum (spot metrics only; absent for cumulative)."),
+  maxValue: z
+    .number()
+    .nullable()
+    .optional()
+    .describe("Per-day maximum (spot metrics only; absent for cumulative)."),
+});
+
+const seriesBatchResponse = z
+  .object({
+    series: z
+      .record(measurementTypeEnum, z.array(seriesBatchRowSchema))
+      .describe("Per-type daily series, keyed by MeasurementType."),
+  })
+  .meta({
+    id: "MeasurementsSeriesBatchResponse",
+    description:
+      "Batched daily series — one rollup-backed series per requested type.",
+  });
+
 export const measurementPaths: NonNullable<ZodOpenApiObject["paths"]> = {
+  "/api/measurements/series-batch": {
+    get: {
+      tags: ["Measurements"],
+      summary: "Batched daily series (dashboard fetch coalescing)",
+      description:
+        "Returns the rollup-backed daily series for every requested MeasurementType in ONE response, so the dashboard chart row does a single round-trip instead of one self-fetch per chart. Each per-type series is byte-identical with `GET /api/measurements?aggregate=daily&source=rollup` for the same window. SLEEP_DURATION is not served here (it rides the per-night reconstruction at `/api/measurements/series?kind=sleep`). Auth via cookie or Bearer.",
+      requestParams: {
+        query: seriesBatchQuerySchema,
+      },
+      responses: {
+        "200": {
+          description: "Per-type daily series.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(
+                seriesBatchResponse,
+                "GetMeasurementsSeriesBatchResponse",
+              ),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
   "/api/measurements/series": {
     get: {
       tags: ["Measurements"],
diff --git a/src/lib/query-keys/measurements.ts b/src/lib/query-keys/measurements.ts
index 42c326302..4a3d12cb5 100644
--- a/src/lib/query-keys/measurements.ts
+++ b/src/lib/query-keys/measurements.ts
@@ -85,17 +85,36 @@ export const measurementKeys = {
     // (scaled) series doesn't bleed across charts that share the
     // underlying raw window.
     valueScale: number = 1,
+    // v1.18.6 — read-mode discriminator ("preloaded" vs "fetch"). The
+    // dashboard's batched-slice render and a self-fetch must not share a
+    // cache entry, otherwise a range-tab change (which drops batched
+    // coverage) could read a batched slice. Defaults to "" and is only
+    // appended when set, so every pre-v1.18.6 caller packs a
+    // byte-identical tuple and the existing cache layout is unchanged.
+    readMode: string = "",
   ) =>
-    [
-      "chart-data",
-      types,
-      valueMode,
-      bmiDivisor,
-      timezone,
-      fromIso,
-      toIso,
-      valueScale,
-    ] as const,
+    (readMode
+      ? ([
+          "chart-data",
+          types,
+          valueMode,
+          bmiDivisor,
+          timezone,
+          fromIso,
+          toIso,
+          valueScale,
+          readMode,
+        ] as const)
+      : ([
+          "chart-data",
+          types,
+          valueMode,
+          bmiDivisor,
+          timezone,
+          fromIso,
+          toIso,
+          valueScale,
+        ] as const)),
 
   /**
    * v1.8.5 — bounded recent-timestamp read powering the
@@ -106,4 +125,15 @@ export const measurementKeys = {
    */
   measurementDiversity: (type: string) =>
     ["measurement-diversity", type] as const,
+
+  /**
+   * v1.18.6 — batched dashboard daily series
+   * (`GET /api/measurements/series-batch`). Shares the `chart-data`
+   * prefix so a fresh measurement evicts it alongside the per-chart
+   * caches (it lands in `measurementDependentKeys`). Keyed by the
+   * comma-joined type list + the ISO window so a changed visible-chart
+   * set or window re-fetches cleanly.
+   */
+  chartSeriesBatch: (types: string, fromIso: string, toIso: string) =>
+    ["chart-data", "series-batch", types, fromIso, toIso] as const,
 };
diff --git a/src/lib/validations/series-batch.ts b/src/lib/validations/series-batch.ts
new file mode 100644
index 000000000..1b97d52b8
--- /dev/null
+++ b/src/lib/validations/series-batch.ts
@@ -0,0 +1,51 @@
+/**
+ * v1.18.6 — query schema for `GET /api/measurements/series-batch`.
+ *
+ * Kept in its own file (not inline in the route) so the OpenAPI registry
+ * can import it and the wire contract stays single-source, mirroring the
+ * `listMeasurementsSchema` convention.
+ */
+import { z } from "zod/v4";
+import { measurementTypeEnum } from "@/lib/validations/measurement";
+
+/** Upper bound on the types per batch — the dashboard never asks for more. */
+export const SERIES_BATCH_MAX_TYPES = 16;
+
+export const seriesBatchQuerySchema = z
+  .object({
+    types: z
+      .string()
+      .min(1)
+      .transform((s) =>
+        s
+          .split(",")
+          .map((t) => t.trim())
+          .filter((t) => t.length > 0),
+      )
+      .pipe(
+        z
+          .array(measurementTypeEnum)
+          .min(1)
+          .max(SERIES_BATCH_MAX_TYPES),
+      )
+      .describe(
+        "Comma-separated list of MeasurementType values (1.." +
+          `${SERIES_BATCH_MAX_TYPES}). Each is read as a daily series through ` +
+          "the rollup tier.",
+      ),
+    from: z.iso
+      .datetime({ offset: true })
+      .transform((s) => new Date(s))
+      .describe("Window start (ISO-8601 instant)."),
+    to: z.iso
+      .datetime({ offset: true })
+      .transform((s) => new Date(s))
+      .describe("Window end (ISO-8601 instant)."),
+  })
+  .meta({
+    id: "MeasurementsSeriesBatchQuery",
+    description:
+      "Batched daily-series request — returns every requested type's rollup-backed daily series in one response.",
+  });
+
+export type SeriesBatchInput = z.infer<typeof seriesBatchQuerySchema>;

From 437e501536228d7116741aa9b217f89b0ce2d05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:29:29 +0200
Subject: [PATCH 08/71] refactor(dashboard): thin page orchestrator + consume
 server bands and batched series

Extract the pure first-paint / skeleton-reservation gates
(resolveDashboardFirstPaintGate, resolveConfiguredTileCount,
resolveChartRowPlaceholderCount + their widget-id sets) into
components/dashboard/dashboard-gates; page.tsx re-exports them so the
existing unit-test imports stay valid. Wire the page to read the
server-computed targetBands when snapshot mode is on (legacy client
compute kept for the snapshot-off fallback) and to issue one
series-batch fetch for the visible non-sleep charts, threading each
chart its slice via preloadedSeries.
---
 src/app/page.tsx                            | 275 ++++++++++----------
 src/components/dashboard/dashboard-gates.ts | 119 +++++++++
 2 files changed, 260 insertions(+), 134 deletions(-)
 create mode 100644 src/components/dashboard/dashboard-gates.ts

diff --git a/src/app/page.tsx b/src/app/page.tsx
index c58eca290..c7a111143 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -120,115 +120,20 @@ import {
 } from "@/lib/analytics/pulse-targets";
 import { apiGet } from "@/lib/api/api-fetch";
 
-/**
- * v1.7.0 — first-paint gate for the dashboard tile strip.
- *
- * `primaryLoading` must come from whichever query actually drives the
- * tiles: the snapshot cell by default, the slim analytics cell when
- * `NEXT_PUBLIC_DASHBOARD_SNAPSHOT=false`. A disabled TanStack query reports
- * `isLoading: false` (idle fetch status), so keying off the wrong
- * source flashes the empty state for the whole fetch. Pure + exported
- * so the gate has direct unit coverage without mounting the page.
- */
-export function resolveDashboardFirstPaintGate(input: {
-  trendCardCount: number;
-  chartCount: number;
-  configuredTileCount: number;
-  primaryLoading: boolean;
-}): { showTileStripSkeleton: boolean; showEmptyState: boolean } {
-  const showTileStripSkeleton =
-    input.trendCardCount === 0 &&
-    input.primaryLoading &&
-    input.configuredTileCount > 0;
-  const showEmptyState =
-    input.trendCardCount === 0 &&
-    input.chartCount === 0 &&
-    !showTileStripSkeleton &&
-    !input.primaryLoading;
-  return { showTileStripSkeleton, showEmptyState };
-}
-
-/**
- * v1.16.8 — widget ids that actually paint a tile in the strip on the
- * web dashboard, mirrored from the per-id render blocks below.
- * `medications` / `recentWorkouts` / `achievements` carry NO strip tile
- * (chart-row cards only), and the iOS-pin-only ids have no web render
- * path at all — counting any of them over-reserved the loading
- * silhouette and made the strip reshuffle when the data landed.
- */
-const TILE_CAPABLE_WIDGET_IDS = new Set<string>([
-  "weight",
-  "bp",
-  "pulse",
-  "bodyFat",
-  "mood",
-  "sleep",
-  "steps",
-  "glucose",
-  "bpInTarget",
-  "vo2Max",
-]);
-
-/**
- * v1.16.8 — silhouette count for the tile-strip skeleton: one card per
- * tile-capable, tile-visible widget. `bp` paints TWO tiles (sys + dia,
- * see the render block below) so it counts double; `glucose` can fan
- * out to one tile per logged context, but the contexts are unknown
- * until the snapshot lands, so it reserves one card (the sane floor).
- * Pure + exported for direct unit coverage.
- */
-export function resolveConfiguredTileCount(layout: DashboardLayout): number {
-  let count = 0;
-  for (const widget of layout.widgets) {
-    if (!TILE_CAPABLE_WIDGET_IDS.has(widget.id)) continue;
-    if (!(widget.tileVisible ?? widget.visible)) continue;
-    count += widget.id === "bp" ? 2 : 1;
-  }
-  return count;
-}
-
-/**
- * v1.16.8 — widget ids with a chart-row surface on the web dashboard,
- * mirrored from the `charts[]` entries below. The achievements +
- * recent-workouts cards stay out: they self-skeleton, carry no
- * chart-shaped footprint, and gate on `layoutResolved`.
- */
-const CHART_CAPABLE_WIDGET_IDS = new Set<string>([
-  "weight",
-  "bp",
-  "pulse",
-  "bodyFat",
-  "mood",
-  "sleep",
-  "steps",
-  "medications",
-  // v1.18.2 — Vorsorge preventive-care summary card (chart-row only).
-  "vorsorge",
-]);
-
-/**
- * v1.16.8 — expected chart-row card count while the snapshot is still
- * in flight. Every chart gate below needs `count > 0` from snapshot
- * data, so the cold page used to render NO chart row at all and then
- * grow ~1000 px when the snapshot landed. The best available signal
- * before data arrives is the layout config (the user's saved layout
- * when cached, the default otherwise): one card per chart-visible
- * widget, plus the BMI card that rides the weight gate when the
- * profile carries a height. Pure + exported for direct unit coverage.
- */
-export function resolveChartRowPlaceholderCount(
-  layout: DashboardLayout,
-  opts?: { hasHeightCm?: boolean },
-): number {
-  let count = 0;
-  for (const widget of layout.widgets) {
-    if (!CHART_CAPABLE_WIDGET_IDS.has(widget.id)) continue;
-    if (!widget.visible) continue;
-    count += 1;
-    if (widget.id === "weight" && opts?.hasHeightCm) count += 1;
-  }
-  return count;
-}
+// v1.18.6 — the pure first-paint / skeleton-reservation gates moved to
+// `@/components/dashboard/dashboard-gates`. Re-exported here so the
+// existing `../page` unit-test imports stay valid while `page.tsx` thins
+// to an orchestrator.
+export {
+  resolveDashboardFirstPaintGate,
+  resolveConfiguredTileCount,
+  resolveChartRowPlaceholderCount,
+} from "@/components/dashboard/dashboard-gates";
+import {
+  resolveDashboardFirstPaintGate,
+  resolveConfiguredTileCount,
+  resolveChartRowPlaceholderCount,
+} from "@/components/dashboard/dashboard-gates";
 
 export default function DashboardPage() {
   const { isAuthenticated, user } = useAuth();
@@ -621,23 +526,45 @@ export default function DashboardPage() {
     RANDOM: "targets.glucoseRandom",
     BEDTIME: "targets.glucoseBedtime",
   };
-  const bpTargets =
-    user?.dateOfBirth != null ? getBpTargets(new Date(user.dateOfBirth)) : null;
+  // v1.18.6 — band / target math is computed SERVER-side in the snapshot
+  // DTO (`targetBands`) so the client stops recomputing it from the
+  // profile (audit finding #3). When snapshot mode is on, read the
+  // resolved numbers straight from `snapshotQuery.data.targetBands`; the
+  // `!snapshotEnabled` branch keeps the legacy client-compute path so the
+  // non-snapshot fallback still works. The two produce byte-identical
+  // numbers (the server calls the SAME helpers — see
+  // `buildTargetBands` + its parity test).
+  const serverBands = snapshotEnabled
+    ? snapshotQuery.data?.targetBands
+    : undefined;
+  const bpTargets = snapshotEnabled
+    ? (serverBands?.bpTargets ?? null)
+    : user?.dateOfBirth != null
+      ? getBpTargets(new Date(user.dateOfBirth))
+      : null;
+  const bodyFatRange = snapshotEnabled
+    ? (serverBands?.bodyFatRange ?? getBodyFatTargetRange(user?.gender))
+    : getBodyFatTargetRange(user?.gender);
+  const weightRange = snapshotEnabled
+    ? (serverBands?.weightRange ?? null)
+    : user?.heightCm
+      ? buildWeightRangeFromHeight(user.heightCm)
+      : null;
+  const weightBands = snapshotEnabled
+    ? (serverBands?.weightBands ?? undefined)
+    : user?.heightCm
+      ? buildWeightBandsFromHeight(user.heightCm, {
+          lowerBound: 30,
+          upperBound: 250,
+        })
+      : undefined;
+  // The pulse target range / bands carry no i18n — read them server-side
+  // under snapshot mode; recompute from the profile otherwise.
   const pulseAge = getAgeFromDateOfBirth(user?.dateOfBirth ?? null);
   const pulseTarget = getPersonalizedPulseTarget(
     pulseAge,
     (user?.gender as "MALE" | "FEMALE" | null | undefined) ?? null,
   );
-  const bodyFatRange = getBodyFatTargetRange(user?.gender);
-  const weightRange = user?.heightCm
-    ? buildWeightRangeFromHeight(user.heightCm)
-    : null;
-  const weightBands = user?.heightCm
-    ? buildWeightBandsFromHeight(user.heightCm, {
-        lowerBound: 30,
-        upperBound: 250,
-      })
-    : undefined;
   const bpTargetZones = bpTargets
     ? [
         {
@@ -660,19 +587,23 @@ export default function DashboardPage() {
         },
       ]
     : undefined;
-  const bpSysRange = bpTargets
-    ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
-    : null;
-  const bpDiaRange = bpTargets
-    ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
-    : null;
-  const pulseDisplayRange = {
+  const bpSysRange = snapshotEnabled
+    ? (serverBands?.bpSysRange ?? null)
+    : bpTargets
+      ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
+      : null;
+  const bpDiaRange = snapshotEnabled
+    ? (serverBands?.bpDiaRange ?? null)
+    : bpTargets
+      ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
+      : null;
+  const pulseDisplayRange = serverBands?.pulseDisplayRange ?? {
     greenMin: pulseTarget.greenMin,
     greenMax: pulseTarget.greenMax,
     orangeMin: pulseTarget.orangeMin,
     orangeMax: pulseTarget.orangeMax,
   };
-  const pulseBands = [
+  const pulseBands = serverBands?.pulseBands ?? [
     { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
     {
       min: pulseTarget.orangeMin,
@@ -694,14 +625,84 @@ export default function DashboardPage() {
     },
     { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
   ].filter((band) => band.max > band.min);
-  const bodyFatBands = buildTrafficLightBands(
-    bodyFatRange.min,
-    bodyFatRange.max,
-    {
+  const bodyFatBands =
+    serverBands?.bodyFatBands ??
+    buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
       lowerBound: 2,
       upperBound: 55,
+    });
+
+  // v1.18.6 — ONE batched fetch for every visible non-sleep chart series
+  // (audit finding #2). Pre-fix, each `<HealthChart>` fired its own
+  // `/api/measurements?...&source=rollup` round-trip, so a 6-8 chart
+  // dashboard issued 6-8 parallel requests on load. The batched endpoint
+  // returns all of them in one response; each chart reads its slice via
+  // `preloadedSeries` instead of self-fetching. Sleep stays on its
+  // dedicated per-night `/series` adapter (not rollup-backed), so it is
+  // never included here and the sleep chart keeps its own fetch.
+  //
+  // The window matches the charts' default 30-point view (the dashboard
+  // mounts them with no range-tab interaction); a chart whose window
+  // widens past this slice (range tab / comparison) drops batched
+  // coverage and self-fetches for the new window — see `usePreloaded`.
+  const batchTypeSet = new Set<string>();
+  if (showWeightChart) batchTypeSet.add("WEIGHT");
+  if (showBpCharts) {
+    batchTypeSet.add("BLOOD_PRESSURE_SYS");
+    batchTypeSet.add("BLOOD_PRESSURE_DIA");
+  }
+  if (showPulseChart)
+    batchTypeSet.add(hasRestingHr ? "RESTING_HEART_RATE" : "PULSE");
+  if (showBodyFatChart) batchTypeSet.add("BODY_FAT");
+  if (showStepsChart) batchTypeSet.add("ACTIVITY_STEPS");
+  const batchChartTypes = Array.from(batchTypeSet);
+
+  // Stable day-bucketed window so the cache key is stable across the day
+  // (mirrors the chart's own ISO-window stability contract). Computed
+  // once per mount via lazy state so a re-render never re-keys the batch.
+  const [batchWindow] = useState(() => {
+    const to = new Date();
+    to.setHours(23, 59, 59, 999);
+    const from = new Date(to.getTime() - 31 * 86_400_000);
+    return { from: from.toISOString(), to: to.toISOString() };
+  });
+
+  const { data: batchedSeries } = useQuery({
+    queryKey: queryKeys.chartSeriesBatch(
+      batchChartTypes.join(","),
+      batchWindow.from,
+      batchWindow.to,
+    ),
+    enabled:
+      isAuthenticated && mounted && batchChartTypes.length > 0,
+    staleTime: 60_000,
+    gcTime: 5 * 60_000,
+    refetchOnWindowFocus: false,
+    queryFn: async () => {
+      const sp = new URLSearchParams();
+      sp.set("types", batchChartTypes.join(","));
+      sp.set("from", batchWindow.from);
+      sp.set("to", batchWindow.to);
+      const res = await apiGet<{
+        series: Record<
+          string,
+          Array<{
+            value: number;
+            measuredAt: string;
+            count?: number;
+            minValue?: number | null;
+            maxValue?: number | null;
+          }>
+        >;
+      }>(`/api/measurements/series-batch?${sp}`);
+      return res.series;
     },
-  );
+  });
+
+  // Per-chart slices in the chart's `MeasurementApiRow` shape. The batched
+  // rows already carry `measuredAt` / `value` / `count` / min / max — the
+  // exact fields the chart's bucketing loop reads.
+  const preloadedSeries = batchedSeries;
   // v1.7.0 — the primary data source differs by flag. In snapshot
   // mode `analyticsSlimQuery` is `enabled: false`, and a disabled
   // TanStack query reports `fetchStatus: "idle"` → `isLoading` is
@@ -1222,6 +1223,7 @@ export default function DashboardPage() {
               <HealthChartDynamic
                 key="weight-chart"
                 onDataReady={() => markChartReady("weight-chart")}
+                preloadedSeries={preloadedSeries}
                 chartKey="weight"
                 types={["WEIGHT"]}
                 title={t("dashboard.weight")}
@@ -1242,6 +1244,7 @@ export default function DashboardPage() {
                 <HealthChartDynamic
                   key="bmi-chart"
                   onDataReady={() => markChartReady("bmi-chart")}
+                  preloadedSeries={preloadedSeries}
                   chartKey="bmi"
                   types={["WEIGHT"]}
                   title={t("targets.bmi")}
@@ -1271,6 +1274,7 @@ export default function DashboardPage() {
               <HealthChartDynamic
                 key="bp-chart"
                 onDataReady={() => markChartReady("bp-chart")}
+                preloadedSeries={preloadedSeries}
                 chartKey="bp"
                 types={["BLOOD_PRESSURE_SYS", "BLOOD_PRESSURE_DIA"]}
                 title={t("dashboard.bloodPressure")}
@@ -1294,6 +1298,7 @@ export default function DashboardPage() {
               <HealthChartDynamic
                 key="pulse-chart"
                 onDataReady={() => markChartReady("pulse-chart")}
+                preloadedSeries={preloadedSeries}
                 chartKey="pulse"
                 // v1.15.12 A2 — chart the RESTING series against the
                 // resting band when available; otherwise chart raw heart
@@ -1320,6 +1325,7 @@ export default function DashboardPage() {
               <HealthChartDynamic
                 key="bodyFat-chart"
                 onDataReady={() => markChartReady("bodyFat-chart")}
+                preloadedSeries={preloadedSeries}
                 chartKey="bodyFat"
                 types={["BODY_FAT"]}
                 title={t("dashboard.bodyFat")}
@@ -1380,6 +1386,7 @@ export default function DashboardPage() {
               <HealthChartDynamic
                 key="steps-chart"
                 onDataReady={() => markChartReady("steps-chart")}
+                preloadedSeries={preloadedSeries}
                 chartKey="steps"
                 types={["ACTIVITY_STEPS"]}
                 title={t("dashboard.steps") ?? "Steps"}
diff --git a/src/components/dashboard/dashboard-gates.ts b/src/components/dashboard/dashboard-gates.ts
new file mode 100644
index 000000000..3b74ff113
--- /dev/null
+++ b/src/components/dashboard/dashboard-gates.ts
@@ -0,0 +1,119 @@
+/**
+ * v1.18.6 — dashboard first-paint / skeleton-reservation gates.
+ *
+ * Extracted verbatim from `src/app/page.tsx` so the page component reads
+ * as a thinner orchestrator and these pure helpers (already unit-tested)
+ * live in one cohesive module. `page.tsx` re-exports them so the existing
+ * `../page` test imports stay valid.
+ */
+import type { DashboardLayout } from "@/lib/dashboard-layout";
+
+/**
+ * v1.7.0 — first-paint gate for the dashboard tile strip.
+ *
+ * `primaryLoading` must come from whichever query actually drives the
+ * tiles: the snapshot cell by default, the slim analytics cell when
+ * `NEXT_PUBLIC_DASHBOARD_SNAPSHOT=false`. A disabled TanStack query reports
+ * `isLoading: false` (idle fetch status), so keying off the wrong
+ * source flashes the empty state for the whole fetch. Pure + exported
+ * so the gate has direct unit coverage without mounting the page.
+ */
+export function resolveDashboardFirstPaintGate(input: {
+  trendCardCount: number;
+  chartCount: number;
+  configuredTileCount: number;
+  primaryLoading: boolean;
+}): { showTileStripSkeleton: boolean; showEmptyState: boolean } {
+  const showTileStripSkeleton =
+    input.trendCardCount === 0 &&
+    input.primaryLoading &&
+    input.configuredTileCount > 0;
+  const showEmptyState =
+    input.trendCardCount === 0 &&
+    input.chartCount === 0 &&
+    !showTileStripSkeleton &&
+    !input.primaryLoading;
+  return { showTileStripSkeleton, showEmptyState };
+}
+
+/**
+ * v1.16.8 — widget ids that actually paint a tile in the strip on the
+ * web dashboard, mirrored from the per-id render blocks below.
+ * `medications` / `recentWorkouts` / `achievements` carry NO strip tile
+ * (chart-row cards only), and the iOS-pin-only ids have no web render
+ * path at all — counting any of them over-reserved the loading
+ * silhouette and made the strip reshuffle when the data landed.
+ */
+const TILE_CAPABLE_WIDGET_IDS = new Set<string>([
+  "weight",
+  "bp",
+  "pulse",
+  "bodyFat",
+  "mood",
+  "sleep",
+  "steps",
+  "glucose",
+  "bpInTarget",
+  "vo2Max",
+]);
+
+/**
+ * v1.16.8 — silhouette count for the tile-strip skeleton: one card per
+ * tile-capable, tile-visible widget. `bp` paints TWO tiles (sys + dia,
+ * see the render block below) so it counts double; `glucose` can fan
+ * out to one tile per logged context, but the contexts are unknown
+ * until the snapshot lands, so it reserves one card (the sane floor).
+ * Pure + exported for direct unit coverage.
+ */
+export function resolveConfiguredTileCount(layout: DashboardLayout): number {
+  let count = 0;
+  for (const widget of layout.widgets) {
+    if (!TILE_CAPABLE_WIDGET_IDS.has(widget.id)) continue;
+    if (!(widget.tileVisible ?? widget.visible)) continue;
+    count += widget.id === "bp" ? 2 : 1;
+  }
+  return count;
+}
+
+/**
+ * v1.16.8 — widget ids with a chart-row surface on the web dashboard,
+ * mirrored from the `charts[]` entries below. The achievements +
+ * recent-workouts cards stay out: they self-skeleton, carry no
+ * chart-shaped footprint, and gate on `layoutResolved`.
+ */
+const CHART_CAPABLE_WIDGET_IDS = new Set<string>([
+  "weight",
+  "bp",
+  "pulse",
+  "bodyFat",
+  "mood",
+  "sleep",
+  "steps",
+  "medications",
+  // v1.18.2 — Vorsorge preventive-care summary card (chart-row only).
+  "vorsorge",
+]);
+
+/**
+ * v1.16.8 — expected chart-row card count while the snapshot is still
+ * in flight. Every chart gate below needs `count > 0` from snapshot
+ * data, so the cold page used to render NO chart row at all and then
+ * grow ~1000 px when the snapshot landed. The best available signal
+ * before data arrives is the layout config (the user's saved layout
+ * when cached, the default otherwise): one card per chart-visible
+ * widget, plus the BMI card that rides the weight gate when the
+ * profile carries a height. Pure + exported for direct unit coverage.
+ */
+export function resolveChartRowPlaceholderCount(
+  layout: DashboardLayout,
+  opts?: { hasHeightCm?: boolean },
+): number {
+  let count = 0;
+  for (const widget of layout.widgets) {
+    if (!CHART_CAPABLE_WIDGET_IDS.has(widget.id)) continue;
+    if (!widget.visible) continue;
+    count += 1;
+    if (widget.id === "weight" && opts?.hasHeightCm) count += 1;
+  }
+  return count;
+}

From 36ce82866a0531f79e4950204ae1bf45416a9798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 15:35:49 +0200
Subject: [PATCH 09/71] chore(release): v1.18.6

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54228ffd..309d35660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 ## [Unreleased]
 
+## [1.18.6] — 2026-06-18 — a real offline app and a faster dashboard
+
+This release makes the installed app genuinely useful offline and lightens the dashboard. Opened without a connection, the home-screen app now shows your last synced data instead of empty placeholders, and a quiet line tells you it's the last sync. The dashboard fetches all its charts in one request instead of one per chart, and resolves its target ranges on the server. Plus a mobile touch-target pass and a reduced-motion safeguard. No breaking changes; no migration.
+
+### Added
+
+- **Real offline reads.** The installed app caches your dashboard, recent readings, medications and insights (safe, read-only data only — never anything tied to sign-in), so opening it offline shows your last synced view with a "showing your last synced data" note, rather than blank skeletons. Changes you make offline still save when you reconnect.
+
+### Changed
+
+- **A faster dashboard.** All dashboard charts now load from a single batched request instead of one fetch per chart, and target ranges are computed on the server — less work on your device and lighter load on the database.
+- **Mobile polish.** Small tap targets (reminder-time chips, the dose-history and token-copy buttons, sortable headers) were brought up to a comfortable touch size, and a global reduced-motion safeguard now quiets animation when your device asks for it.
+
+### Security
+
+- The container scan ignores a known `picomatch` advisory (CVE-2026-33671) that exists only in the npm CLI bundled inside the base image, not in the app's own dependencies (which are pinned to the fixed version) — clearing a false-positive in the non-blocking security scan.
+
+### Operator note
+
+- UI/API-only; no migration. The service worker cache version bumps with the release, so clients refresh their offline cache automatically on update.
+
 ## [1.18.5] — 2026-06-18 — filter by value, a tidier advanced panel, and a titration timeline for injectables
 
 A small polish release. You can now filter your readings by value, the advanced medication settings collapse into sections instead of one long page, and injectable medications show their dose-escalation plan as a timeline. No breaking changes; no migration.

From 730430728d62d78b316272ae3c56598ca1674010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 17:09:56 +0200
Subject: [PATCH 10/71] fix(pwa): serve allowlisted API reads network-first

The offline service worker cached allowlisted GET /api/* reads with
stale-while-revalidate, serving the cached pre-mutation copy first and
revalidating in the background. Online, a list fetched straight after a
create or update rendered the old (or empty) data until the next paint,
breaking read-after-write.

Switch the data branch to network-first: always fetch fresh from the
network online and refresh the cache behind it; fall back to the last
cached copy only when the network fails (offline). The offline fallback,
the allowlist plus auth/token/secret-body boundary, and the
release-versioned cache name are unchanged.

Add a regression guard to the cache-policy test that reads public/sw.js
and asserts the network-first wiring and the absence of the old
stale-while-revalidate handler.
---
 public/sw.js                                  | 98 ++++++++++---------
 src/lib/pwa/__tests__/sw-cache-policy.test.ts | 37 +++++++
 2 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/public/sw.js b/public/sw.js
index 8735e44b8..e94b6d5f3 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -40,8 +40,16 @@ const CACHE_VERSION =
 const STATIC_CACHE = `healthlog-static-${CACHE_VERSION}`;
 const PAGE_CACHE = `healthlog-pages-${CACHE_VERSION}`;
 // v1.18.6 — read-only data cache for a curated allowlist of safe GET `/api/*`
-// reads. Stale-while-revalidate: an installed PWA opened offline now renders
-// the LAST cached dashboard/series instead of empty skeletons forever.
+// reads. Network-first: online callers always get the fresh server response
+// (and the cache is refreshed behind it), so a read-after-write never serves a
+// stale pre-mutation list. Offline (the network fetch throws) the LAST cached
+// dashboard/series is served instead of empty skeletons forever.
+//
+// v1.18.6.x — reverted from stale-while-revalidate, which served the cached
+// pre-mutation copy first and only revalidated in the background, so a list
+// read straight after a create/update showed the old (or empty) data until the
+// next paint. Network-first restores read-after-write freshness while keeping
+// the offline fallback.
 const DATA_CACHE = `healthlog-data-${CACHE_VERSION}`;
 const MAX_STATIC_ENTRIES = 150;
 const MAX_PAGE_ENTRIES = 30;
@@ -139,12 +147,13 @@ self.addEventListener("fetch", (event) => {
   // Only handle same-origin GET requests
   if (request.method !== "GET" || url.origin !== self.location.origin) return;
 
-  // API calls. Allowlisted safe GET reads use stale-while-revalidate so the
-  // installed PWA renders last-synced data offline; everything else (auth,
+  // API calls. Allowlisted safe GET reads use network-first so the installed
+  // PWA always renders fresh server data online (and falls back to the last
+  // cached copy only when the network fails); everything else (auth,
   // mutations, anything not on the list) stays network-only.
   if (url.pathname.startsWith("/api/")) {
     if (isAllowlistedApiRead(url.pathname)) {
-      event.respondWith(staleWhileRevalidateApi(request));
+      event.respondWith(networkFirstApi(request));
     }
     return;
   }
@@ -186,59 +195,54 @@ async function cacheFirst(request, cacheName) {
 }
 
 /**
- * Stale-while-revalidate for allowlisted safe GET `/api/*` reads.
+ * Network-first for allowlisted safe GET `/api/*` reads.
  *
- * Serves the cached copy immediately (instant offline value) while a
- * background fetch refreshes it. With no cache yet it awaits the network and,
- * if that fails offline, returns a JSON 503 so the client's TanStack Query
- * cache / IndexedDB persister (also added in v1.18.6) supplies the data.
+ * Always tries the network first so an online caller gets the fresh server
+ * response — critical for read-after-write: a list fetched straight after a
+ * create/update must reflect the mutation, not a stale pre-mutation copy. On a
+ * cacheable response the data cache is refreshed behind it. Only when the
+ * network fails (offline) is the last cached copy served; with neither, a JSON
+ * 503 lets the client's TanStack Query cache / IndexedDB persister supply data.
  *
  * Caching is gated twice: `isAllowlistedApiRead` already filtered the path,
  * and `isCacheableApiResponse` inspects the actual body so a `no-store` or
  * secret-shaped (`hlk_`/`hlr_`/`sk-`) response is never persisted — the same
  * refusal discipline the idempotency cache uses.
  */
-async function staleWhileRevalidateApi(request) {
+async function networkFirstApi(request) {
   const cache = await caches.open(DATA_CACHE);
-  const cached = await cache.match(request);
 
-  const network = fetch(request)
-    .then(async (response) => {
-      // Read the body once to body-screen it, then reconstruct a fresh
-      // Response so both the cache.put and the return value have an
-      // unconsumed body.
-      const bodyText = await response
-        .clone()
-        .text()
-        .catch(() => undefined);
-      if (isCacheableApiResponse(response, bodyText)) {
-        const toStore = new Response(bodyText, {
-          status: response.status,
-          statusText: response.statusText,
-          headers: response.headers,
-        });
-        await cache.put(request, toStore);
-        trimCache(DATA_CACHE, MAX_DATA_ENTRIES);
-      }
-      return response;
-    })
-    .catch(() => null);
+  try {
+    const response = await fetch(request);
+    // Read the body once to body-screen it, then reconstruct a fresh Response
+    // so both the cache.put and the return value have an unconsumed body.
+    const bodyText = await response
+      .clone()
+      .text()
+      .catch(() => undefined);
+    if (isCacheableApiResponse(response, bodyText)) {
+      const toStore = new Response(bodyText, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+      });
+      await cache.put(request, toStore);
+      trimCache(DATA_CACHE, MAX_DATA_ENTRIES);
+    }
+    return response;
+  } catch {
+    // Network failed (offline) — serve the last cached copy if we have one.
+    const cached = await cache.match(request);
+    if (cached) return cached;
 
-  if (cached) {
-    // Refresh in the background; don't block the cached response on it.
-    return cached;
+    return new Response(
+      JSON.stringify({ data: null, error: "offline", meta: { offline: true } }),
+      {
+        status: 503,
+        headers: { "Content-Type": "application/json; charset=utf-8" },
+      },
+    );
   }
-
-  const fresh = await network;
-  if (fresh) return fresh;
-
-  return new Response(
-    JSON.stringify({ data: null, error: "offline", meta: { offline: true } }),
-    {
-      status: 503,
-      headers: { "Content-Type": "application/json; charset=utf-8" },
-    },
-  );
 }
 
 /**
diff --git a/src/lib/pwa/__tests__/sw-cache-policy.test.ts b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
index db93bd5b8..0e6a68734 100644
--- a/src/lib/pwa/__tests__/sw-cache-policy.test.ts
+++ b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
@@ -1,3 +1,6 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
 import { describe, expect, it } from "vitest";
 
 import {
@@ -5,6 +8,11 @@ import {
   isCacheableApiResponse,
 } from "@/lib/pwa/sw-cache-policy";
 
+const SW_SOURCE = readFileSync(
+  join(process.cwd(), "public", "sw.js"),
+  "utf8",
+);
+
 describe("isAllowlistedApiRead — offline read boundary", () => {
   it("caches the curated safe GET read endpoints", () => {
     expect(isAllowlistedApiRead("/api/dashboard/snapshot")).toBe(true);
@@ -91,3 +99,32 @@ describe("isCacheableApiResponse — body/header refusal", () => {
     ).toBe(false);
   });
 });
+
+// v1.18.6.x regression guard. The first v1.18.6 cut cached allowlisted API
+// reads with stale-while-revalidate, which served the pre-mutation copy first
+// and broke read-after-write (a list fetched straight after a create showed
+// the old/empty data). The strategy must be network-first: always fetch fresh
+// online, fall back to cache ONLY when the network throws (offline).
+describe("public/sw.js — allowlisted API reads are network-first", () => {
+  it("routes the allowlisted API branch through a network-first handler", () => {
+    expect(SW_SOURCE).toContain("networkFirstApi(request)");
+    expect(SW_SOURCE).toContain("async function networkFirstApi(request)");
+  });
+
+  it("no longer uses stale-while-revalidate for API reads", () => {
+    expect(SW_SOURCE).not.toContain("staleWhileRevalidateApi");
+  });
+
+  it("falls back to the cached copy only inside the network-failure catch", () => {
+    const handler = SW_SOURCE.slice(
+      SW_SOURCE.indexOf("async function networkFirstApi(request)"),
+    );
+    const tryIdx = handler.indexOf("await fetch(request)");
+    const catchIdx = handler.indexOf("} catch {");
+    const cacheMatchIdx = handler.indexOf("cache.match(request)");
+    // fetch comes first; the cache read lives after the catch boundary.
+    expect(tryIdx).toBeGreaterThan(-1);
+    expect(catchIdx).toBeGreaterThan(tryIdx);
+    expect(cacheMatchIdx).toBeGreaterThan(catchIdx);
+  });
+});

From 33dcf39adf513806dde257d94d2d45dd7e9e9d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 17:48:41 +0200
Subject: [PATCH 11/71] fix(a11y): hold revealed state under the reduced-motion
 backstop

The global prefers-reduced-motion catch-all collapsed every animation to
near-zero duration but left animation-fill-mode at its default, so an
entrance animation whose element rests at opacity:0 and only reveals
through its keyframe snapped back to the hidden base style once the
near-instant animation completed. Under reduced motion that left charts
and list rows permanently invisible. Pin animation-fill-mode:forwards and
zero the stagger delay so the shortened reveal holds its final visible
frame and paints immediately. Per-component blocks that set animation:none
are unaffected (no animation to fill).
---
 src/app/globals.css | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index e7892e703..73a7dd6d9 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -896,13 +896,24 @@
  * for reduced motion. The per-component blocks above stay — they carry
  * tailored static fallbacks (static dots, full-height bars). This is the
  * floor, not a replacement. Near-zero (not 0) keeps JS animation-end /
- * transition-end listeners firing so state machines don't stall. */
+ * transition-end listeners firing so state machines don't stall.
+ *
+ * `animation-fill-mode: forwards` + `animation-delay: 0ms` are load-bearing:
+ * several entrance animations rest at `opacity: 0` and only become visible
+ * through their reveal keyframe. Without holding the end state (and without
+ * zeroing the stagger delay) the near-zero animation completes and the
+ * element snaps back to its hidden base style — leaving charts and list
+ * rows permanently invisible under reduced motion. Forwards pins the final
+ * (revealed) frame; zero delay reveals immediately. Per-component blocks
+ * above that set `animation: none` are unaffected (no animation to fill). */
 @media (prefers-reduced-motion: reduce) {
   *,
   *::before,
   *::after {
     animation-duration: 0.01ms !important;
     animation-iteration-count: 1 !important;
+    animation-fill-mode: forwards !important;
+    animation-delay: 0ms !important;
     transition-duration: 0.01ms !important;
     scroll-behavior: auto !important;
   }

From 9633d66eea3662ddda2d0f0c7621dde93760cb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 17:48:57 +0200
Subject: [PATCH 12/71] fix(pwa): restore persisted query cache as gap-fill,
 never overwrite live data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

restorePersistedQueryCache hydrated the dehydrated snapshot
unconditionally, so a restore that resolves in an effect AFTER the page
has already fetched a fresh result overwrote that live query with the
stale (often empty) on-disk copy — a read opened straight after a
mutation then showed pre-mutation data. Filter the dehydrated state to
keys the live cache does not already hold before hydrate, so restore only
fills gaps; a query already present is by definition fresher than disk.
Scope the post-restore invalidation to the keys actually hydrated so a
live query is never disturbed. Adds an invariant test covering the
clobber case.
---
 src/lib/pwa/__tests__/query-persister.test.ts | 82 +++++++++++++++++++
 src/lib/pwa/query-persister.ts                | 33 +++++++-
 2 files changed, 114 insertions(+), 1 deletion(-)

diff --git a/src/lib/pwa/__tests__/query-persister.test.ts b/src/lib/pwa/__tests__/query-persister.test.ts
index 8f085b01d..161c6c14a 100644
--- a/src/lib/pwa/__tests__/query-persister.test.ts
+++ b/src/lib/pwa/__tests__/query-persister.test.ts
@@ -134,8 +134,90 @@ describe("persister round-trips through a fake IndexedDB", () => {
       weightKg: 81,
     });
 
+    // Restored data must paint instantly BUT be marked stale so the first
+    // observer background-refetches — otherwise the client's 5-minute
+    // staleTime treats a minutes-old snapshot as fresh and a list opened
+    // right after a mutation serves the stale pre-mutation copy.
+    const restored = matchingBuild
+      .getQueryCache()
+      .find({ queryKey: ["dashboard", "snapshot"] });
+    expect(restored?.isStale()).toBe(true);
+
     const foreignBuild = new QueryClient();
     await restorePersistedQueryCache(foreignBuild, "v9.9.9");
     expect(foreignBuild.getQueryData(["dashboard", "snapshot"])).toBeUndefined();
   });
+
+  it("never clobbers a query the live cache already holds", async () => {
+    // The read-after-write invariant: restore runs in an effect, possibly
+    // AFTER the page already fetched a fresh (post-mutation) list. A
+    // persisted STALE copy under the same key must not overwrite it — a
+    // present query is always fresher than disk.
+    const store = new Map<string, unknown>();
+    const makeReq = (run: () => void) => {
+      const req: Record<string, unknown> = {};
+      queueMicrotask(() => {
+        run();
+        (req.onsuccess as (() => void) | undefined)?.();
+      });
+      return req;
+    };
+    const fakeDb = {
+      close() {},
+      transaction() {
+        return {
+          objectStore() {
+            return {
+              put(value: unknown, key: string) {
+                store.set(key, value);
+                return makeReq(() => {});
+              },
+              get(key: string) {
+                const req = makeReq(() => {});
+                (req as { result?: unknown }).result = store.get(key);
+                return req;
+              },
+              delete(key: string) {
+                store.delete(key);
+                return makeReq(() => {});
+              },
+            };
+          },
+          set oncomplete(fn: () => void) {
+            queueMicrotask(fn);
+          },
+          set onerror(_fn: () => void) {},
+        };
+      },
+    };
+    (globalThis as { indexedDB?: unknown }).indexedDB = {
+      open() {
+        const req: Record<string, unknown> = { result: fakeDb };
+        queueMicrotask(() => (req.onsuccess as () => void)?.());
+        return req;
+      },
+    };
+
+    // Persist a STALE (empty) measurements list.
+    const source = new QueryClient();
+    source.setQueryData(["measurements", "list"], []);
+    const stop = startPersistingQueryCache(source, "v1.18.6");
+    vi.useFakeTimers();
+    source.setQueryData(["measurements", "list"], []);
+    vi.advanceTimersByTime(1100);
+    vi.useRealTimers();
+    await new Promise((r) => setTimeout(r, 0));
+    stop();
+
+    // The live client already fetched the FRESH (post-mutation) row.
+    const live = new QueryClient();
+    live.setQueryData(["measurements", "list"], [{ id: "fresh-row" }]);
+
+    await restorePersistedQueryCache(live, "v1.18.6");
+
+    // The fresh row survived — the empty persisted snapshot did not win.
+    expect(live.getQueryData(["measurements", "list"])).toEqual([
+      { id: "fresh-row" },
+    ]);
+  });
 });
diff --git a/src/lib/pwa/query-persister.ts b/src/lib/pwa/query-persister.ts
index 3d7f5a578..cc85009ab 100644
--- a/src/lib/pwa/query-persister.ts
+++ b/src/lib/pwa/query-persister.ts
@@ -106,7 +106,38 @@ export async function restorePersistedQueryCache(
       await clearPersistedQueryCache();
       return;
     }
-    hydrate(queryClient, payload.state);
+
+    // Never clobber a query the live client already holds. `hydrate` calls
+    // `setData` per dehydrated query unconditionally, so a snapshot restored
+    // in an effect AFTER the first paint would overwrite a query the page
+    // already fetched/prefetched — replacing the fresh (post-mutation) list
+    // with the stale persisted (often empty) copy. That was the read-after-
+    // write break across dashboard/measurements/medications: the restore won
+    // the race against the in-flight fetch. Drop every dehydrated query whose
+    // key the cache already carries so restore only ever FILLS gaps, never
+    // overwrites; a query already present is by definition fresher than disk.
+    const cache = queryClient.getQueryCache();
+    const filtered: DehydratedState = {
+      ...payload.state,
+      queries: payload.state.queries.filter(
+        (q) => cache.get(q.queryHash) === undefined,
+      ),
+    };
+    if (filtered.queries.length === 0) return;
+
+    hydrate(queryClient, filtered);
+    // Restored queries carry their original `dataUpdatedAt`, so with the
+    // client's 5-minute `staleTime` a snapshot saved minutes ago hydrates as
+    // *fresh* and the first observer never refetches — a list opened straight
+    // after a create/update then serves the stale pre-mutation copy. Marking
+    // every restored query invalidated makes it stale-but-shown: the persisted
+    // data still paints instantly, and the first mount triggers a background
+    // refetch. Online that lands fresh data within ms; offline the refetch
+    // fails and the hydrated copy stays on screen — the offline value holds.
+    // Scoped to the keys we just hydrated so we never disturb a live query.
+    for (const dq of filtered.queries) {
+      cache.get(dq.queryHash)?.invalidate();
+    }
   } catch {
     // Persistence is best-effort; never block boot on a cache restore.
   }

From 3cf9a262ca8fa71d05e96d0bb15ec4e1adcdd054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 17:48:57 +0200
Subject: [PATCH 13/71] test(e2e): keep route mocks authoritative against the
 v1.18.6 service worker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The production build registers a service worker whose v1.18.6 data branch
serves allowlisted GET /api/* reads network-first. A worker-originated
fetch is not subject to Playwright's page.route interception, so the
worker re-fetched the real (empty) backend and bypassed every per-spec
route.fulfill — a just-created row never surfaced and read-after-write
assertions failed. Block the worker in the test context so the route
mocks are authoritative; the shipped offline cache is untouched for real
users. Separately, the dashboard now batches chart series into
/api/measurements/series-batch, a sub-path the **/api/measurements* glob
does not match, so it fell through to the empty backend and each chart
painted an empty preloaded slice; stub the endpoint with the same
populated set.
---
 e2e/dashboard.spec.ts | 43 +++++++++++++++++++++++++++++++++++++++++++
 playwright.config.ts  | 11 +++++++++++
 2 files changed, 54 insertions(+)

diff --git a/e2e/dashboard.spec.ts b/e2e/dashboard.spec.ts
index 2a86bc52d..0a4891df2 100644
--- a/e2e/dashboard.spec.ts
+++ b/e2e/dashboard.spec.ts
@@ -98,10 +98,53 @@ test.describe("authenticated dashboard render", () => {
       }),
     );
 
+    // v1.18.6 — the dashboard now batches every visible chart's daily
+    // series into ONE `/api/measurements/series-batch` round-trip and
+    // hands each chart its slice via `preloadedSeries`. The route is a
+    // sub-path of `/api/measurements`, which the `**/api/measurements*`
+    // glob below does NOT match (Playwright's `*` does not cross `/`), so
+    // without an explicit stub the request fell through to the real
+    // backend. The seed user has no measurements, so the route returned
+    // every requested type as an EMPTY array — and an empty-but-present
+    // slice satisfies the chart's preloaded-coverage check, so each chart
+    // rendered the batched empty slice instead of self-fetching. Mock the
+    // endpoint with the same populated set so the charts paint.
+    await page.route(/\/api\/measurements\/series-batch(\?|$)/, (route) => {
+      const url = new URL(route.request().url());
+      const types = (url.searchParams.get("types") ?? "WEIGHT").split(",");
+      const series: Record<
+        string,
+        Array<{ type: string; value: number; measuredAt: string; count: number }>
+      > = {};
+      for (const type of types) {
+        const baseValue =
+          type === "BLOOD_PRESSURE_SYS"
+            ? 124
+            : type === "BLOOD_PRESSURE_DIA"
+              ? 80
+              : type === "PULSE"
+                ? 70
+                : 78.5;
+        series[type] = Array.from({ length: 10 }, (_, i) => ({
+          type,
+          value: baseValue + (i % 3) - 1,
+          measuredAt: new Date(Date.now() - i * 86_400_000).toISOString(),
+          count: 1,
+        }));
+      }
+      return route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({ data: { series }, error: null }),
+      });
+    });
+
     // The chart's per-type fetch reads `json.data.measurements` and
     // expects a `meta.total`. Return a small dataset so the chart has
     // points to plot — otherwise Recharts mounts a placeholder instead
     // of the recharts-wrapper SVG and the assertion below times out.
+    // (Self-fetch fallback for any chart not covered by the batch above,
+    // e.g. a range-tab change that drops batched coverage.)
     await page.route("**/api/measurements*", (route) => {
       const url = new URL(route.request().url());
       const type = url.searchParams.get("type") ?? "WEIGHT";
diff --git a/playwright.config.ts b/playwright.config.ts
index 1ee341f56..1c9773571 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -33,6 +33,17 @@ export default defineConfig({
     trace: "retain-on-failure",
     screenshot: "only-on-failure",
     video: "retain-on-failure",
+    // v1.18.6 — block the service worker in the test context. The
+    // production build registers `/sw.js`, whose v1.18.6 data branch
+    // serves allowlisted `/api/*` GET reads network-first. A worker-
+    // originated `fetch` is NOT subject to Playwright's `page.route`
+    // interception, so the SW would re-fetch the real (empty) backend
+    // and serve that — bypassing every per-spec `route.fulfill` mock and
+    // breaking read-after-write assertions (a just-created row never
+    // surfaced). Blocking the worker keeps the route mocks authoritative
+    // without weakening the shipped SW behaviour. Real users keep the
+    // offline data cache; only the test harness opts out.
+    serviceWorkers: "block",
     // HealthLog ships dark mode as the default (Dracula theme) — `globals.css`
     // sets `color-scheme: dark` on the root and the `<ThemeProvider>` defaults
     // to "system". Playwright's stock context is `colorScheme: "light"`, which

From b474ea1489a6eb8140d453a2f206f9c46586c8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:18:24 +0200
Subject: [PATCH 14/71] fix(pwa): stop the offline cache from persisting
 sensitive health data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The offline layer wrote far too much to disk and cleared it too rarely.
The query persister used a denylist (only auth/session/admin/tokens), so
every other family — coach, insights, illness, labs, mood, cycle — was
dehydrated to IndexedDB in plaintext; the service worker likewise
prefix-cached GET /api/insights, which serves decrypted Coach
conversations. Neither store carried an account marker and both were
wiped only on explicit logout, so a session that ended by expiry or a
401 left health data on disk for the next account on a shared profile.

Flip the persister to a strict allowlist (dashboard snapshot, per-chart
series, widget layout — the offline-dashboard set only) and stamp each
payload with the live account id, discarding on mismatch. Drop
/api/insights and /api/analytics from the worker allowlist. Wipe the
IndexedDB blob and the data/page caches on every session end — the
401/expiry redirect and the logout path both route through one helper.
---
 public/sw.js                                  |   8 +-
 src/components/layout/auth-shell.tsx          |   8 ++
 src/hooks/use-auth.ts                         |  32 ++---
 src/lib/pwa/__tests__/query-persister.test.ts | 126 +++++++++++++++--
 src/lib/pwa/__tests__/sw-cache-policy.test.ts |  16 ++-
 src/lib/pwa/query-persister.ts                | 129 +++++++++++++++---
 src/lib/pwa/sw-cache-policy.ts                |  13 +-
 7 files changed, 273 insertions(+), 59 deletions(-)

diff --git a/public/sw.js b/public/sw.js
index e94b6d5f3..fb3bad369 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -61,13 +61,17 @@ const MAX_DATA_ENTRIES = 60;
 // (mirrors the idempotency cache's `hlk_`/`hlr_`/`sk-` refusal) so a future
 // endpoint that slipped onto the list can still never persist a secret.
 // Matched by exact path or `<path>/` / `<path>?` prefix.
+// v1.18.6 — AI/clinical narrative surfaces (`/api/insights`, `/api/analytics`)
+// are deliberately NOT cached: `/api/insights` prefix-matched the Coach chat
+// endpoint into the disk cache, and neither belongs on a self-hosted health
+// PWA's durable storage. Only the dashboard snapshot, the widget layout, the
+// measurement reads (incl. the batched daily series), the medication reads,
+// and the version probe are eligible.
 const API_READ_ALLOWLIST = [
   "/api/dashboard/snapshot",
   "/api/dashboard/widgets",
   "/api/measurements",
   "/api/medications",
-  "/api/insights",
-  "/api/analytics",
   "/api/version",
 ];
 
diff --git a/src/components/layout/auth-shell.tsx b/src/components/layout/auth-shell.tsx
index d95f9a2bc..8d4a27ba6 100644
--- a/src/components/layout/auth-shell.tsx
+++ b/src/components/layout/auth-shell.tsx
@@ -8,6 +8,7 @@ import { MaintainershipBanner } from "@/components/i18n/maintainership-banner";
 import { LayoutCoachFab } from "@/components/insights/layout-coach-fab";
 import { LayoutCoachMount } from "@/components/insights/layout-coach-mount";
 import { useAuth } from "@/hooks/use-auth";
+import { clearOfflineCachesForSessionEnd } from "@/lib/pwa/query-persister";
 import { useTranslations } from "@/lib/i18n/context";
 import { CoachLaunchProvider } from "@/lib/insights/coach-launch-context";
 import { BottomNav } from "./bottom-nav";
@@ -91,6 +92,13 @@ export function AuthShell({
 
   useEffect(() => {
     if (!isLoading && !isAuthenticated && !isPublicPage) {
+      // Session END (expired / invalidated cookie → `/api/auth/me` 401). Wipe
+      // every client-side cache that can hold the previous account's health
+      // data before bouncing to login, so it never leaks to the next account
+      // on a shared device. Logout does the same from `useLogout`; this covers
+      // the expiry path that logout never runs through. Best-effort; the
+      // redirect proceeds regardless.
+      void clearOfflineCachesForSessionEnd();
       router.replace("/auth/login");
     }
   }, [isLoading, isAuthenticated, isPublicPage, router]);
diff --git a/src/hooks/use-auth.ts b/src/hooks/use-auth.ts
index d73adbca9..ba079e0c7 100644
--- a/src/hooks/use-auth.ts
+++ b/src/hooks/use-auth.ts
@@ -10,7 +10,7 @@ import { useTranslations } from "@/lib/i18n/context";
 import type { TimeFormatPreference } from "@/lib/format-locale";
 import { isTimeFormatPreference, storeTimeFormat } from "@/lib/time-format";
 import type { ModuleKey } from "@/lib/modules/registry";
-import { clearPersistedQueryCache } from "@/lib/pwa/query-persister";
+import { clearOfflineCachesForSessionEnd } from "@/lib/pwa/query-persister";
 
 export interface AuthUser {
   id: string;
@@ -195,28 +195,14 @@ export function useLogout() {
     onSuccess: () => {
       queryClient.setQueryData(queryKeys.authMe(), null);
       queryClient.invalidateQueries({ queryKey: queryKeys.auth() });
-      // Defense-in-depth at the session boundary: wipe the service-worker
-      // page cache so no cached navigation HTML survives a logout on a
-      // shared device. Scoped to `healthlog-pages-*` only — the static
-      // cache (hashed chunks, icons) carries no PII and dropping it would
-      // force a needless re-download on the next login. Best-effort; never
-      // blocks the redirect.
-      if (typeof caches !== "undefined") {
-        void caches.keys().then((keys) => {
-          for (const key of keys) {
-            // v1.18.6 — also drop the offline read-data cache; it holds the
-            // last-synced health JSON and must never survive a logout.
-            if (
-              key.startsWith("healthlog-pages-") ||
-              key.startsWith("healthlog-data-")
-            ) {
-              void caches.delete(key);
-            }
-          }
-        });
-      }
-      // Wipe the persisted IndexedDB query cache for the same reason.
-      void clearPersistedQueryCache();
+      // Defense-in-depth at the session boundary: wipe every client-side cache
+      // that can hold this account's health data — the IndexedDB query
+      // snapshot, the SW offline read-data cache (`healthlog-data-*`), and the
+      // SW page cache (`healthlog-pages-*`, cached navigation HTML) — so
+      // nothing survives a logout on a shared device. The static cache (hashed
+      // chunks, icons) carries no PII and is left intact to avoid a needless
+      // re-download. Best-effort; never blocks the redirect.
+      void clearOfflineCachesForSessionEnd();
       router.push("/auth/login");
     },
     // v1.16.4 — a network-failed logout used to do nothing at all (the
diff --git a/src/lib/pwa/__tests__/query-persister.test.ts b/src/lib/pwa/__tests__/query-persister.test.ts
index 161c6c14a..9ddf27bdb 100644
--- a/src/lib/pwa/__tests__/query-persister.test.ts
+++ b/src/lib/pwa/__tests__/query-persister.test.ts
@@ -8,11 +8,33 @@ import {
   startPersistingQueryCache,
 } from "@/lib/pwa/query-persister";
 
-describe("isPersistableKey — what survives to disk", () => {
-  it("persists health-data query families", () => {
+describe("isPersistableKey — strict dashboard-offline allowlist", () => {
+  it("persists ONLY the dashboard snapshot + measurement daily-series families", () => {
+    // Dashboard snapshot — the unified first-paint read.
     expect(isPersistableKey(["dashboard", "snapshot"])).toBe(true);
-    expect(isPersistableKey(["measurements", "list"])).toBe(true);
-    expect(isPersistableKey(["medications"])).toBe(true);
+    // Per-chart daily series + the batched dashboard series.
+    expect(isPersistableKey(["chart-data", "WEIGHT"])).toBe(true);
+    expect(isPersistableKey(["chart-data", "series-batch", "WEIGHT"])).toBe(
+      true,
+    );
+    // The resolved widget layout the snapshot seeds — matched as an exact
+    // tuple under the overloaded `["user", …]` head.
+    expect(isPersistableKey(["user", "dashboardWidgets"])).toBe(true);
+  });
+
+  it("never persists clinical / narrative health families", () => {
+    // The denylist regression: each of these used to be dehydrated to disk
+    // in plaintext. They are health/clinical/narrative and must stay
+    // in-memory only.
+    expect(isPersistableKey(["coach", "conversations"])).toBe(false);
+    expect(isPersistableKey(["insights"])).toBe(false);
+    expect(isPersistableKey(["illness"])).toBe(false);
+    expect(isPersistableKey(["labs"])).toBe(false);
+    expect(isPersistableKey(["mood-entries"])).toBe(false);
+    expect(isPersistableKey(["medications"])).toBe(false);
+    expect(isPersistableKey(["cycle"])).toBe(false);
+    expect(isPersistableKey(["measurements", "list"])).toBe(false);
+    expect(isPersistableKey(["analytics"])).toBe(false);
   });
 
   it("never persists auth / session / admin / token families", () => {
@@ -22,6 +44,13 @@ describe("isPersistableKey — what survives to disk", () => {
     expect(isPersistableKey(["tokens"])).toBe(false);
     expect(isPersistableKey(["apiTokens"])).toBe(false);
   });
+
+  it("never persists the rest of the overloaded user head", () => {
+    expect(isPersistableKey(["user", "profile"])).toBe(false);
+    expect(isPersistableKey(["user", "ai-provider"])).toBe(false);
+    expect(isPersistableKey(["user", "insightsLayout"])).toBe(false);
+    expect(isPersistableKey(["user", "thresholds"])).toBe(false);
+  });
 });
 
 describe("persister degrades gracefully without IndexedDB", () => {
@@ -120,9 +149,10 @@ describe("persister round-trips through a fake IndexedDB", () => {
     const source = new QueryClient();
     source.setQueryData(["dashboard", "snapshot"], { weightKg: 81 });
     const stop = startPersistingQueryCache(source, "v1.18.6");
-    // Force a flush by advancing past the 1s debounce.
+    // Force a flush by advancing past the 1s debounce. The trigger write uses
+    // an allowlisted family so the flush captures real persistable data.
     vi.useFakeTimers();
-    source.setQueryData(["measurements", "list"], [{ id: "a" }]);
+    source.setQueryData(["chart-data", "WEIGHT"], [{ d: "2026-06-18", v: 81 }]);
     vi.advanceTimersByTime(1100);
     vi.useRealTimers();
     await new Promise((r) => setTimeout(r, 0));
@@ -198,26 +228,98 @@ describe("persister round-trips through a fake IndexedDB", () => {
       },
     };
 
-    // Persist a STALE (empty) measurements list.
+    // Persist a STALE (empty) chart series under an allowlisted family.
     const source = new QueryClient();
-    source.setQueryData(["measurements", "list"], []);
+    source.setQueryData(["chart-data", "WEIGHT"], []);
     const stop = startPersistingQueryCache(source, "v1.18.6");
     vi.useFakeTimers();
-    source.setQueryData(["measurements", "list"], []);
+    source.setQueryData(["chart-data", "WEIGHT"], []);
     vi.advanceTimersByTime(1100);
     vi.useRealTimers();
     await new Promise((r) => setTimeout(r, 0));
     stop();
 
-    // The live client already fetched the FRESH (post-mutation) row.
+    // The live client already fetched the FRESH (post-mutation) series.
     const live = new QueryClient();
-    live.setQueryData(["measurements", "list"], [{ id: "fresh-row" }]);
+    live.setQueryData(["chart-data", "WEIGHT"], [{ id: "fresh-row" }]);
 
     await restorePersistedQueryCache(live, "v1.18.6");
 
     // The fresh row survived — the empty persisted snapshot did not win.
-    expect(live.getQueryData(["measurements", "list"])).toEqual([
+    expect(live.getQueryData(["chart-data", "WEIGHT"])).toEqual([
       { id: "fresh-row" },
     ]);
   });
+
+  it("discards a snapshot stamped with a different account id", async () => {
+    const store = new Map<string, unknown>();
+    const makeReq = (run: () => void) => {
+      const req: Record<string, unknown> = {};
+      queueMicrotask(() => {
+        run();
+        (req.onsuccess as (() => void) | undefined)?.();
+      });
+      return req;
+    };
+    const fakeDb = {
+      close() {},
+      transaction() {
+        return {
+          objectStore() {
+            return {
+              put(value: unknown, key: string) {
+                store.set(key, value);
+                return makeReq(() => {});
+              },
+              get(key: string) {
+                const req = makeReq(() => {});
+                (req as { result?: unknown }).result = store.get(key);
+                return req;
+              },
+              delete(key: string) {
+                store.delete(key);
+                return makeReq(() => {});
+              },
+            };
+          },
+          set oncomplete(fn: () => void) {
+            queueMicrotask(fn);
+          },
+          set onerror(_fn: () => void) {},
+        };
+      },
+    };
+    (globalThis as { indexedDB?: unknown }).indexedDB = {
+      open() {
+        const req: Record<string, unknown> = { result: fakeDb };
+        queueMicrotask(() => (req.onsuccess as () => void)?.());
+        return req;
+      },
+    };
+
+    // Account "user-a" persists a dashboard snapshot. The persister stamps
+    // the payload with the id read from the live `["auth","me"]` cache entry.
+    const source = new QueryClient();
+    source.setQueryData(["auth", "me"], { id: "user-a" });
+    source.setQueryData(["dashboard", "snapshot"], { weightKg: 81 });
+    const stop = startPersistingQueryCache(source, "v1.18.6");
+    vi.useFakeTimers();
+    source.setQueryData(["chart-data", "WEIGHT"], [{ v: 81 }]);
+    vi.advanceTimersByTime(1100);
+    vi.useRealTimers();
+    await new Promise((r) => setTimeout(r, 0));
+    stop();
+
+    // A DIFFERENT account ("user-b") restores on the same browser profile:
+    // the stamped owner mismatches the live account, so the snapshot is
+    // discarded rather than hydrating user-a's dashboard into user-b's cache.
+    const other = new QueryClient();
+    other.setQueryData(["auth", "me"], { id: "user-b" });
+    await restorePersistedQueryCache(other, "v1.18.6");
+    expect(other.getQueryData(["dashboard", "snapshot"])).toBeUndefined();
+
+    // ...and the foreign snapshot is wiped from disk, so a later same-account
+    // restore can't resurrect it either.
+    expect(store.get("react-query")).toBeUndefined();
+  });
 });
diff --git a/src/lib/pwa/__tests__/sw-cache-policy.test.ts b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
index 0e6a68734..8d359a968 100644
--- a/src/lib/pwa/__tests__/sw-cache-policy.test.ts
+++ b/src/lib/pwa/__tests__/sw-cache-policy.test.ts
@@ -22,11 +22,21 @@ describe("isAllowlistedApiRead — offline read boundary", () => {
       isAllowlistedApiRead("/api/measurements/series-batch?types=WEIGHT"),
     ).toBe(true);
     expect(isAllowlistedApiRead("/api/medications")).toBe(true);
-    expect(isAllowlistedApiRead("/api/insights")).toBe(true);
-    expect(isAllowlistedApiRead("/api/analytics")).toBe(true);
     expect(isAllowlistedApiRead("/api/version")).toBe(true);
   });
 
+  // v1.18.6 — AI/clinical narrative surfaces are never disk-cached. `/api/insights`
+  // previously prefix-matched the Coach chat list (`/api/insights/chat`, which
+  // returns decrypted conversation content) into the data cache; `/api/analytics`
+  // carries clinical aggregates. Both are off the allowlist.
+  it("never caches the AI / clinical narrative surfaces", () => {
+    expect(isAllowlistedApiRead("/api/insights")).toBe(false);
+    expect(isAllowlistedApiRead("/api/insights/chat")).toBe(false);
+    expect(isAllowlistedApiRead("/api/insights/generate")).toBe(false);
+    expect(isAllowlistedApiRead("/api/analytics")).toBe(false);
+    expect(isAllowlistedApiRead("/api/analytics/range")).toBe(false);
+  });
+
   it("never caches auth / session / token / login surfaces", () => {
     expect(isAllowlistedApiRead("/api/auth/me")).toBe(false);
     expect(isAllowlistedApiRead("/api/auth/logout")).toBe(false);
@@ -38,7 +48,7 @@ describe("isAllowlistedApiRead — offline read boundary", () => {
 
   it("refuses an auth/token segment nested under an allowlisted prefix", () => {
     expect(isAllowlistedApiRead("/api/medications/tokens")).toBe(false);
-    expect(isAllowlistedApiRead("/api/insights/auth")).toBe(false);
+    expect(isAllowlistedApiRead("/api/measurements/auth")).toBe(false);
   });
 
   it("does not cache endpoints outside the allowlist", () => {
diff --git a/src/lib/pwa/query-persister.ts b/src/lib/pwa/query-persister.ts
index cc85009ab..e512f54b7 100644
--- a/src/lib/pwa/query-persister.ts
+++ b/src/lib/pwa/query-persister.ts
@@ -8,10 +8,19 @@
  *
  * Safety:
  *  - Only successful (`status: "success"`) query results are persisted.
- *  - A small denylist keeps obviously sensitive query families out of disk
- *    (auth/session/admin/tokens), defence-in-depth alongside the SW boundary.
- *  - `clearPersistedQueryCache()` is called on logout so a shared device never
- *    leaks one account's cached health data to the next.
+ *  - A strict ALLOWLIST keeps everything except the low-sensitivity
+ *    dashboard-offline families off disk. This is the privacy floor: a
+ *    denylist would persist every family it didn't name (cycle, mood, illness,
+ *    labs, coach, insights, medications, …) in plaintext. Only the dashboard
+ *    snapshot, its resolved widget layout, and the measurement daily-series —
+ *    the data the dashboard needs to paint last-known values offline — are
+ *    eligible. Clinical / narrative families are never written to disk.
+ *  - `clearPersistedQueryCache()` is called on every session END (logout AND
+ *    the 401 / session-expiry redirect), so a shared device never leaks one
+ *    account's cached data to the next once the session is gone.
+ *  - The payload is stamped with the current user id; a restore whose stored
+ *    marker doesn't match the live account discards + clears the cache rather
+ *    than hydrating a foreign account's data.
  *  - Respects the centralised queryKey factory: it reads existing query keys,
  *    it never invents new ones.
  */
@@ -29,20 +38,31 @@ const KEY = "react-query";
 const VERSION_KEY = "react-query-version";
 const MAX_AGE_MS = 24 * 60 * 60 * 1000; // discard anything older than a day
 
-/** Query-key families never written to disk (defence in depth). */
-const PERSIST_DENYLIST = [
-  "auth",
-  "session",
-  "sessions",
-  "admin",
-  "tokens",
-  "apiTokens",
-];
+/**
+ * Strict allowlist of the only query families written to disk — the
+ * low-sensitivity reads the dashboard needs to paint last-known values when
+ * opened offline. Everything else (coach, insights, illness, labs, mood,
+ * medications, cycle, auth, admin, tokens, …) stays in memory only.
+ *
+ *  - `["dashboard", …]`  — the unified first-paint snapshot
+ *    (`queryKeys.dashboardSnapshot()` → `["dashboard","snapshot"]`).
+ *  - `["chart-data", …]` — the per-chart daily series + the batched dashboard
+ *    series (`queryKeys.chartData(…)` / `queryKeys.chartSeriesBatch(…)`), the
+ *    aggregated values the dashboard charts render.
+ *  - `["user","dashboardWidgets"]` — the resolved widget layout the snapshot
+ *    seeds, matched as an exact tuple so the rest of the overloaded `["user", …]`
+ *    head (profile, AI provider, insights layout, thresholds) stays off disk.
+ */
+const PERSIST_ALLOWLIST_HEADS = ["dashboard", "chart-data"] as const;
 
 export function isPersistableKey(queryKey: readonly unknown[]): boolean {
   const head = queryKey[0];
-  if (typeof head !== "string") return true;
-  return !PERSIST_DENYLIST.includes(head);
+  if (typeof head !== "string") return false;
+  if ((PERSIST_ALLOWLIST_HEADS as readonly string[]).includes(head)) {
+    return true;
+  }
+  // Only the dashboard widget layout under the overloaded `["user", …]` head.
+  return head === "user" && queryKey[1] === "dashboardWidgets";
 }
 
 function openDb(): Promise<IDBDatabase> {
@@ -82,9 +102,23 @@ async function idbGet<T>(): Promise<T | undefined> {
 interface PersistedPayload {
   buildVersion: string;
   savedAt: number;
+  /**
+   * Per-account binding. The id of the account whose reads produced this
+   * snapshot, read from the live `["auth","me"]` cache entry at flush time
+   * (`null` when unknown). A restore whose live account differs discards the
+   * snapshot rather than hydrating a foreign account's dashboard data — a
+   * belt-and-suspenders guard alongside the session-end wipe.
+   */
+  userId: string | null;
   state: DehydratedState;
 }
 
+/** Read the current account id from the live `["auth","me"]` cache entry. */
+function currentUserId(queryClient: QueryClient): string | null {
+  const me = queryClient.getQueryData<{ id?: string } | null>(["auth", "me"]);
+  return me?.id ?? null;
+}
+
 /**
  * Restore persisted query data into the client (called once before the first
  * paint of the authenticated shell). A build-version or age mismatch discards
@@ -106,6 +140,17 @@ export async function restorePersistedQueryCache(
       await clearPersistedQueryCache();
       return;
     }
+    // Per-account binding: if the live account is known and differs from the
+    // snapshot's stored owner, this is a different user on the same browser
+    // profile — discard + clear rather than hydrate a foreign account's data.
+    // When the live id is not yet known (auth/me not resolved at restore time)
+    // we don't gate on it; the session-end wipe is the primary guarantee and
+    // the build-version + 24 h age gates still apply.
+    const liveUserId = currentUserId(queryClient);
+    if (liveUserId !== null && payload.userId !== liveUserId) {
+      await clearPersistedQueryCache();
+      return;
+    }
 
     // Never clobber a query the live client already holds. `hydrate` calls
     // `setData` per dehydrated query unconditionally, so a snapshot restored
@@ -163,6 +208,7 @@ export function startPersistingQueryCache(
     const payload: PersistedPayload = {
       buildVersion,
       savedAt: Date.now(),
+      userId: currentUserId(queryClient),
       state,
     };
     void idbSet(payload).catch(() => {
@@ -181,7 +227,11 @@ export function startPersistingQueryCache(
   };
 }
 
-/** Wipe the persisted cache. Call on logout (shared-device data hygiene). */
+/**
+ * Wipe the persisted query cache. Call on every session END — logout AND the
+ * 401 / session-expiry redirect — so a shared device never leaks one account's
+ * cached data to the next.
+ */
 export async function clearPersistedQueryCache(): Promise<void> {
   if (typeof indexedDB === "undefined") return;
   try {
@@ -198,3 +248,50 @@ export async function clearPersistedQueryCache(): Promise<void> {
     /* best effort */
   }
 }
+
+/**
+ * Drop the service-worker offline read-data cache (`healthlog-data-*`). It
+ * holds the last-synced dashboard JSON and must never survive a session end on
+ * a shared device. Scoped to the data cache only — the static cache (hashed
+ * chunks, icons) carries no PII and dropping it would force a needless
+ * re-download. Best-effort; never throws.
+ */
+export async function clearServiceWorkerDataCache(): Promise<void> {
+  if (typeof caches === "undefined") return;
+  try {
+    const keys = await caches.keys();
+    await Promise.all(
+      keys
+        .filter((k) => k.startsWith("healthlog-data-"))
+        .map((k) => caches.delete(k)),
+    );
+  } catch {
+    /* best effort */
+  }
+}
+
+/**
+ * Wipe every client-side cache that can hold one account's health data: the
+ * IndexedDB query snapshot, the SW offline read-data cache, and the SW page
+ * cache (cached navigation HTML). The single call for a session END (logout or
+ * 401 / expiry redirect). Best-effort across the board.
+ */
+export async function clearOfflineCachesForSessionEnd(): Promise<void> {
+  await clearPersistedQueryCache();
+  if (typeof caches !== "undefined") {
+    try {
+      const keys = await caches.keys();
+      await Promise.all(
+        keys
+          .filter(
+            (k) =>
+              k.startsWith("healthlog-data-") ||
+              k.startsWith("healthlog-pages-"),
+          )
+          .map((k) => caches.delete(k)),
+      );
+    } catch {
+      /* best effort */
+    }
+  }
+}
diff --git a/src/lib/pwa/sw-cache-policy.ts b/src/lib/pwa/sw-cache-policy.ts
index f733e58d6..b8d35a39b 100644
--- a/src/lib/pwa/sw-cache-policy.ts
+++ b/src/lib/pwa/sw-cache-policy.ts
@@ -14,14 +14,21 @@
  * allowlisted by mistake — mirroring the idempotency cache's refusal.
  */
 
-/** Path prefixes whose safe GET reads are eligible for the offline data cache. */
+/**
+ * Path prefixes whose safe GET reads are eligible for the offline data cache.
+ *
+ * v1.18.6 — AI/clinical narrative surfaces (`/api/insights`, `/api/analytics`)
+ * are excluded: `/api/insights` prefix-matched the Coach chat endpoint
+ * (`/api/insights/chat`) into the disk cache, and neither belongs on durable
+ * storage. Only the dashboard snapshot, the widget layout, the measurement
+ * reads (incl. the batched daily series), the medication reads, and the
+ * version probe are cached.
+ */
 export const API_READ_ALLOWLIST = [
   "/api/dashboard/snapshot",
   "/api/dashboard/widgets",
   "/api/measurements",
   "/api/medications",
-  "/api/insights",
-  "/api/analytics",
   "/api/version",
 ] as const;
 

From 1b354de68bc40bfa4f8dcc60ea4a9bfe4a81c5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:25:03 +0200
Subject: [PATCH 15/71] fix(tz): anchor medication-intake day floor at local
 midnight
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The intake aggregator built its day floor from en-US calendar parts pinned
to UTC midnight, so today's window opened off by the zone offset for any
non-UTC user — a 23:30-local reading could land in the wrong day's bucket.

Promote the DST-safe start-of-local-day primitive into src/lib/tz/local-day
as startOfLocalDayInTz and route the intake route, the cadence start-of-day,
and the recurrence day floor through it, removing three divergent copies.
---
 src/app/api/medications/intake/route.ts      | 17 +------
 src/lib/medications/scheduling/cadence.ts    |  4 +-
 src/lib/medications/scheduling/recurrence.ts | 15 ++----
 src/lib/tz/__tests__/local-day.test.ts       | 44 +++++++++++++++++
 src/lib/tz/local-day.ts                      | 52 ++++++++++++++++++++
 5 files changed, 103 insertions(+), 29 deletions(-)
 create mode 100644 src/lib/tz/__tests__/local-day.test.ts

diff --git a/src/app/api/medications/intake/route.ts b/src/app/api/medications/intake/route.ts
index 14a53b392..2490e4d98 100644
--- a/src/app/api/medications/intake/route.ts
+++ b/src/app/api/medications/intake/route.ts
@@ -34,7 +34,7 @@ import {
   expectedSlotCountForDay,
   lastNonSkippedTakenAt,
 } from "@/lib/analytics/compliance";
-import { getUserTodayBounds } from "@/lib/tz/local-day";
+import { getUserTodayBounds, startOfLocalDayInTz } from "@/lib/tz/local-day";
 import { projectTodayIntakesAndRecompute } from "@/lib/medications/scheduling/project-today-intakes";
 import {
   applyCanonicalSlotWrite,
@@ -84,19 +84,6 @@ const updateSchema = z.object({
     .optional(),
 });
 
-function startOfDayInTz(date: Date, tz: string): Date {
-  const parts = new Intl.DateTimeFormat("en-US", {
-    timeZone: tz,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-  }).formatToParts(date);
-  const y = parts.find((p) => p.type === "year")?.value ?? "1970";
-  const m = parts.find((p) => p.type === "month")?.value ?? "01";
-  const d = parts.find((p) => p.type === "day")?.value ?? "01";
-  return new Date(`${y}-${m}-${d}T00:00:00.000Z`);
-}
-
 export const GET = apiHandler(async (request: NextRequest) => {
   const { user } = await requireAuth();
 
@@ -138,7 +125,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
   const userTz = user.timezone ?? DEFAULT_TIMEZONE;
 
   if (scope === "today") {
-    const todayStart = startOfDayInTz(new Date(), userTz);
+    const todayStart = startOfLocalDayInTz(new Date(), userTz);
     const todayEnd = new Date(todayStart.getTime() + 86_400_000);
 
     // v1.4.39 W-SERVER-FIX — project pending intake rows for every
diff --git a/src/lib/medications/scheduling/cadence.ts b/src/lib/medications/scheduling/cadence.ts
index 33431c5a2..03d75072b 100644
--- a/src/lib/medications/scheduling/cadence.ts
+++ b/src/lib/medications/scheduling/cadence.ts
@@ -47,6 +47,7 @@ import {
 } from "@/lib/medications/scheduling/recurrence";
 import { normaliseDoseWindows } from "@/lib/medications/scheduling/worker-helpers";
 import { wallClockInTz } from "@/lib/tz/wall-clock";
+import { startOfLocalDayInTz } from "@/lib/tz/local-day";
 
 /**
  * v1.13.x compliance — opt-in retrospective-rolling expansion.
@@ -336,8 +337,7 @@ function hhmmToMinutes(hhmm: string): number | null {
 
 /** Snap a Date down to the user-local midnight. */
 export function startOfLocalDay(d: Date, tz: string | undefined): Date {
-  const parts = wallClockInTz(d, tz);
-  return instantInTz(parts.year, parts.month, parts.day, 0, 0, tz);
+  return startOfLocalDayInTz(d, tz);
 }
 
 /** Snap a Date down to the Sunday-rooted user-local week. */
diff --git a/src/lib/medications/scheduling/recurrence.ts b/src/lib/medications/scheduling/recurrence.ts
index 3dc24dbc9..608ab4024 100644
--- a/src/lib/medications/scheduling/recurrence.ts
+++ b/src/lib/medications/scheduling/recurrence.ts
@@ -59,6 +59,7 @@ import { RRule } from "rrule";
 import { annotate } from "@/lib/logging/context";
 import { parseScheduleRecurrence } from "@/lib/medication-schedule";
 import { wallClockInTz } from "@/lib/tz/wall-clock";
+import { startOfLocalDayInTz } from "@/lib/tz/local-day";
 
 /**
  * v1.7.0 — schedule-type discriminator on the canonical schedule.
@@ -303,7 +304,7 @@ export function nextOccurrenceAfter(
   // keeps a slot the user has not yet acted on visible through the rest
   // of its due day instead of silently rolling it forward by N.
   if (schedule.rollingIntervalDays !== null) {
-    const dayFloor = startOfDayInTz(after, ctx.timeZone);
+    const dayFloor = startOfLocalDayInTz(after, ctx.timeZone);
     // With no intake logged the first dose anchors at `startsOn ?? createdAt`.
     // When that anchor is on a PRIOR calendar day the dose is overdue by ≥1
     // day and must still surface ("take now"); flooring only to the start of
@@ -434,7 +435,7 @@ function expandOneShot(
  */
 function firstRollingDoseDayFloor(ctx: RecurrenceContext): number {
   const anchor = ctx.medication.startsOn ?? ctx.medication.createdAt;
-  return startOfDayInTz(anchor, ctx.timeZone).getTime();
+  return startOfLocalDayInTz(anchor, ctx.timeZone).getTime();
 }
 
 function expandRolling(
@@ -782,16 +783,6 @@ function applyTimeOfDayToDate(day: Date, hhmm: string, tz: string): Date {
   return guess;
 }
 
-/**
- * The UTC instant of midnight (00:00 wall-clock) on `instant`'s day in
- * the user's IANA timezone. Used by the rolling-cadence next-due search
- * to floor the window to the start of the user's current day so an
- * overdue / due-earlier-today rolling dose still surfaces.
- */
-function startOfDayInTz(instant: Date, tz: string): Date {
-  return applyTimeOfDayToDate(instant, "00:00", tz);
-}
-
 function tzOffsetMinutes(date: Date, tz: string): number {
   const parts = wallClockInTz(date, tz);
   const asIfUtc = Date.UTC(
diff --git a/src/lib/tz/__tests__/local-day.test.ts b/src/lib/tz/__tests__/local-day.test.ts
new file mode 100644
index 000000000..f116dd3bb
--- /dev/null
+++ b/src/lib/tz/__tests__/local-day.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from "vitest";
+import { startOfLocalDayInTz } from "@/lib/tz/local-day";
+import { wallClockInTz } from "@/lib/tz/wall-clock";
+
+describe("startOfLocalDayInTz", () => {
+  it("anchors at the user's local midnight, not UTC midnight", () => {
+    // 2026-06-15 22:00 UTC is already 2026-06-16 00:00 in Berlin (UTC+2),
+    // so the local day floor must land on the Berlin 2026-06-16 midnight
+    // instant (2026-06-15T22:00:00Z) — never 2026-06-16T00:00:00Z.
+    const instant = new Date("2026-06-15T23:30:00.000Z");
+    const floor = startOfLocalDayInTz(instant, "Europe/Berlin");
+    const parts = wallClockInTz(floor, "Europe/Berlin");
+    expect(parts.hour).toBe(0);
+    expect(parts.minute).toBe(0);
+    expect(parts.second).toBe(0);
+    expect(floor.toISOString()).toBe("2026-06-15T22:00:00.000Z");
+  });
+
+  it("handles negative offsets (Pacific/Auckland) — late-local reading stays on its day", () => {
+    // 2026-06-15 23:30 NZST (UTC+12) is 2026-06-15T11:30Z; the local day
+    // floor is Auckland 2026-06-15 midnight = 2026-06-14T12:00:00Z.
+    const instant = new Date("2026-06-15T11:30:00.000Z");
+    const floor = startOfLocalDayInTz(instant, "Pacific/Auckland");
+    const parts = wallClockInTz(floor, "Pacific/Auckland");
+    expect(parts.hour).toBe(0);
+    expect(parts.day).toBe(15);
+  });
+
+  it("is DST-safe across the spring-forward boundary", () => {
+    // Europe/Berlin springs forward 2026-03-29 02:00→03:00.
+    const instant = new Date("2026-03-29T10:00:00.000Z");
+    const floor = startOfLocalDayInTz(instant, "Europe/Berlin");
+    const parts = wallClockInTz(floor, "Europe/Berlin");
+    expect(parts.hour).toBe(0);
+    expect(parts.day).toBe(29);
+  });
+
+  it("falls back to host-local day when tz is undefined", () => {
+    const instant = new Date(2026, 5, 15, 14, 30, 0);
+    const floor = startOfLocalDayInTz(instant, undefined);
+    expect(floor.getHours()).toBe(0);
+    expect(floor.getDate()).toBe(15);
+  });
+});
diff --git a/src/lib/tz/local-day.ts b/src/lib/tz/local-day.ts
index 3c6bc2631..42efc54eb 100644
--- a/src/lib/tz/local-day.ts
+++ b/src/lib/tz/local-day.ts
@@ -49,6 +49,58 @@ export function getUserTodayBounds(
   return { start, end };
 }
 
+/**
+ * UTC instant of local midnight (00:00 wall-clock) on the calendar day
+ * `instant` falls on in `tz`. DST-safe: derives the zone offset at the
+ * target local time so the returned instant always represents the user's
+ * local start-of-day, never UTC midnight of that calendar date.
+ *
+ * Canonical start-of-local-day primitive. The medication-scheduling
+ * `startOfLocalDay` (cadence) and `startOfDayInTz` (recurrence) route
+ * through this so the day-floor never drifts between surfaces. When `tz`
+ * is omitted the host's system-local day is used.
+ */
+export function startOfLocalDayInTz(
+  instant: Date,
+  tz: string | undefined,
+): Date {
+  if (!tz) {
+    return new Date(
+      instant.getFullYear(),
+      instant.getMonth(),
+      instant.getDate(),
+      0,
+      0,
+      0,
+      0,
+    );
+  }
+  const parts = wallClockInTz(instant, tz);
+  // Two-pass converge: treat the wall clock as UTC, then correct by the
+  // zone offset at that approximate instant. The second pass settles the
+  // offset across a DST transition for every IANA zone.
+  let guess = new Date(
+    Date.UTC(parts.year, parts.month - 1, parts.day, 0, 0, 0, 0),
+  );
+  for (let i = 0; i < 2; i++) {
+    const at = wallClockInTz(guess, tz);
+    const asIfUtc = Date.UTC(
+      at.year,
+      at.month - 1,
+      at.day,
+      at.hour,
+      at.minute,
+      at.second,
+    );
+    const offsetMin = Math.round((asIfUtc - guess.getTime()) / 60_000);
+    guess = new Date(
+      Date.UTC(parts.year, parts.month - 1, parts.day, 0, 0, 0, 0) -
+        offsetMin * 60_000,
+    );
+  }
+  return guess;
+}
+
 /**
  * Get the day of the week (0=Sun..6=Sat) for a given instant in a specific
  * timezone.

From cbfc4a36d2a2e621358d7bfdde954dc1b29d80ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:27:06 +0200
Subject: [PATCH 16/71] refactor(tz): route day-key copies through the
 canonical userDayKey

Compliance streaks, the measurement-consolidation day key, and the
correlations weekday helper each carried their own Intl formatter
(en-CA / sv-SE / short-weekday). Delegate them to userDayKey and
wallClockInTz so every day-bucket key stays byte-for-byte aligned and the
locale decision lives in one place.
---
 src/lib/analytics/correlations-fast-path.ts  | 33 +++-----------------
 src/lib/measurements/consolidation-tz.ts     | 11 ++++---
 src/lib/medications/scheduling/compliance.ts | 15 ++++-----
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/lib/analytics/correlations-fast-path.ts b/src/lib/analytics/correlations-fast-path.ts
index e5fc0e07a..cc6b00c1b 100644
--- a/src/lib/analytics/correlations-fast-path.ts
+++ b/src/lib/analytics/correlations-fast-path.ts
@@ -58,6 +58,7 @@ import {
   type CorrelationResult,
 } from "@/lib/insights/correlations";
 import { isNearUtc, userDayKey } from "@/lib/tz/resolver";
+import { wallClockInTz } from "@/lib/tz/wall-clock";
 
 /**
  * v1.4.37 W2 — cold-path correlation window. Trim from 30 to 28 days
@@ -368,34 +369,8 @@ function dateFromDayKey(key: string): Date {
   return new Date(`${key}T00:00:00.000Z`);
 }
 
-const WEEKDAY_FORMATTER_CACHE = new Map<string, Intl.DateTimeFormat>();
-function getWeekdayFormatter(timeZone: string): Intl.DateTimeFormat {
-  let formatter = WEEKDAY_FORMATTER_CACHE.get(timeZone);
-  if (!formatter) {
-    formatter = new Intl.DateTimeFormat("en-CA", {
-      timeZone,
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      weekday: "short",
-    });
-    WEEKDAY_FORMATTER_CACHE.set(timeZone, formatter);
-  }
-  return formatter;
-}
-
-const ISO_WEEKDAY: Record<string, number> = {
-  Mon: 1,
-  Tue: 2,
-  Wed: 3,
-  Thu: 4,
-  Fri: 5,
-  Sat: 6,
-  Sun: 7,
-};
-
 function isoWeekdayInTz(d: Date, timeZone: string): number {
-  const parts = getWeekdayFormatter(timeZone).formatToParts(d);
-  const weekday = parts.find((p) => p.type === "weekday")?.value ?? "Mon";
-  return ISO_WEEKDAY[weekday] ?? 1;
+  // `wallClockInTz` returns 0=Sun..6=Sat; remap to ISO 1=Mon..7=Sun.
+  const weekday = wallClockInTz(d, timeZone).weekday;
+  return weekday === 0 ? 7 : weekday;
 }
diff --git a/src/lib/measurements/consolidation-tz.ts b/src/lib/measurements/consolidation-tz.ts
index 35fe4e361..1f58be04c 100644
--- a/src/lib/measurements/consolidation-tz.ts
+++ b/src/lib/measurements/consolidation-tz.ts
@@ -22,6 +22,9 @@
  * every existing import site keeps working unchanged.
  */
 import type { MeasurementType } from "@/generated/prisma/client";
+// `userDayKey` lives in the pure `@/lib/tz/format` leaf (no Prisma /
+// node:module pull) so importing it keeps this dependency-free module clean.
+import { userDayKey } from "@/lib/tz/format";
 
 /**
  * Canonical grace window shared by the cumulative + mean drains. Rows
@@ -52,12 +55,12 @@ export interface PerSampleRow {
 
 /**
  * Resolve the user's calendar-day key (`YYYY-MM-DD`) for a given
- * timestamp + timezone. Reuses the same `sv-SE` Intl formatting choice
- * the mood-entries path locked in v1.4.25 W7b so iOS-side and
- * server-side day-keys round-trip byte-identically.
+ * timestamp + timezone. Delegates to the canonical `userDayKey` so the
+ * server-side and iOS-side day-keys round-trip byte-identically against
+ * every other day-bucketed surface.
  */
 export function dayKeyForUserTz(date: Date, tz: string): string {
-  return new Intl.DateTimeFormat("sv-SE", { timeZone: tz }).format(date);
+  return userDayKey(date, tz);
 }
 
 /**
diff --git a/src/lib/medications/scheduling/compliance.ts b/src/lib/medications/scheduling/compliance.ts
index ab450ef98..1ee94d230 100644
--- a/src/lib/medications/scheduling/compliance.ts
+++ b/src/lib/medications/scheduling/compliance.ts
@@ -39,6 +39,7 @@ import {
   type RecurrenceContext,
 } from "./recurrence";
 import { normaliseDoseWindows } from "./worker-helpers";
+import { userDayKey } from "@/lib/tz/resolver";
 
 export interface ComplianceChips {
   /** 0-100, taken / (taken + missed). Skipped doses are excluded from
@@ -62,9 +63,10 @@ const DAY_MS = 24 * 60 * 60 * 1000;
 
 /**
  * Day-key in the user's timezone (or system-local when `tz` is
- * undefined). `Intl.DateTimeFormat` with `en-CA` reliably returns
- * `YYYY-MM-DD`, which sorts lexically and matches the chart
- * legend's `day` ticks.
+ * undefined). Routes through the canonical `userDayKey` so the
+ * `YYYY-MM-DD` bucket stays byte-for-byte aligned with every other
+ * day-bucketed surface; the host-local branch covers the pre-per-user
+ * callers that pass no zone.
  */
 function localDayKey(d: Date, tz: string | undefined): string {
   if (!tz) {
@@ -73,12 +75,7 @@ function localDayKey(d: Date, tz: string | undefined): string {
     const day = String(d.getDate()).padStart(2, "0");
     return `${y}-${m}-${day}`;
   }
-  return new Intl.DateTimeFormat("en-CA", {
-    timeZone: tz,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-  }).format(d);
+  return userDayKey(d, tz);
 }
 
 /**

From 1a73afa7e9c8714a851b56e1afa5cf81c10f8f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:28:37 +0200
Subject: [PATCH 17/71] perf(illness): parallelise the insights recovery-gap
 fan-out
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The cross-episode insights route looped up to 24 episodes, each running a
sequential 10-vital scan with two serial reads per vital — ~500 serialised
round-trips on a year of episodes, starving the shared Prisma pool.

Pair the baseline + episode-window reads, fan the per-vital scan out under a
p-limit(4) cap, and run the per-episode correlations concurrently under the
same discipline. Series order and the gated outputs are unchanged.
---
 src/app/api/illness/insights/route.ts | 35 ++++++++++++++---------
 src/lib/illness/correlation-read.ts   | 41 +++++++++++++++++++--------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/app/api/illness/insights/route.ts b/src/app/api/illness/insights/route.ts
index 48960abdd..938ebf3b4 100644
--- a/src/app/api/illness/insights/route.ts
+++ b/src/app/api/illness/insights/route.ts
@@ -11,6 +11,7 @@
  * contributes no gap rather than a wrong one. Born-gated + owner-scoped.
  */
 import { NextRequest } from "next/server";
+import pLimit from "p-limit";
 
 import { prisma } from "@/lib/db";
 import { apiHandler, requireAuth } from "@/lib/api-handler";
@@ -29,6 +30,9 @@ import { resolveUserTimezone } from "@/lib/measurements/consolidation-base";
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 /** Cap the per-episode gap computations so a heavy history can't fan out. */
 const MAX_GAP_COMPUTATIONS = 24;
+/** Run the per-episode correlations under a bounded concurrency budget so
+ *  the up-to-24 candidates don't serialise into ~500 round-trips. */
+const EPISODE_GAP_CONCURRENCY = 4;
 
 export const GET = apiHandler(async (request: NextRequest) => {
   const { user } = await requireAuth();
@@ -69,19 +73,24 @@ export const GET = apiHandler(async (request: NextRequest) => {
   const gapCandidates = rows
     .filter((r) => r.resolvedAt !== null && r.lifecycle !== "CHRONIC_ONGOING")
     .slice(0, MAX_GAP_COMPUTATIONS);
-  const gapById = new Map<string, number | null>();
-  for (const r of gapCandidates) {
-    const derived = await computeEpisodeCorrelation(
-      user.id,
-      { id: r.id, onsetAt: r.onsetAt, resolvedAt: r.resolvedAt, lifecycle: r.lifecycle },
-      tz,
-      now,
-    );
-    gapById.set(
-      r.id,
-      derived.status === "ok" ? derived.value.recoveryGapDays : null,
-    );
-  }
+  const limit = pLimit(EPISODE_GAP_CONCURRENCY);
+  const gapEntries = await Promise.all(
+    gapCandidates.map((r) =>
+      limit(async (): Promise<[string, number | null]> => {
+        const derived = await computeEpisodeCorrelation(
+          user.id,
+          { id: r.id, onsetAt: r.onsetAt, resolvedAt: r.resolvedAt, lifecycle: r.lifecycle },
+          tz,
+          now,
+        );
+        return [
+          r.id,
+          derived.status === "ok" ? derived.value.recoveryGapDays : null,
+        ];
+      }),
+    ),
+  );
+  const gapById = new Map<string, number | null>(gapEntries);
 
   const episodes: RetrospectiveEpisode[] = rows.map((r) => ({
     id: r.id,
diff --git a/src/lib/illness/correlation-read.ts b/src/lib/illness/correlation-read.ts
index d37c42240..a17f64909 100644
--- a/src/lib/illness/correlation-read.ts
+++ b/src/lib/illness/correlation-read.ts
@@ -24,6 +24,7 @@
  * Rollup DAY buckets are minted at the UTC midnight of the user-tz day, so
  * keying their `bucketStart` through `dayKeyForUserTz` is exact.
  */
+import pLimit from "p-limit";
 import type { MeasurementType } from "@/generated/prisma/client";
 import { prisma } from "@/lib/db";
 import { readBestGranularityRollups } from "@/lib/rollups/measurement-read-wmy";
@@ -43,6 +44,13 @@ import {
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 
+/**
+ * Bound the per-vital fan-out so a single episode's scan can't pin the
+ * shared Prisma pool. Mirrors the W-POOL `p-limit(4)` discipline the
+ * analytics summaries slice applies.
+ */
+const VITAL_SCAN_CONCURRENCY = 4;
+
 /** The episode shape the read layer needs (a subset of the Prisma row). */
 export interface EpisodeForCorrelation {
   id: string;
@@ -88,16 +96,30 @@ export async function computeEpisodeCorrelation(
   // mitigation — the same pattern the derived route uses).
   const coverage = await probeRollupCoverage(userId);
 
+  // Attempt every scan type under a bounded concurrency cap. The two
+  // windows per type (baseline + episode) are independent reads, so they
+  // run paired rather than serially (halving the per-type round-trips).
+  // The day-log fever read shares the same fan-out budget.
+  const limit = pLimit(VITAL_SCAN_CONCURRENCY);
+  const [perType, dayLogFever] = await Promise.all([
+    Promise.all(
+      ILLNESS_SCAN_TYPES.map((type) =>
+        limit(async () => {
+          const [baseline, episodeWin] = await Promise.all([
+            readWindowMeans(userId, type, baselineStart, baselineEnd, coverage, tz, now),
+            readWindowMeans(userId, type, preOnsetStart, end, coverage, tz, now),
+          ]);
+          return { type, baseline, episodeWin };
+        }),
+      ),
+    ),
+    limit(() => readDayLogFever(episode.id, preOnsetStart, end, tz)),
+  ]);
+
   const series: VitalSeries[] = [];
   let anyLive = false;
   let anyDay = false;
-
-  // We attempt every scan type. An untracked vital returns empty points and
-  // is dropped below. Each read is a single windowed query, so attempting all
-  // types is bounded.
-  for (const type of ILLNESS_SCAN_TYPES) {
-    const baseline = await readWindowMeans(userId, type, baselineStart, baselineEnd, coverage, tz, now);
-    const episodeWin = await readWindowMeans(userId, type, preOnsetStart, end, coverage, tz, now);
+  for (const { type, baseline, episodeWin } of perType) {
     if (baseline.points.length === 0 && episodeWin.points.length === 0) continue;
     if (baseline.source === "live" || episodeWin.source === "live") anyLive = true;
     if (baseline.source === "DAY" || episodeWin.source === "DAY") anyDay = true;
@@ -111,11 +133,6 @@ export async function computeEpisodeCorrelation(
     });
   }
 
-  // Union the canonical journaling-fever path: the illness day-log `feverC`
-  // series over the episode window. A user logging 39.2 °C for days with no
-  // HealthKit thermometer must still escalate. Per-day MAX.
-  const dayLogFever = await readDayLogFever(episode.id, preOnsetStart, end, tz);
-
   const source: "DAY" | "live" | "none" = anyDay
     ? "DAY"
     : anyLive

From 04b0f385376cbd8f51f93a031d60532bf48a60b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:29:46 +0200
Subject: [PATCH 18/71] fix(measurements): isolate per-type failures in the
 series batch

The batched daily-series endpoint ran every type through one Promise.all
with no per-task catch, so a single type's transient reject 500'd the whole
batch and blanked every preloaded chart in the dashboard row at once.

Wrap each per-type read so a failure degrades to an empty slice for that
type only; the failing chart self-fetches through its existing fallback.
A degraded_types counter rides the wide event.
---
 .../series-batch/__tests__/route.test.ts      | 20 +++++++++++++
 .../api/measurements/series-batch/route.ts    | 28 +++++++++++++------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/app/api/measurements/series-batch/__tests__/route.test.ts b/src/app/api/measurements/series-batch/__tests__/route.test.ts
index dc6e31c02..9e465acfb 100644
--- a/src/app/api/measurements/series-batch/__tests__/route.test.ts
+++ b/src/app/api/measurements/series-batch/__tests__/route.test.ts
@@ -117,4 +117,24 @@ describe("GET /api/measurements/series-batch", () => {
     expect(res.status).toBe(200);
     expect(vi.mocked(readDailySeries)).toHaveBeenCalledTimes(1);
   });
+
+  it("isolates a single type's failure to an empty slice, others still return", async () => {
+    vi.mocked(getSession).mockResolvedValue(SESSION_OK as never);
+    const weightRows = [
+      { type: "WEIGHT", value: 80, measuredAt: FROM, count: 1 },
+    ];
+    vi.mocked(readDailySeries).mockImplementation(async ({ type }) => {
+      if (type === "WEIGHT") return weightRows as never;
+      throw new Error("transient db reject");
+    });
+
+    const res = await GET(
+      req(`types=WEIGHT,BLOOD_PRESSURE_SYS&from=${FROM}&to=${TO}`),
+    );
+    // One type rejecting must NOT 500 the whole batch.
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    expect(body.data.series.WEIGHT).toEqual(weightRows);
+    expect(body.data.series.BLOOD_PRESSURE_SYS).toEqual([]);
+  });
 });
diff --git a/src/app/api/measurements/series-batch/route.ts b/src/app/api/measurements/series-batch/route.ts
index 8f685926c..00f1ace89 100644
--- a/src/app/api/measurements/series-batch/route.ts
+++ b/src/app/api/measurements/series-batch/route.ts
@@ -63,18 +63,27 @@ export const GET = apiHandler(async (request: NextRequest) => {
   // so the batched reader doesn't re-query it per type.
   const priorityJson = await loadUserSourcePriority(user.id);
 
+  // Per-type isolation: a single type's transient DB reject degrades to an
+  // empty slice for THAT type only, never a 500 that blanks every chart in
+  // the row. The failing chart self-fetches through its existing fallback.
   const limit = pLimit(SERIES_BATCH_CONCURRENCY);
+  let degradedTypes = 0;
   const entries = await Promise.all(
     uniqueTypes.map((type) =>
-      limit(async () => {
-        const rows = await readDailySeries({
-          userId: user.id,
-          type,
-          from,
-          to,
-          priorityJson,
-        });
-        return [type, rows] as const;
+      limit(async (): Promise<readonly [MeasurementType, DailySeriesRow[]]> => {
+        try {
+          const rows = await readDailySeries({
+            userId: user.id,
+            type,
+            from,
+            to,
+            priorityJson,
+          });
+          return [type, rows] as const;
+        } catch {
+          degradedTypes += 1;
+          return [type, []] as const;
+        }
       }),
     ),
   );
@@ -89,6 +98,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
     meta: {
       type_count: uniqueTypes.length,
       total: entries.reduce((sum, [, rows]) => sum + rows.length, 0),
+      degraded_types: degradedTypes,
     },
   });
 

From 075dae9ace054f3a13d2b3ba67f0b3ddc9d9ead1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:31:25 +0200
Subject: [PATCH 19/71] perf(illness): dedupe the active-episode read per
 request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

resolveRestMode is resolved from several surfaces in one request — the
snapshot builder, the recovery score, the analytics route, and coincident-
deviation — each firing an identical active-episode findMany for the same
account. Memoise the read per request keyed on (userId, asOf instant); an
explicit client bypasses the memo so transaction and test reads are never
served a default-client cached result.
---
 src/lib/illness/rest-mode.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/lib/illness/rest-mode.ts b/src/lib/illness/rest-mode.ts
index 66e7a38cb..818784b45 100644
--- a/src/lib/illness/rest-mode.ts
+++ b/src/lib/illness/rest-mode.ts
@@ -26,6 +26,7 @@
 import type { PrismaClient, IllnessEpisode } from "@/generated/prisma/client";
 import { prisma as defaultPrisma } from "@/lib/db";
 import { isIllnessEnabled } from "@/lib/illness/gate";
+import { memoizePerRequest } from "@/lib/request-cache";
 
 /** Minimal shape the Rest Mode resolver needs from an episode row. */
 export type ActiveIllnessEpisode = Pick<
@@ -78,6 +79,24 @@ export async function getActiveIllnessEpisodes(
   userId: string,
   asOf: Date = new Date(),
   client: PrismaClient = defaultPrisma,
+): Promise<ActiveIllnessEpisode[]> {
+  // Several surfaces resolve Rest Mode for the same `(userId, asOf)` inside
+  // one request — the snapshot builder, the recovery score it builds, the
+  // analytics route, and coincident-deviation — each firing an identical
+  // `findMany`. Dedupe them to a single read per request. An explicit client
+  // (a test stub or a transaction) bypasses the memo so its query is never
+  // served a default-client cached result.
+  if (client !== defaultPrisma) return readActiveIllnessEpisodes(userId, asOf, client);
+  return memoizePerRequest(
+    `illness-active-episodes:${userId}:${asOf.getTime()}`,
+    () => readActiveIllnessEpisodes(userId, asOf, client),
+  );
+}
+
+async function readActiveIllnessEpisodes(
+  userId: string,
+  asOf: Date,
+  client: PrismaClient,
 ): Promise<ActiveIllnessEpisode[]> {
   if (!(await isIllnessEnabled(userId))) return [];
   return client.illnessEpisode.findMany({

From 0af1fbb9d4c543f13cd2ad42f5dbb00b21d6ba7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:34:27 +0200
Subject: [PATCH 20/71] refactor(targets): extract the insights-targets builder
 into lib

The targets route held a ~1.4k-line domain function in the handler body.
Move buildTargetsResponse into src/lib/targets/build-response so it sits
beside the other targets helpers and can be unit-tested without the route
shell; the route is now auth -> cachedSwr(buildTargetsResponse) -> apiSuccess.

Follow the as-needed compliance source pin to the new file location.
---
 src/app/api/insights/targets/route.ts         | 1554 +----------------
 .../as-needed-compliance-exclusion.test.ts    |    2 +-
 src/lib/targets/build-response.ts             | 1552 ++++++++++++++++
 3 files changed, 1566 insertions(+), 1542 deletions(-)
 create mode 100644 src/lib/targets/build-response.ts

diff --git a/src/app/api/insights/targets/route.ts b/src/app/api/insights/targets/route.ts
index 4b83a14b6..7c2a2a1ad 100644
--- a/src/app/api/insights/targets/route.ts
+++ b/src/app/api/insights/targets/route.ts
@@ -1,146 +1,26 @@
-import { prisma } from "@/lib/db";
+/**
+ * `GET /api/insights/targets` — per-metric target tiles + consistency strips.
+ *
+ * Thin handler: auth → `cachedSwr(buildTargetsResponse)` → `apiSuccess`. The
+ * domain function lives in `@/lib/targets/build-response` so the ~1.4k-line
+ * walk can be unit-tested without the route shell.
+ */
 import { apiSuccess } from "@/lib/api-response";
-import {
-  classifyBMI,
-  classifyBP,
-  classifySleepDuration,
-  classifyBodyFat,
-  classifySteps,
-  getWeightRange,
-  getSleepDurationRange,
-  getStepsRange,
-  getBpTargetsByAge,
-} from "@/lib/analytics/classifications";
-import {
-  buildComplianceMedicationContext,
-  calculateCompliance,
-  lastNonSkippedTakenAt,
-  SCHEDULE_COMPLIANCE_SELECT,
-} from "@/lib/analytics/compliance";
-import { pairByTimestamp } from "@/lib/analytics/correlations";
-import {
-  reconstructSleepNights,
-  type SleepStageRow,
-} from "@/lib/analytics/sleep-night";
-import { isBpReadingInTarget } from "@/lib/analytics/bp-in-target";
-import { userDayKey, DEFAULT_TIMEZONE } from "@/lib/tz/resolver";
-import {
-  classifyPulseByTarget,
-  getPersonalizedPulseTarget,
-} from "@/lib/analytics/pulse-targets";
-import { resolveRestingPulseSeries } from "@/lib/analytics/resting-pulse";
-import pLimit from "p-limit";
-import type {
-  MeasurementType,
-  GlucoseContext,
-} from "@/generated/prisma/client";
 import { apiHandler, requireAuth } from "@/lib/api-handler";
 import { annotate } from "@/lib/logging/context";
 import { cachedSwr, caches, type ServerCache } from "@/lib/cache/server-cache";
 import { NO_STORE_BUT_BFCACHE } from "@/lib/http/cache-headers";
-import {
-  getEffectiveRange,
-  type ThresholdOverridesJson,
-} from "@/lib/analytics/effective-range";
-import { getBodyFatTargetRange } from "@/lib/analytics/value-bands";
-import { thresholdMetricForContext, resolveGlucoseUnit } from "@/lib/glucose";
-import {
-  ensureUserMoodRollupsFresh,
-  readMoodDayRollups,
-} from "@/lib/rollups/mood-rollups";
+import { buildTargetsResponse } from "@/lib/targets/build-response";
 
 export const dynamic = "force-dynamic";
 
-function getAge(dateOfBirth: Date): number {
-  const today = new Date();
-  let age = today.getFullYear() - dateOfBirth.getFullYear();
-  const monthDiff = today.getMonth() - dateOfBirth.getMonth();
-  if (
-    monthDiff < 0 ||
-    (monthDiff === 0 && today.getDate() < dateOfBirth.getDate())
-  ) {
-    age--;
-  }
-  return age;
-}
-
-interface TargetItem {
-  type: string;
-  label: string;
-  current: number | null;
-  average30: number | null;
-  trend: "up" | "down" | "stable" | null;
-  unit: string;
-  range: { min: number; max: number } | null;
-  classification: { category: string; color: string } | null;
-  source: string;
-  /**
-   * v1.4.25 W3e — consistency strip support. Berlin-tz day buckets over
-   * the last 7 days. `daysInRange7d` is the count of days whose mean
-   * reading landed inside the target's green band; `daysLogged7d` is
-   * how many of those days had at least one reading (so the strip can
-   * render filled / hollow / dimmed dots without ambiguity).
-   *
-   * `lastMetGoalAt` is the most recent Berlin-tz day whose mean reading
-   * was in the green band (ISO date YYYY-MM-DD), or null if the user
-   * has not hit goal in the last 30 days.
-   *
-   * `streakDays` is the count of consecutive Berlin days ending today
-   * where the day's mean was in the green band. Capped at 365.
-   *
-   * `insufficientData` is true when the target has fewer than 3
-   * readings over the last 30 days OR fewer than 1 day of data in the
-   * last 7 days. The page hides the strip + percentage when this is
-   * true.
-   */
-  daysInRange7d: number;
-  daysLogged7d: number;
-  daysInRange30d: number;
-  daysLogged30d: number;
-  lastMetGoalAt: string | null;
-  streakDays: number;
-  insufficientData: boolean;
-  /**
-   * v1.4.25 W3e — per-day classification of the last 7 Berlin-tz days
-   * for the consistency strip. Index 0 is six days ago, index 6 is
-   * today. `null` slots represent days with no readings; non-null
-   * slots represent days whose mean reading landed in the named band.
-   */
-  consistency7d: ReadonlyArray<"in" | "near" | "out" | null>;
-  details?: {
-    medications?: Array<{
-      name: string;
-      compliance7: number;
-      compliance30: number;
-    }>;
-  };
-}
-
-interface TargetPageSummary {
-  targetsMetThisWeek: number;
-  totalTargets: number;
-  streakHighlight: { metric: string; days: number } | null;
-}
-
-/**
- * v1.4.36 W1 — `/api/insights/targets` body, lifted out of the route
- * handler so `cached()` can wrap it. The handler attaches the
- * bfcache-friendly Cache-Control header afterward. 60 s TTL keyed on
- * the user id matches the analytics cache so multiple Insights mounts
- * inside a minute all hit a warm cache. Invalidated alongside the
- * analytics bucket on measurement / mood / medication writes.
- */
-type AuthedUser = Awaited<ReturnType<typeof requireAuth>>["user"];
-
 export const GET = apiHandler(async () => {
   const { user } = await requireAuth();
-  // v1.16.8 — stale-while-revalidate read. The cold build is the
-  // multi-query walk below; past the 60 s fresh TTL the prior body now
-  // serves immediately while ONE background rebuild warms the cell,
-  // instead of every Insights mount more than a minute apart re-paying
-  // the >1 s compute inline. Writes still hard-evict the bucket
-  // (`invalidateUser*` → `deleteByPrefix`), so user actions always
-  // reflect on the next read.
+  // v1.16.8 — stale-while-revalidate read. The cold build is the multi-query
+  // walk in `buildTargetsResponse`; past the 60 s fresh TTL the prior body
+  // serves immediately while ONE background rebuild warms the cell. Writes
+  // hard-evict the bucket (`invalidateUser*` → `deleteByPrefix`), so user
+  // actions always reflect on the next read.
   const body = await cachedSwr(
     caches.insightsTargets as ServerCache<
       Awaited<ReturnType<typeof buildTargetsResponse>>
@@ -153,1411 +33,3 @@ export const GET = apiHandler(async () => {
   response.headers.set("Cache-Control", NO_STORE_BUT_BFCACHE);
   return response;
 });
-
-async function buildTargetsResponse(user: AuthedUser) {
-  const userId = user.id;
-
-  // v1.4.25 W7b — every per-day bucket key in this route resolves
-  // against the user's display timezone so a Pacific/Auckland user gets
-  // their Auckland-day streaks, their Auckland-day "last met goal" date,
-  // and their Auckland-day consistency strip. Falls back to
-  // Europe/Berlin when the column is somehow missing (defensive — the
-  // schema's NOT NULL default normally pins it).
-  const userTz = user.timezone ?? DEFAULT_TIMEZONE;
-  const dayKey = (d: Date): string => userDayKey(d, userTz);
-
-  // Fetch latest measurements for each type
-  // v1.11.5 — SLEEP_DURATION is handled by a dedicated per-night
-  // reconstruction read below (the generic per-type average treats each
-  // stage row as an independent reading and would inflate the night total),
-  // so it is intentionally excluded from this generic set.
-  const types: MeasurementType[] = [
-    "WEIGHT",
-    "BLOOD_PRESSURE_SYS",
-    "BLOOD_PRESSURE_DIA",
-    "PULSE",
-    // v1.15.12 A2 — the "Resting pulse" tile scores RESTING_HEART_RATE
-    // (Apple's clean daily resting figure) against the resting band,
-    // falling back to a low-percentile PULSE proxy. Pull the resting rows
-    // alongside so the consistency strip uses resting data, not raw HR
-    // polluted by workout samples.
-    "RESTING_HEART_RATE",
-    "BODY_FAT",
-    "ACTIVITY_STEPS",
-  ];
-
-  const thirtyDaysAgo = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
-  const oneYearAgo = new Date(Date.now() - 365 * 24 * 60 * 60 * 1000);
-
-  // Mood-rollup warm-up fires before the parallel read below so a legacy
-  // account converges onto the rollup tier on a subsequent request; the
-  // read itself never blocks on the warm-up (fire-and-forget).
-  void ensureUserMoodRollupsFresh(userId);
-  // Five-year window mirrors `/api/mood/analytics` so existing rollup
-  // coverage is consulted; the trailing 30-day filter happens in JS
-  // because the consistency strip already walks per-day buckets.
-  const moodRollupWindowMs = 5 * 365 * 24 * 60 * 60 * 1000;
-  const moodSince = new Date(Date.now() - moodRollupWindowMs);
-
-  // v1.16.8 — ONE parallel round of every independent read. The cold
-  // build used to await eight queries strictly in sequence (profile →
-  // measurements → latest-per-type → sleep → medications → intakes →
-  // mood → glucose), stacking their round-trip latencies into the >1 s
-  // wall-clock the production trace showed. All of them are independent
-  // (the intake read depends only on the medication ids, so the pair
-  // chains inside its own slot); fan them out together and the cold
-  // build pays roughly the slowest query instead of the sum. The
-  // fan-out is bounded by the project's `p-limit(4)` discipline (parity
-  // with the derived batch route) so one cold build never claims eight
-  // connections from the shared Prisma pool at once.
-  const limit = pLimit(4);
-  const [
-    dbUser,
-    recentMeasurements,
-    latestEverByType,
-    sleepStageRows,
-    medicationBundle,
-    moodRollups,
-    latestMoodEntry,
-    glucoseRows,
-  ] = await Promise.all([
-    // User profile (height / age / gender / thresholds / source priority).
-    limit(() =>
-      prisma.user.findUnique({
-        where: { id: userId },
-        select: {
-          heightCm: true,
-          dateOfBirth: true,
-          gender: true,
-          glucoseUnit: true,
-          thresholdsJson: true,
-          // v1.11.5 — needed to collapse a dual-source sleep night to one
-          // canonical source before reconstructing per-night asleep totals.
-          sourcePriorityJson: true,
-        },
-      }),
-    ),
-    // All measurements in the last 30 days for the generic type set.
-    // Soft-delete filter mirrors the W-DELETED pattern: tombstoned rows
-    // must not contribute to tile averages / latest values once iOS sync
-    // starts emitting deletions.
-    limit(() =>
-      prisma.measurement.findMany({
-        where: {
-          userId,
-          type: { in: types },
-          measuredAt: { gte: thirtyDaysAgo },
-          deletedAt: null,
-        },
-        orderBy: { measuredAt: "desc" },
-        select: { type: true, value: true, measuredAt: true },
-      }),
-    ),
-    // Absolute latest measurement per type within a one-year floor.
-    //
-    // Prisma's `distinct` does not compile to Postgres `DISTINCT ON` — the
-    // driver dedups after pulling the rows, so an unbounded scan on a
-    // 347 k-row tenant pulls every measurement back to Node only to drop
-    // all but seven (audit Critical Finding #2, v1.4.40). The 365-day
-    // floor caps the planner-side walk to the existing
-    // `(user_id, type, measured_at)` index range; the trade-off is that a
-    // user who hasn't measured a metric in over a year sees the tile's
-    // `current` value as null instead of pulling a stale year-old reading
-    // forward — which is the correct behaviour for the consistency strip
-    // (the strip already gates on "fewer than 3 readings in 30 days" →
-    // insufficientData).
-    limit(() =>
-      prisma.measurement.findMany({
-        where: {
-          userId,
-          type: { in: types },
-          measuredAt: { gte: oneYearAgo },
-          deletedAt: null,
-        },
-        orderBy: { measuredAt: "desc" },
-        distinct: ["type"],
-        select: { type: true, value: true },
-      }),
-    ),
-    // Sleep stage rows for the per-night reconstruction (section 4).
-    limit(() =>
-      prisma.measurement.findMany({
-        where: {
-          userId,
-          type: "SLEEP_DURATION",
-          measuredAt: { gte: thirtyDaysAgo },
-          deletedAt: null,
-        },
-        orderBy: { measuredAt: "asc" },
-        // Writer-level collapse: two HealthKit apps behind one source (watch
-        // stages vs phone in-bed) must not blend into one night.
-        select: {
-          value: true,
-          measuredAt: true,
-          sleepStage: true,
-          source: true,
-          deviceType: true,
-        },
-      }),
-    ),
-    // Active medications + their 30-day intake events (section 8). The
-    // intake read depends on the medication ids, so the pair chains
-    // inside this slot while riding the outer fan-out.
-    limit(async () => {
-      const activeMedications = await prisma.medication.findMany({
-        // v1.16.11 — as-needed (PRN) medications never surface a
-        // compliance rate (no expected doses).
-        where: { userId, active: true, asNeeded: false },
-        // v1.15.20 — schedules through the shared compliance select so the
-        // configured per-dose windows reach this surface like every other.
-        include: {
-          schedules: { select: SCHEDULE_COMPLIANCE_SELECT },
-          // v1.16.3 — archived schedule eras for era-aware compliance.
-          scheduleRevisions: { orderBy: { validFrom: "asc" } },
-        },
-        orderBy: { name: "asc" },
-      });
-      if (activeMedications.length === 0) {
-        return { activeMedications, intakeEvents: [] };
-      }
-      const intakeEvents = await prisma.medicationIntakeEvent.findMany({
-        where: {
-          userId,
-          // v1.7.0 sync — exclude tombstoned rows.
-          deletedAt: null,
-          medicationId: {
-            in: activeMedications.map((medication) => medication.id),
-          },
-          scheduledFor: { gte: thirtyDaysAgo },
-        },
-        orderBy: { scheduledFor: "desc" },
-        select: {
-          medicationId: true,
-          takenAt: true,
-          skipped: true,
-          scheduledFor: true,
-        },
-      });
-      return { activeMedications, intakeEvents };
-    }),
-    // Mood day rollups (section 9).
-    limit(() => readMoodDayRollups(userId, moodSince)),
-    // Latest raw mood entry — bounded `take: 1` via the index.
-    limit(() =>
-      prisma.moodEntry.findFirst({
-        // v1.7.0 sync — exclude tombstoned rows.
-        where: { userId, deletedAt: null },
-        orderBy: { moodLoggedAt: "desc" },
-        select: { score: true, moodLoggedAt: true },
-      }),
-    ),
-    // Glucose rows (section 10). Same one-year floor as the
-    // latest-per-type read above — the previous unbounded scan pulled a
-    // heavy logger's full history back to Node on every cold build; a
-    // context whose newest reading is over a year old now reports no
-    // card, matching the per-type tile posture.
-    limit(() =>
-      prisma.measurement.findMany({
-        where: {
-          userId,
-          type: "BLOOD_GLUCOSE",
-          measuredAt: { gte: oneYearAgo },
-          deletedAt: null,
-        },
-        orderBy: { measuredAt: "desc" },
-        select: { value: true, measuredAt: true, glucoseContext: true },
-      }),
-    ),
-  ]);
-
-  const age = dbUser?.dateOfBirth ? getAge(new Date(dbUser.dateOfBirth)) : null;
-  const gender = (dbUser?.gender as "MALE" | "FEMALE" | null) ?? null;
-  const heightCm = dbUser?.heightCm ?? null;
-
-  const latestByType: Record<string, number | null> = {};
-  const avg30ByType: Record<string, number | null> = {};
-
-  for (const t of types) {
-    const latest = latestEverByType.find((row) => row.type === t);
-    latestByType[t] = latest?.value ?? null;
-
-    const recentOfType = recentMeasurements.filter((m) => m.type === t);
-    if (recentOfType.length > 0) {
-      const sum = recentOfType.reduce((acc, m) => acc + m.value, 0);
-      avg30ByType[t] = Math.round((sum / recentOfType.length) * 10) / 10;
-    } else {
-      avg30ByType[t] = null;
-    }
-  }
-
-  // Compute trend (compare first half of 30-day data to second half)
-  function computeTrend(
-    type: MeasurementType,
-  ): "up" | "down" | "stable" | null {
-    const data = recentMeasurements
-      .filter((m) => m.type === type)
-      .sort((a, b) => a.measuredAt.getTime() - b.measuredAt.getTime());
-    if (data.length < 4) return null;
-
-    const mid = Math.floor(data.length / 2);
-    const firstHalf = data.slice(0, mid);
-    const secondHalf = data.slice(mid);
-
-    const avgFirst =
-      firstHalf.reduce((s, m) => s + m.value, 0) / firstHalf.length;
-    const avgSecond =
-      secondHalf.reduce((s, m) => s + m.value, 0) / secondHalf.length;
-
-    const diff = avgSecond - avgFirst;
-    const threshold = avgFirst * 0.02; // 2% change threshold
-
-    if (diff > threshold) return "up";
-    if (diff < -threshold) return "down";
-    return "stable";
-  }
-
-  // --------------------------------------------------------------------
-  // v1.4.25 W3e — consistency helper. Buckets readings by Berlin-tz day
-  // and classifies each day's mean against the target's green band.
-  // Single helper shared by every target type so the rule stays stable
-  // (mean reading per day → in-range / near-range / out-of-range).
-  // --------------------------------------------------------------------
-  const last7DayKeys: string[] = [];
-  for (let i = 6; i >= 0; i--) {
-    const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-    last7DayKeys.push(dayKey(d));
-  }
-
-  type DayBand = "in" | "near" | "out";
-
-  interface ConsistencyOutput {
-    daysInRange7d: number;
-    daysLogged7d: number;
-    daysInRange30d: number;
-    daysLogged30d: number;
-    lastMetGoalAt: string | null;
-    streakDays: number;
-    insufficientData: boolean;
-    consistency7d: ReadonlyArray<DayBand | null>;
-  }
-
-  const EMPTY_CONSISTENCY: ConsistencyOutput = {
-    daysInRange7d: 0,
-    daysLogged7d: 0,
-    daysInRange30d: 0,
-    daysLogged30d: 0,
-    lastMetGoalAt: null,
-    streakDays: 0,
-    insufficientData: true,
-    consistency7d: [null, null, null, null, null, null, null] as const,
-  };
-
-  /**
-   * Bucket a series of `{ measuredAt, value }` events by Berlin-tz day,
-   * classify each day's mean against the target band, and roll up the
-   * 7-day strip + 30-day stats + recency + streak.
-   *
-   * `classify(meanValue)` returns the band the day's mean falls into.
-   * Pass `null` to mean "no band — skip this day for classification".
-   */
-  function rollupConsistency(
-    events: ReadonlyArray<{ measuredAt: Date; value: number }>,
-    classify: (mean: number) => DayBand | null,
-    totalReadingsThreshold = 3,
-  ): ConsistencyOutput {
-    if (events.length < totalReadingsThreshold) {
-      // Cold-start path. Still emit the per-day strip if we have any
-      // recent readings, but mark insufficient so the UI hides the %.
-      const partial = computeStrip(events, classify);
-      return {
-        ...EMPTY_CONSISTENCY,
-        consistency7d: partial.consistency7d,
-        daysLogged7d: partial.daysLogged7d,
-        daysInRange7d: partial.daysInRange7d,
-        insufficientData: true,
-      };
-    }
-
-    const byDay = new Map<string, { sum: number; count: number }>();
-    for (const ev of events) {
-      const day = dayKey(ev.measuredAt);
-      const bucket = byDay.get(day) ?? { sum: 0, count: 0 };
-      bucket.sum += ev.value;
-      bucket.count += 1;
-      byDay.set(day, bucket);
-    }
-
-    const stripPart = computeStrip(events, classify);
-
-    // 30-day stats: walk the last 30 Berlin-tz day keys.
-    let daysInRange30d = 0;
-    let daysLogged30d = 0;
-    for (let i = 29; i >= 0; i--) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      const bucket = byDay.get(key);
-      if (!bucket) continue;
-      daysLogged30d += 1;
-      const mean = bucket.sum / bucket.count;
-      if (classify(mean) === "in") daysInRange30d += 1;
-    }
-
-    // lastMetGoalAt: walk back from today until a day is in range.
-    let lastMetGoalAt: string | null = null;
-    for (let i = 0; i < 30; i++) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      const bucket = byDay.get(key);
-      if (!bucket) continue;
-      const mean = bucket.sum / bucket.count;
-      if (classify(mean) === "in") {
-        lastMetGoalAt = key;
-        break;
-      }
-    }
-
-    // streakDays: consecutive days ending today that are in-range. A
-    // day with no reading breaks the streak (the user did not meet the
-    // goal that day, even if today is in-range).
-    let streakDays = 0;
-    for (let i = 0; i < 365; i++) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      const bucket = byDay.get(key);
-      if (!bucket) break;
-      const mean = bucket.sum / bucket.count;
-      if (classify(mean) !== "in") break;
-      streakDays += 1;
-    }
-
-    // insufficientData: < 3 readings total OR < 1 day in the last 7.
-    const insufficientData =
-      events.length < totalReadingsThreshold || stripPart.daysLogged7d < 1;
-
-    return {
-      daysInRange7d: stripPart.daysInRange7d,
-      daysLogged7d: stripPart.daysLogged7d,
-      daysInRange30d,
-      daysLogged30d,
-      lastMetGoalAt,
-      streakDays,
-      insufficientData,
-      consistency7d: stripPart.consistency7d,
-    };
-  }
-
-  function computeStrip(
-    events: ReadonlyArray<{ measuredAt: Date; value: number }>,
-    classify: (mean: number) => DayBand | null,
-  ): {
-    consistency7d: ReadonlyArray<DayBand | null>;
-    daysInRange7d: number;
-    daysLogged7d: number;
-  } {
-    const byDay = new Map<string, { sum: number; count: number }>();
-    for (const ev of events) {
-      const day = dayKey(ev.measuredAt);
-      const bucket = byDay.get(day) ?? { sum: 0, count: 0 };
-      bucket.sum += ev.value;
-      bucket.count += 1;
-      byDay.set(day, bucket);
-    }
-    const strip: Array<DayBand | null> = [];
-    let daysInRange7d = 0;
-    let daysLogged7d = 0;
-    for (const key of last7DayKeys) {
-      const bucket = byDay.get(key);
-      if (!bucket) {
-        strip.push(null);
-        continue;
-      }
-      daysLogged7d += 1;
-      const mean = bucket.sum / bucket.count;
-      const band = classify(mean);
-      strip.push(band);
-      if (band === "in") daysInRange7d += 1;
-    }
-    return { consistency7d: strip, daysInRange7d, daysLogged7d };
-  }
-
-  /**
-   * Helper: classify a value against a target range with an orange band
-   * symmetrical to the green band (the same heuristic RangeBar uses
-   * client-side). When `min`/`max` is null we treat the input as
-   * unclassifiable and return null.
-   */
-  function makeRangeClassifier(
-    range: { min: number; max: number } | null,
-    options?: { orangeMin?: number; orangeMax?: number },
-  ): (mean: number) => DayBand | null {
-    if (!range) return () => null;
-    const span = range.max - range.min;
-    const orangeMin = options?.orangeMin ?? range.min - span * 0.3;
-    const orangeMax = options?.orangeMax ?? range.max + span * 0.3;
-    return (mean: number) => {
-      if (mean >= range.min && mean <= range.max) return "in";
-      if (mean >= orangeMin && mean <= orangeMax) return "near";
-      return "out";
-    };
-  }
-
-  /**
-   * Per-day BP-in-target classifier: a day is "in" if every BP pair on
-   * that day (sys+dia matched within 5 min) passes `isBpReadingInTarget`.
-   * "near" if at least one pair passes; "out" otherwise.
-   *
-   * Returns a function (day-key, dayEvents) → band. We pre-compute the
-   * by-day map once because the route already paginates BP twice (sys
-   * + dia) and we want to avoid quadratic work.
-   */
-  function buildBpPairsByDay(): Map<string, DayBand | null> {
-    if (!bpRange) return new Map();
-    const sysByDay = new Map<string, Array<{ date: Date; value: number }>>();
-    const diaByDay = new Map<string, Array<{ date: Date; value: number }>>();
-    for (const m of recentMeasurements) {
-      if (m.type === "BLOOD_PRESSURE_SYS") {
-        const k = dayKey(m.measuredAt);
-        const arr = sysByDay.get(k) ?? [];
-        arr.push({ date: m.measuredAt, value: m.value });
-        sysByDay.set(k, arr);
-      } else if (m.type === "BLOOD_PRESSURE_DIA") {
-        const k = dayKey(m.measuredAt);
-        const arr = diaByDay.get(k) ?? [];
-        arr.push({ date: m.measuredAt, value: m.value });
-        diaByDay.set(k, arr);
-      }
-    }
-    const out = new Map<string, DayBand | null>();
-    const allKeys = new Set([...sysByDay.keys(), ...diaByDay.keys()]);
-    for (const key of allKeys) {
-      const sys = sysByDay.get(key) ?? [];
-      const dia = diaByDay.get(key) ?? [];
-      const pairs = pairByTimestamp(sys, dia, 5 * 60 * 1000);
-      if (pairs.length === 0) {
-        out.set(key, null);
-        continue;
-      }
-      const inCount = pairs.filter((p) =>
-        isBpReadingInTarget(p.a, p.b, bpRange),
-      ).length;
-      if (inCount === pairs.length) out.set(key, "in");
-      else if (inCount > 0) out.set(key, "near");
-      else out.set(key, "out");
-    }
-    return out;
-  }
-
-  // We need bpRange before the per-target loop runs so the helpers above
-  // can use it; reorder the local so it's available.
-  const bpRange = age != null ? getBpTargetsByAge(age, gender) : null;
-
-  /**
-   * Roll up consistency for a target whose bands come from a pre-mapped
-   * `dayBandByKey` map (used for BP-in-target and medication compliance
-   * which have day-level classification rather than mean-classification).
-   */
-  function rollupFromDayMap(
-    dayBandByKey: Map<string, DayBand | null>,
-    totalDaysThreshold = 3,
-  ): ConsistencyOutput {
-    const loggedKeys = Array.from(dayBandByKey.entries()).filter(
-      ([, v]) => v !== null,
-    );
-    if (loggedKeys.length < totalDaysThreshold) {
-      // Cold-start: still emit the strip.
-      const strip: Array<DayBand | null> = last7DayKeys.map(
-        (k) => dayBandByKey.get(k) ?? null,
-      );
-      const daysLogged7d = strip.filter((b) => b !== null).length;
-      const daysInRange7d = strip.filter((b) => b === "in").length;
-      return {
-        ...EMPTY_CONSISTENCY,
-        consistency7d: strip,
-        daysLogged7d,
-        daysInRange7d,
-        insufficientData: true,
-      };
-    }
-
-    const strip: Array<DayBand | null> = last7DayKeys.map(
-      (k) => dayBandByKey.get(k) ?? null,
-    );
-    const daysLogged7d = strip.filter((b) => b !== null).length;
-    const daysInRange7d = strip.filter((b) => b === "in").length;
-
-    let daysInRange30d = 0;
-    let daysLogged30d = 0;
-    for (let i = 29; i >= 0; i--) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      const band = dayBandByKey.get(key);
-      if (!band) continue;
-      daysLogged30d += 1;
-      if (band === "in") daysInRange30d += 1;
-    }
-
-    let lastMetGoalAt: string | null = null;
-    for (let i = 0; i < 30; i++) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      if (dayBandByKey.get(key) === "in") {
-        lastMetGoalAt = key;
-        break;
-      }
-    }
-
-    let streakDays = 0;
-    for (let i = 0; i < 365; i++) {
-      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
-      const key = dayKey(d);
-      const band = dayBandByKey.get(key);
-      if (band === undefined || band === null) break;
-      if (band !== "in") break;
-      streakDays += 1;
-    }
-
-    return {
-      daysInRange7d,
-      daysLogged7d,
-      daysInRange30d,
-      daysLogged30d,
-      lastMetGoalAt,
-      streakDays,
-      insufficientData: loggedKeys.length < totalDaysThreshold,
-      consistency7d: strip,
-    };
-  }
-
-  // Memo: pre-compute the BP-pairs day map once.
-  const bpPairsByDay = buildBpPairsByDay();
-
-  // Build target items
-  const targets: TargetItem[] = [];
-
-  // 1. Weight
-  const weightRange = heightCm ? getWeightRange(heightCm) : null;
-  let weightClassification: { category: string; color: string } | null = null;
-  if (latestByType.WEIGHT != null && heightCm) {
-    const heightM = heightCm / 100;
-    const bmi = latestByType.WEIGHT / (heightM * heightM);
-    const cls = classifyBMI(bmi);
-    weightClassification = { category: cls.category, color: cls.color };
-  }
-  {
-    const consistency = rollupConsistency(
-      recentMeasurements.filter((m) => m.type === "WEIGHT"),
-      makeRangeClassifier(weightRange),
-    );
-    targets.push({
-      type: "WEIGHT",
-      label: "Weight",
-      current: latestByType.WEIGHT ?? null,
-      average30: avg30ByType.WEIGHT ?? null,
-      trend: computeTrend("WEIGHT"),
-      unit: "kg",
-      range: weightRange,
-      classification: weightClassification,
-      source: "WHO BMI",
-      ...consistency,
-    });
-  }
-
-  // 2. Blood Pressure (sys/dia combined)
-  // `bpRange` is hoisted to the helpers block above so the BP-pairs
-  // day-map can use it; do not redeclare here.
-  let bpClassification: { category: string; color: string } | null = null;
-  if (
-    latestByType.BLOOD_PRESSURE_SYS != null &&
-    latestByType.BLOOD_PRESSURE_DIA != null
-  ) {
-    const cls = classifyBP(
-      latestByType.BLOOD_PRESSURE_SYS,
-      latestByType.BLOOD_PRESSURE_DIA,
-    );
-    bpClassification = { category: cls.category, color: cls.color };
-  }
-  {
-    // Per-day BP classifier reuses the sys+dia paired classifier from
-    // `bpPairsByDay`. This is the right semantic for "in target band"
-    // because a systolic in range with a diastolic out of range is
-    // still an out-of-target reading.
-    const consistency = rollupFromDayMap(bpPairsByDay);
-    targets.push({
-      type: "BLOOD_PRESSURE",
-      label: "Blood pressure",
-      current: latestByType.BLOOD_PRESSURE_SYS ?? null,
-      average30: avg30ByType.BLOOD_PRESSURE_SYS ?? null,
-      trend: computeTrend("BLOOD_PRESSURE_SYS"),
-      unit: "mmHg",
-      range: bpRange ? { min: bpRange.sysLow, max: bpRange.sysHigh } : null,
-      classification: bpClassification,
-      source: "ESH 2023",
-      ...consistency,
-      // Extra fields for diastolic
-    } as TargetItem);
-  }
-
-  // 2b. Blood pressure target-hit rate over 30 days
-  if (bpRange) {
-    const sysPoints = recentMeasurements
-      .filter((measurement) => measurement.type === "BLOOD_PRESSURE_SYS")
-      .map((measurement) => ({
-        date: measurement.measuredAt,
-        value: measurement.value,
-      }));
-    const diaPoints = recentMeasurements
-      .filter((measurement) => measurement.type === "BLOOD_PRESSURE_DIA")
-      .map((measurement) => ({
-        date: measurement.measuredAt,
-        value: measurement.value,
-      }));
-
-    const bpPairs = pairByTimestamp(sysPoints, diaPoints, 5 * 60 * 1000);
-    // v1.4.16 A2 — one-sided ceiling semantics with hypotension
-    // floor. See lib/analytics/bp-in-target.ts.
-    const bpInTargetCount = bpPairs.filter((pair) =>
-      isBpReadingInTarget(pair.a, pair.b, bpRange),
-    ).length;
-    const bpInTargetRate =
-      bpPairs.length > 0
-        ? Math.round((bpInTargetCount / bpPairs.length) * 100 * 10) / 10
-        : null;
-
-    // BP-in-target consistency mirrors the BP pair-by-day map above:
-    // a day is "in" when every pair on that day clears the BP target.
-    const inTargetConsistency = rollupFromDayMap(bpPairsByDay);
-    targets.push({
-      type: "BLOOD_PRESSURE_IN_TARGET",
-      label: "Blood pressure on target",
-      current: bpInTargetRate,
-      average30: bpInTargetRate,
-      trend: null,
-      unit: "%",
-      range: { min: 70, max: 100 },
-      classification:
-        bpInTargetRate != null
-          ? bpInTargetRate >= 70
-            ? { category: "Good", color: "#50fa7b" }
-            : bpInTargetRate >= 40
-              ? { category: "Moderate", color: "#f1fa8c" }
-              : { category: "Low", color: "#ff5555" }
-          : null,
-      source: "ESH 2023",
-      ...inTargetConsistency,
-    });
-  }
-
-  // 3. Resting pulse
-  //
-  // v1.15.12 A2 — judge the RESTING band against a RESTING series, not
-  // the raw PULSE stream (which Apple Health fills with workout HR). We
-  // prefer RESTING_HEART_RATE; when the user has none we fall back to a
-  // low-percentile-of-daily-PULSE proxy. The resting series drives the
-  // tile's current / average / consistency / classification so a workout
-  // burst no longer reads "outside target".
-  const pulseTarget = getPersonalizedPulseTarget(age, gender);
-  {
-    const restingResolved = resolveRestingPulseSeries({
-      restingSamples: recentMeasurements
-        .filter((m) => m.type === "RESTING_HEART_RATE")
-        .map((m) => ({ measuredAt: m.measuredAt, value: m.value })),
-      pulseSamples: recentMeasurements
-        .filter((m) => m.type === "PULSE")
-        .map((m) => ({ measuredAt: m.measuredAt, value: m.value })),
-      dayKeyOf: dayKey,
-    });
-    const restingEvents = restingResolved.series;
-    // Current = most recent resting value; average30 = resting mean.
-    const restingCurrent =
-      restingEvents.length > 0
-        ? restingEvents[restingEvents.length - 1].value
-        : null;
-    const restingAvg30 =
-      restingEvents.length > 0
-        ? Math.round(
-            (restingEvents.reduce((s, e) => s + e.value, 0) /
-              restingEvents.length) *
-              10,
-          ) / 10
-        : null;
-
-    let pulseClassification: { category: string; color: string } | null = null;
-    if (restingCurrent != null) {
-      const cls = classifyPulseByTarget(restingCurrent, pulseTarget);
-      pulseClassification = { category: cls.category, color: cls.color };
-    }
-
-    const pulseRange = {
-      min: pulseTarget.greenMin,
-      max: pulseTarget.greenMax,
-    };
-    const consistency = rollupConsistency(
-      restingEvents,
-      makeRangeClassifier(pulseRange, {
-        orangeMin: pulseTarget.orangeMin,
-        orangeMax: pulseTarget.orangeMax,
-      }),
-    );
-    // Trend over the resting series (first-half vs second-half mean).
-    let restingTrend: "up" | "down" | "stable" | null = null;
-    if (restingEvents.length >= 4) {
-      const sorted = [...restingEvents].sort(
-        (a, b) => a.measuredAt.getTime() - b.measuredAt.getTime(),
-      );
-      const mid = Math.floor(sorted.length / 2);
-      const avgFirst =
-        sorted.slice(0, mid).reduce((s, e) => s + e.value, 0) / mid;
-      const avgSecond =
-        sorted.slice(mid).reduce((s, e) => s + e.value, 0) /
-        (sorted.length - mid);
-      const diff = avgSecond - avgFirst;
-      const threshold = avgFirst * 0.02;
-      restingTrend =
-        diff > threshold ? "up" : diff < -threshold ? "down" : "stable";
-    }
-
-    targets.push({
-      type: "PULSE",
-      label: "Resting pulse",
-      current: restingCurrent,
-      average30: restingAvg30,
-      trend: restingTrend,
-      unit: "bpm",
-      range: pulseRange,
-      classification: pulseClassification,
-      source:
-        restingResolved.which === "proxy"
-          ? `${pulseTarget.source} (estimated from heart rate)`
-          : pulseTarget.source,
-      ...consistency,
-    });
-  }
-
-  // 4. Sleep Duration
-  //
-  // v1.11.5 (deferred v1.11.4 QA L3) — SLEEP_DURATION is stored one row per
-  // STAGE per night in MINUTES. The generic per-type path treated every stage
-  // row as an independent reading, summing IN_BED + AWAKE + the bare ASLEEP
-  // aggregate + the granular CORE/DEEP/REM rows over 30 days and dividing by
-  // the row count — and then fed those MINUTES straight into a target range
-  // expressed in HOURS. The result was a bogus ~16 h/day average. Reconstruct
-  // per-night TIME-ASLEEP through the shared helper (which dedups dual-source
-  // nights, excludes IN_BED/AWAKE, and counts only the granular partition when
-  // present), convert to HOURS, then classify and roll up consistency on the
-  // per-night hour totals so this surface matches the dashboard / series /
-  // overview headline.
-  const sleepRange = getSleepDurationRange();
-  {
-    // `sleepStageRows` resolved in the parallel read at the top.
-    const nights = reconstructSleepNights(
-      sleepStageRows as SleepStageRow[],
-      userTz,
-      dbUser?.sourcePriorityJson ?? null,
-    )
-      .filter((n) => n.asleepMinutes > 0)
-      .sort((a, b) => a.measuredAt.getTime() - b.measuredAt.getTime());
-
-    const round1 = (n: number): number => Math.round(n * 100) / 100;
-    // One event per night carrying the night's asleep HOURS — the right unit
-    // for the 7–9 h target band and for the per-day consistency bucketing.
-    const sleepEvents = nights.map((n) => ({
-      measuredAt: n.measuredAt,
-      value: round1(n.asleepMinutes / 60),
-    }));
-
-    const latestNight = nights.length > 0 ? nights[nights.length - 1] : null;
-    const currentSleepHours = latestNight
-      ? round1(latestNight.asleepMinutes / 60)
-      : null;
-    const avgSleepHours =
-      sleepEvents.length > 0
-        ? round1(
-            sleepEvents.reduce((s, e) => s + e.value, 0) / sleepEvents.length,
-          )
-        : null;
-
-    let sleepClassification: { category: string; color: string } | null = null;
-    if (currentSleepHours != null) {
-      const cls = classifySleepDuration(currentSleepHours);
-      sleepClassification = { category: cls.category, color: cls.color };
-    }
-
-    // Trend over the per-night hour series (first vs second half), mirroring
-    // `computeTrend` but on reconstructed nights rather than raw stage rows.
-    let sleepTrend: "up" | "down" | "stable" | null = null;
-    if (sleepEvents.length >= 4) {
-      const mid = Math.floor(sleepEvents.length / 2);
-      const firstHalf = sleepEvents.slice(0, mid);
-      const secondHalf = sleepEvents.slice(mid);
-      const avgFirst =
-        firstHalf.reduce((s, e) => s + e.value, 0) / firstHalf.length;
-      const avgSecond =
-        secondHalf.reduce((s, e) => s + e.value, 0) / secondHalf.length;
-      const diff = avgSecond - avgFirst;
-      const threshold = avgFirst * 0.02;
-      if (diff > threshold) sleepTrend = "up";
-      else if (diff < -threshold) sleepTrend = "down";
-      else sleepTrend = "stable";
-    }
-
-    const consistency = rollupConsistency(
-      sleepEvents,
-      makeRangeClassifier(sleepRange),
-    );
-    targets.push({
-      type: "SLEEP_DURATION",
-      label: "Sleep duration",
-      current: currentSleepHours,
-      average30: avgSleepHours,
-      trend: sleepTrend,
-      unit: "h",
-      range: sleepRange,
-      classification: sleepClassification,
-      source: "AASM/SRS",
-      ...consistency,
-    });
-  }
-
-  // 5. BMI (derived from weight + height)
-  if (heightCm) {
-    const heightM = heightCm / 100;
-    const heightSq = heightM * heightM;
-    const latestWeight = latestByType.WEIGHT ?? null;
-    const currentBmi =
-      latestWeight != null
-        ? Math.round((latestWeight / heightSq) * 10) / 10
-        : null;
-
-    // Compute 30-day average BMI from average weight
-    const avgWeight = avg30ByType.WEIGHT ?? null;
-    const avgBmi =
-      avgWeight != null ? Math.round((avgWeight / heightSq) * 10) / 10 : null;
-
-    let bmiClassification: { category: string; color: string } | null = null;
-    if (currentBmi != null) {
-      const cls = classifyBMI(currentBmi);
-      bmiClassification = { category: cls.category, color: cls.color };
-    }
-
-    // BMI consistency derives from the weight series: divide each
-    // bucket by height\u00B2 so the day's mean BMI is classified against
-    // the BMI range bar (18.5 \u2014 24.9).
-    const bmiRange = { min: 18.5, max: 24.9 };
-    const bmiEvents = recentMeasurements
-      .filter((m) => m.type === "WEIGHT")
-      .map((m) => ({ measuredAt: m.measuredAt, value: m.value / heightSq }));
-    const consistency = rollupConsistency(
-      bmiEvents,
-      makeRangeClassifier(bmiRange),
-    );
-    targets.push({
-      type: "BMI",
-      label: "BMI",
-      current: currentBmi,
-      average30: avgBmi,
-      trend: computeTrend("WEIGHT"), // BMI trend follows weight trend
-      unit: "kg/m\u00B2",
-      range: bmiRange,
-      classification: bmiClassification,
-      source: "WHO",
-      ...consistency,
-    });
-  }
-
-  // 6. Body Fat
-  let bodyFatClassification: { category: string; color: string } | null = null;
-  if (latestByType.BODY_FAT != null && age != null) {
-    const cls = classifyBodyFat(latestByType.BODY_FAT, gender, age);
-    bodyFatClassification = { category: cls.category, color: cls.color };
-  }
-  // Single source of truth for the body-fat green band lives in
-  // `value-bands.ts`. v1.3.3 had three different hardcoded ranges across
-  // value-bands.ts / targets/route.ts / classifications.ts; the v1.4
-  // marathon consolidated them onto `getBodyFatTargetRange` (ACE
-  // fitness + acceptable bands).
-  const bodyFatRange = age != null ? getBodyFatTargetRange(gender) : null;
-  {
-    const consistency = rollupConsistency(
-      recentMeasurements.filter((m) => m.type === "BODY_FAT"),
-      makeRangeClassifier(bodyFatRange),
-    );
-    targets.push({
-      type: "BODY_FAT",
-      label: "Body fat",
-      current: latestByType.BODY_FAT ?? null,
-      average30: avg30ByType.BODY_FAT ?? null,
-      trend: computeTrend("BODY_FAT"),
-      unit: "%",
-      range: bodyFatRange,
-      classification: bodyFatClassification,
-      source: "ACE",
-      ...consistency,
-    });
-  }
-
-  // 7. Activity Steps
-  const stepsRange = getStepsRange();
-  let stepsClassification: { category: string; color: string } | null = null;
-  if (avg30ByType.ACTIVITY_STEPS != null) {
-    const cls = classifySteps(avg30ByType.ACTIVITY_STEPS);
-    stepsClassification = { category: cls.category, color: cls.color };
-  }
-  {
-    const consistency = rollupConsistency(
-      recentMeasurements.filter((m) => m.type === "ACTIVITY_STEPS"),
-      makeRangeClassifier(stepsRange),
-    );
-    targets.push({
-      type: "ACTIVITY_STEPS",
-      label: "Steps/day",
-      current: latestByType.ACTIVITY_STEPS ?? null,
-      average30: avg30ByType.ACTIVITY_STEPS ?? null,
-      trend: computeTrend("ACTIVITY_STEPS"),
-      unit: "steps",
-      range: stepsRange,
-      classification: stepsClassification,
-      // WHO publishes activity *time* (150–300 min/wk moderate),
-      // not a step quota. The closest peer-reviewed dose-response
-      // for the 8 000–15 000 band is Saint-Maurice JAMA 2020. The
-      // AI prompts at src/lib/ai/prompts/base-system.ts and
-      // src/lib/ai/prompts/general-status.ts already enforce this
-      // attribution; this surface label was the last "WHO" mislabel
-      // in the codebase.
-      source: "Saint-Maurice JAMA 2020",
-      ...consistency,
-    });
-  }
-
-  // 8. Medication Compliance (average across active medications) —
-  // `activeMedications` + their 30-day `intakeEvents` resolved in the
-  // parallel read at the top.
-  const { activeMedications, intakeEvents } = medicationBundle;
-
-  if (activeMedications.length > 0) {
-    const medicationStats = activeMedications.map((medication) => {
-      const medicationEvents = intakeEvents.filter(
-        (event) => event.medicationId === medication.id,
-      );
-      // v1.7.0 SB-SCHED-2 — engine-routed denominator (userTz resolved
-      // above at the route entry).
-      const medicationContext = buildComplianceMedicationContext(
-        medication,
-        lastNonSkippedTakenAt(medicationEvents),
-        userTz,
-      );
-      const compliance7 = calculateCompliance(
-        medicationEvents,
-        medication.schedules,
-        7,
-        medication.createdAt,
-        { medicationContext },
-      );
-      const compliance30 = calculateCompliance(
-        medicationEvents,
-        medication.schedules,
-        30,
-        medication.createdAt,
-        { medicationContext },
-      );
-
-      return {
-        name: medication.name,
-        compliance7: compliance7.rate,
-        compliance30: compliance30.rate,
-        totalExpected7: compliance7.totalExpected,
-        taken7: compliance7.taken,
-        totalExpected30: compliance30.totalExpected,
-        taken30: compliance30.taken,
-      };
-    });
-
-    const totalExpected7 = medicationStats.reduce(
-      (sum, medication) => sum + medication.totalExpected7,
-      0,
-    );
-    const totalTaken7 = medicationStats.reduce(
-      (sum, medication) => sum + medication.taken7,
-      0,
-    );
-    const totalExpected30 = medicationStats.reduce(
-      (sum, medication) => sum + medication.totalExpected30,
-      0,
-    );
-    const totalTaken30 = medicationStats.reduce(
-      (sum, medication) => sum + medication.taken30,
-      0,
-    );
-
-    const complianceRate7 =
-      totalExpected7 > 0
-        ? Math.round(
-            (Math.min(1, totalTaken7 / totalExpected7) * 100 + Number.EPSILON) *
-              10,
-          ) / 10
-        : null;
-    const complianceRate30 =
-      totalExpected30 > 0
-        ? Math.round(
-            (Math.min(1, totalTaken30 / totalExpected30) * 100 +
-              Number.EPSILON) *
-              10,
-          ) / 10
-        : complianceRate7;
-
-    // Per-day compliance: for each Berlin-tz day, classify as "in" if
-    // every scheduled dose that day was taken; "near" if at least one
-    // was taken; "out" if all were skipped/missed; null if there were
-    // no scheduled doses (the user's regimen excluded that day).
-    const dayCountsByKey = new Map<
-      string,
-      { taken: number; expected: number }
-    >();
-    for (const event of intakeEvents) {
-      const key = dayKey(event.scheduledFor);
-      const cur = dayCountsByKey.get(key) ?? { taken: 0, expected: 0 };
-      cur.expected += 1;
-      if (event.takenAt && !event.skipped) cur.taken += 1;
-      dayCountsByKey.set(key, cur);
-    }
-    const dayBandByKey = new Map<string, DayBand | null>();
-    for (const [key, counts] of dayCountsByKey.entries()) {
-      if (counts.expected === 0) {
-        dayBandByKey.set(key, null);
-        continue;
-      }
-      const ratio = counts.taken / counts.expected;
-      if (ratio >= 0.99) dayBandByKey.set(key, "in");
-      else if (ratio >= 0.5) dayBandByKey.set(key, "near");
-      else dayBandByKey.set(key, "out");
-    }
-    const consistency = rollupFromDayMap(dayBandByKey);
-    targets.push({
-      type: "MEDICATION_COMPLIANCE",
-      label: "Medication compliance",
-      current: complianceRate7,
-      average30: complianceRate30,
-      trend: null,
-      unit: "%",
-      range: { min: 90, max: 100 },
-      classification:
-        complianceRate7 != null
-          ? complianceRate7 >= 90
-            ? { category: "Very good", color: "#50fa7b" }
-            : complianceRate7 >= 70
-              ? { category: "Good", color: "#f1fa8c" }
-              : { category: "Low", color: "#ff5555" }
-          : null,
-      source: "7-day",
-      details: {
-        medications: medicationStats.map((medication) => ({
-          name: medication.name,
-          compliance7: medication.compliance7,
-          compliance30: medication.compliance30,
-        })),
-      },
-      ...consistency,
-    });
-  }
-
-  // 9. Mood targets (if mood data exists)
-  //
-  // v1.4.40 \u2014 swap the unbounded `prisma.moodEntry.findMany({ where: {
-  // userId } })` for the persistent mood-rollup DAY tier (audit Critical
-  // Finding #2). The tile reads:
-  //   - per-day mean over the trailing 30 days (avg30, trend, stability)
-  //   - the consistency strip (in/near/out band per day)
-  //   - the latest score for the "current" reading + classification
-  //
-  // Rollup row = `{bucketStart, mean, count, minScore, maxScore}` per
-  // calendar day. Per-day mean replaces the per-entry score series the
-  // legacy path passed to `rollupConsistency` \u2014 the helper buckets by
-  // day-key anyway, so feeding one row per day with the pre-computed
-  // mean is mathematically identical to feeding N raw entries that
-  // collapse to the same mean.
-  //
-  // The "latest score" needs a single raw entry (the newest one), so we
-  // pull it with `take: 1` \u2014 bounded by the index, never an unbounded
-  // scan. The "\u2265 3 entries threshold" gate uses the rollup count sum so
-  // the cold-start branch stays consistent with the legacy semantics
-  // (which counted raw entries, not raw days).
-  //
-  // Coverage-fallback: when the user has mood entries but zero rollup
-  // rows yet (legacy account before the boot-time backfill caught up)
-  // we run the legacy live walk once and fire the warm-up so the next
-  // request lands on the rollup tier. Same posture as
-  // `/api/mood/analytics`. The warm-up trigger + the `moodRollups` /
-  // `latestMoodEntry` reads moved into the parallel round at the top.
-  const thirtyDaysAgoMood = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
-
-  // Build a per-day event list for the consistency strip + 30-day stats.
-  // Use the rollup tier when populated; fall back to a bounded raw walk
-  // when the user has mood entries but zero rollup coverage yet.
-  let moodDailyEvents: Array<{ measuredAt: Date; value: number }>;
-  let moodEntryCount: number;
-  let moodSumScores: number;
-  let moodVarianceN: number;
-  let moodSumSquares: number;
-  if (moodRollups.length > 0) {
-    moodEntryCount = moodRollups.reduce((s, r) => s + r.count, 0);
-    moodDailyEvents = moodRollups
-      .filter((r) => r.bucketStart >= thirtyDaysAgoMood)
-      .map((r) => ({ measuredAt: r.bucketStart, value: r.mean }));
-    moodSumScores = moodDailyEvents.reduce((s, e) => s + e.value, 0);
-    moodVarianceN = moodDailyEvents.length;
-    moodSumSquares = moodDailyEvents.reduce((s, e) => s + e.value * e.value, 0);
-  } else if (latestMoodEntry !== null) {
-    // Coverage-fallback: rollups empty but raw entries exist. Pull the
-    // trailing 30-day window only (instead of every entry ever) \u2014 that's
-    // the bound the legacy code was missing.
-    const recentRawMood = await prisma.moodEntry.findMany({
-      // v1.7.0 sync — exclude tombstoned rows.
-      where: {
-        userId,
-        deletedAt: null,
-        moodLoggedAt: { gte: thirtyDaysAgoMood },
-      },
-      orderBy: { moodLoggedAt: "asc" },
-      select: { score: true, moodLoggedAt: true },
-    });
-    moodEntryCount = recentRawMood.length;
-    moodDailyEvents = recentRawMood.map((e) => ({
-      measuredAt: e.moodLoggedAt,
-      value: e.score,
-    }));
-    moodSumScores = recentRawMood.reduce((s, e) => s + e.score, 0);
-    moodVarianceN = recentRawMood.length;
-    moodSumSquares = recentRawMood.reduce((s, e) => s + e.score * e.score, 0);
-  } else {
-    moodEntryCount = 0;
-    moodDailyEvents = [];
-    moodSumScores = 0;
-    moodVarianceN = 0;
-    moodSumSquares = 0;
-  }
-
-  if (moodEntryCount >= 3) {
-    const latestMoodScore = latestMoodEntry?.score ?? null;
-
-    const moodAvg30 =
-      moodDailyEvents.length > 0
-        ? Math.round((moodSumScores / moodDailyEvents.length) * 10) / 10
-        : null;
-
-    // Mood trend: compare first half to second half of last 30 days.
-    // The rollup tier carries one DataPoint per day (the daily mean),
-    // matching the legacy comparison semantics on single-entry days.
-    let moodTrend: "up" | "down" | "stable" | null = null;
-    if (moodDailyEvents.length >= 4) {
-      const sorted = [...moodDailyEvents].sort(
-        (a, b) => a.measuredAt.getTime() - b.measuredAt.getTime(),
-      );
-      const mid = Math.floor(sorted.length / 2);
-      const firstHalf = sorted.slice(0, mid);
-      const secondHalf = sorted.slice(mid);
-      const avgFirst =
-        firstHalf.reduce((s, e) => s + e.value, 0) / firstHalf.length;
-      const avgSecond =
-        secondHalf.reduce((s, e) => s + e.value, 0) / secondHalf.length;
-      const diff = avgSecond - avgFirst;
-      if (diff > 0.2) moodTrend = "up";
-      else if (diff < -0.2) moodTrend = "down";
-      else moodTrend = "stable";
-    }
-
-    const moodClassification =
-      latestMoodScore != null
-        ? latestMoodScore >= 3.5
-          ? { category: "Good", color: "#50fa7b" }
-          : latestMoodScore >= 2
-            ? { category: "Moderate", color: "#f1fa8c" }
-            : { category: "Low", color: "#ff5555" }
-        : null;
-
-    const moodRange = { min: 3.5, max: 5 };
-    const moodConsistency = rollupConsistency(
-      moodDailyEvents,
-      makeRangeClassifier(moodRange, { orangeMin: 2, orangeMax: 5 }),
-    );
-    targets.push({
-      type: "MOOD_SCORE",
-      label: "Mood",
-      current: latestMoodScore,
-      average30: moodAvg30,
-      trend: moodTrend,
-      unit: "/ 5",
-      range: moodRange,
-      classification: moodClassification,
-      source: "moodLog",
-      ...moodConsistency,
-    });
-
-    // Mood stability: standard deviation of the recent series. The
-    // rollup tier surfaces one mean per day, which is the right
-    // resolution for "is the user's mood stable across days" \u2014 a power
-    // user logging multiple times per day with a wide intraday spread
-    // still gets a "stable" badge if the daily mean barely moves. The
-    // legacy path conflated intraday variance with day-to-day stability
-    // by passing per-entry scores; the rollup-tier semantic is closer
-    // to what the UI label suggests.
-    if (moodVarianceN >= 5) {
-      const seriesMean = moodSumScores / moodVarianceN;
-      const variance = moodSumSquares / moodVarianceN - seriesMean * seriesMean;
-      const stdDev = Math.round(Math.sqrt(Math.max(0, variance)) * 100) / 100;
-
-      const stabilityClassification =
-        stdDev <= 0.5
-          ? { category: "Very stable", color: "#50fa7b" }
-          : stdDev <= 1.0
-            ? { category: "Stable", color: "#f1fa8c" }
-            : { category: "Fluctuating", color: "#ff5555" };
-
-      // Mood stability is computed from the same recent-mood window;
-      // consistency mirrors MOOD_SCORE so the strip aligns with the
-      // user's logging cadence rather than introducing a synthetic
-      // "\u03C3 in range per day" rule that would be hard to reason about.
-      targets.push({
-        type: "MOOD_STABILITY",
-        label: "Mood stability",
-        current: stdDev,
-        average30: stdDev,
-        trend: null,
-        unit: "\u03C3",
-        range: { min: 0, max: 0.5 },
-        classification: stabilityClassification,
-        source: "moodLog",
-        ...moodConsistency,
-      });
-    }
-  }
-
-  // 10. Blood glucose — one card per logged context.
-  const glucoseContexts: GlucoseContext[] = [
-    "FASTING",
-    "POSTPRANDIAL",
-    "RANDOM",
-    "BEDTIME",
-  ];
-  const glucoseUnit = resolveGlucoseUnit(dbUser?.glucoseUnit ?? null);
-  const overrides = (dbUser?.thresholdsJson ??
-    null) as ThresholdOverridesJson | null;
-  const profileForRange = {
-    heightCm,
-    dateOfBirth: dbUser?.dateOfBirth ?? null,
-    gender: dbUser?.gender ?? null,
-  };
-  // `glucoseRows` resolved (one-year floor) in the parallel read at the top.
-  const thirtyDaysAgoGlucose = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
-
-  const labelKeyByContext: Record<GlucoseContext, string> = {
-    FASTING: "targets.glucoseFasting",
-    POSTPRANDIAL: "targets.glucosePostprandial",
-    RANDOM: "targets.glucoseRandom",
-    BEDTIME: "targets.glucoseBedtime",
-  };
-
-  for (const ctx of glucoseContexts) {
-    const ctxRows = glucoseRows.filter((r) => r.glucoseContext === ctx);
-    if (ctxRows.length === 0) continue;
-    const latest = ctxRows[0].value;
-    const recent = ctxRows.filter((r) => r.measuredAt >= thirtyDaysAgoGlucose);
-    const avg30 =
-      recent.length > 0
-        ? Math.round(
-            (recent.reduce((s, r) => s + r.value, 0) / recent.length) * 10,
-          ) / 10
-        : null;
-
-    const metric = thresholdMetricForContext(ctx);
-    const eff = getEffectiveRange(metric, profileForRange, overrides);
-    const range = eff.range
-      ? { min: eff.range.greenMin, max: eff.range.greenMax }
-      : null;
-
-    let classification: { category: string; color: string } | null = null;
-    if (range) {
-      if (latest >= range.min && latest <= range.max) {
-        classification = { category: "Optimal", color: "#50fa7b" };
-      } else if (
-        eff.range &&
-        latest >= eff.range.orangeMin &&
-        latest <= eff.range.orangeMax
-      ) {
-        classification = { category: "Elevated", color: "#f1fa8c" };
-      } else {
-        classification = { category: "High", color: "#ff5555" };
-      }
-    }
-
-    const consistency = rollupConsistency(
-      recent.map((r) => ({ measuredAt: r.measuredAt, value: r.value })),
-      makeRangeClassifier(
-        range,
-        eff.range
-          ? { orangeMin: eff.range.orangeMin, orangeMax: eff.range.orangeMax }
-          : undefined,
-      ),
-    );
-    targets.push({
-      type: `BLOOD_GLUCOSE_${ctx}`,
-      label: labelKeyByContext[ctx],
-      current: latest,
-      average30: avg30,
-      trend: null,
-      unit: glucoseUnit,
-      range,
-      classification,
-      source: eff.isOverride ? "Custom" : "ADA 2024 / DDG",
-      ...consistency,
-    });
-  }
-
-  // --------------------------------------------------------------------
-  // v1.4.25 W3e — page summary. "X of Y targets met this week" is the
-  // single most-asked-about glanceable answer. We define "met this
-  // week" as the target having `daysInRange7d >= 4` AND not flagged as
-  // `insufficientData`. The streak highlight surfaces the metric with
-  // the longest current ≥ 3 day streak; nothing renders client-side
-  // when no target hits the bar.
-  // --------------------------------------------------------------------
-  const targetsMetThisWeek = targets.filter(
-    (target) => !target.insufficientData && target.daysInRange7d >= 4,
-  ).length;
-  let streakHighlight: TargetPageSummary["streakHighlight"] = null;
-  for (const target of targets) {
-    if (target.streakDays < 3) continue;
-    if (!streakHighlight || target.streakDays > streakHighlight.days) {
-      streakHighlight = { metric: target.type, days: target.streakDays };
-    }
-  }
-  const pageSummary: TargetPageSummary = {
-    targetsMetThisWeek,
-    totalTargets: targets.length,
-    streakHighlight,
-  };
-
-  annotate({
-    action: { name: "insights.targets" },
-    meta: {
-      targetCount: targets.length,
-      targetsMetThisWeek,
-      streakHighlightMetric: streakHighlight?.metric ?? null,
-    },
-  });
-
-  return {
-    targets,
-    pageSummary,
-    // Extra diastolic data for BP display
-    bpDiastolic: {
-      current: latestByType.BLOOD_PRESSURE_DIA ?? null,
-      average30: avg30ByType.BLOOD_PRESSURE_DIA ?? null,
-      range: bpRange ? { min: bpRange.diaLow, max: bpRange.diaHigh } : null,
-    },
-    profile: {
-      heightCm,
-      age,
-      gender,
-      glucoseUnit,
-    },
-  };
-}
diff --git a/src/lib/analytics/__tests__/as-needed-compliance-exclusion.test.ts b/src/lib/analytics/__tests__/as-needed-compliance-exclusion.test.ts
index b3e36ad46..209ff82c9 100644
--- a/src/lib/analytics/__tests__/as-needed-compliance-exclusion.test.ts
+++ b/src/lib/analytics/__tests__/as-needed-compliance-exclusion.test.ts
@@ -36,7 +36,7 @@ const CALL_SITES: Array<{ file: string; surface: string }> = [
     surface: "insight feature extraction (c7/c30/c90)",
   },
   {
-    file: "src/app/api/insights/targets/route.ts",
+    file: "src/lib/targets/build-response.ts",
     surface: "insight targets",
   },
   {
diff --git a/src/lib/targets/build-response.ts b/src/lib/targets/build-response.ts
new file mode 100644
index 000000000..7bae2df9d
--- /dev/null
+++ b/src/lib/targets/build-response.ts
@@ -0,0 +1,1552 @@
+/**
+ * `GET /api/insights/targets` response builder.
+ *
+ * Extracted from the route handler (v1.18.6) so the ~1.4k-line domain
+ * function lives under `src/lib/targets/` next to the other targets
+ * helpers and can be unit-tested without the route shell. The route is
+ * now auth → `cachedSwr(buildTargetsResponse)` → `apiSuccess`.
+ *
+ * Every per-day bucket key resolves against the user's display timezone
+ * (`userDayKey`) so streaks, "last met goal", and the consistency strip
+ * are read in the user's own calendar.
+ */
+import { prisma } from "@/lib/db";
+import { annotate } from "@/lib/logging/context";
+import {
+  classifyBMI,
+  classifyBP,
+  classifySleepDuration,
+  classifyBodyFat,
+  classifySteps,
+  getWeightRange,
+  getSleepDurationRange,
+  getStepsRange,
+  getBpTargetsByAge,
+} from "@/lib/analytics/classifications";
+import {
+  buildComplianceMedicationContext,
+  calculateCompliance,
+  lastNonSkippedTakenAt,
+  SCHEDULE_COMPLIANCE_SELECT,
+} from "@/lib/analytics/compliance";
+import { pairByTimestamp } from "@/lib/analytics/correlations";
+import {
+  reconstructSleepNights,
+  type SleepStageRow,
+} from "@/lib/analytics/sleep-night";
+import { isBpReadingInTarget } from "@/lib/analytics/bp-in-target";
+import { userDayKey, DEFAULT_TIMEZONE } from "@/lib/tz/resolver";
+import {
+  classifyPulseByTarget,
+  getPersonalizedPulseTarget,
+} from "@/lib/analytics/pulse-targets";
+import { resolveRestingPulseSeries } from "@/lib/analytics/resting-pulse";
+import pLimit from "p-limit";
+import type {
+  MeasurementType,
+  GlucoseContext,
+} from "@/generated/prisma/client";
+import {
+  getEffectiveRange,
+  type ThresholdOverridesJson,
+} from "@/lib/analytics/effective-range";
+import { getBodyFatTargetRange } from "@/lib/analytics/value-bands";
+import { thresholdMetricForContext, resolveGlucoseUnit } from "@/lib/glucose";
+import {
+  ensureUserMoodRollupsFresh,
+  readMoodDayRollups,
+} from "@/lib/rollups/mood-rollups";
+
+
+import type { User } from "@/generated/prisma/client";
+
+function getAge(dateOfBirth: Date): number {
+  const today = new Date();
+  let age = today.getFullYear() - dateOfBirth.getFullYear();
+  const monthDiff = today.getMonth() - dateOfBirth.getMonth();
+  if (
+    monthDiff < 0 ||
+    (monthDiff === 0 && today.getDate() < dateOfBirth.getDate())
+  ) {
+    age--;
+  }
+  return age;
+}
+
+interface TargetItem {
+  type: string;
+  label: string;
+  current: number | null;
+  average30: number | null;
+  trend: "up" | "down" | "stable" | null;
+  unit: string;
+  range: { min: number; max: number } | null;
+  classification: { category: string; color: string } | null;
+  source: string;
+  /**
+   * v1.4.25 W3e — consistency strip support. Berlin-tz day buckets over
+   * the last 7 days. `daysInRange7d` is the count of days whose mean
+   * reading landed inside the target's green band; `daysLogged7d` is
+   * how many of those days had at least one reading (so the strip can
+   * render filled / hollow / dimmed dots without ambiguity).
+   *
+   * `lastMetGoalAt` is the most recent Berlin-tz day whose mean reading
+   * was in the green band (ISO date YYYY-MM-DD), or null if the user
+   * has not hit goal in the last 30 days.
+   *
+   * `streakDays` is the count of consecutive Berlin days ending today
+   * where the day's mean was in the green band. Capped at 365.
+   *
+   * `insufficientData` is true when the target has fewer than 3
+   * readings over the last 30 days OR fewer than 1 day of data in the
+   * last 7 days. The page hides the strip + percentage when this is
+   * true.
+   */
+  daysInRange7d: number;
+  daysLogged7d: number;
+  daysInRange30d: number;
+  daysLogged30d: number;
+  lastMetGoalAt: string | null;
+  streakDays: number;
+  insufficientData: boolean;
+  /**
+   * v1.4.25 W3e — per-day classification of the last 7 Berlin-tz days
+   * for the consistency strip. Index 0 is six days ago, index 6 is
+   * today. `null` slots represent days with no readings; non-null
+   * slots represent days whose mean reading landed in the named band.
+   */
+  consistency7d: ReadonlyArray<"in" | "near" | "out" | null>;
+  details?: {
+    medications?: Array<{
+      name: string;
+      compliance7: number;
+      compliance30: number;
+    }>;
+  };
+}
+
+interface TargetPageSummary {
+  targetsMetThisWeek: number;
+  totalTargets: number;
+  streakHighlight: { metric: string; days: number } | null;
+}
+
+/**
+ * The authenticated-user shape the builder reads directly. The profile
+ * fields (height / dob / gender / glucose unit / thresholds) are re-read
+ * from the DB inside the builder, so the handler only threads id + tz.
+ */
+export type AuthedUser = Pick<User, "id" | "timezone">;
+
+/**
+ * `/api/insights/targets` body. Wrapped in `cachedSwr` by the route so the
+ * cold multi-query walk is paid once per 60 s window; writes hard-evict the
+ * bucket so user actions reflect on the next read.
+ */
+export async function buildTargetsResponse(user: AuthedUser) {
+  const userId = user.id;
+
+  // v1.4.25 W7b — every per-day bucket key in this route resolves
+  // against the user's display timezone so a Pacific/Auckland user gets
+  // their Auckland-day streaks, their Auckland-day "last met goal" date,
+  // and their Auckland-day consistency strip. Falls back to
+  // Europe/Berlin when the column is somehow missing (defensive — the
+  // schema's NOT NULL default normally pins it).
+  const userTz = user.timezone ?? DEFAULT_TIMEZONE;
+  const dayKey = (d: Date): string => userDayKey(d, userTz);
+
+  // Fetch latest measurements for each type
+  // v1.11.5 — SLEEP_DURATION is handled by a dedicated per-night
+  // reconstruction read below (the generic per-type average treats each
+  // stage row as an independent reading and would inflate the night total),
+  // so it is intentionally excluded from this generic set.
+  const types: MeasurementType[] = [
+    "WEIGHT",
+    "BLOOD_PRESSURE_SYS",
+    "BLOOD_PRESSURE_DIA",
+    "PULSE",
+    // v1.15.12 A2 — the "Resting pulse" tile scores RESTING_HEART_RATE
+    // (Apple's clean daily resting figure) against the resting band,
+    // falling back to a low-percentile PULSE proxy. Pull the resting rows
+    // alongside so the consistency strip uses resting data, not raw HR
+    // polluted by workout samples.
+    "RESTING_HEART_RATE",
+    "BODY_FAT",
+    "ACTIVITY_STEPS",
+  ];
+
+  const thirtyDaysAgo = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
+  const oneYearAgo = new Date(Date.now() - 365 * 24 * 60 * 60 * 1000);
+
+  // Mood-rollup warm-up fires before the parallel read below so a legacy
+  // account converges onto the rollup tier on a subsequent request; the
+  // read itself never blocks on the warm-up (fire-and-forget).
+  void ensureUserMoodRollupsFresh(userId);
+  // Five-year window mirrors `/api/mood/analytics` so existing rollup
+  // coverage is consulted; the trailing 30-day filter happens in JS
+  // because the consistency strip already walks per-day buckets.
+  const moodRollupWindowMs = 5 * 365 * 24 * 60 * 60 * 1000;
+  const moodSince = new Date(Date.now() - moodRollupWindowMs);
+
+  // v1.16.8 — ONE parallel round of every independent read. The cold
+  // build used to await eight queries strictly in sequence (profile →
+  // measurements → latest-per-type → sleep → medications → intakes →
+  // mood → glucose), stacking their round-trip latencies into the >1 s
+  // wall-clock the production trace showed. All of them are independent
+  // (the intake read depends only on the medication ids, so the pair
+  // chains inside its own slot); fan them out together and the cold
+  // build pays roughly the slowest query instead of the sum. The
+  // fan-out is bounded by the project's `p-limit(4)` discipline (parity
+  // with the derived batch route) so one cold build never claims eight
+  // connections from the shared Prisma pool at once.
+  const limit = pLimit(4);
+  const [
+    dbUser,
+    recentMeasurements,
+    latestEverByType,
+    sleepStageRows,
+    medicationBundle,
+    moodRollups,
+    latestMoodEntry,
+    glucoseRows,
+  ] = await Promise.all([
+    // User profile (height / age / gender / thresholds / source priority).
+    limit(() =>
+      prisma.user.findUnique({
+        where: { id: userId },
+        select: {
+          heightCm: true,
+          dateOfBirth: true,
+          gender: true,
+          glucoseUnit: true,
+          thresholdsJson: true,
+          // v1.11.5 — needed to collapse a dual-source sleep night to one
+          // canonical source before reconstructing per-night asleep totals.
+          sourcePriorityJson: true,
+        },
+      }),
+    ),
+    // All measurements in the last 30 days for the generic type set.
+    // Soft-delete filter mirrors the W-DELETED pattern: tombstoned rows
+    // must not contribute to tile averages / latest values once iOS sync
+    // starts emitting deletions.
+    limit(() =>
+      prisma.measurement.findMany({
+        where: {
+          userId,
+          type: { in: types },
+          measuredAt: { gte: thirtyDaysAgo },
+          deletedAt: null,
+        },
+        orderBy: { measuredAt: "desc" },
+        select: { type: true, value: true, measuredAt: true },
+      }),
+    ),
+    // Absolute latest measurement per type within a one-year floor.
+    //
+    // Prisma's `distinct` does not compile to Postgres `DISTINCT ON` — the
+    // driver dedups after pulling the rows, so an unbounded scan on a
+    // 347 k-row tenant pulls every measurement back to Node only to drop
+    // all but seven (audit Critical Finding #2, v1.4.40). The 365-day
+    // floor caps the planner-side walk to the existing
+    // `(user_id, type, measured_at)` index range; the trade-off is that a
+    // user who hasn't measured a metric in over a year sees the tile's
+    // `current` value as null instead of pulling a stale year-old reading
+    // forward — which is the correct behaviour for the consistency strip
+    // (the strip already gates on "fewer than 3 readings in 30 days" →
+    // insufficientData).
+    limit(() =>
+      prisma.measurement.findMany({
+        where: {
+          userId,
+          type: { in: types },
+          measuredAt: { gte: oneYearAgo },
+          deletedAt: null,
+        },
+        orderBy: { measuredAt: "desc" },
+        distinct: ["type"],
+        select: { type: true, value: true },
+      }),
+    ),
+    // Sleep stage rows for the per-night reconstruction (section 4).
+    limit(() =>
+      prisma.measurement.findMany({
+        where: {
+          userId,
+          type: "SLEEP_DURATION",
+          measuredAt: { gte: thirtyDaysAgo },
+          deletedAt: null,
+        },
+        orderBy: { measuredAt: "asc" },
+        // Writer-level collapse: two HealthKit apps behind one source (watch
+        // stages vs phone in-bed) must not blend into one night.
+        select: {
+          value: true,
+          measuredAt: true,
+          sleepStage: true,
+          source: true,
+          deviceType: true,
+        },
+      }),
+    ),
+    // Active medications + their 30-day intake events (section 8). The
+    // intake read depends on the medication ids, so the pair chains
+    // inside this slot while riding the outer fan-out.
+    limit(async () => {
+      const activeMedications = await prisma.medication.findMany({
+        // v1.16.11 — as-needed (PRN) medications never surface a
+        // compliance rate (no expected doses).
+        where: { userId, active: true, asNeeded: false },
+        // v1.15.20 — schedules through the shared compliance select so the
+        // configured per-dose windows reach this surface like every other.
+        include: {
+          schedules: { select: SCHEDULE_COMPLIANCE_SELECT },
+          // v1.16.3 — archived schedule eras for era-aware compliance.
+          scheduleRevisions: { orderBy: { validFrom: "asc" } },
+        },
+        orderBy: { name: "asc" },
+      });
+      if (activeMedications.length === 0) {
+        return { activeMedications, intakeEvents: [] };
+      }
+      const intakeEvents = await prisma.medicationIntakeEvent.findMany({
+        where: {
+          userId,
+          // v1.7.0 sync — exclude tombstoned rows.
+          deletedAt: null,
+          medicationId: {
+            in: activeMedications.map((medication) => medication.id),
+          },
+          scheduledFor: { gte: thirtyDaysAgo },
+        },
+        orderBy: { scheduledFor: "desc" },
+        select: {
+          medicationId: true,
+          takenAt: true,
+          skipped: true,
+          scheduledFor: true,
+        },
+      });
+      return { activeMedications, intakeEvents };
+    }),
+    // Mood day rollups (section 9).
+    limit(() => readMoodDayRollups(userId, moodSince)),
+    // Latest raw mood entry — bounded `take: 1` via the index.
+    limit(() =>
+      prisma.moodEntry.findFirst({
+        // v1.7.0 sync — exclude tombstoned rows.
+        where: { userId, deletedAt: null },
+        orderBy: { moodLoggedAt: "desc" },
+        select: { score: true, moodLoggedAt: true },
+      }),
+    ),
+    // Glucose rows (section 10). Same one-year floor as the
+    // latest-per-type read above — the previous unbounded scan pulled a
+    // heavy logger's full history back to Node on every cold build; a
+    // context whose newest reading is over a year old now reports no
+    // card, matching the per-type tile posture.
+    limit(() =>
+      prisma.measurement.findMany({
+        where: {
+          userId,
+          type: "BLOOD_GLUCOSE",
+          measuredAt: { gte: oneYearAgo },
+          deletedAt: null,
+        },
+        orderBy: { measuredAt: "desc" },
+        select: { value: true, measuredAt: true, glucoseContext: true },
+      }),
+    ),
+  ]);
+
+  const age = dbUser?.dateOfBirth ? getAge(new Date(dbUser.dateOfBirth)) : null;
+  const gender = (dbUser?.gender as "MALE" | "FEMALE" | null) ?? null;
+  const heightCm = dbUser?.heightCm ?? null;
+
+  const latestByType: Record<string, number | null> = {};
+  const avg30ByType: Record<string, number | null> = {};
+
+  for (const t of types) {
+    const latest = latestEverByType.find((row) => row.type === t);
+    latestByType[t] = latest?.value ?? null;
+
+    const recentOfType = recentMeasurements.filter((m) => m.type === t);
+    if (recentOfType.length > 0) {
+      const sum = recentOfType.reduce((acc, m) => acc + m.value, 0);
+      avg30ByType[t] = Math.round((sum / recentOfType.length) * 10) / 10;
+    } else {
+      avg30ByType[t] = null;
+    }
+  }
+
+  // Compute trend (compare first half of 30-day data to second half)
+  function computeTrend(
+    type: MeasurementType,
+  ): "up" | "down" | "stable" | null {
+    const data = recentMeasurements
+      .filter((m) => m.type === type)
+      .sort((a, b) => a.measuredAt.getTime() - b.measuredAt.getTime());
+    if (data.length < 4) return null;
+
+    const mid = Math.floor(data.length / 2);
+    const firstHalf = data.slice(0, mid);
+    const secondHalf = data.slice(mid);
+
+    const avgFirst =
+      firstHalf.reduce((s, m) => s + m.value, 0) / firstHalf.length;
+    const avgSecond =
+      secondHalf.reduce((s, m) => s + m.value, 0) / secondHalf.length;
+
+    const diff = avgSecond - avgFirst;
+    const threshold = avgFirst * 0.02; // 2% change threshold
+
+    if (diff > threshold) return "up";
+    if (diff < -threshold) return "down";
+    return "stable";
+  }
+
+  // --------------------------------------------------------------------
+  // v1.4.25 W3e — consistency helper. Buckets readings by Berlin-tz day
+  // and classifies each day's mean against the target's green band.
+  // Single helper shared by every target type so the rule stays stable
+  // (mean reading per day → in-range / near-range / out-of-range).
+  // --------------------------------------------------------------------
+  const last7DayKeys: string[] = [];
+  for (let i = 6; i >= 0; i--) {
+    const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+    last7DayKeys.push(dayKey(d));
+  }
+
+  type DayBand = "in" | "near" | "out";
+
+  interface ConsistencyOutput {
+    daysInRange7d: number;
+    daysLogged7d: number;
+    daysInRange30d: number;
+    daysLogged30d: number;
+    lastMetGoalAt: string | null;
+    streakDays: number;
+    insufficientData: boolean;
+    consistency7d: ReadonlyArray<DayBand | null>;
+  }
+
+  const EMPTY_CONSISTENCY: ConsistencyOutput = {
+    daysInRange7d: 0,
+    daysLogged7d: 0,
+    daysInRange30d: 0,
+    daysLogged30d: 0,
+    lastMetGoalAt: null,
+    streakDays: 0,
+    insufficientData: true,
+    consistency7d: [null, null, null, null, null, null, null] as const,
+  };
+
+  /**
+   * Bucket a series of `{ measuredAt, value }` events by Berlin-tz day,
+   * classify each day's mean against the target band, and roll up the
+   * 7-day strip + 30-day stats + recency + streak.
+   *
+   * `classify(meanValue)` returns the band the day's mean falls into.
+   * Pass `null` to mean "no band — skip this day for classification".
+   */
+  function rollupConsistency(
+    events: ReadonlyArray<{ measuredAt: Date; value: number }>,
+    classify: (mean: number) => DayBand | null,
+    totalReadingsThreshold = 3,
+  ): ConsistencyOutput {
+    if (events.length < totalReadingsThreshold) {
+      // Cold-start path. Still emit the per-day strip if we have any
+      // recent readings, but mark insufficient so the UI hides the %.
+      const partial = computeStrip(events, classify);
+      return {
+        ...EMPTY_CONSISTENCY,
+        consistency7d: partial.consistency7d,
+        daysLogged7d: partial.daysLogged7d,
+        daysInRange7d: partial.daysInRange7d,
+        insufficientData: true,
+      };
+    }
+
+    const byDay = new Map<string, { sum: number; count: number }>();
+    for (const ev of events) {
+      const day = dayKey(ev.measuredAt);
+      const bucket = byDay.get(day) ?? { sum: 0, count: 0 };
+      bucket.sum += ev.value;
+      bucket.count += 1;
+      byDay.set(day, bucket);
+    }
+
+    const stripPart = computeStrip(events, classify);
+
+    // 30-day stats: walk the last 30 Berlin-tz day keys.
+    let daysInRange30d = 0;
+    let daysLogged30d = 0;
+    for (let i = 29; i >= 0; i--) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      const bucket = byDay.get(key);
+      if (!bucket) continue;
+      daysLogged30d += 1;
+      const mean = bucket.sum / bucket.count;
+      if (classify(mean) === "in") daysInRange30d += 1;
+    }
+
+    // lastMetGoalAt: walk back from today until a day is in range.
+    let lastMetGoalAt: string | null = null;
+    for (let i = 0; i < 30; i++) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      const bucket = byDay.get(key);
+      if (!bucket) continue;
+      const mean = bucket.sum / bucket.count;
+      if (classify(mean) === "in") {
+        lastMetGoalAt = key;
+        break;
+      }
+    }
+
+    // streakDays: consecutive days ending today that are in-range. A
+    // day with no reading breaks the streak (the user did not meet the
+    // goal that day, even if today is in-range).
+    let streakDays = 0;
+    for (let i = 0; i < 365; i++) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      const bucket = byDay.get(key);
+      if (!bucket) break;
+      const mean = bucket.sum / bucket.count;
+      if (classify(mean) !== "in") break;
+      streakDays += 1;
+    }
+
+    // insufficientData: < 3 readings total OR < 1 day in the last 7.
+    const insufficientData =
+      events.length < totalReadingsThreshold || stripPart.daysLogged7d < 1;
+
+    return {
+      daysInRange7d: stripPart.daysInRange7d,
+      daysLogged7d: stripPart.daysLogged7d,
+      daysInRange30d,
+      daysLogged30d,
+      lastMetGoalAt,
+      streakDays,
+      insufficientData,
+      consistency7d: stripPart.consistency7d,
+    };
+  }
+
+  function computeStrip(
+    events: ReadonlyArray<{ measuredAt: Date; value: number }>,
+    classify: (mean: number) => DayBand | null,
+  ): {
+    consistency7d: ReadonlyArray<DayBand | null>;
+    daysInRange7d: number;
+    daysLogged7d: number;
+  } {
+    const byDay = new Map<string, { sum: number; count: number }>();
+    for (const ev of events) {
+      const day = dayKey(ev.measuredAt);
+      const bucket = byDay.get(day) ?? { sum: 0, count: 0 };
+      bucket.sum += ev.value;
+      bucket.count += 1;
+      byDay.set(day, bucket);
+    }
+    const strip: Array<DayBand | null> = [];
+    let daysInRange7d = 0;
+    let daysLogged7d = 0;
+    for (const key of last7DayKeys) {
+      const bucket = byDay.get(key);
+      if (!bucket) {
+        strip.push(null);
+        continue;
+      }
+      daysLogged7d += 1;
+      const mean = bucket.sum / bucket.count;
+      const band = classify(mean);
+      strip.push(band);
+      if (band === "in") daysInRange7d += 1;
+    }
+    return { consistency7d: strip, daysInRange7d, daysLogged7d };
+  }
+
+  /**
+   * Helper: classify a value against a target range with an orange band
+   * symmetrical to the green band (the same heuristic RangeBar uses
+   * client-side). When `min`/`max` is null we treat the input as
+   * unclassifiable and return null.
+   */
+  function makeRangeClassifier(
+    range: { min: number; max: number } | null,
+    options?: { orangeMin?: number; orangeMax?: number },
+  ): (mean: number) => DayBand | null {
+    if (!range) return () => null;
+    const span = range.max - range.min;
+    const orangeMin = options?.orangeMin ?? range.min - span * 0.3;
+    const orangeMax = options?.orangeMax ?? range.max + span * 0.3;
+    return (mean: number) => {
+      if (mean >= range.min && mean <= range.max) return "in";
+      if (mean >= orangeMin && mean <= orangeMax) return "near";
+      return "out";
+    };
+  }
+
+  /**
+   * Per-day BP-in-target classifier: a day is "in" if every BP pair on
+   * that day (sys+dia matched within 5 min) passes `isBpReadingInTarget`.
+   * "near" if at least one pair passes; "out" otherwise.
+   *
+   * Returns a function (day-key, dayEvents) → band. We pre-compute the
+   * by-day map once because the route already paginates BP twice (sys
+   * + dia) and we want to avoid quadratic work.
+   */
+  function buildBpPairsByDay(): Map<string, DayBand | null> {
+    if (!bpRange) return new Map();
+    const sysByDay = new Map<string, Array<{ date: Date; value: number }>>();
+    const diaByDay = new Map<string, Array<{ date: Date; value: number }>>();
+    for (const m of recentMeasurements) {
+      if (m.type === "BLOOD_PRESSURE_SYS") {
+        const k = dayKey(m.measuredAt);
+        const arr = sysByDay.get(k) ?? [];
+        arr.push({ date: m.measuredAt, value: m.value });
+        sysByDay.set(k, arr);
+      } else if (m.type === "BLOOD_PRESSURE_DIA") {
+        const k = dayKey(m.measuredAt);
+        const arr = diaByDay.get(k) ?? [];
+        arr.push({ date: m.measuredAt, value: m.value });
+        diaByDay.set(k, arr);
+      }
+    }
+    const out = new Map<string, DayBand | null>();
+    const allKeys = new Set([...sysByDay.keys(), ...diaByDay.keys()]);
+    for (const key of allKeys) {
+      const sys = sysByDay.get(key) ?? [];
+      const dia = diaByDay.get(key) ?? [];
+      const pairs = pairByTimestamp(sys, dia, 5 * 60 * 1000);
+      if (pairs.length === 0) {
+        out.set(key, null);
+        continue;
+      }
+      const inCount = pairs.filter((p) =>
+        isBpReadingInTarget(p.a, p.b, bpRange),
+      ).length;
+      if (inCount === pairs.length) out.set(key, "in");
+      else if (inCount > 0) out.set(key, "near");
+      else out.set(key, "out");
+    }
+    return out;
+  }
+
+  // We need bpRange before the per-target loop runs so the helpers above
+  // can use it; reorder the local so it's available.
+  const bpRange = age != null ? getBpTargetsByAge(age, gender) : null;
+
+  /**
+   * Roll up consistency for a target whose bands come from a pre-mapped
+   * `dayBandByKey` map (used for BP-in-target and medication compliance
+   * which have day-level classification rather than mean-classification).
+   */
+  function rollupFromDayMap(
+    dayBandByKey: Map<string, DayBand | null>,
+    totalDaysThreshold = 3,
+  ): ConsistencyOutput {
+    const loggedKeys = Array.from(dayBandByKey.entries()).filter(
+      ([, v]) => v !== null,
+    );
+    if (loggedKeys.length < totalDaysThreshold) {
+      // Cold-start: still emit the strip.
+      const strip: Array<DayBand | null> = last7DayKeys.map(
+        (k) => dayBandByKey.get(k) ?? null,
+      );
+      const daysLogged7d = strip.filter((b) => b !== null).length;
+      const daysInRange7d = strip.filter((b) => b === "in").length;
+      return {
+        ...EMPTY_CONSISTENCY,
+        consistency7d: strip,
+        daysLogged7d,
+        daysInRange7d,
+        insufficientData: true,
+      };
+    }
+
+    const strip: Array<DayBand | null> = last7DayKeys.map(
+      (k) => dayBandByKey.get(k) ?? null,
+    );
+    const daysLogged7d = strip.filter((b) => b !== null).length;
+    const daysInRange7d = strip.filter((b) => b === "in").length;
+
+    let daysInRange30d = 0;
+    let daysLogged30d = 0;
+    for (let i = 29; i >= 0; i--) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      const band = dayBandByKey.get(key);
+      if (!band) continue;
+      daysLogged30d += 1;
+      if (band === "in") daysInRange30d += 1;
+    }
+
+    let lastMetGoalAt: string | null = null;
+    for (let i = 0; i < 30; i++) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      if (dayBandByKey.get(key) === "in") {
+        lastMetGoalAt = key;
+        break;
+      }
+    }
+
+    let streakDays = 0;
+    for (let i = 0; i < 365; i++) {
+      const d = new Date(Date.now() - i * 24 * 60 * 60 * 1000);
+      const key = dayKey(d);
+      const band = dayBandByKey.get(key);
+      if (band === undefined || band === null) break;
+      if (band !== "in") break;
+      streakDays += 1;
+    }
+
+    return {
+      daysInRange7d,
+      daysLogged7d,
+      daysInRange30d,
+      daysLogged30d,
+      lastMetGoalAt,
+      streakDays,
+      insufficientData: loggedKeys.length < totalDaysThreshold,
+      consistency7d: strip,
+    };
+  }
+
+  // Memo: pre-compute the BP-pairs day map once.
+  const bpPairsByDay = buildBpPairsByDay();
+
+  // Build target items
+  const targets: TargetItem[] = [];
+
+  // 1. Weight
+  const weightRange = heightCm ? getWeightRange(heightCm) : null;
+  let weightClassification: { category: string; color: string } | null = null;
+  if (latestByType.WEIGHT != null && heightCm) {
+    const heightM = heightCm / 100;
+    const bmi = latestByType.WEIGHT / (heightM * heightM);
+    const cls = classifyBMI(bmi);
+    weightClassification = { category: cls.category, color: cls.color };
+  }
+  {
+    const consistency = rollupConsistency(
+      recentMeasurements.filter((m) => m.type === "WEIGHT"),
+      makeRangeClassifier(weightRange),
+    );
+    targets.push({
+      type: "WEIGHT",
+      label: "Weight",
+      current: latestByType.WEIGHT ?? null,
+      average30: avg30ByType.WEIGHT ?? null,
+      trend: computeTrend("WEIGHT"),
+      unit: "kg",
+      range: weightRange,
+      classification: weightClassification,
+      source: "WHO BMI",
+      ...consistency,
+    });
+  }
+
+  // 2. Blood Pressure (sys/dia combined)
+  // `bpRange` is hoisted to the helpers block above so the BP-pairs
+  // day-map can use it; do not redeclare here.
+  let bpClassification: { category: string; color: string } | null = null;
+  if (
+    latestByType.BLOOD_PRESSURE_SYS != null &&
+    latestByType.BLOOD_PRESSURE_DIA != null
+  ) {
+    const cls = classifyBP(
+      latestByType.BLOOD_PRESSURE_SYS,
+      latestByType.BLOOD_PRESSURE_DIA,
+    );
+    bpClassification = { category: cls.category, color: cls.color };
+  }
+  {
+    // Per-day BP classifier reuses the sys+dia paired classifier from
+    // `bpPairsByDay`. This is the right semantic for "in target band"
+    // because a systolic in range with a diastolic out of range is
+    // still an out-of-target reading.
+    const consistency = rollupFromDayMap(bpPairsByDay);
+    targets.push({
+      type: "BLOOD_PRESSURE",
+      label: "Blood pressure",
+      current: latestByType.BLOOD_PRESSURE_SYS ?? null,
+      average30: avg30ByType.BLOOD_PRESSURE_SYS ?? null,
+      trend: computeTrend("BLOOD_PRESSURE_SYS"),
+      unit: "mmHg",
+      range: bpRange ? { min: bpRange.sysLow, max: bpRange.sysHigh } : null,
+      classification: bpClassification,
+      source: "ESH 2023",
+      ...consistency,
+      // Extra fields for diastolic
+    } as TargetItem);
+  }
+
+  // 2b. Blood pressure target-hit rate over 30 days
+  if (bpRange) {
+    const sysPoints = recentMeasurements
+      .filter((measurement) => measurement.type === "BLOOD_PRESSURE_SYS")
+      .map((measurement) => ({
+        date: measurement.measuredAt,
+        value: measurement.value,
+      }));
+    const diaPoints = recentMeasurements
+      .filter((measurement) => measurement.type === "BLOOD_PRESSURE_DIA")
+      .map((measurement) => ({
+        date: measurement.measuredAt,
+        value: measurement.value,
+      }));
+
+    const bpPairs = pairByTimestamp(sysPoints, diaPoints, 5 * 60 * 1000);
+    // v1.4.16 A2 — one-sided ceiling semantics with hypotension
+    // floor. See lib/analytics/bp-in-target.ts.
+    const bpInTargetCount = bpPairs.filter((pair) =>
+      isBpReadingInTarget(pair.a, pair.b, bpRange),
+    ).length;
+    const bpInTargetRate =
+      bpPairs.length > 0
+        ? Math.round((bpInTargetCount / bpPairs.length) * 100 * 10) / 10
+        : null;
+
+    // BP-in-target consistency mirrors the BP pair-by-day map above:
+    // a day is "in" when every pair on that day clears the BP target.
+    const inTargetConsistency = rollupFromDayMap(bpPairsByDay);
+    targets.push({
+      type: "BLOOD_PRESSURE_IN_TARGET",
+      label: "Blood pressure on target",
+      current: bpInTargetRate,
+      average30: bpInTargetRate,
+      trend: null,
+      unit: "%",
+      range: { min: 70, max: 100 },
+      classification:
+        bpInTargetRate != null
+          ? bpInTargetRate >= 70
+            ? { category: "Good", color: "#50fa7b" }
+            : bpInTargetRate >= 40
+              ? { category: "Moderate", color: "#f1fa8c" }
+              : { category: "Low", color: "#ff5555" }
+          : null,
+      source: "ESH 2023",
+      ...inTargetConsistency,
+    });
+  }
+
+  // 3. Resting pulse
+  //
+  // v1.15.12 A2 — judge the RESTING band against a RESTING series, not
+  // the raw PULSE stream (which Apple Health fills with workout HR). We
+  // prefer RESTING_HEART_RATE; when the user has none we fall back to a
+  // low-percentile-of-daily-PULSE proxy. The resting series drives the
+  // tile's current / average / consistency / classification so a workout
+  // burst no longer reads "outside target".
+  const pulseTarget = getPersonalizedPulseTarget(age, gender);
+  {
+    const restingResolved = resolveRestingPulseSeries({
+      restingSamples: recentMeasurements
+        .filter((m) => m.type === "RESTING_HEART_RATE")
+        .map((m) => ({ measuredAt: m.measuredAt, value: m.value })),
+      pulseSamples: recentMeasurements
+        .filter((m) => m.type === "PULSE")
+        .map((m) => ({ measuredAt: m.measuredAt, value: m.value })),
+      dayKeyOf: dayKey,
+    });
+    const restingEvents = restingResolved.series;
+    // Current = most recent resting value; average30 = resting mean.
+    const restingCurrent =
+      restingEvents.length > 0
+        ? restingEvents[restingEvents.length - 1].value
+        : null;
+    const restingAvg30 =
+      restingEvents.length > 0
+        ? Math.round(
+            (restingEvents.reduce((s, e) => s + e.value, 0) /
+              restingEvents.length) *
+              10,
+          ) / 10
+        : null;
+
+    let pulseClassification: { category: string; color: string } | null = null;
+    if (restingCurrent != null) {
+      const cls = classifyPulseByTarget(restingCurrent, pulseTarget);
+      pulseClassification = { category: cls.category, color: cls.color };
+    }
+
+    const pulseRange = {
+      min: pulseTarget.greenMin,
+      max: pulseTarget.greenMax,
+    };
+    const consistency = rollupConsistency(
+      restingEvents,
+      makeRangeClassifier(pulseRange, {
+        orangeMin: pulseTarget.orangeMin,
+        orangeMax: pulseTarget.orangeMax,
+      }),
+    );
+    // Trend over the resting series (first-half vs second-half mean).
+    let restingTrend: "up" | "down" | "stable" | null = null;
+    if (restingEvents.length >= 4) {
+      const sorted = [...restingEvents].sort(
+        (a, b) => a.measuredAt.getTime() - b.measuredAt.getTime(),
+      );
+      const mid = Math.floor(sorted.length / 2);
+      const avgFirst =
+        sorted.slice(0, mid).reduce((s, e) => s + e.value, 0) / mid;
+      const avgSecond =
+        sorted.slice(mid).reduce((s, e) => s + e.value, 0) /
+        (sorted.length - mid);
+      const diff = avgSecond - avgFirst;
+      const threshold = avgFirst * 0.02;
+      restingTrend =
+        diff > threshold ? "up" : diff < -threshold ? "down" : "stable";
+    }
+
+    targets.push({
+      type: "PULSE",
+      label: "Resting pulse",
+      current: restingCurrent,
+      average30: restingAvg30,
+      trend: restingTrend,
+      unit: "bpm",
+      range: pulseRange,
+      classification: pulseClassification,
+      source:
+        restingResolved.which === "proxy"
+          ? `${pulseTarget.source} (estimated from heart rate)`
+          : pulseTarget.source,
+      ...consistency,
+    });
+  }
+
+  // 4. Sleep Duration
+  //
+  // v1.11.5 (deferred v1.11.4 QA L3) — SLEEP_DURATION is stored one row per
+  // STAGE per night in MINUTES. The generic per-type path treated every stage
+  // row as an independent reading, summing IN_BED + AWAKE + the bare ASLEEP
+  // aggregate + the granular CORE/DEEP/REM rows over 30 days and dividing by
+  // the row count — and then fed those MINUTES straight into a target range
+  // expressed in HOURS. The result was a bogus ~16 h/day average. Reconstruct
+  // per-night TIME-ASLEEP through the shared helper (which dedups dual-source
+  // nights, excludes IN_BED/AWAKE, and counts only the granular partition when
+  // present), convert to HOURS, then classify and roll up consistency on the
+  // per-night hour totals so this surface matches the dashboard / series /
+  // overview headline.
+  const sleepRange = getSleepDurationRange();
+  {
+    // `sleepStageRows` resolved in the parallel read at the top.
+    const nights = reconstructSleepNights(
+      sleepStageRows as SleepStageRow[],
+      userTz,
+      dbUser?.sourcePriorityJson ?? null,
+    )
+      .filter((n) => n.asleepMinutes > 0)
+      .sort((a, b) => a.measuredAt.getTime() - b.measuredAt.getTime());
+
+    const round1 = (n: number): number => Math.round(n * 100) / 100;
+    // One event per night carrying the night's asleep HOURS — the right unit
+    // for the 7–9 h target band and for the per-day consistency bucketing.
+    const sleepEvents = nights.map((n) => ({
+      measuredAt: n.measuredAt,
+      value: round1(n.asleepMinutes / 60),
+    }));
+
+    const latestNight = nights.length > 0 ? nights[nights.length - 1] : null;
+    const currentSleepHours = latestNight
+      ? round1(latestNight.asleepMinutes / 60)
+      : null;
+    const avgSleepHours =
+      sleepEvents.length > 0
+        ? round1(
+            sleepEvents.reduce((s, e) => s + e.value, 0) / sleepEvents.length,
+          )
+        : null;
+
+    let sleepClassification: { category: string; color: string } | null = null;
+    if (currentSleepHours != null) {
+      const cls = classifySleepDuration(currentSleepHours);
+      sleepClassification = { category: cls.category, color: cls.color };
+    }
+
+    // Trend over the per-night hour series (first vs second half), mirroring
+    // `computeTrend` but on reconstructed nights rather than raw stage rows.
+    let sleepTrend: "up" | "down" | "stable" | null = null;
+    if (sleepEvents.length >= 4) {
+      const mid = Math.floor(sleepEvents.length / 2);
+      const firstHalf = sleepEvents.slice(0, mid);
+      const secondHalf = sleepEvents.slice(mid);
+      const avgFirst =
+        firstHalf.reduce((s, e) => s + e.value, 0) / firstHalf.length;
+      const avgSecond =
+        secondHalf.reduce((s, e) => s + e.value, 0) / secondHalf.length;
+      const diff = avgSecond - avgFirst;
+      const threshold = avgFirst * 0.02;
+      if (diff > threshold) sleepTrend = "up";
+      else if (diff < -threshold) sleepTrend = "down";
+      else sleepTrend = "stable";
+    }
+
+    const consistency = rollupConsistency(
+      sleepEvents,
+      makeRangeClassifier(sleepRange),
+    );
+    targets.push({
+      type: "SLEEP_DURATION",
+      label: "Sleep duration",
+      current: currentSleepHours,
+      average30: avgSleepHours,
+      trend: sleepTrend,
+      unit: "h",
+      range: sleepRange,
+      classification: sleepClassification,
+      source: "AASM/SRS",
+      ...consistency,
+    });
+  }
+
+  // 5. BMI (derived from weight + height)
+  if (heightCm) {
+    const heightM = heightCm / 100;
+    const heightSq = heightM * heightM;
+    const latestWeight = latestByType.WEIGHT ?? null;
+    const currentBmi =
+      latestWeight != null
+        ? Math.round((latestWeight / heightSq) * 10) / 10
+        : null;
+
+    // Compute 30-day average BMI from average weight
+    const avgWeight = avg30ByType.WEIGHT ?? null;
+    const avgBmi =
+      avgWeight != null ? Math.round((avgWeight / heightSq) * 10) / 10 : null;
+
+    let bmiClassification: { category: string; color: string } | null = null;
+    if (currentBmi != null) {
+      const cls = classifyBMI(currentBmi);
+      bmiClassification = { category: cls.category, color: cls.color };
+    }
+
+    // BMI consistency derives from the weight series: divide each
+    // bucket by height\u00B2 so the day's mean BMI is classified against
+    // the BMI range bar (18.5 \u2014 24.9).
+    const bmiRange = { min: 18.5, max: 24.9 };
+    const bmiEvents = recentMeasurements
+      .filter((m) => m.type === "WEIGHT")
+      .map((m) => ({ measuredAt: m.measuredAt, value: m.value / heightSq }));
+    const consistency = rollupConsistency(
+      bmiEvents,
+      makeRangeClassifier(bmiRange),
+    );
+    targets.push({
+      type: "BMI",
+      label: "BMI",
+      current: currentBmi,
+      average30: avgBmi,
+      trend: computeTrend("WEIGHT"), // BMI trend follows weight trend
+      unit: "kg/m\u00B2",
+      range: bmiRange,
+      classification: bmiClassification,
+      source: "WHO",
+      ...consistency,
+    });
+  }
+
+  // 6. Body Fat
+  let bodyFatClassification: { category: string; color: string } | null = null;
+  if (latestByType.BODY_FAT != null && age != null) {
+    const cls = classifyBodyFat(latestByType.BODY_FAT, gender, age);
+    bodyFatClassification = { category: cls.category, color: cls.color };
+  }
+  // Single source of truth for the body-fat green band lives in
+  // `value-bands.ts`. v1.3.3 had three different hardcoded ranges across
+  // value-bands.ts / targets/route.ts / classifications.ts; the v1.4
+  // marathon consolidated them onto `getBodyFatTargetRange` (ACE
+  // fitness + acceptable bands).
+  const bodyFatRange = age != null ? getBodyFatTargetRange(gender) : null;
+  {
+    const consistency = rollupConsistency(
+      recentMeasurements.filter((m) => m.type === "BODY_FAT"),
+      makeRangeClassifier(bodyFatRange),
+    );
+    targets.push({
+      type: "BODY_FAT",
+      label: "Body fat",
+      current: latestByType.BODY_FAT ?? null,
+      average30: avg30ByType.BODY_FAT ?? null,
+      trend: computeTrend("BODY_FAT"),
+      unit: "%",
+      range: bodyFatRange,
+      classification: bodyFatClassification,
+      source: "ACE",
+      ...consistency,
+    });
+  }
+
+  // 7. Activity Steps
+  const stepsRange = getStepsRange();
+  let stepsClassification: { category: string; color: string } | null = null;
+  if (avg30ByType.ACTIVITY_STEPS != null) {
+    const cls = classifySteps(avg30ByType.ACTIVITY_STEPS);
+    stepsClassification = { category: cls.category, color: cls.color };
+  }
+  {
+    const consistency = rollupConsistency(
+      recentMeasurements.filter((m) => m.type === "ACTIVITY_STEPS"),
+      makeRangeClassifier(stepsRange),
+    );
+    targets.push({
+      type: "ACTIVITY_STEPS",
+      label: "Steps/day",
+      current: latestByType.ACTIVITY_STEPS ?? null,
+      average30: avg30ByType.ACTIVITY_STEPS ?? null,
+      trend: computeTrend("ACTIVITY_STEPS"),
+      unit: "steps",
+      range: stepsRange,
+      classification: stepsClassification,
+      // WHO publishes activity *time* (150–300 min/wk moderate),
+      // not a step quota. The closest peer-reviewed dose-response
+      // for the 8 000–15 000 band is Saint-Maurice JAMA 2020. The
+      // AI prompts at src/lib/ai/prompts/base-system.ts and
+      // src/lib/ai/prompts/general-status.ts already enforce this
+      // attribution; this surface label was the last "WHO" mislabel
+      // in the codebase.
+      source: "Saint-Maurice JAMA 2020",
+      ...consistency,
+    });
+  }
+
+  // 8. Medication Compliance (average across active medications) —
+  // `activeMedications` + their 30-day `intakeEvents` resolved in the
+  // parallel read at the top.
+  const { activeMedications, intakeEvents } = medicationBundle;
+
+  if (activeMedications.length > 0) {
+    const medicationStats = activeMedications.map((medication) => {
+      const medicationEvents = intakeEvents.filter(
+        (event) => event.medicationId === medication.id,
+      );
+      // v1.7.0 SB-SCHED-2 — engine-routed denominator (userTz resolved
+      // above at the route entry).
+      const medicationContext = buildComplianceMedicationContext(
+        medication,
+        lastNonSkippedTakenAt(medicationEvents),
+        userTz,
+      );
+      const compliance7 = calculateCompliance(
+        medicationEvents,
+        medication.schedules,
+        7,
+        medication.createdAt,
+        { medicationContext },
+      );
+      const compliance30 = calculateCompliance(
+        medicationEvents,
+        medication.schedules,
+        30,
+        medication.createdAt,
+        { medicationContext },
+      );
+
+      return {
+        name: medication.name,
+        compliance7: compliance7.rate,
+        compliance30: compliance30.rate,
+        totalExpected7: compliance7.totalExpected,
+        taken7: compliance7.taken,
+        totalExpected30: compliance30.totalExpected,
+        taken30: compliance30.taken,
+      };
+    });
+
+    const totalExpected7 = medicationStats.reduce(
+      (sum, medication) => sum + medication.totalExpected7,
+      0,
+    );
+    const totalTaken7 = medicationStats.reduce(
+      (sum, medication) => sum + medication.taken7,
+      0,
+    );
+    const totalExpected30 = medicationStats.reduce(
+      (sum, medication) => sum + medication.totalExpected30,
+      0,
+    );
+    const totalTaken30 = medicationStats.reduce(
+      (sum, medication) => sum + medication.taken30,
+      0,
+    );
+
+    const complianceRate7 =
+      totalExpected7 > 0
+        ? Math.round(
+            (Math.min(1, totalTaken7 / totalExpected7) * 100 + Number.EPSILON) *
+              10,
+          ) / 10
+        : null;
+    const complianceRate30 =
+      totalExpected30 > 0
+        ? Math.round(
+            (Math.min(1, totalTaken30 / totalExpected30) * 100 +
+              Number.EPSILON) *
+              10,
+          ) / 10
+        : complianceRate7;
+
+    // Per-day compliance: for each Berlin-tz day, classify as "in" if
+    // every scheduled dose that day was taken; "near" if at least one
+    // was taken; "out" if all were skipped/missed; null if there were
+    // no scheduled doses (the user's regimen excluded that day).
+    const dayCountsByKey = new Map<
+      string,
+      { taken: number; expected: number }
+    >();
+    for (const event of intakeEvents) {
+      const key = dayKey(event.scheduledFor);
+      const cur = dayCountsByKey.get(key) ?? { taken: 0, expected: 0 };
+      cur.expected += 1;
+      if (event.takenAt && !event.skipped) cur.taken += 1;
+      dayCountsByKey.set(key, cur);
+    }
+    const dayBandByKey = new Map<string, DayBand | null>();
+    for (const [key, counts] of dayCountsByKey.entries()) {
+      if (counts.expected === 0) {
+        dayBandByKey.set(key, null);
+        continue;
+      }
+      const ratio = counts.taken / counts.expected;
+      if (ratio >= 0.99) dayBandByKey.set(key, "in");
+      else if (ratio >= 0.5) dayBandByKey.set(key, "near");
+      else dayBandByKey.set(key, "out");
+    }
+    const consistency = rollupFromDayMap(dayBandByKey);
+    targets.push({
+      type: "MEDICATION_COMPLIANCE",
+      label: "Medication compliance",
+      current: complianceRate7,
+      average30: complianceRate30,
+      trend: null,
+      unit: "%",
+      range: { min: 90, max: 100 },
+      classification:
+        complianceRate7 != null
+          ? complianceRate7 >= 90
+            ? { category: "Very good", color: "#50fa7b" }
+            : complianceRate7 >= 70
+              ? { category: "Good", color: "#f1fa8c" }
+              : { category: "Low", color: "#ff5555" }
+          : null,
+      source: "7-day",
+      details: {
+        medications: medicationStats.map((medication) => ({
+          name: medication.name,
+          compliance7: medication.compliance7,
+          compliance30: medication.compliance30,
+        })),
+      },
+      ...consistency,
+    });
+  }
+
+  // 9. Mood targets (if mood data exists)
+  //
+  // v1.4.40 \u2014 swap the unbounded `prisma.moodEntry.findMany({ where: {
+  // userId } })` for the persistent mood-rollup DAY tier (audit Critical
+  // Finding #2). The tile reads:
+  //   - per-day mean over the trailing 30 days (avg30, trend, stability)
+  //   - the consistency strip (in/near/out band per day)
+  //   - the latest score for the "current" reading + classification
+  //
+  // Rollup row = `{bucketStart, mean, count, minScore, maxScore}` per
+  // calendar day. Per-day mean replaces the per-entry score series the
+  // legacy path passed to `rollupConsistency` \u2014 the helper buckets by
+  // day-key anyway, so feeding one row per day with the pre-computed
+  // mean is mathematically identical to feeding N raw entries that
+  // collapse to the same mean.
+  //
+  // The "latest score" needs a single raw entry (the newest one), so we
+  // pull it with `take: 1` \u2014 bounded by the index, never an unbounded
+  // scan. The "\u2265 3 entries threshold" gate uses the rollup count sum so
+  // the cold-start branch stays consistent with the legacy semantics
+  // (which counted raw entries, not raw days).
+  //
+  // Coverage-fallback: when the user has mood entries but zero rollup
+  // rows yet (legacy account before the boot-time backfill caught up)
+  // we run the legacy live walk once and fire the warm-up so the next
+  // request lands on the rollup tier. Same posture as
+  // `/api/mood/analytics`. The warm-up trigger + the `moodRollups` /
+  // `latestMoodEntry` reads moved into the parallel round at the top.
+  const thirtyDaysAgoMood = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
+
+  // Build a per-day event list for the consistency strip + 30-day stats.
+  // Use the rollup tier when populated; fall back to a bounded raw walk
+  // when the user has mood entries but zero rollup coverage yet.
+  let moodDailyEvents: Array<{ measuredAt: Date; value: number }>;
+  let moodEntryCount: number;
+  let moodSumScores: number;
+  let moodVarianceN: number;
+  let moodSumSquares: number;
+  if (moodRollups.length > 0) {
+    moodEntryCount = moodRollups.reduce((s, r) => s + r.count, 0);
+    moodDailyEvents = moodRollups
+      .filter((r) => r.bucketStart >= thirtyDaysAgoMood)
+      .map((r) => ({ measuredAt: r.bucketStart, value: r.mean }));
+    moodSumScores = moodDailyEvents.reduce((s, e) => s + e.value, 0);
+    moodVarianceN = moodDailyEvents.length;
+    moodSumSquares = moodDailyEvents.reduce((s, e) => s + e.value * e.value, 0);
+  } else if (latestMoodEntry !== null) {
+    // Coverage-fallback: rollups empty but raw entries exist. Pull the
+    // trailing 30-day window only (instead of every entry ever) \u2014 that's
+    // the bound the legacy code was missing.
+    const recentRawMood = await prisma.moodEntry.findMany({
+      // v1.7.0 sync — exclude tombstoned rows.
+      where: {
+        userId,
+        deletedAt: null,
+        moodLoggedAt: { gte: thirtyDaysAgoMood },
+      },
+      orderBy: { moodLoggedAt: "asc" },
+      select: { score: true, moodLoggedAt: true },
+    });
+    moodEntryCount = recentRawMood.length;
+    moodDailyEvents = recentRawMood.map((e) => ({
+      measuredAt: e.moodLoggedAt,
+      value: e.score,
+    }));
+    moodSumScores = recentRawMood.reduce((s, e) => s + e.score, 0);
+    moodVarianceN = recentRawMood.length;
+    moodSumSquares = recentRawMood.reduce((s, e) => s + e.score * e.score, 0);
+  } else {
+    moodEntryCount = 0;
+    moodDailyEvents = [];
+    moodSumScores = 0;
+    moodVarianceN = 0;
+    moodSumSquares = 0;
+  }
+
+  if (moodEntryCount >= 3) {
+    const latestMoodScore = latestMoodEntry?.score ?? null;
+
+    const moodAvg30 =
+      moodDailyEvents.length > 0
+        ? Math.round((moodSumScores / moodDailyEvents.length) * 10) / 10
+        : null;
+
+    // Mood trend: compare first half to second half of last 30 days.
+    // The rollup tier carries one DataPoint per day (the daily mean),
+    // matching the legacy comparison semantics on single-entry days.
+    let moodTrend: "up" | "down" | "stable" | null = null;
+    if (moodDailyEvents.length >= 4) {
+      const sorted = [...moodDailyEvents].sort(
+        (a, b) => a.measuredAt.getTime() - b.measuredAt.getTime(),
+      );
+      const mid = Math.floor(sorted.length / 2);
+      const firstHalf = sorted.slice(0, mid);
+      const secondHalf = sorted.slice(mid);
+      const avgFirst =
+        firstHalf.reduce((s, e) => s + e.value, 0) / firstHalf.length;
+      const avgSecond =
+        secondHalf.reduce((s, e) => s + e.value, 0) / secondHalf.length;
+      const diff = avgSecond - avgFirst;
+      if (diff > 0.2) moodTrend = "up";
+      else if (diff < -0.2) moodTrend = "down";
+      else moodTrend = "stable";
+    }
+
+    const moodClassification =
+      latestMoodScore != null
+        ? latestMoodScore >= 3.5
+          ? { category: "Good", color: "#50fa7b" }
+          : latestMoodScore >= 2
+            ? { category: "Moderate", color: "#f1fa8c" }
+            : { category: "Low", color: "#ff5555" }
+        : null;
+
+    const moodRange = { min: 3.5, max: 5 };
+    const moodConsistency = rollupConsistency(
+      moodDailyEvents,
+      makeRangeClassifier(moodRange, { orangeMin: 2, orangeMax: 5 }),
+    );
+    targets.push({
+      type: "MOOD_SCORE",
+      label: "Mood",
+      current: latestMoodScore,
+      average30: moodAvg30,
+      trend: moodTrend,
+      unit: "/ 5",
+      range: moodRange,
+      classification: moodClassification,
+      source: "moodLog",
+      ...moodConsistency,
+    });
+
+    // Mood stability: standard deviation of the recent series. The
+    // rollup tier surfaces one mean per day, which is the right
+    // resolution for "is the user's mood stable across days" \u2014 a power
+    // user logging multiple times per day with a wide intraday spread
+    // still gets a "stable" badge if the daily mean barely moves. The
+    // legacy path conflated intraday variance with day-to-day stability
+    // by passing per-entry scores; the rollup-tier semantic is closer
+    // to what the UI label suggests.
+    if (moodVarianceN >= 5) {
+      const seriesMean = moodSumScores / moodVarianceN;
+      const variance = moodSumSquares / moodVarianceN - seriesMean * seriesMean;
+      const stdDev = Math.round(Math.sqrt(Math.max(0, variance)) * 100) / 100;
+
+      const stabilityClassification =
+        stdDev <= 0.5
+          ? { category: "Very stable", color: "#50fa7b" }
+          : stdDev <= 1.0
+            ? { category: "Stable", color: "#f1fa8c" }
+            : { category: "Fluctuating", color: "#ff5555" };
+
+      // Mood stability is computed from the same recent-mood window;
+      // consistency mirrors MOOD_SCORE so the strip aligns with the
+      // user's logging cadence rather than introducing a synthetic
+      // "\u03C3 in range per day" rule that would be hard to reason about.
+      targets.push({
+        type: "MOOD_STABILITY",
+        label: "Mood stability",
+        current: stdDev,
+        average30: stdDev,
+        trend: null,
+        unit: "\u03C3",
+        range: { min: 0, max: 0.5 },
+        classification: stabilityClassification,
+        source: "moodLog",
+        ...moodConsistency,
+      });
+    }
+  }
+
+  // 10. Blood glucose — one card per logged context.
+  const glucoseContexts: GlucoseContext[] = [
+    "FASTING",
+    "POSTPRANDIAL",
+    "RANDOM",
+    "BEDTIME",
+  ];
+  const glucoseUnit = resolveGlucoseUnit(dbUser?.glucoseUnit ?? null);
+  const overrides = (dbUser?.thresholdsJson ??
+    null) as ThresholdOverridesJson | null;
+  const profileForRange = {
+    heightCm,
+    dateOfBirth: dbUser?.dateOfBirth ?? null,
+    gender: dbUser?.gender ?? null,
+  };
+  // `glucoseRows` resolved (one-year floor) in the parallel read at the top.
+  const thirtyDaysAgoGlucose = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
+
+  const labelKeyByContext: Record<GlucoseContext, string> = {
+    FASTING: "targets.glucoseFasting",
+    POSTPRANDIAL: "targets.glucosePostprandial",
+    RANDOM: "targets.glucoseRandom",
+    BEDTIME: "targets.glucoseBedtime",
+  };
+
+  for (const ctx of glucoseContexts) {
+    const ctxRows = glucoseRows.filter((r) => r.glucoseContext === ctx);
+    if (ctxRows.length === 0) continue;
+    const latest = ctxRows[0].value;
+    const recent = ctxRows.filter((r) => r.measuredAt >= thirtyDaysAgoGlucose);
+    const avg30 =
+      recent.length > 0
+        ? Math.round(
+            (recent.reduce((s, r) => s + r.value, 0) / recent.length) * 10,
+          ) / 10
+        : null;
+
+    const metric = thresholdMetricForContext(ctx);
+    const eff = getEffectiveRange(metric, profileForRange, overrides);
+    const range = eff.range
+      ? { min: eff.range.greenMin, max: eff.range.greenMax }
+      : null;
+
+    let classification: { category: string; color: string } | null = null;
+    if (range) {
+      if (latest >= range.min && latest <= range.max) {
+        classification = { category: "Optimal", color: "#50fa7b" };
+      } else if (
+        eff.range &&
+        latest >= eff.range.orangeMin &&
+        latest <= eff.range.orangeMax
+      ) {
+        classification = { category: "Elevated", color: "#f1fa8c" };
+      } else {
+        classification = { category: "High", color: "#ff5555" };
+      }
+    }
+
+    const consistency = rollupConsistency(
+      recent.map((r) => ({ measuredAt: r.measuredAt, value: r.value })),
+      makeRangeClassifier(
+        range,
+        eff.range
+          ? { orangeMin: eff.range.orangeMin, orangeMax: eff.range.orangeMax }
+          : undefined,
+      ),
+    );
+    targets.push({
+      type: `BLOOD_GLUCOSE_${ctx}`,
+      label: labelKeyByContext[ctx],
+      current: latest,
+      average30: avg30,
+      trend: null,
+      unit: glucoseUnit,
+      range,
+      classification,
+      source: eff.isOverride ? "Custom" : "ADA 2024 / DDG",
+      ...consistency,
+    });
+  }
+
+  // --------------------------------------------------------------------
+  // v1.4.25 W3e — page summary. "X of Y targets met this week" is the
+  // single most-asked-about glanceable answer. We define "met this
+  // week" as the target having `daysInRange7d >= 4` AND not flagged as
+  // `insufficientData`. The streak highlight surfaces the metric with
+  // the longest current ≥ 3 day streak; nothing renders client-side
+  // when no target hits the bar.
+  // --------------------------------------------------------------------
+  const targetsMetThisWeek = targets.filter(
+    (target) => !target.insufficientData && target.daysInRange7d >= 4,
+  ).length;
+  let streakHighlight: TargetPageSummary["streakHighlight"] = null;
+  for (const target of targets) {
+    if (target.streakDays < 3) continue;
+    if (!streakHighlight || target.streakDays > streakHighlight.days) {
+      streakHighlight = { metric: target.type, days: target.streakDays };
+    }
+  }
+  const pageSummary: TargetPageSummary = {
+    targetsMetThisWeek,
+    totalTargets: targets.length,
+    streakHighlight,
+  };
+
+  annotate({
+    action: { name: "insights.targets" },
+    meta: {
+      targetCount: targets.length,
+      targetsMetThisWeek,
+      streakHighlightMetric: streakHighlight?.metric ?? null,
+    },
+  });
+
+  return {
+    targets,
+    pageSummary,
+    // Extra diastolic data for BP display
+    bpDiastolic: {
+      current: latestByType.BLOOD_PRESSURE_DIA ?? null,
+      average30: avg30ByType.BLOOD_PRESSURE_DIA ?? null,
+      range: bpRange ? { min: bpRange.diaLow, max: bpRange.diaHigh } : null,
+    },
+    profile: {
+      heightCm,
+      age,
+      gender,
+      glucoseUnit,
+    },
+  };
+}

From d50e277a2b765de10cff4cc9a2999e002a4cfd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:47:05 +0200
Subject: [PATCH 21/71] chore(i18n): remove orphaned translation keys and add a
 reverse-coverage guard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Delete 177 translation keys that no call site reaches — across all six locales
— covering the medications, cycle, labs, notifications, nav, targets, and
admin namespaces that drifted out of use as their surfaces were rebuilt. The
forward call-site guard only catches keys referenced from code that never
shipped to the bundle; nothing watched the reverse, so orphans piled up.

Add a reverse-coverage test that walks messages/en.json and asserts every leaf
is reachable: a literal t() key, a subtree returned by t("ns"), a dynamic key
built inside a t(`…`) template or by string concatenation (the per-metric
${i18nPrefix}.* pages, cycle.calendar.flow${LEVEL}, medications.site${Suffix},
"notifications.event" + type), or an explicit allowlist for DB-driven keys
(mood.tag / mood.tagCategory). A new orphan now prints as a punch list.

Drop the unrendered admin.carrierUnknown and dashboard.bpInTargetShort from the
drift / trend-card guards — both lost their call sites and were removed here.
---
 messages/de.json                              | 187 +-------------
 messages/en.json                              | 187 +-------------
 messages/es.json                              | 187 +-------------
 messages/fr.json                              | 187 +-------------
 messages/it.json                              | 187 +-------------
 messages/pl.json                              | 187 +-------------
 src/__tests__/i18n-drift-guard.test.ts        |   2 +-
 src/__tests__/i18n-reverse-coverage.test.ts   | 232 ++++++++++++++++++
 .../trend-card-baseline-alignment.test.tsx    |   1 -
 9 files changed, 251 insertions(+), 1106 deletions(-)
 create mode 100644 src/__tests__/i18n-reverse-coverage.test.ts

diff --git a/messages/de.json b/messages/de.json
index 0d6890d30..36c227c57 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -18,7 +18,6 @@
     "optional": "Optional",
     "active": "Aktiv",
     "inactive": "Inaktiv",
-    "enabled": "Aktiviert",
     "disabled": "Deaktiviert",
     "networkError": "Netzwerkfehler",
     "unknownError": "Unbekannter Fehler",
@@ -74,7 +73,6 @@
     "colTaken": "Eingenommen",
     "colSkipped": "Übersprungen",
     "colMissed": "Verpasst",
-    "colTotal": "Gesamt",
     "colExpected": "Erwartet",
     "colComplianceRate": "Therapietreue",
     "moodTitle": "Stimmungsverlauf",
@@ -202,14 +200,12 @@
     "measurements": "Messungen",
     "medications": "Medikamente",
     "insights": "Insights",
-    "targets": "Zielwerte",
     "achievements": "Erfolge",
     "settings": "Einstellungen",
     "bugreport": "Bugreport",
     "admin": "Admin-Konsole",
     "logout": "Abmelden",
     "login": "Anmelden",
-    "about": "Über HealthLog",
     "notifications": "Benachrichtigungen",
     "theme": "Darstellung",
     "themeSystem": "System",
@@ -219,13 +215,11 @@
     "userMenu": "Benutzermenü",
     "accountSettings": "Kontoeinstellungen",
     "mood": "Stimmung",
-    "workouts": "Workouts",
     "coach": "Coach",
     "skipToContent": "Zum Inhalt springen",
     "sidebar": "Sidebar",
     "mainNavigation": "Hauptnavigation",
     "mobileNavigation": "Mobile Navigation",
-    "breadcrumb": "Brotkrumen-Navigation",
     "loadingScreen": "Laden…",
     "more": "Mehr",
     "moreSheetTitle": "Mehr",
@@ -242,7 +236,6 @@
     },
     "cycle": "Zyklus",
     "labs": "Laborwerte",
-    "recovery": "Erholung",
     "vorsorge": "Vorsorge",
     "illness": "Krankheit"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Schlaf",
     "stepsShort": "Schritte",
     "vo2MaxShort": "VO₂ max",
-    "bpInTargetShort": "BD-Ziel",
     "bpInTargetWindow90": "BD-Ziel · 90 T",
     "bpInTargetWindowDynamic": "BD-Ziel · {days} T",
     "bpInTargetCollecting": "sammelt noch Daten",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Letzter Wert vor {count} Wochen",
     "staleHintMonthsOne": "Letzter Wert vor 1 Monat",
     "staleHintMonthsOther": "Letzter Wert vor {count} Monaten",
-    "coachCta": "Frag den Coach",
     "recentWorkouts": {
       "title": "Letzte Workouts",
       "viewAll": "Alle anzeigen",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Bitte einen gültigen Zeitpunkt wählen.",
     "loginRequired": "Bitte anmelden, um Messwerte zu sehen.",
     "allTypes": "Alle Typen",
-    "filterByType": "Nach Typ filtern",
     "measurementCount": "{count} Messwerte",
     "emptyTitle": "Noch keine Messwerte",
     "emptyDescription": "Erfasse Gewicht, Blutdruck, Puls oder andere Werte, um Trends zu erkennen.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Kardio-Belastung",
     "typeSleepScore": "Schlafscore",
     "typeBodyTemperatureDeviation": "Körpertemperaturabweichung",
-    "filterBySource": "Nach Quelle filtern",
     "sourceComputed": "Berechnet",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "Traurigkeit",
       "praise": "Lob"
     },
-    "filterBySource": "Nach Quelle filtern",
     "sourceManual": "Manuell",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Medikation, Zeitpläne & Einnahmen",
     "loginRequired": "Bitte anmelden, um Medikamente zu verwalten.",
     "addMedication": "Hinzufügen",
-    "editMedication": "Medikament bearbeiten",
-    "newMedication": "Neues Medikament",
     "firstMedication": "Erstes Medikament anlegen",
     "addChoice": {
       "logIntake": "Einnahme erfassen",
@@ -778,16 +764,9 @@
     "loadFailed": "Medikamente konnten nicht geladen werden",
     "retryLoad": "Erneut laden",
     "name": "Name",
-    "dose": "Dosis",
-    "scheduleFrom": "Von",
-    "scheduleTo": "Bis",
-    "scheduleLabel": "Bezeichnung",
-    "scheduleDays": "Tage",
-    "scheduleDaily": "Täglich",
     "inactive": "Pausiert",
     "intakeHistory": "Einnahme-Verlauf",
     "openDetailPage": "Medikament-Detailseite öffnen",
-    "deleteConfirm": "Medikament löschen?",
     "compliance": "Therapietreue",
     "importIntakes": "Einnahmen importieren",
     "importDescription": "JSON-Array mit Einnahme-Daten einfügen. Erwartetes Format:",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} ungültige Einträge übersprungen",
     "importFailed": "Import fehlgeschlagen",
     "importInvalidFormat": "Ungültiges JSON-Format",
-    "apiEndpointTitle": "API-Endpoint: {name}",
-    "apiEndpointDescription": "Nutze diesen Endpoint, um Einnahmen per API zu erfassen (z.B. via iPhone-Kurzbefehl oder cron-Job).",
-    "apiEndpointActive": "API-Endpoint aktiv",
-    "apiEndpointActivated": "API-Endpoint aktiviert",
-    "apiEndpointDeactivated": "API-Endpoint deaktiviert",
-    "apiTokenCount": "Aktiv ({count} Token)",
-    "apiToken": "API-Token",
-    "apiTokenActiveHint": "Endpoint ist aktiv. Vorhandene Tokens bleiben gültig, können aber nicht erneut im Klartext angezeigt werden.",
-    "apiTokenActivateHint": "Aktiviere den Endpoint, um einen neuen Token zu erstellen.",
-    "apiTokenOnceHint": "Der Token wird nur bei der Erstellung einmal im Klartext angezeigt.",
     "requestExample": "Request-Beispiel",
-    "statusLoadFailed": "Status konnte nicht geladen werden",
-    "changeFailed": "Ändern fehlgeschlagen",
     "categoryBloodPressure": "Blutdrucksenker",
     "categoryVitamin": "Vitamine",
     "categoryThyroid": "Schilddrüse",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Letzte Dosis vor {count} Tagen",
     "overdue": "Überfällig",
     "veryOverdue": "Stark überfällig",
-    "compliance7d": "Therapietreue (7 Tage)",
-    "compliance30d": "Therapietreue (30 Tage)",
     "complianceWindow": "Therapietreue ({days} Tage)",
     "complianceUnavailable": "Therapietreue konnte nicht geladen werden",
     "complianceInfo": "Anteil der erfassten an den erwarteten Dosen. Wöchentliche Pläne zählen wochenweise.",
     "complianceInfoLabel": "Was bedeutet Therapietreue?",
-    "complianceDoses": "{count} Dosen",
     "lastIntake": "Letzte Einnahme:",
     "nextIntake": "Nächste Einnahme:",
     "nextIntakeOverdue": "Überfällig · {time} — noch nachholbar",
     "dayStreak": "Tage Serie",
     "dayStreakOne": "Tag Serie",
-    "cycleNextDoseToday": "Nächste Dosis heute",
-    "cycleNextDoseTomorrow": "Nächste Dosis morgen",
-    "cycleNextDoseInDays": "Nächste Dosis in {days} Tagen",
     "cycleDueToday": "Heute fällig",
     "cycleOverdue": "Überfällig",
     "cycleNoClosedCycles": "Noch keine abgeschlossenen Dosiszyklen",
@@ -873,40 +834,10 @@
     "intakeUndo": "Rückgängig",
     "intakeUndone": "Eintrag zurückgenommen",
     "intakeUndoFailed": "Rückgängig fehlgeschlagen – im Verlauf korrigieren",
-    "weekdaySunday": "Sonntag",
-    "weekdayMonday": "Montag",
-    "weekdayTuesday": "Dienstag",
-    "weekdayWednesday": "Mittwoch",
-    "weekdayThursday": "Donnerstag",
-    "weekdayFriday": "Freitag",
-    "weekdaySaturday": "Samstag",
-    "weekdaySundayPlural": "Sonntags",
-    "weekdayMondayPlural": "Montags",
-    "weekdayTuesdayPlural": "Dienstags",
-    "weekdayWednesdayPlural": "Mittwochs",
-    "weekdayThursdayPlural": "Donnerstags",
-    "weekdayFridayPlural": "Freitags",
-    "weekdaySaturdayPlural": "Samstags",
-    "formType": "Typ",
-    "formDose": "Dosis",
-    "formUnit": "Einheit",
-    "formSchedule": "Zeitfenster",
-    "formTreatmentClass": "Behandlungsklasse",
-    "formTreatmentClassHelp": "Wähle „GLP-1-Injektion“ für wöchentliche Spritzen wie Mounjaro, Ozempic, Wegovy, Zepbound. Schaltet die Körperkarte und das GLP-1-Logbuch frei.",
-    "treatmentClassGeneric": "Standard-Medikament",
-    "treatmentClassGlp1": "GLP-1-Injektion",
-    "glp1WeeklyPresetTitle": "Einmal wöchentlich am …",
-    "glp1WeeklyPresetHelp": "Die meisten GLP-1-Rezeptoragonisten werden einmal pro Woche injiziert. Tippe einen Tag, um den Rhythmus zu setzen.",
-    "glp1WeeklyPresetSuggest": "Letzten gewählten Wochentag übernehmen",
-    "glp1DosesPerUnit": "Dosen pro Pen / Ampulle",
-    "glp1DosesPerUnitPlaceholder": "z. B. 4 für einen Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Optional — Mounjaro KwikPen = 4, Ozempic 0,25/0,5 mg = 4, Wegovy Einmal-Pen = 1. Leer lassen, wenn keine Dosis-pro-Pen-Verfolgung gewünscht ist.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (in {days} Tagen)",
     "glp1NextInjectionToday": "heute",
     "glp1NextInjectionTomorrow": "morgen",
-    "glp1RotationLast": "Letzte Stelle: {site}",
     "glp1RotationSuggested": "Empfohlen: {site}",
     "glp1LogSideEffect": "Nebenwirkung loggen",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Weiteren Zeitplan hinzufügen",
           "edit": "Bearbeiten",
           "remove": "Entfernen",
-          "removeDisabled": "Mindestens ein Zeitplan ist erforderlich.",
-          "empty": "Noch kein Zeitplan."
+          "removeDisabled": "Mindestens ein Zeitplan ist erforderlich."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "Appetitlosigkeit",
     "sideEffectTagHeartburn": "Sodbrennen",
     "sideEffectTagHeadache": "Kopfschmerzen",
-    "newSchedule": "Neues Zeitfenster",
-    "removeSchedule": "Zeitfenster entfernen",
-    "advancedEditing": "Erweiterte Bearbeitung",
-    "advancedEditingHide": "Erweiterte Bearbeitung ausblenden",
-    "scheduleInterval": "Intervall",
-    "scheduleEveryWeek": "jede Woche",
-    "scheduleEveryNWeeks": "alle {n} Wochen",
-    "scheduleIntervalPrefix": "Intervall:",
-    "nextSchedulePrefix": "Nächstes Zeitfenster:",
-    "nextScheduleDaily": "täglich",
-    "importIntakesAction": "Einnahmen importieren",
-    "apiEndpointAction": "API-Endpunkt",
-    "pause": "Pausieren",
-    "activate": "Aktivieren",
-    "disableNotifications": "Benachrichtigungen deaktivieren",
-    "enableNotifications": "Benachrichtigungen aktivieren",
-    "purgeRecords": "Alle Aufzeichnungen löschen",
-    "formReset": "Formular zurücksetzen",
-    "createMedication": "Medikament anlegen",
-    "deleteConfirmDescription": "Das Medikament und die gesamte Einnahme-Historie werden unwiderruflich gelöscht.",
-    "purgeConfirmTitle": "Alle Aufzeichnungen löschen?",
-    "purgeConfirmDescription": "Alle Einnahme-Aufzeichnungen für dieses Medikament werden unwiderruflich gelöscht. Das Medikament selbst bleibt bestehen und startet ohne Verlaufsdaten.",
-    "saveError": "Fehler beim Speichern",
-    "deleteError": "Fehler beim Löschen",
-    "purgeError": "Fehler beim Löschen der Aufzeichnungen",
-    "invalidTimestamp": "Bitte einen gültigen Zeitpunkt wählen.",
-    "noIntakesYet": "Noch keine Einnahmen vorhanden",
-    "actions": "Aktionen",
-    "pageInfo": "Seite {page} von {total}",
-    "previousPage": "Vorherige Seite",
-    "nextPage": "Nächste Seite",
-    "loginRequiredIntakes": "Bitte anmelden, um Einnahmen zu sehen.",
     "phaseConfig": "Erinnerungsphasen",
     "phaseConfigDescription": "Konfiguriere die Zeitpunkte für Erinnerungen.",
     "phaseGreen": "Grün",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Rot",
     "phaseMinutes": "Min",
     "phasePercent": "%",
-    "phaseBeforeEnd": "vor Ende",
-    "phaseAfterEnd": "nach Ende",
     "phaseResetDefaults": "Auf Defaults zurücksetzen",
     "phaseSaved": "Erinnerungsphasen gespeichert",
-    "phaseReset": "Auf Defaults zurückgesetzt",
     "sourceWeb": "Web",
     "sourceApi": "iOS-App",
     "sourceReminder": "Erinnerung",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Seite {page} von {total} · {count} Einträge",
     "intakeHistoryPrev": "Zurück",
     "intakeHistoryNext": "Weiter",
-    "unitDrops": "Tropfen",
-    "unitTablets": "Tablette(n)",
-    "unitCapsules": "Kapsel(n)",
-    "unitPieces": "Stück",
-    "namePlaceholder": "z.B. Ibuprofen",
-    "dosePlaceholder": "z.B. 400",
-    "labelPlaceholder": "z.B. Morgens",
-    "defaultDose": "Standard",
-    "dayDeactivate": "{day} deaktivieren",
-    "dayActivate": "{day} aktivieren",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "Einnahmeverlauf ansehen"
       },
       "history": {
-        "back": "Zurück zum Medikament",
-        "subtitle": "Vollständiger Einnahmeverlauf",
         "plannedSuffix": "geplant"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Default",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Überschrieben",
     "overrideToggleLabel": "Eigene Werte",
     "resetAction": "Auf Default zurücksetzen",
     "resetAllAction": "Alle auf Default zurücksetzen",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Modulverfügbarkeit",
       "description": "Schalte ein Modul für den gesamten Server ab. Ein hier deaktiviertes Modul ist für jedes Konto aus – unabhängig von den persönlichen Einstellungen. Kerndaten (Gewicht, Blutdruck, Puls, Medikamente) sind immer aktiv und lassen sich nicht abschalten.",
-      "disabledHint": "Serverweit deaktiviert",
       "saveError": "Modulverfügbarkeit konnte nicht aktualisiert werden."
     },
     "bugReportRepo": "Repository",
@@ -5343,12 +5223,10 @@
         "subtitle": "Destruktive systemweite Operationen."
       },
       "about": {
-        "title": "Über",
-        "subtitle": "Version, Lizenz, Quellcode und Update-Prüfung."
+        "title": "Über"
       }
     },
     "carrier": "Anbieter",
-    "carrierUnknown": "Unbekannter Anbieter",
     "carrierUnavailableGeoFallback": "{location} — Anbieter nicht verfügbar"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Benachrichtigungen",
     "breadcrumbInbox": "Benachrichtigungen",
     "breadcrumbChannels": "Benachrichtigungs-Kanäle",
-    "breadcrumbSettings": "Einstellungen",
     "eventColumn": "Ereignis",
     "subtitle": "Wähle aus, welche Benachrichtigungen du über welchen Kanal erhalten möchtest.",
     "loadError": "Benachrichtigungseinstellungen konnten nicht geladen werden.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "nahe am Bereich",
       "dotOutOfRange": "außerhalb",
       "dotNotLogged": "nicht erfasst",
-      "insufficientData": "Noch zu wenige Daten — bitte weiter erfassen.",
       "relativeDay": {
         "today": "heute",
         "yesterday": "gestern",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Zielbereich für {metric} bearbeiten",
       "title": "Zielbereich bearbeiten — {metric}",
       "description": "Passt den Zielbereich an, der in Charts, Insights und im Arztbericht verwendet wird. Werte in {unit}.",
       "derivedHint": "Diese Karte wird aus anderen Metriken abgeleitet. Bearbeite stattdessen die zugrundeliegenden Ziele (z. B. Blutdruck oder Gewicht).",
@@ -5825,13 +5700,6 @@
       "saveError": "Zielbereich konnte nicht gespeichert werden",
       "resetSuccess": "Zielbereich auf Standard zurückgesetzt"
     },
-    "mood": {
-      "stability": {
-        "stable": "stabil",
-        "variable": "schwankend",
-        "highlyVariable": "sehr schwankend"
-      }
-    },
     "currentValue": "Aktuell: {value} {unit}",
     "targetRangeValue": "Zielbereich: {min}–{max} {unit}",
     "sourceLabel": "Quelle: {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Vorrat niedrig: {medName}",
-    "body": "Dein Vorrat an {medName} reicht noch etwa {days} Tage ({units} Einheiten übrig).",
     "bodyToday": "Dein Vorrat an {medName} reicht keinen ganzen Tag mehr ({units} Einheiten übrig).",
     "bodyReorder": "Dein Vorrat an {medName} ({units} Einheiten) ist um den {runsOutOn} aufgebraucht — bestelle bis zum {reorderBy} nach.",
     "bodyLastDose": "Dein Vorrat an {medName} ({units} Einheiten) reicht noch etwa für die letzte Dosis. Aufgebraucht um den {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "Wie sich jeder Messwert zwischen deiner Luteal- und Follikelphase vergleicht – auf deinen eigenen Daten.",
         "pairLabel": "{metric} · Luteal vs. Follikel",
         "detail": "Luteal {lutealAvg} {unit} ({lutealDays} Tage) vs. Follikel {follicularAvg} {unit} ({follicularDays} Tage).",
-        "footer": "Das sind Zusammenhänge in deinen eigenen Daten, keine Ursachen. Nur Muster, die einen Signifikanztest bestehen, werden gezeigt.",
         "metricRestingHeartRate": "Ruhepuls",
         "metricHrv": "Herzfrequenzvariabilität",
         "metricSleepDuration": "Schlafdauer",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "Hohe Sicherheit"
       },
       "title": "Zyklus-Erkenntnisse",
-      "empty": "Phasen-Erkenntnisse erscheinen hier, sobald du genug Zyklen erfasst hast. Sie vergleichen deine Werte über die Zyklusphasen hinweg, mit offen gezeigter Statistik.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Effektstärke {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Symptommuster nach Phase",
       "symptomPatternsEmpty": "Erfasse Symptome über einen Zyklus, um zu sehen, in welcher Phase sie sich häufen.",
       "symptomMostlyIn": "Meist in {phase} ({count}/{total} Tage)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "Das Progesteron führt durch die zweite Zyklushälfte, und die Basaltemperatur liegt meist etwas höher als zuvor im Zyklus. Manche bemerken im Lauf der Tage Veränderungen bei Schlaf, Appetit, Stimmung oder Energie, während andere durchgehend ausgeglichen bleiben. Das Muster ist persönlich und sieht von Monat zu Monat oft anders aus."
       },
       "commonHere": "Das bemerkst du hier oft",
-      "trackNudge": "Heute eintragen",
       "stillLearning": "Lerne deinen Zyklus noch kennen. Trage weiter ein, dann füllt sich das mit Mustern aus deinen eigenen Tagen."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Vorheriger Monat",
       "nextMonth": "Nächster Monat",
       "loading": "Kalender wird geladen…",
-      "empty": "Erfasse Daten, damit sich dein Kalender füllt.",
       "learning": "Wir lernen deinen Zyklus – erfasse mindestens drei volle Zyklen, dann füllen sich fruchtbares Fenster, Eisprung und Phasen. Bis dahin zeigt der Kalender nur, was du erfasst hast.",
-      "today": "Heute",
-      "dayAria": "{date}",
       "legendSymptom": "Symptome",
       "legendOvulationConfirmed": "Bestätigter Eisprung",
       "flowSpotting": "Schmierblutung",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "Was als Nächstes kommt",
       "nextPeriod": "Nächste Periode",
-      "nextPeriodRange": "Etwa am {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Fruchtbares Fenster",
       "ovulation": "Geschätzter Eisprung",
-      "confidence": "Sicherheit",
       "confidenceHigh": "Hoch",
       "confidenceMedium": "Mittel",
       "confidenceLow": "Niedrig",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Tag erfassen",
       "description": "Erfasse Stärke, Symptome und Notizen von heute.",
-      "date": "Datum",
       "flow": "Stärke",
       "symptoms": "Symptome",
       "temperature": "Basaltemperatur",
@@ -6259,10 +6114,7 @@
       "save": "Speichern",
       "saving": "Speichern…",
       "cancel": "Abbrechen",
-      "saved": "Tag gespeichert",
       "saveError": "Konnte nicht gespeichert werden. Versuch es erneut.",
-      "periodStarted": "Periodenbeginn erfasst",
-      "clear": "Keine",
       "intermenstrualBleeding": "Schmierblutung zwischen Perioden",
       "pregnancyTest": "Schwangerschaftstest",
       "progesteroneTest": "Progesterontest",
@@ -6278,8 +6130,6 @@
     },
     "settings": {
       "title": "Zyklus-Einstellungen",
-      "enable": "Zyklus-Tracking",
-      "enableDescription": "Schalte den Zyklus-Tab für dein Konto ein oder aus.",
       "typicalCycleLength": "Typische Zykluslänge (Tage)",
       "typicalPeriodLength": "Typische Periodenlänge (Tage)",
       "lutealPhaseLength": "Länge der Lutealphase (Tage)",
@@ -6298,30 +6148,14 @@
       "encryptionDescription": "Verschlüssele absichtsverratende Felder (Schwangerschaftstests, Verhütung, Geschlechtsverkehr) ruhend, zusätzlich zu den stets verschlüsselten Notizen.",
       "discreet": "Diskrete Benachrichtigungen",
       "discreetDescription": "Verbirg Zyklusdetails im Benachrichtigungstext auf deinem Sperrbildschirm.",
-      "dataTitle": "Deine Daten",
-      "dataDescription": "Deine Zyklusdaten liegen nur auf diesem Server. Exportiere sie jederzeit oder lösche sie endgültig.",
-      "export": "Meine Zyklusdaten exportieren",
-      "deleteData": "Meine Zyklusdaten löschen",
       "saved": "Einstellungen gespeichert",
       "saveError": "Konnte nicht gespeichert werden. Versuch es erneut.",
       "save": "Speichern",
-      "purgeTitle": "Alle Zyklusdaten löschen",
-      "purgeDescription": "Entfernt dauerhaft jeden erfassten Tag, Zyklus, jede Vorhersage und jeden Erinnerungseintrag. Kann nicht rückgängig gemacht werden.",
-      "purgeButton": "Alle Zyklusdaten löschen",
-      "purgeConfirmTitle": "Alle Zyklusdaten löschen?",
-      "purgeConfirmBody": "Dies löscht dauerhaft jede Periode, jeden Tageseintrag, jedes Symptom und jede Vorhersage. Dies kann nicht rückgängig gemacht werden.",
-      "purgeConfirm": "Alle Zyklusdaten dauerhaft löschen?",
-      "purgeCancel": "Abbrechen",
-      "purgeSuccess": "Alle Zyklusdaten gelöscht.",
-      "purgeError": "Zyklusdaten konnten nicht gelöscht werden.",
       "reminders": "Erinnerungen",
       "remindersDescription": "Perioden-Erinnerungen pro Kanal in den Benachrichtigungseinstellungen aktivieren.",
       "remindersLink": "Benachrichtigungseinstellungen",
       "fertileReminder": "Erinnerung an das fruchtbare Fenster",
-      "fertileReminderDescription": "Erhalte einige Tage vor deinem geschätzten fruchtbaren Fenster einen Hinweis. Standardmäßig aus – aktiviere sie pro Kanal in den Benachrichtigungseinstellungen.",
-      "purgeData": "Zyklusdaten löschen",
-      "purgeConfirmAction": "Ja, alles löschen",
-      "purgeDone": "Zyklusdaten gelöscht."
+      "fertileReminderDescription": "Erhalte einige Tage vor deinem geschätzten fruchtbaren Fenster einen Hinweis. Standardmäßig aus – aktiviere sie pro Kanal in den Benachrichtigungseinstellungen."
     },
     "testResult": {
       "POSITIVE": "Positiv",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Erfasse Blutwerte wie HbA1c, LDL oder Ferritin, um sie über die Zeit zu verfolgen und mit deiner Ärztin oder deinem Arzt zu teilen.",
     "referenceLabel": "Referenz",
     "readingsCount": "{count} Messungen",
-    "deleteLatest": "Letzten Wert löschen",
     "deleteConfirmTitle": "Laborwert löschen?",
     "deleteConfirmDescription": "Dieser Laborwert wird dauerhaft gelöscht.",
     "deletedToast": "Wert gelöscht",
@@ -6514,24 +6347,11 @@
       "above": "Über Bereich"
     },
     "form": {
-      "analyte": "Biomarker",
-      "analytePlaceholder": "z. B. HbA1c, LDL, Ferritin",
       "value": "Wert",
-      "unit": "Einheit",
-      "unitPlaceholder": "z. B. mg/dl, %, ng/ml",
       "takenAt": "Probendatum",
-      "optionalGroup": "Optional",
-      "panel": "Panel",
-      "panelPlaceholder": "z. B. Großes Blutbild",
-      "referenceLow": "Referenz unten",
-      "referenceHigh": "Referenz oben",
-      "referenceLowPlaceholder": "Untere Grenze",
-      "referenceHighPlaceholder": "Obere Grenze",
-      "referenceHint": "Übernimm den Referenzbereich aus deinem Laborbefund. Beide Grenzen sind optional.",
       "note": "Notiz",
       "notePlaceholder": "Optionaler Kontext zu diesem Wert",
       "requiredError": "Bitte einen Wert eingeben.",
-      "rangeOrderError": "Die untere Referenz darf nicht über der oberen liegen.",
       "save": "Speichern",
       "savedToast": "Wert gespeichert",
       "saveError": "Wert konnte nicht gespeichert werden",
@@ -6824,7 +6644,6 @@
       "countOther": "Du hast in diesem Zeitraum {count} Episoden erfasst.",
       "typicalGap": "Typische Erholungslücke: {days} Tage zwischen Besserung und normalisierten Werten.",
       "typicalGapLearning": "Noch ein paar abgeschlossene Episoden und hier erscheint eine typische Erholungslücke.",
-      "byMonth": "Wann du Episoden erfasst",
       "none": "In diesem Zeitraum keine Episoden erfasst."
     },
     "section": {
diff --git a/messages/en.json b/messages/en.json
index 0895bb5d8..18cf5182a 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -18,7 +18,6 @@
     "optional": "Optional",
     "active": "Active",
     "inactive": "Inactive",
-    "enabled": "Enabled",
     "disabled": "Disabled",
     "networkError": "Network error",
     "unknownError": "Unknown error",
@@ -74,7 +73,6 @@
     "colTaken": "Taken",
     "colSkipped": "Skipped",
     "colMissed": "Missed",
-    "colTotal": "Total",
     "colExpected": "Expected",
     "colComplianceRate": "Adherence rate",
     "moodTitle": "Mood trajectory",
@@ -202,14 +200,12 @@
     "measurements": "Measurements",
     "medications": "Medications",
     "insights": "Insights",
-    "targets": "Targets",
     "achievements": "Achievements",
     "settings": "Settings",
     "bugreport": "Bug Report",
     "admin": "Admin Console",
     "logout": "Sign out",
     "login": "Sign in",
-    "about": "About HealthLog",
     "notifications": "Notifications",
     "theme": "Appearance",
     "themeSystem": "System",
@@ -219,13 +215,11 @@
     "userMenu": "User menu",
     "accountSettings": "Account settings",
     "mood": "Mood",
-    "workouts": "Workouts",
     "coach": "Coach",
     "skipToContent": "Skip to content",
     "sidebar": "Sidebar",
     "mainNavigation": "Main navigation",
     "mobileNavigation": "Mobile navigation",
-    "breadcrumb": "Breadcrumb navigation",
     "loadingScreen": "Loading…",
     "more": "More",
     "moreSheetTitle": "More",
@@ -242,7 +236,6 @@
     },
     "cycle": "Cycle",
     "labs": "Labs",
-    "recovery": "Recovery",
     "vorsorge": "Preventive Care",
     "illness": "Illness"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Sleep",
     "stepsShort": "Steps",
     "vo2MaxShort": "VO₂ max",
-    "bpInTargetShort": "BP in Target",
     "bpInTargetWindow90": "BP in Target · 90d",
     "bpInTargetWindowDynamic": "BP in Target · {days}d",
     "bpInTargetCollecting": "collecting data",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Last reading {count} weeks ago",
     "staleHintMonthsOne": "Last reading 1 month ago",
     "staleHintMonthsOther": "Last reading {count} months ago",
-    "coachCta": "Ask the coach",
     "recentWorkouts": {
       "title": "Recent workouts",
       "viewAll": "View all",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Please select a valid time.",
     "loginRequired": "Please sign in to view measurements.",
     "allTypes": "All types",
-    "filterByType": "Filter by type",
     "measurementCount": "{count} measurements",
     "emptyTitle": "No measurements yet",
     "emptyDescription": "Log your weight, blood pressure, pulse, or other vitals to start tracking trends.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Cardio load",
     "typeSleepScore": "Sleep score",
     "typeBodyTemperatureDeviation": "Body temperature deviation",
-    "filterBySource": "Filter by source",
     "sourceComputed": "Computed",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "sadness",
       "praise": "praise"
     },
-    "filterBySource": "Filter by source",
     "sourceManual": "Manual",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Medications, schedules & intake",
     "loginRequired": "Please sign in to manage medications.",
     "addMedication": "Add",
-    "editMedication": "Edit medication",
-    "newMedication": "New medication",
     "firstMedication": "Add first medication",
     "addChoice": {
       "logIntake": "Log an intake",
@@ -778,16 +764,9 @@
     "loadFailed": "Could not load medications",
     "retryLoad": "Retry",
     "name": "Name",
-    "dose": "Dose",
-    "scheduleFrom": "From",
-    "scheduleTo": "To",
-    "scheduleLabel": "Label",
-    "scheduleDays": "Days",
-    "scheduleDaily": "Daily",
     "inactive": "Paused",
     "intakeHistory": "Intake history",
     "openDetailPage": "Open medication detail page",
-    "deleteConfirm": "Delete medication?",
     "compliance": "Adherence",
     "importIntakes": "Import intakes",
     "importDescription": "Paste a JSON array with intake data. Expected format:",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} invalid entries skipped",
     "importFailed": "Import failed",
     "importInvalidFormat": "Invalid JSON format",
-    "apiEndpointTitle": "API Endpoint: {name}",
-    "apiEndpointDescription": "Use this endpoint to record intakes via API (e.g., iPhone Shortcut or cron job).",
-    "apiEndpointActive": "API endpoint active",
-    "apiEndpointActivated": "API endpoint activated",
-    "apiEndpointDeactivated": "API endpoint deactivated",
-    "apiTokenCount": "Active ({count} tokens)",
-    "apiToken": "API Token",
-    "apiTokenActiveHint": "Endpoint is active. Existing tokens remain valid but cannot be shown in plain text again.",
-    "apiTokenActivateHint": "Activate the endpoint to create a new token.",
-    "apiTokenOnceHint": "The token is only shown in plain text once at creation.",
     "requestExample": "Request example",
-    "statusLoadFailed": "Could not load status",
-    "changeFailed": "Change failed",
     "categoryBloodPressure": "Blood Pressure",
     "categoryVitamin": "Vitamins",
     "categoryThyroid": "Thyroid",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Last dose {count} days ago",
     "overdue": "Overdue",
     "veryOverdue": "Very overdue",
-    "compliance7d": "Adherence (7 days)",
-    "compliance30d": "Adherence (30 days)",
     "complianceWindow": "Adherence ({days} days)",
     "complianceUnavailable": "Adherence could not be loaded",
     "complianceInfo": "Share of expected doses you logged. Weekly schedules count week by week.",
     "complianceInfoLabel": "What does adherence mean?",
-    "complianceDoses": "{count} doses",
     "lastIntake": "Last intake:",
     "nextIntake": "Next intake:",
     "nextIntakeOverdue": "Overdue · {time} — can still be taken",
     "dayStreak": "day streak",
     "dayStreakOne": "day streak",
-    "cycleNextDoseToday": "Next dose today",
-    "cycleNextDoseTomorrow": "Next dose tomorrow",
-    "cycleNextDoseInDays": "Next dose in {days} days",
     "cycleDueToday": "Due today",
     "cycleOverdue": "Overdue",
     "cycleNoClosedCycles": "No closed dose cycles yet",
@@ -873,40 +834,10 @@
     "intakeUndo": "Undo",
     "intakeUndone": "Entry reverted",
     "intakeUndoFailed": "Could not undo — open the history to fix it",
-    "weekdaySunday": "Sunday",
-    "weekdayMonday": "Monday",
-    "weekdayTuesday": "Tuesday",
-    "weekdayWednesday": "Wednesday",
-    "weekdayThursday": "Thursday",
-    "weekdayFriday": "Friday",
-    "weekdaySaturday": "Saturday",
-    "weekdaySundayPlural": "Sundays",
-    "weekdayMondayPlural": "Mondays",
-    "weekdayTuesdayPlural": "Tuesdays",
-    "weekdayWednesdayPlural": "Wednesdays",
-    "weekdayThursdayPlural": "Thursdays",
-    "weekdayFridayPlural": "Fridays",
-    "weekdaySaturdayPlural": "Saturdays",
-    "formType": "Type",
-    "formDose": "Dose",
-    "formUnit": "Unit",
-    "formSchedule": "Schedule",
-    "formTreatmentClass": "Treatment class",
-    "formTreatmentClassHelp": "Pick \"GLP-1 injection\" for weekly injectables like Mounjaro, Ozempic, Wegovy, Zepbound. Unlocks the body-map picker and the GLP-1 logbook below.",
-    "treatmentClassGeneric": "Standard medication",
-    "treatmentClassGlp1": "GLP-1 injection",
-    "glp1WeeklyPresetTitle": "Once weekly on …",
-    "glp1WeeklyPresetHelp": "Most GLP-1 receptor agonists are once-weekly. Tap a day to set the cadence.",
-    "glp1WeeklyPresetSuggest": "Use my last weekday choice",
-    "glp1DosesPerUnit": "Doses per pen / vial",
-    "glp1DosesPerUnitPlaceholder": "e.g. 4 for a Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Optional — Mounjaro KwikPen = 4, Ozempic 0.25/0.5 mg = 4, Wegovy single-dose pen = 1. Leave blank if you don't track per-pen dosing.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (in {days} days)",
     "glp1NextInjectionToday": "today",
     "glp1NextInjectionTomorrow": "tomorrow",
-    "glp1RotationLast": "Last site: {site}",
     "glp1RotationSuggested": "Recommended next: {site}",
     "glp1LogSideEffect": "Log side effect",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Add another schedule",
           "edit": "Edit",
           "remove": "Remove",
-          "removeDisabled": "At least one schedule is required.",
-          "empty": "No schedule yet."
+          "removeDisabled": "At least one schedule is required."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "appetite-loss",
     "sideEffectTagHeartburn": "heartburn",
     "sideEffectTagHeadache": "headache",
-    "newSchedule": "New schedule",
-    "removeSchedule": "Remove schedule",
-    "advancedEditing": "Advanced editing",
-    "advancedEditingHide": "Hide advanced editing",
-    "scheduleInterval": "Interval",
-    "scheduleEveryWeek": "every week",
-    "scheduleEveryNWeeks": "every {n} weeks",
-    "scheduleIntervalPrefix": "Interval:",
-    "nextSchedulePrefix": "Next schedule:",
-    "nextScheduleDaily": "daily",
-    "importIntakesAction": "Import intakes",
-    "apiEndpointAction": "API endpoint",
-    "pause": "Pause",
-    "activate": "Activate",
-    "disableNotifications": "Disable notifications",
-    "enableNotifications": "Enable notifications",
-    "purgeRecords": "Delete all records",
-    "formReset": "Reset form",
-    "createMedication": "Create medication",
-    "deleteConfirmDescription": "The medication and all intake history will be permanently deleted.",
-    "purgeConfirmTitle": "Delete all records?",
-    "purgeConfirmDescription": "All intake records for this medication will be permanently deleted. The medication itself will remain and start without history data.",
-    "saveError": "Error saving",
-    "deleteError": "Error deleting",
-    "purgeError": "Error deleting records",
-    "invalidTimestamp": "Please select a valid time.",
-    "noIntakesYet": "No intakes recorded yet",
-    "actions": "Actions",
-    "pageInfo": "Page {page} of {total}",
-    "previousPage": "Previous page",
-    "nextPage": "Next page",
-    "loginRequiredIntakes": "Please sign in to view intakes.",
     "phaseConfig": "Reminder phases",
     "phaseConfigDescription": "Configure timing for reminders.",
     "phaseGreen": "Green",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Red",
     "phaseMinutes": "Min",
     "phasePercent": "%",
-    "phaseBeforeEnd": "before end",
-    "phaseAfterEnd": "after end",
     "phaseResetDefaults": "Reset to defaults",
     "phaseSaved": "Reminder phases saved",
-    "phaseReset": "Reset to defaults",
     "sourceWeb": "Web",
     "sourceApi": "iOS App",
     "sourceReminder": "Reminder",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Page {page} of {total} · {count} entries",
     "intakeHistoryPrev": "Previous",
     "intakeHistoryNext": "Next",
-    "unitDrops": "Drops",
-    "unitTablets": "Tablet(s)",
-    "unitCapsules": "Capsule(s)",
-    "unitPieces": "Piece(s)",
-    "namePlaceholder": "e.g. Ibuprofen",
-    "dosePlaceholder": "e.g. 400",
-    "labelPlaceholder": "e.g. Morning",
-    "defaultDose": "Default",
-    "dayDeactivate": "Deactivate {day}",
-    "dayActivate": "Activate {day}",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "View intake history"
       },
       "history": {
-        "back": "Back to medication",
-        "subtitle": "Full intake history",
         "plannedSuffix": "planned"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Default",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Override",
     "overrideToggleLabel": "Custom range",
     "resetAction": "Reset to default",
     "resetAllAction": "Reset all to default",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Module availability",
       "description": "Turn a module off for the whole server. A module disabled here is off for every account regardless of personal preference. Core domains (weight, blood pressure, pulse, medications) are always on and cannot be disabled.",
-      "disabledHint": "Disabled server-wide",
       "saveError": "Could not update module availability."
     },
     "bugReportRepo": "Repository",
@@ -5343,12 +5223,10 @@
         "subtitle": "Destructive system-wide operations."
       },
       "about": {
-        "title": "About",
-        "subtitle": "Version, license, source, and update check."
+        "title": "About"
       }
     },
     "carrier": "Carrier",
-    "carrierUnknown": "Unknown carrier",
     "carrierUnavailableGeoFallback": "{location} — carrier unavailable"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Notifications",
     "breadcrumbInbox": "Notifications",
     "breadcrumbChannels": "Notification channels",
-    "breadcrumbSettings": "Settings",
     "eventColumn": "Event",
     "subtitle": "Choose which notifications you want to receive through which channel.",
     "loadError": "Notification preferences could not be loaded.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "near range",
       "dotOutOfRange": "out of range",
       "dotNotLogged": "not logged",
-      "insufficientData": "Not enough data yet — keep logging.",
       "relativeDay": {
         "today": "today",
         "yesterday": "yesterday",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Edit target range for {metric}",
       "title": "Edit target range — {metric}",
       "description": "Adjust the in-range band used across charts, insights and the doctor report. Values are in {unit}.",
       "derivedHint": "This card is derived from other metrics. Edit the underlying targets (e.g. blood pressure or weight) instead.",
@@ -5825,13 +5700,6 @@
       "saveError": "Could not save the target range",
       "resetSuccess": "Target range reset to default"
     },
-    "mood": {
-      "stability": {
-        "stable": "stable",
-        "variable": "variable",
-        "highlyVariable": "highly variable"
-      }
-    },
     "currentValue": "Current: {value} {unit}",
     "targetRangeValue": "Target: {min}–{max} {unit}",
     "sourceLabel": "Source: {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Low supply: {medName}",
-    "body": "{medName}: {units} units left — enough for about {days} more days.",
     "bodyToday": "{medName}: {units} units left — less than one day of supply.",
     "bodyReorder": "{medName}: {units} units left. Supply runs out around {runsOutOn} — reorder by {reorderBy}.",
     "bodyLastDose": "{medName}: {units} units left — about your final dose. Supply runs out around {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "How each measurement compares between your luteal and follicular phases, on your own data.",
         "pairLabel": "{metric} · luteal vs follicular",
         "detail": "Luteal {lutealAvg} {unit} ({lutealDays} days) vs follicular {follicularAvg} {unit} ({follicularDays} days).",
-        "footer": "These are associations in your own data, not causes. Only patterns that clear a significance check are shown.",
         "metricRestingHeartRate": "Resting heart rate",
         "metricHrv": "Heart-rate variability",
         "metricSleepDuration": "Sleep duration",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "High confidence"
       },
       "title": "Cycle insights",
-      "empty": "Phase insights appear here once you have enough logged cycles. They compare your metrics across cycle phases, with the statistics shown openly.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Effect size {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Symptom patterns by phase",
       "symptomPatternsEmpty": "Log symptoms across a cycle to see which phase they cluster in.",
       "symptomMostlyIn": "Mostly in {phase} ({count}/{total} days)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "Progesterone leads the second half and basal body temperature usually settles a little higher than earlier in the cycle. Some people notice shifts in sleep, appetite, mood or energy as the days go on, while others feel steady throughout. The pattern is personal, and it often looks different from one month to the next."
       },
       "commonHere": "You often notice this here",
-      "trackNudge": "Log today",
       "stillLearning": "Still learning your cycle. Keep logging and this fills in with patterns from your own days."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Previous month",
       "nextMonth": "Next month",
       "loading": "Loading your calendar…",
-      "empty": "Start logging to see your calendar fill in.",
       "learning": "Learning your cycle — log at least three full cycles and the fertile window, ovulation and phases fill in. Until then the calendar shows only what you've logged.",
-      "today": "Today",
-      "dayAria": "{date}",
       "legendSymptom": "Symptoms",
       "legendOvulationConfirmed": "Confirmed ovulation",
       "flowSpotting": "spotting",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "What comes next",
       "nextPeriod": "Next period",
-      "nextPeriodRange": "Around {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Fertile window",
       "ovulation": "Estimated ovulation",
-      "confidence": "Confidence",
       "confidenceHigh": "High",
       "confidenceMedium": "Medium",
       "confidenceLow": "Low",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Log your day",
       "description": "Capture today's flow, symptoms, and notes.",
-      "date": "Date",
       "flow": "Flow",
       "symptoms": "Symptoms",
       "temperature": "Basal body temperature",
@@ -6266,10 +6121,7 @@
       "save": "Save",
       "saving": "Saving…",
       "cancel": "Cancel",
-      "saved": "Day saved",
       "saveError": "Could not save. Try again.",
-      "periodStarted": "Period start logged",
-      "clear": "None",
       "temperatureSection": "Temperature & ovulation",
       "intimacySection": "Intimacy & contraception",
       "testsSection": "Tests",
@@ -6283,8 +6135,6 @@
     },
     "settings": {
       "title": "Cycle settings",
-      "enable": "Cycle tracking",
-      "enableDescription": "Turn the cycle tab on or off for your account.",
       "typicalCycleLength": "Typical cycle length (days)",
       "typicalPeriodLength": "Typical period length (days)",
       "lutealPhaseLength": "Luteal phase length (days)",
@@ -6303,30 +6153,14 @@
       "encryptionDescription": "Encrypt intent-revealing fields (pregnancy tests, contraception, intercourse) at rest, on top of the always-encrypted notes.",
       "discreet": "Discreet notifications",
       "discreetDescription": "Hide cycle details from notification text on your lock screen.",
-      "dataTitle": "Your data",
-      "dataDescription": "Your cycle data lives only on this server. Export it any time, or delete it for good.",
-      "export": "Export my cycle data",
-      "deleteData": "Delete my cycle data",
       "saved": "Settings saved",
       "saveError": "Could not save. Try again.",
       "save": "Save",
-      "purgeTitle": "Delete all cycle data",
-      "purgeDescription": "Permanently removes every logged day, cycle, prediction, and reminder record. This cannot be undone.",
-      "purgeButton": "Delete all cycle data",
-      "purgeConfirmTitle": "Delete all cycle data?",
-      "purgeConfirmBody": "This permanently deletes every period, day-log, symptom, and prediction. This cannot be undone.",
-      "purgeConfirm": "Delete all cycle data permanently?",
-      "purgeCancel": "Cancel",
-      "purgeSuccess": "All cycle data deleted.",
-      "purgeError": "Couldn't delete cycle data.",
       "reminders": "Reminders",
       "remindersDescription": "Turn period reminders on per channel in notification settings.",
       "remindersLink": "Notification settings",
       "fertileReminder": "Fertile-window reminder",
-      "fertileReminderDescription": "Get a heads-up a few days before your estimated fertile window. Off by default — turn it on per channel in notification settings.",
-      "purgeData": "Delete cycle data",
-      "purgeConfirmAction": "Yes, delete everything",
-      "purgeDone": "Cycle data deleted."
+      "fertileReminderDescription": "Get a heads-up a few days before your estimated fertile window. Off by default — turn it on per channel in notification settings."
     },
     "contraceptive": {
       "NONE": "None",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Record bloodwork like HbA1c, LDL or ferritin to track it over time and share it with your doctor.",
     "referenceLabel": "Reference",
     "readingsCount": "{count} readings",
-    "deleteLatest": "Delete latest reading",
     "deleteConfirmTitle": "Delete lab result?",
     "deleteConfirmDescription": "This lab result will be permanently deleted.",
     "deletedToast": "Result deleted",
@@ -6514,24 +6347,11 @@
       "above": "Above range"
     },
     "form": {
-      "analyte": "Biomarker",
-      "analytePlaceholder": "e.g. HbA1c, LDL, Ferritin",
       "value": "Value",
-      "unit": "Unit",
-      "unitPlaceholder": "e.g. mg/dL, %, ng/mL",
       "takenAt": "Sample date",
-      "optionalGroup": "Optional",
-      "panel": "Panel",
-      "panelPlaceholder": "e.g. Complete blood count",
-      "referenceLow": "Reference low",
-      "referenceHigh": "Reference high",
-      "referenceLowPlaceholder": "Lower bound",
-      "referenceHighPlaceholder": "Upper bound",
-      "referenceHint": "Copy the reference range from your lab report. Either bound is optional.",
       "note": "Note",
       "notePlaceholder": "Optional context for this result",
       "requiredError": "Enter a value.",
-      "rangeOrderError": "The reference low must not exceed the reference high.",
       "save": "Save",
       "savedToast": "Result saved",
       "saveError": "Could not save the result",
@@ -6824,7 +6644,6 @@
       "countOther": "You logged {count} episodes in this period.",
       "typicalGap": "Typical recovery gap: {days} days between feeling better and your numbers settling.",
       "typicalGapLearning": "A few more resolved episodes and a typical recovery gap will appear here.",
-      "byMonth": "When you tend to log episodes",
       "none": "No episodes logged in this period."
     },
     "section": {
diff --git a/messages/es.json b/messages/es.json
index ecc64c96c..1b2e2c7a0 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -18,7 +18,6 @@
     "optional": "Opcional",
     "active": "Activo",
     "inactive": "Inactivo",
-    "enabled": "Activado",
     "disabled": "Desactivado",
     "networkError": "Error de red",
     "unknownError": "Error desconocido",
@@ -74,7 +73,6 @@
     "colTaken": "Tomada",
     "colSkipped": "Omitida",
     "colMissed": "Perdida",
-    "colTotal": "Total",
     "colExpected": "Esperadas",
     "colComplianceRate": "Tasa de cumplimiento",
     "moodTitle": "Evolución del estado de ánimo",
@@ -202,14 +200,12 @@
     "measurements": "Mediciones",
     "medications": "Medicamentos",
     "insights": "Insights",
-    "targets": "Objetivos",
     "achievements": "Logros",
     "settings": "Ajustes",
     "bugreport": "Reporte de bug",
     "admin": "Consola de administración",
     "logout": "Cerrar sesión",
     "login": "Iniciar sesión",
-    "about": "Acerca de HealthLog",
     "notifications": "Notificaciones",
     "theme": "Apariencia",
     "themeSystem": "Sistema",
@@ -219,13 +215,11 @@
     "userMenu": "Menú de usuario",
     "accountSettings": "Ajustes de cuenta",
     "mood": "Estado de ánimo",
-    "workouts": "Entrenamientos",
     "coach": "Coach",
     "skipToContent": "Saltar al contenido",
     "sidebar": "Barra lateral",
     "mainNavigation": "Navegación principal",
     "mobileNavigation": "Navegación móvil",
-    "breadcrumb": "Ruta de navegación",
     "loadingScreen": "Cargando…",
     "more": "Más",
     "moreSheetTitle": "Más",
@@ -242,7 +236,6 @@
     },
     "cycle": "Ciclo",
     "labs": "Análisis",
-    "recovery": "Recuperación",
     "vorsorge": "Prevención",
     "illness": "Enfermedad"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Sueño",
     "stepsShort": "Pasos",
     "vo2MaxShort": "VO₂ máx",
-    "bpInTargetShort": "PA-objetivo",
     "bpInTargetWindow90": "PA-objetivo · 90 d",
     "bpInTargetWindowDynamic": "PA-objetivo · {days} d",
     "bpInTargetCollecting": "recopilando datos",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Último valor hace {count} semanas",
     "staleHintMonthsOne": "Último valor hace 1 mes",
     "staleHintMonthsOther": "Último valor hace {count} meses",
-    "coachCta": "Pregunta al coach",
     "recentWorkouts": {
       "title": "Entrenamientos recientes",
       "viewAll": "Ver todos",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Selecciona una fecha y hora válidas.",
     "loginRequired": "Inicia sesión para ver las mediciones.",
     "allTypes": "Todos los tipos",
-    "filterByType": "Filtrar por tipo",
     "measurementCount": "{count} mediciones",
     "emptyTitle": "Aún no hay mediciones",
     "emptyDescription": "Registra peso, tensión arterial, pulso u otros valores para detectar tendencias.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Carga cardio",
     "typeSleepScore": "Puntuación de sueño",
     "typeBodyTemperatureDeviation": "Desviación de temperatura corporal",
-    "filterBySource": "Filtrar por fuente",
     "sourceComputed": "Calculado",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "tristeza",
       "praise": "elogio"
     },
-    "filterBySource": "Filtrar por fuente",
     "sourceManual": "Manual",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Medicación, horarios y tomas",
     "loginRequired": "Inicia sesión para gestionar medicamentos.",
     "addMedication": "Añadir",
-    "editMedication": "Editar medicamento",
-    "newMedication": "Nuevo medicamento",
     "firstMedication": "Añadir el primer medicamento",
     "addChoice": {
       "logIntake": "Registrar una toma",
@@ -778,16 +764,9 @@
     "loadFailed": "No se han podido cargar los medicamentos",
     "retryLoad": "Reintentar",
     "name": "Nombre",
-    "dose": "Dosis",
-    "scheduleFrom": "Desde",
-    "scheduleTo": "Hasta",
-    "scheduleLabel": "Etiqueta",
-    "scheduleDays": "Días",
-    "scheduleDaily": "A diario",
     "inactive": "En pausa",
     "intakeHistory": "Historial de tomas",
     "openDetailPage": "Abrir la página de detalle del medicamento",
-    "deleteConfirm": "¿Eliminar medicamento?",
     "compliance": "Cumplimiento",
     "importIntakes": "Importar tomas",
     "importDescription": "Pega un array JSON con los datos de tomas. Formato esperado:",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} entradas no válidas omitidas",
     "importFailed": "Falló la importación",
     "importInvalidFormat": "Formato JSON no válido",
-    "apiEndpointTitle": "Endpoint de API: {name}",
-    "apiEndpointDescription": "Usa este endpoint para registrar tomas a través de la API (p. ej., con un Atajo de iPhone o un cron job).",
-    "apiEndpointActive": "Endpoint de API activo",
-    "apiEndpointActivated": "Endpoint de API activado",
-    "apiEndpointDeactivated": "Endpoint de API desactivado",
-    "apiTokenCount": "Activo ({count} tokens)",
-    "apiToken": "Token de API",
-    "apiTokenActiveHint": "El endpoint está activo. Los tokens existentes siguen siendo válidos, pero no se pueden mostrar de nuevo en texto plano.",
-    "apiTokenActivateHint": "Activa el endpoint para crear un nuevo token.",
-    "apiTokenOnceHint": "El token solo se muestra en texto plano una vez, al crearlo.",
     "requestExample": "Ejemplo de solicitud",
-    "statusLoadFailed": "No se pudo cargar el estado",
-    "changeFailed": "Falló el cambio",
     "categoryBloodPressure": "Presión arterial",
     "categoryVitamin": "Vitaminas",
     "categoryThyroid": "Tiroides",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Última dosis hace {count} días",
     "overdue": "Vencida",
     "veryOverdue": "Muy vencida",
-    "compliance7d": "Cumplimiento 7 días",
-    "compliance30d": "Cumplimiento 30 días",
     "complianceWindow": "Cumplimiento {days} días",
     "complianceUnavailable": "No se pudo cargar el cumplimiento",
     "complianceInfo": "Proporción de dosis registradas respecto a las esperadas. Las pautas semanales se cuentan semana a semana.",
     "complianceInfoLabel": "¿Qué significa el cumplimiento?",
-    "complianceDoses": "{count} dosis",
     "lastIntake": "Última toma:",
     "nextIntake": "Próxima toma:",
     "nextIntakeOverdue": "Atrasada · {time} — aún se puede tomar",
     "dayStreak": "días de racha",
     "dayStreakOne": "día de racha",
-    "cycleNextDoseToday": "Próxima dosis hoy",
-    "cycleNextDoseTomorrow": "Próxima dosis mañana",
-    "cycleNextDoseInDays": "Próxima dosis en {days} días",
     "cycleDueToday": "Pendiente hoy",
     "cycleOverdue": "Atrasada",
     "cycleNoClosedCycles": "Aún no hay ciclos de dosis completados",
@@ -873,40 +834,10 @@
     "intakeUndo": "Deshacer",
     "intakeUndone": "Entrada revertida",
     "intakeUndoFailed": "No se pudo deshacer; corrígelo en el historial",
-    "weekdaySunday": "Domingo",
-    "weekdayMonday": "Lunes",
-    "weekdayTuesday": "Martes",
-    "weekdayWednesday": "Miércoles",
-    "weekdayThursday": "Jueves",
-    "weekdayFriday": "Viernes",
-    "weekdaySaturday": "Sábado",
-    "weekdaySundayPlural": "Domingos",
-    "weekdayMondayPlural": "Lunes",
-    "weekdayTuesdayPlural": "Martes",
-    "weekdayWednesdayPlural": "Miércoles",
-    "weekdayThursdayPlural": "Jueves",
-    "weekdayFridayPlural": "Viernes",
-    "weekdaySaturdayPlural": "Sábados",
-    "formType": "Tipo",
-    "formDose": "Dosis",
-    "formUnit": "Unidad",
-    "formSchedule": "Franja horaria",
-    "formTreatmentClass": "Clase de tratamiento",
-    "formTreatmentClassHelp": "Selecciona \"Inyección GLP-1\" para inyecciones semanales como Mounjaro, Ozempic, Wegovy, Zepbound. Activa la tarjeta corporal y el registro GLP-1.",
-    "treatmentClassGeneric": "Medicamento estándar",
-    "treatmentClassGlp1": "Inyección GLP-1",
-    "glp1WeeklyPresetTitle": "Una vez por semana, en…",
-    "glp1WeeklyPresetHelp": "La mayoría de los agonistas del receptor GLP-1 se inyectan una vez por semana. Toca un día para fijar el ritmo.",
-    "glp1WeeklyPresetSuggest": "Reutilizar el último día elegido",
-    "glp1DosesPerUnit": "Dosis por pluma / vial",
-    "glp1DosesPerUnitPlaceholder": "p. ej. 4 para una pluma Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Opcional — Mounjaro KwikPen = 4, Ozempic 0,25/0,5 mg = 4, Wegovy pluma de un solo uso = 1. Déjalo vacío si no quieres llevar el conteo de dosis por pluma.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (en {days} días)",
     "glp1NextInjectionToday": "hoy",
     "glp1NextInjectionTomorrow": "mañana",
-    "glp1RotationLast": "Último sitio: {site}",
     "glp1RotationSuggested": "Sugerido: {site}",
     "glp1LogSideEffect": "Registrar efecto secundario",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Añadir otro horario",
           "edit": "Editar",
           "remove": "Quitar",
-          "removeDisabled": "Se requiere al menos un horario.",
-          "empty": "Aún no hay horario."
+          "removeDisabled": "Se requiere al menos un horario."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "Pérdida de apetito",
     "sideEffectTagHeartburn": "Ardor de estómago",
     "sideEffectTagHeadache": "Dolor de cabeza",
-    "newSchedule": "Nueva franja horaria",
-    "removeSchedule": "Quitar franja horaria",
-    "advancedEditing": "Edición avanzada",
-    "advancedEditingHide": "Ocultar edición avanzada",
-    "scheduleInterval": "Intervalo",
-    "scheduleEveryWeek": "cada semana",
-    "scheduleEveryNWeeks": "cada {n} semanas",
-    "scheduleIntervalPrefix": "Intervalo:",
-    "nextSchedulePrefix": "Próxima franja:",
-    "nextScheduleDaily": "a diario",
-    "importIntakesAction": "Importar tomas",
-    "apiEndpointAction": "Endpoint de API",
-    "pause": "Pausar",
-    "activate": "Activar",
-    "disableNotifications": "Desactivar notificaciones",
-    "enableNotifications": "Activar notificaciones",
-    "purgeRecords": "Eliminar registros",
-    "formReset": "Restablecer formulario",
-    "createMedication": "Crear medicamento",
-    "deleteConfirmDescription": "Este medicamento y todas sus tomas se eliminarán de forma permanente.",
-    "purgeConfirmTitle": "¿Eliminar todas las tomas?",
-    "purgeConfirmDescription": "Se eliminarán de forma permanente todas las tomas registradas para este medicamento.",
-    "saveError": "Error al guardar",
-    "deleteError": "Error al eliminar",
-    "purgeError": "Error al limpiar los registros",
-    "invalidTimestamp": "Selecciona una fecha y hora válidas.",
-    "noIntakesYet": "Aún no hay tomas registradas.",
-    "actions": "Acciones",
-    "pageInfo": "Página {page} de {total}",
-    "previousPage": "Página anterior",
-    "nextPage": "Página siguiente",
-    "loginRequiredIntakes": "Inicia sesión para ver el historial de tomas.",
     "phaseConfig": "Fases de recordatorio",
     "phaseConfigDescription": "Configura los momentos de los recordatorios.",
     "phaseGreen": "Verde",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Rojo",
     "phaseMinutes": "Mín",
     "phasePercent": "%",
-    "phaseBeforeEnd": "antes del final",
-    "phaseAfterEnd": "después del final",
     "phaseResetDefaults": "Restablecer valores por defecto",
     "phaseSaved": "Fases de recordatorio guardadas",
-    "phaseReset": "Restablecidas a valores por defecto",
     "sourceWeb": "Web",
     "sourceApi": "App de iOS",
     "sourceReminder": "Recordatorio",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Página {page} de {total} · {count} entradas",
     "intakeHistoryPrev": "Anterior",
     "intakeHistoryNext": "Siguiente",
-    "unitDrops": "gotas",
-    "unitTablets": "comprimidos",
-    "unitCapsules": "cápsulas",
-    "unitPieces": "unidades",
-    "namePlaceholder": "p. ej. Ramipril",
-    "dosePlaceholder": "p. ej. 5 mg",
-    "labelPlaceholder": "p. ej. Por la mañana",
-    "defaultDose": "Dosis estándar",
-    "dayDeactivate": "Desactivar {day}",
-    "dayActivate": "Activar {day}",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "Ver historial de tomas"
       },
       "history": {
-        "back": "Volver al medicamento",
-        "subtitle": "Historial completo de tomas",
         "plannedSuffix": "planificado"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Por defecto",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Personalizado",
     "overrideToggleLabel": "Valores propios",
     "resetAction": "Restablecer valor por defecto",
     "resetAllAction": "Restablecer todos los valores",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Disponibilidad de módulos",
       "description": "Desactiva un módulo para todo el servidor. Un módulo desactivado aquí queda apagado para todas las cuentas, sin importar la preferencia personal. Los dominios principales (peso, presión arterial, pulso, medicación) están siempre activos y no se pueden desactivar.",
-      "disabledHint": "Desactivado en todo el servidor",
       "saveError": "No se pudo actualizar la disponibilidad de módulos."
     },
     "bugReportRepo": "Repositorio",
@@ -5343,12 +5223,10 @@
         "subtitle": "Operaciones destructivas en todo el sistema."
       },
       "about": {
-        "title": "Acerca de",
-        "subtitle": "Versión, licencia, código fuente y comprobación de actualizaciones."
+        "title": "Acerca de"
       }
     },
     "carrier": "Operador",
-    "carrierUnknown": "Operador desconocido",
     "carrierUnavailableGeoFallback": "{location} — operador no disponible"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Notificaciones",
     "breadcrumbInbox": "Notificaciones",
     "breadcrumbChannels": "Canales de notificación",
-    "breadcrumbSettings": "Ajustes",
     "eventColumn": "Evento",
     "subtitle": "Elige qué notificaciones recibes y por qué canal.",
     "loadError": "No se han podido cargar los ajustes de notificación.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "cerca del rango",
       "dotOutOfRange": "fuera",
       "dotNotLogged": "no registrado",
-      "insufficientData": "Aún hay pocos datos — sigue registrando.",
       "relativeDay": {
         "today": "Hoy",
         "yesterday": "Ayer",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Editar el rango objetivo de {metric}",
       "title": "Editar rango objetivo — {metric}",
       "description": "Ajusta el rango objetivo usado en gráficas, insights y el informe médico. Valores en {unit}.",
       "derivedHint": "Esta tarjeta se calcula a partir de otras métricas. Edita en su lugar los objetivos subyacentes (p. ej. tensión arterial o peso).",
@@ -5825,13 +5700,6 @@
       "saveError": "No se ha podido guardar el rango objetivo",
       "resetSuccess": "Rango objetivo restablecido por defecto"
     },
-    "mood": {
-      "stability": {
-        "stable": "estable",
-        "variable": "variable",
-        "highlyVariable": "muy variable"
-      }
-    },
     "currentValue": "Actual: {value} {unit}",
     "targetRangeValue": "Rango objetivo: {min}–{max} {unit}",
     "sourceLabel": "Fuente: {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Quedan pocas existencias: {medName}",
-    "body": "{medName}: quedan {units} unidades — para unos {days} días más.",
     "bodyToday": "{medName}: quedan {units} unidades — menos de un día de suministro.",
     "bodyReorder": "{medName}: quedan {units} unidades. Las existencias se agotan hacia el {runsOutOn} — vuelve a pedir antes del {reorderBy}.",
     "bodyLastDose": "{medName}: quedan {units} unidades — alrededor de tu última dosis. Las existencias se agotan hacia el {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "Cómo se compara cada medición entre tus fases lútea y folicular, con tus propios datos.",
         "pairLabel": "{metric} · lútea vs. folicular",
         "detail": "Lútea {lutealAvg} {unit} ({lutealDays} días) vs. folicular {follicularAvg} {unit} ({follicularDays} días).",
-        "footer": "Son asociaciones en tus propios datos, no causas. Solo se muestran los patrones que superan una prueba de significación.",
         "metricRestingHeartRate": "Frecuencia cardíaca en reposo",
         "metricHrv": "Variabilidad de la frecuencia cardíaca",
         "metricSleepDuration": "Duración del sueño",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "Confianza alta"
       },
       "title": "Análisis del ciclo",
-      "empty": "Los análisis por fase aparecen aquí cuando tienes suficientes ciclos registrados. Comparan tus métricas entre fases del ciclo, mostrando la estadística abiertamente.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Tamaño del efecto {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Patrones de síntomas por fase",
       "symptomPatternsEmpty": "Registra síntomas a lo largo de un ciclo para ver en qué fase se concentran.",
       "symptomMostlyIn": "Sobre todo en {phase} ({count}/{total} días)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "La progesterona guía la segunda mitad y la temperatura basal suele asentarse algo más alta que al inicio del ciclo. Algunas personas notan cambios en el sueño, el apetito, el ánimo o la energía a medida que pasan los días, mientras que otras se sienten estables todo el tiempo. El patrón es personal y a menudo se ve distinto de un mes a otro."
       },
       "commonHere": "Esto lo notas a menudo aquí",
-      "trackNudge": "Registrar hoy",
       "stillLearning": "Aún estamos conociendo tu ciclo. Sigue registrando y esto se irá completando con patrones de tus propios días."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Mes anterior",
       "nextMonth": "Mes siguiente",
       "loading": "Cargando tu calendario…",
-      "empty": "Empieza a registrar para ver tu calendario.",
       "learning": "Estamos aprendiendo tu ciclo: registra al menos tres ciclos completos y se completarán la ventana fértil, la ovulación y las fases. Hasta entonces, el calendario solo muestra lo que has registrado.",
-      "today": "Hoy",
-      "dayAria": "{date}",
       "legendSymptom": "Síntomas",
       "legendOvulationConfirmed": "Ovulación confirmada",
       "flowSpotting": "manchado",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "Qué viene después",
       "nextPeriod": "Próximo periodo",
-      "nextPeriodRange": "Alrededor del {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Ventana fértil",
       "ovulation": "Ovulación estimada",
-      "confidence": "Confianza",
       "confidenceHigh": "Alta",
       "confidenceMedium": "Media",
       "confidenceLow": "Baja",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Registrar tu día",
       "description": "Captura el flujo, los síntomas y las notas de hoy.",
-      "date": "Fecha",
       "flow": "Flujo",
       "symptoms": "Síntomas",
       "temperature": "Temperatura basal",
@@ -6259,10 +6114,7 @@
       "save": "Guardar",
       "saving": "Guardando…",
       "cancel": "Cancelar",
-      "saved": "Día guardado",
       "saveError": "No se pudo guardar. Inténtalo de nuevo.",
-      "periodStarted": "Inicio del periodo registrado",
-      "clear": "Ninguno",
       "intermenstrualBleeding": "Manchado entre periodos",
       "pregnancyTest": "Prueba de embarazo",
       "progesteroneTest": "Prueba de progesterona",
@@ -6278,8 +6130,6 @@
     },
     "settings": {
       "title": "Ajustes del ciclo",
-      "enable": "Seguimiento del ciclo",
-      "enableDescription": "Activa o desactiva la pestaña del ciclo en tu cuenta.",
       "typicalCycleLength": "Duración típica del ciclo (días)",
       "typicalPeriodLength": "Duración típica del periodo (días)",
       "lutealPhaseLength": "Duración de la fase lútea (días)",
@@ -6298,30 +6148,14 @@
       "encryptionDescription": "Cifra en reposo los campos que revelan intención (test de embarazo, anticoncepción, relaciones), además de las notas siempre cifradas.",
       "discreet": "Notificaciones discretas",
       "discreetDescription": "Oculta los detalles del ciclo en el texto de las notificaciones de tu pantalla de bloqueo.",
-      "dataTitle": "Tus datos",
-      "dataDescription": "Tus datos del ciclo viven solo en este servidor. Expórtalos cuando quieras o elimínalos para siempre.",
-      "export": "Exportar mis datos del ciclo",
-      "deleteData": "Eliminar mis datos del ciclo",
       "saved": "Ajustes guardados",
       "saveError": "No se pudo guardar. Inténtalo de nuevo.",
       "save": "Guardar",
-      "purgeTitle": "Eliminar todos los datos del ciclo",
-      "purgeDescription": "Elimina de forma permanente cada día registrado, ciclo, predicción y registro de recordatorio. No se puede deshacer.",
-      "purgeButton": "Eliminar todos los datos del ciclo",
-      "purgeConfirmTitle": "¿Eliminar todos los datos del ciclo?",
-      "purgeConfirmBody": "Esto elimina de forma permanente todos los periodos, registros diarios, síntomas y predicciones. No se puede deshacer.",
-      "purgeConfirm": "¿Eliminar permanentemente todos los datos del ciclo?",
-      "purgeCancel": "Cancelar",
-      "purgeSuccess": "Todos los datos del ciclo eliminados.",
-      "purgeError": "No se pudieron eliminar los datos del ciclo.",
       "reminders": "Recordatorios",
       "remindersDescription": "Activa los recordatorios de período por canal en los ajustes de notificaciones.",
       "remindersLink": "Ajustes de notificaciones",
       "fertileReminder": "Recordatorio de ventana fértil",
-      "fertileReminderDescription": "Recibe un aviso unos días antes de tu ventana fértil estimada. Desactivado por defecto: actívalo por canal en los ajustes de notificaciones.",
-      "purgeData": "Eliminar datos del ciclo",
-      "purgeConfirmAction": "Sí, eliminar todo",
-      "purgeDone": "Datos del ciclo eliminados."
+      "fertileReminderDescription": "Recibe un aviso unos días antes de tu ventana fértil estimada. Desactivado por defecto: actívalo por canal en los ajustes de notificaciones."
     },
     "testResult": {
       "POSITIVE": "Positivo",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Registra analíticas como HbA1c, LDL o ferritina para seguirlas a lo largo del tiempo y compartirlas con tu médico.",
     "referenceLabel": "Referencia",
     "readingsCount": "{count} mediciones",
-    "deleteLatest": "Eliminar el último valor",
     "deleteConfirmTitle": "¿Eliminar resultado de laboratorio?",
     "deleteConfirmDescription": "Este resultado de laboratorio se eliminará de forma permanente.",
     "deletedToast": "Resultado eliminado",
@@ -6514,24 +6347,11 @@
       "above": "Por encima"
     },
     "form": {
-      "analyte": "Biomarcador",
-      "analytePlaceholder": "p. ej. HbA1c, LDL, Ferritina",
       "value": "Valor",
-      "unit": "Unidad",
-      "unitPlaceholder": "p. ej. mg/dL, %, ng/mL",
       "takenAt": "Fecha de la muestra",
-      "optionalGroup": "Opcional",
-      "panel": "Panel",
-      "panelPlaceholder": "p. ej. Hemograma completo",
-      "referenceLow": "Referencia mínima",
-      "referenceHigh": "Referencia máxima",
-      "referenceLowPlaceholder": "Límite inferior",
-      "referenceHighPlaceholder": "Límite superior",
-      "referenceHint": "Copia el rango de referencia de tu informe de laboratorio. Cualquiera de los límites es opcional.",
       "note": "Nota",
       "notePlaceholder": "Contexto opcional para este resultado",
       "requiredError": "Introduce un valor.",
-      "rangeOrderError": "La referencia mínima no puede superar la máxima.",
       "save": "Guardar",
       "savedToast": "Resultado guardado",
       "saveError": "No se pudo guardar el resultado",
@@ -6824,7 +6644,6 @@
       "countOther": "Registraste {count} episodios en este período.",
       "typicalGap": "Brecha de recuperación típica: {days} días entre sentirte mejor y la estabilización de tus valores.",
       "typicalGapLearning": "Con unos pocos episodios resueltos más aparecerá aquí una brecha de recuperación típica.",
-      "byMonth": "Cuándo sueles registrar episodios",
       "none": "Sin episodios registrados en este período."
     },
     "section": {
diff --git a/messages/fr.json b/messages/fr.json
index ea1705a4a..e278cc028 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -18,7 +18,6 @@
     "optional": "Facultatif",
     "active": "Actif",
     "inactive": "Inactif",
-    "enabled": "Activé",
     "disabled": "Désactivé",
     "networkError": "Erreur réseau",
     "unknownError": "Erreur inconnue",
@@ -74,7 +73,6 @@
     "colTaken": "Pris",
     "colSkipped": "Sauté",
     "colMissed": "Manqué",
-    "colTotal": "Total",
     "colExpected": "Attendues",
     "colComplianceRate": "Taux d'observance",
     "moodTitle": "Évolution de l’humeur",
@@ -202,14 +200,12 @@
     "measurements": "Mesures",
     "medications": "Médicaments",
     "insights": "Insights",
-    "targets": "Objectifs",
     "achievements": "Succès",
     "settings": "Paramètres",
     "bugreport": "Rapport de bug",
     "admin": "Console d’administration",
     "logout": "Se déconnecter",
     "login": "Se connecter",
-    "about": "À propos de HealthLog",
     "notifications": "Notifications",
     "theme": "Apparence",
     "themeSystem": "Système",
@@ -219,13 +215,11 @@
     "userMenu": "Menu utilisateur",
     "accountSettings": "Paramètres du compte",
     "mood": "Humeur",
-    "workouts": "Entraînements",
     "coach": "Coach",
     "skipToContent": "Aller au contenu",
     "sidebar": "Barre latérale",
     "mainNavigation": "Navigation principale",
     "mobileNavigation": "Navigation mobile",
-    "breadcrumb": "Fil d'Ariane",
     "loadingScreen": "Chargement…",
     "more": "Plus",
     "moreSheetTitle": "Plus",
@@ -242,7 +236,6 @@
     },
     "cycle": "Cycle",
     "labs": "Analyses",
-    "recovery": "Récupération",
     "vorsorge": "Prévention",
     "illness": "Maladie"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Sommeil",
     "stepsShort": "Pas",
     "vo2MaxShort": "VO₂ max",
-    "bpInTargetShort": "TA-cible",
     "bpInTargetWindow90": "TA-cible · 90 j",
     "bpInTargetWindowDynamic": "TA-cible · {days} j",
     "bpInTargetCollecting": "collecte de données",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Dernière valeur il y a {count} semaines",
     "staleHintMonthsOne": "Dernière valeur il y a 1 mois",
     "staleHintMonthsOther": "Dernière valeur il y a {count} mois",
-    "coachCta": "Demande au coach",
     "recentWorkouts": {
       "title": "Entraînements récents",
       "viewAll": "Tout voir",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Choisis une date et une heure valides.",
     "loginRequired": "Connecte-toi pour voir tes mesures.",
     "allTypes": "Tous les types",
-    "filterByType": "Filtrer par type",
     "measurementCount": "{count} mesures",
     "emptyTitle": "Aucune mesure pour l’instant",
     "emptyDescription": "Saisis du poids, de la tension, du pouls ou d’autres valeurs pour repérer les tendances.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Charge cardio",
     "typeSleepScore": "Score de sommeil",
     "typeBodyTemperatureDeviation": "Écart de température corporelle",
-    "filterBySource": "Filtrer par source",
     "sourceComputed": "Calculé",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "tristesse",
       "praise": "compliment"
     },
-    "filterBySource": "Filtrer par source",
     "sourceManual": "Manuel",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Médication, horaires et prises",
     "loginRequired": "Connecte-toi pour gérer tes médicaments.",
     "addMedication": "Ajouter",
-    "editMedication": "Modifier le médicament",
-    "newMedication": "Nouveau médicament",
     "firstMedication": "Ajouter le premier médicament",
     "addChoice": {
       "logIntake": "Enregistrer une prise",
@@ -778,16 +764,9 @@
     "loadFailed": "Impossible de charger les médicaments",
     "retryLoad": "Réessayer",
     "name": "Nom",
-    "dose": "Dose",
-    "scheduleFrom": "De",
-    "scheduleTo": "À",
-    "scheduleLabel": "Libellé",
-    "scheduleDays": "Jours",
-    "scheduleDaily": "Quotidien",
     "inactive": "En pause",
     "intakeHistory": "Historique des prises",
     "openDetailPage": "Ouvrir la page de détail du médicament",
-    "deleteConfirm": "Supprimer le médicament ?",
     "compliance": "Observance",
     "importIntakes": "Importer les prises",
     "importDescription": "Collez un tableau JSON contenant les données de prises. Format attendu :",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} entrées non valides ignorées",
     "importFailed": "Échec de l’importation",
     "importInvalidFormat": "Format JSON non valide",
-    "apiEndpointTitle": "Point de terminaison API : {name}",
-    "apiEndpointDescription": "Utilisez ce point de terminaison pour enregistrer des prises via l’API (par exemple un Raccourci iPhone ou une tâche cron).",
-    "apiEndpointActive": "Point de terminaison API actif",
-    "apiEndpointActivated": "Point de terminaison API activé",
-    "apiEndpointDeactivated": "Point de terminaison API désactivé",
-    "apiTokenCount": "Actif ({count} jetons)",
-    "apiToken": "Jeton API",
-    "apiTokenActiveHint": "Le point de terminaison est actif. Les jetons existants restent valides mais ne peuvent plus être affichés en texte clair.",
-    "apiTokenActivateHint": "Activez le point de terminaison pour créer un nouveau jeton.",
-    "apiTokenOnceHint": "Le jeton n’est affiché en texte clair qu’une seule fois, lors de sa création.",
     "requestExample": "Exemple de requête",
-    "statusLoadFailed": "Impossible de charger le statut",
-    "changeFailed": "Échec de la modification",
     "categoryBloodPressure": "Tension artérielle",
     "categoryVitamin": "Vitamines",
     "categoryThyroid": "Thyroïde",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Dernière dose il y a {count} jours",
     "overdue": "En retard",
     "veryOverdue": "Très en retard",
-    "compliance7d": "Observance 7 jours",
-    "compliance30d": "Observance 30 jours",
     "complianceWindow": "Observance {days} jours",
     "complianceUnavailable": "Impossible de charger l'observance",
     "complianceInfo": "Part des doses attendues que vous avez enregistrées. Les plans hebdomadaires comptent semaine par semaine.",
     "complianceInfoLabel": "Que signifie l'observance ?",
-    "complianceDoses": "{count} doses",
     "lastIntake": "Dernière prise :",
     "nextIntake": "Prochaine prise :",
     "nextIntakeOverdue": "En retard · {time} — encore rattrapable",
     "dayStreak": "jours de série",
     "dayStreakOne": "jour de série",
-    "cycleNextDoseToday": "Prochaine dose aujourd'hui",
-    "cycleNextDoseTomorrow": "Prochaine dose demain",
-    "cycleNextDoseInDays": "Prochaine dose dans {days} jours",
     "cycleDueToday": "À prendre aujourd'hui",
     "cycleOverdue": "En retard",
     "cycleNoClosedCycles": "Aucun cycle de dose terminé pour l'instant",
@@ -873,40 +834,10 @@
     "intakeUndo": "Annuler",
     "intakeUndone": "Entrée annulée",
     "intakeUndoFailed": "Annulation impossible — corrigez dans l'historique",
-    "weekdaySunday": "Dimanche",
-    "weekdayMonday": "Lundi",
-    "weekdayTuesday": "Mardi",
-    "weekdayWednesday": "Mercredi",
-    "weekdayThursday": "Jeudi",
-    "weekdayFriday": "Vendredi",
-    "weekdaySaturday": "Samedi",
-    "weekdaySundayPlural": "Dimanches",
-    "weekdayMondayPlural": "Lundis",
-    "weekdayTuesdayPlural": "Mardis",
-    "weekdayWednesdayPlural": "Mercredis",
-    "weekdayThursdayPlural": "Jeudis",
-    "weekdayFridayPlural": "Vendredis",
-    "weekdaySaturdayPlural": "Samedis",
-    "formType": "Type",
-    "formDose": "Dose",
-    "formUnit": "Unité",
-    "formSchedule": "Fenêtre horaire",
-    "formTreatmentClass": "Classe de traitement",
-    "formTreatmentClassHelp": "Choisis « Injection GLP-1 » pour les injections hebdomadaires comme Mounjaro, Ozempic, Wegovy, Zepbound. Active la carte corps et le journal GLP-1.",
-    "treatmentClassGeneric": "Médicament standard",
-    "treatmentClassGlp1": "Injection GLP-1",
-    "glp1WeeklyPresetTitle": "Une fois par semaine, le…",
-    "glp1WeeklyPresetHelp": "La plupart des agonistes du récepteur GLP-1 sont injectés une fois par semaine. Touche un jour pour fixer le rythme.",
-    "glp1WeeklyPresetSuggest": "Reprendre le dernier jour choisi",
-    "glp1DosesPerUnit": "Doses par stylo / flacon",
-    "glp1DosesPerUnitPlaceholder": "p. ex. 4 pour un stylo Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Optionnel — Mounjaro KwikPen = 4, Ozempic 0,25/0,5 mg = 4, Wegovy stylo à usage unique = 1. Laisse vide si tu ne veux pas suivre la dose par stylo.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (dans {days} jours)",
     "glp1NextInjectionToday": "aujourd’hui",
     "glp1NextInjectionTomorrow": "demain",
-    "glp1RotationLast": "Dernier site : {site}",
     "glp1RotationSuggested": "Conseillé : {site}",
     "glp1LogSideEffect": "Consigner un effet secondaire",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Ajouter un autre horaire",
           "edit": "Modifier",
           "remove": "Retirer",
-          "removeDisabled": "Au moins un horaire est requis.",
-          "empty": "Pas encore d’horaire."
+          "removeDisabled": "Au moins un horaire est requis."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "Perte d’appétit",
     "sideEffectTagHeartburn": "Brûlures d’estomac",
     "sideEffectTagHeadache": "Maux de tête",
-    "newSchedule": "Nouvelle fenêtre horaire",
-    "removeSchedule": "Supprimer la fenêtre",
-    "advancedEditing": "Édition avancée",
-    "advancedEditingHide": "Masquer l’édition avancée",
-    "scheduleInterval": "Intervalle",
-    "scheduleEveryWeek": "chaque semaine",
-    "scheduleEveryNWeeks": "toutes les {n} semaines",
-    "scheduleIntervalPrefix": "Intervalle :",
-    "nextSchedulePrefix": "Prochaine fenêtre :",
-    "nextScheduleDaily": "quotidien",
-    "importIntakesAction": "Importer des prises",
-    "apiEndpointAction": "Endpoint API",
-    "pause": "Mettre en pause",
-    "activate": "Activer",
-    "disableNotifications": "Désactiver les notifications",
-    "enableNotifications": "Activer les notifications",
-    "purgeRecords": "Purger les enregistrements",
-    "formReset": "Réinitialiser le formulaire",
-    "createMedication": "Créer le médicament",
-    "deleteConfirmDescription": "Ce médicament et toutes ses prises seront supprimés définitivement.",
-    "purgeConfirmTitle": "Supprimer toutes les prises ?",
-    "purgeConfirmDescription": "Toutes les prises enregistrées pour ce médicament seront supprimées définitivement.",
-    "saveError": "Erreur lors de l’enregistrement",
-    "deleteError": "Erreur lors de la suppression",
-    "purgeError": "Erreur lors de la purge",
-    "invalidTimestamp": "Choisis une date et une heure valides.",
-    "noIntakesYet": "Aucune prise enregistrée pour l’instant.",
-    "actions": "Actions",
-    "pageInfo": "Page {page} sur {total}",
-    "previousPage": "Page précédente",
-    "nextPage": "Page suivante",
-    "loginRequiredIntakes": "Connecte-toi pour voir l’historique des prises.",
     "phaseConfig": "Phases de rappel",
     "phaseConfigDescription": "Configure les moments des rappels.",
     "phaseGreen": "Vert",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Rouge",
     "phaseMinutes": "Min",
     "phasePercent": "%",
-    "phaseBeforeEnd": "avant la fin",
-    "phaseAfterEnd": "après la fin",
     "phaseResetDefaults": "Rétablir les valeurs par défaut",
     "phaseSaved": "Phases de rappel enregistrées",
-    "phaseReset": "Réinitialisées par défaut",
     "sourceWeb": "Web",
     "sourceApi": "App iOS",
     "sourceReminder": "Rappel",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Page {page} sur {total} · {count} entrées",
     "intakeHistoryPrev": "Précédent",
     "intakeHistoryNext": "Suivant",
-    "unitDrops": "gouttes",
-    "unitTablets": "comprimés",
-    "unitCapsules": "gélules",
-    "unitPieces": "pièces",
-    "namePlaceholder": "p. ex. Ramipril",
-    "dosePlaceholder": "p. ex. 5 mg",
-    "labelPlaceholder": "p. ex. Le matin",
-    "defaultDose": "Dose standard",
-    "dayDeactivate": "Désactiver {day}",
-    "dayActivate": "Activer {day}",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "Voir l'historique des prises"
       },
       "history": {
-        "back": "Retour au médicament",
-        "subtitle": "Historique complet des prises",
         "plannedSuffix": "prévu"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Par défaut",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Personnalisé",
     "overrideToggleLabel": "Valeurs personnelles",
     "resetAction": "Restaurer la valeur par défaut",
     "resetAllAction": "Tout restaurer aux valeurs par défaut",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Disponibilité des modules",
       "description": "Désactivez un module pour tout le serveur. Un module désactivé ici est coupé pour chaque compte, quelle que soit la préférence personnelle. Les domaines essentiels (poids, tension, pouls, médicaments) restent toujours actifs et ne peuvent pas être désactivés.",
-      "disabledHint": "Désactivé sur tout le serveur",
       "saveError": "Impossible de mettre à jour la disponibilité des modules."
     },
     "bugReportRepo": "Dépôt",
@@ -5343,12 +5223,10 @@
         "subtitle": "Opérations destructrices à l'échelle du système."
       },
       "about": {
-        "title": "À propos",
-        "subtitle": "Version, licence, code source et vérification des mises à jour."
+        "title": "À propos"
       }
     },
     "carrier": "Opérateur",
-    "carrierUnknown": "Opérateur inconnu",
     "carrierUnavailableGeoFallback": "{location} — opérateur indisponible"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Notifications",
     "breadcrumbInbox": "Notifications",
     "breadcrumbChannels": "Canaux de notification",
-    "breadcrumbSettings": "Paramètres",
     "eventColumn": "Événement",
     "subtitle": "Choisis quelles notifications tu reçois et par quel canal.",
     "loadError": "Impossible de charger les paramètres de notification.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "proche de la plage",
       "dotOutOfRange": "hors plage",
       "dotNotLogged": "non saisi",
-      "insufficientData": "Pas encore assez de données — continue à saisir.",
       "relativeDay": {
         "today": "Aujourd'hui",
         "yesterday": "Hier",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Modifier la plage cible de {metric}",
       "title": "Modifier la plage cible — {metric}",
       "description": "Ajuste la plage cible utilisée dans les graphiques, les insights et le rapport médical. Valeurs en {unit}.",
       "derivedHint": "Cette carte est dérivée d’autres métriques. Modifie plutôt les objectifs sous-jacents (p. ex. tension ou poids).",
@@ -5825,13 +5700,6 @@
       "saveError": "Impossible d’enregistrer la plage cible",
       "resetSuccess": "Plage cible réinitialisée"
     },
-    "mood": {
-      "stability": {
-        "stable": "stable",
-        "variable": "variable",
-        "highlyVariable": "très variable"
-      }
-    },
     "currentValue": "Actuel : {value} {unit}",
     "targetRangeValue": "Plage cible : {min}–{max} {unit}",
     "sourceLabel": "Source : {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Stock faible : {medName}",
-    "body": "{medName} : {units} unités restantes — environ {days} jours de réserve.",
     "bodyToday": "{medName} : {units} unités restantes — moins d’un jour de réserve.",
     "bodyReorder": "{medName} : {units} unités restantes. Le stock sera épuisé vers le {runsOutOn} — recommandez avant le {reorderBy}.",
     "bodyLastDose": "{medName} : {units} unités restantes — environ votre dernière dose. Le stock sera épuisé vers le {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "Comment chaque mesure se compare entre tes phases lutéale et folliculaire, sur tes propres données.",
         "pairLabel": "{metric} · lutéale vs folliculaire",
         "detail": "Lutéale {lutealAvg} {unit} ({lutealDays} jours) vs folliculaire {follicularAvg} {unit} ({follicularDays} jours).",
-        "footer": "Ce sont des associations dans tes propres données, pas des causes. Seuls les schémas qui passent un test de significativité sont affichés.",
         "metricRestingHeartRate": "Fréquence cardiaque au repos",
         "metricHrv": "Variabilité de la fréquence cardiaque",
         "metricSleepDuration": "Durée du sommeil",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "Confiance élevée"
       },
       "title": "Analyses du cycle",
-      "empty": "Les analyses par phase apparaissent ici une fois assez de cycles enregistrés. Elles comparent tes mesures entre les phases du cycle, avec les statistiques affichées ouvertement.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Taille d'effet {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Tendances des symptômes par phase",
       "symptomPatternsEmpty": "Notez vos symptômes sur un cycle pour voir dans quelle phase ils se regroupent.",
       "symptomMostlyIn": "Surtout en {phase} ({count}/{total} jours)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "La progestérone mène la seconde moitié et la température basale se stabilise en général un peu plus haut qu'au début du cycle. Certaines personnes remarquent des variations du sommeil, de l'appétit, de l'humeur ou de l'énergie au fil des jours, tandis que d'autres se sentent stables tout du long. Le schéma est personnel, et il se présente souvent différemment d'un mois à l'autre."
       },
       "commonHere": "Tu le remarques souvent ici",
-      "trackNudge": "Noter aujourd'hui",
       "stillLearning": "On apprend encore ton cycle. Continue à noter et cela se remplira avec les tendances de tes propres journées."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Mois précédent",
       "nextMonth": "Mois suivant",
       "loading": "Chargement de ton calendrier…",
-      "empty": "Commence à enregistrer pour remplir ton calendrier.",
       "learning": "Nous apprenons ton cycle — enregistre au moins trois cycles complets et la fenêtre fertile, l'ovulation et les phases se compléteront. D'ici là, le calendrier n'affiche que ce que tu as enregistré.",
-      "today": "Aujourd'hui",
-      "dayAria": "{date}",
       "legendSymptom": "Symptômes",
       "legendOvulationConfirmed": "Ovulation confirmée",
       "flowSpotting": "spotting",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "Ce qui arrive ensuite",
       "nextPeriod": "Prochaines règles",
-      "nextPeriodRange": "Vers le {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Fenêtre fertile",
       "ovulation": "Ovulation estimée",
-      "confidence": "Confiance",
       "confidenceHigh": "Élevée",
       "confidenceMedium": "Moyenne",
       "confidenceLow": "Faible",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Enregistrer ta journée",
       "description": "Saisis le flux, les symptômes et les notes du jour.",
-      "date": "Date",
       "flow": "Flux",
       "symptoms": "Symptômes",
       "temperature": "Température basale",
@@ -6259,10 +6114,7 @@
       "save": "Enregistrer",
       "saving": "Enregistrement…",
       "cancel": "Annuler",
-      "saved": "Journée enregistrée",
       "saveError": "Enregistrement impossible. Réessaie.",
-      "periodStarted": "Début des règles enregistré",
-      "clear": "Aucun",
       "intermenstrualBleeding": "Saignements entre les règles",
       "pregnancyTest": "Test de grossesse",
       "progesteroneTest": "Test de progestérone",
@@ -6278,8 +6130,6 @@
     },
     "settings": {
       "title": "Réglages du cycle",
-      "enable": "Suivi du cycle",
-      "enableDescription": "Active ou désactive l'onglet cycle pour ton compte.",
       "typicalCycleLength": "Durée typique du cycle (jours)",
       "typicalPeriodLength": "Durée typique des règles (jours)",
       "lutealPhaseLength": "Durée de la phase lutéale (jours)",
@@ -6298,30 +6148,14 @@
       "encryptionDescription": "Chiffre au repos les champs révélant l'intention (tests de grossesse, contraception, rapports), en plus des notes toujours chiffrées.",
       "discreet": "Notifications discrètes",
       "discreetDescription": "Masque les détails du cycle dans le texte des notifications sur ton écran verrouillé.",
-      "dataTitle": "Tes données",
-      "dataDescription": "Tes données de cycle ne vivent que sur ce serveur. Exporte-les quand tu veux, ou supprime-les définitivement.",
-      "export": "Exporter mes données de cycle",
-      "deleteData": "Supprimer mes données de cycle",
       "saved": "Réglages enregistrés",
       "saveError": "Enregistrement impossible. Réessaie.",
       "save": "Enregistrer",
-      "purgeTitle": "Supprimer toutes les données de cycle",
-      "purgeDescription": "Supprime définitivement chaque jour enregistré, cycle, prédiction et rappel. Action irréversible.",
-      "purgeButton": "Supprimer toutes les données de cycle",
-      "purgeConfirmTitle": "Supprimer toutes les données de cycle ?",
-      "purgeConfirmBody": "Cela supprime définitivement chaque règle, journal quotidien, symptôme et prédiction. Cette action est irréversible.",
-      "purgeConfirm": "Supprimer définitivement toutes les données de cycle ?",
-      "purgeCancel": "Annuler",
-      "purgeSuccess": "Toutes les données de cycle ont été supprimées.",
-      "purgeError": "Impossible de supprimer les données de cycle.",
       "reminders": "Rappels",
       "remindersDescription": "Activez les rappels de règles par canal dans les paramètres de notification.",
       "remindersLink": "Paramètres de notification",
       "fertileReminder": "Rappel de fenêtre fertile",
-      "fertileReminderDescription": "Recevez un avertissement quelques jours avant votre fenêtre fertile estimée. Désactivé par défaut : activez-le par canal dans les paramètres de notification.",
-      "purgeData": "Supprimer les données de cycle",
-      "purgeConfirmAction": "Oui, tout supprimer",
-      "purgeDone": "Données de cycle supprimées."
+      "fertileReminderDescription": "Recevez un avertissement quelques jours avant votre fenêtre fertile estimée. Désactivé par défaut : activez-le par canal dans les paramètres de notification."
     },
     "testResult": {
       "POSITIVE": "Positif",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Enregistrez des analyses comme l'HbA1c, le LDL ou la ferritine pour les suivre dans le temps et les partager avec votre médecin.",
     "referenceLabel": "Référence",
     "readingsCount": "{count} mesures",
-    "deleteLatest": "Supprimer la dernière valeur",
     "deleteConfirmTitle": "Supprimer le résultat d'analyse ?",
     "deleteConfirmDescription": "Ce résultat d'analyse sera définitivement supprimé.",
     "deletedToast": "Résultat supprimé",
@@ -6514,24 +6347,11 @@
       "above": "Au-dessus de la norme"
     },
     "form": {
-      "analyte": "Biomarqueur",
-      "analytePlaceholder": "ex. HbA1c, LDL, Ferritine",
       "value": "Valeur",
-      "unit": "Unité",
-      "unitPlaceholder": "ex. mg/dL, %, ng/mL",
       "takenAt": "Date du prélèvement",
-      "optionalGroup": "Facultatif",
-      "panel": "Panel",
-      "panelPlaceholder": "ex. Numération formule sanguine",
-      "referenceLow": "Référence basse",
-      "referenceHigh": "Référence haute",
-      "referenceLowPlaceholder": "Borne inférieure",
-      "referenceHighPlaceholder": "Borne supérieure",
-      "referenceHint": "Reprenez l'intervalle de référence de votre compte rendu. Chaque borne est facultative.",
       "note": "Note",
       "notePlaceholder": "Contexte facultatif pour ce résultat",
       "requiredError": "Saisissez une valeur.",
-      "rangeOrderError": "La référence basse ne doit pas dépasser la référence haute.",
       "save": "Enregistrer",
       "savedToast": "Résultat enregistré",
       "saveError": "Impossible d'enregistrer le résultat",
@@ -6824,7 +6644,6 @@
       "countOther": "Tu as enregistré {count} épisodes sur cette période.",
       "typicalGap": "Écart de récupération typique : {days} jours entre le mieux-être et la stabilisation de tes valeurs.",
       "typicalGapLearning": "Encore quelques épisodes résolus et un écart de récupération typique apparaîtra ici.",
-      "byMonth": "Quand tu enregistres des épisodes",
       "none": "Aucun épisode enregistré sur cette période."
     },
     "section": {
diff --git a/messages/it.json b/messages/it.json
index 3aef973cb..e5fb79eb1 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -18,7 +18,6 @@
     "optional": "Opzionale",
     "active": "Attivo",
     "inactive": "Inattivo",
-    "enabled": "Abilitato",
     "disabled": "Disabilitato",
     "networkError": "Errore di rete",
     "unknownError": "Errore sconosciuto",
@@ -74,7 +73,6 @@
     "colTaken": "Assunta",
     "colSkipped": "Saltata",
     "colMissed": "Persa",
-    "colTotal": "Totale",
     "colExpected": "Attese",
     "colComplianceRate": "Tasso di aderenza",
     "moodTitle": "Andamento dell’umore",
@@ -202,14 +200,12 @@
     "measurements": "Misurazioni",
     "medications": "Farmaci",
     "insights": "Insights",
-    "targets": "Obiettivi",
     "achievements": "Traguardi",
     "settings": "Impostazioni",
     "bugreport": "Segnalazione bug",
     "admin": "Console di amministrazione",
     "logout": "Esci",
     "login": "Accedi",
-    "about": "Informazioni su HealthLog",
     "notifications": "Notifiche",
     "theme": "Aspetto",
     "themeSystem": "Sistema",
@@ -219,13 +215,11 @@
     "userMenu": "Menu utente",
     "accountSettings": "Impostazioni account",
     "mood": "Umore",
-    "workouts": "Allenamenti",
     "coach": "Coach",
     "skipToContent": "Vai al contenuto",
     "sidebar": "Barra laterale",
     "mainNavigation": "Navigazione principale",
     "mobileNavigation": "Navigazione mobile",
-    "breadcrumb": "Navigazione breadcrumb",
     "loadingScreen": "Caricamento…",
     "more": "Altro",
     "moreSheetTitle": "Altro",
@@ -242,7 +236,6 @@
     },
     "cycle": "Ciclo",
     "labs": "Esami",
-    "recovery": "Recupero",
     "vorsorge": "Prevenzione",
     "illness": "Malattia"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Sonno",
     "stepsShort": "Passi",
     "vo2MaxShort": "VO₂ max",
-    "bpInTargetShort": "PA-target",
     "bpInTargetWindow90": "PA-target · 90 gg",
     "bpInTargetWindowDynamic": "PA-target · {days} gg",
     "bpInTargetCollecting": "raccolta dati in corso",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Ultimo valore {count} settimane fa",
     "staleHintMonthsOne": "Ultimo valore 1 mese fa",
     "staleHintMonthsOther": "Ultimo valore {count} mesi fa",
-    "coachCta": "Chiedi al coach",
     "recentWorkouts": {
       "title": "Allenamenti recenti",
       "viewAll": "Vedi tutti",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Scegli una data e un’ora valide.",
     "loginRequired": "Accedi per vedere le misurazioni.",
     "allTypes": "Tutti i tipi",
-    "filterByType": "Filtra per tipo",
     "measurementCount": "{count} misurazioni",
     "emptyTitle": "Ancora nessuna misurazione",
     "emptyDescription": "Registra peso, pressione, pulsazioni o altri valori per individuare i trend.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Carico cardio",
     "typeSleepScore": "Punteggio del sonno",
     "typeBodyTemperatureDeviation": "Deviazione della temperatura corporea",
-    "filterBySource": "Filtra per fonte",
     "sourceComputed": "Calcolato",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "tristezza",
       "praise": "elogio"
     },
-    "filterBySource": "Filtra per fonte",
     "sourceManual": "Manuale",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Farmaci, orari e assunzioni",
     "loginRequired": "Accedi per gestire i farmaci.",
     "addMedication": "Aggiungi",
-    "editMedication": "Modifica farmaco",
-    "newMedication": "Nuovo farmaco",
     "firstMedication": "Aggiungi il primo farmaco",
     "addChoice": {
       "logIntake": "Registra un'assunzione",
@@ -778,16 +764,9 @@
     "loadFailed": "Impossibile caricare i farmaci",
     "retryLoad": "Riprova",
     "name": "Nome",
-    "dose": "Dose",
-    "scheduleFrom": "Da",
-    "scheduleTo": "A",
-    "scheduleLabel": "Etichetta",
-    "scheduleDays": "Giorni",
-    "scheduleDaily": "Quotidiano",
     "inactive": "In pausa",
     "intakeHistory": "Cronologia assunzioni",
     "openDetailPage": "Apri la pagina di dettaglio del farmaco",
-    "deleteConfirm": "Eliminare il farmaco?",
     "compliance": "Aderenza",
     "importIntakes": "Importa assunzioni",
     "importDescription": "Incolla un array JSON con i dati delle assunzioni. Formato previsto:",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} voci non valide ignorate",
     "importFailed": "Importazione non riuscita",
     "importInvalidFormat": "Formato JSON non valido",
-    "apiEndpointTitle": "Endpoint API: {name}",
-    "apiEndpointDescription": "Usa questo endpoint per registrare assunzioni tramite API (ad es. con un Comando rapido iPhone o un cron job).",
-    "apiEndpointActive": "Endpoint API attivo",
-    "apiEndpointActivated": "Endpoint API attivato",
-    "apiEndpointDeactivated": "Endpoint API disattivato",
-    "apiTokenCount": "Attivo ({count} token)",
-    "apiToken": "Token API",
-    "apiTokenActiveHint": "L’endpoint è attivo. I token esistenti restano validi ma non possono essere mostrati di nuovo in chiaro.",
-    "apiTokenActivateHint": "Attiva l’endpoint per creare un nuovo token.",
-    "apiTokenOnceHint": "Il token viene mostrato in chiaro solo una volta, alla creazione.",
     "requestExample": "Esempio di richiesta",
-    "statusLoadFailed": "Impossibile caricare lo stato",
-    "changeFailed": "Modifica non riuscita",
     "categoryBloodPressure": "Pressione arteriosa",
     "categoryVitamin": "Vitamine",
     "categoryThyroid": "Tiroide",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Ultima dose {count} giorni fa",
     "overdue": "In ritardo",
     "veryOverdue": "Molto in ritardo",
-    "compliance7d": "Aderenza 7 giorni",
-    "compliance30d": "Aderenza 30 giorni",
     "complianceWindow": "Aderenza {days} giorni",
     "complianceUnavailable": "Impossibile caricare l'aderenza",
     "complianceInfo": "Quota delle dosi attese che hai registrato. I piani settimanali contano settimana per settimana.",
     "complianceInfoLabel": "Cosa significa aderenza?",
-    "complianceDoses": "{count} dosi",
     "lastIntake": "Ultima assunzione:",
     "nextIntake": "Prossima assunzione:",
     "nextIntakeOverdue": "In ritardo · {time} — ancora recuperabile",
     "dayStreak": "giorni di serie",
     "dayStreakOne": "giorno di serie",
-    "cycleNextDoseToday": "Prossima dose oggi",
-    "cycleNextDoseTomorrow": "Prossima dose domani",
-    "cycleNextDoseInDays": "Prossima dose tra {days} giorni",
     "cycleDueToday": "In scadenza oggi",
     "cycleOverdue": "In ritardo",
     "cycleNoClosedCycles": "Ancora nessun ciclo di dose completato",
@@ -873,40 +834,10 @@
     "intakeUndo": "Annulla",
     "intakeUndone": "Voce annullata",
     "intakeUndoFailed": "Impossibile annullare; correggi nella cronologia",
-    "weekdaySunday": "Domenica",
-    "weekdayMonday": "Lunedì",
-    "weekdayTuesday": "Martedì",
-    "weekdayWednesday": "Mercoledì",
-    "weekdayThursday": "Giovedì",
-    "weekdayFriday": "Venerdì",
-    "weekdaySaturday": "Sabato",
-    "weekdaySundayPlural": "Domeniche",
-    "weekdayMondayPlural": "Lunedì",
-    "weekdayTuesdayPlural": "Martedì",
-    "weekdayWednesdayPlural": "Mercoledì",
-    "weekdayThursdayPlural": "Giovedì",
-    "weekdayFridayPlural": "Venerdì",
-    "weekdaySaturdayPlural": "Sabati",
-    "formType": "Tipo",
-    "formDose": "Dose",
-    "formUnit": "Unità",
-    "formSchedule": "Fascia oraria",
-    "formTreatmentClass": "Classe di trattamento",
-    "formTreatmentClassHelp": "Scegli \"Iniezione GLP-1\" per iniezioni settimanali come Mounjaro, Ozempic, Wegovy, Zepbound. Attiva la card del corpo e il diario GLP-1.",
-    "treatmentClassGeneric": "Farmaco standard",
-    "treatmentClassGlp1": "Iniezione GLP-1",
-    "glp1WeeklyPresetTitle": "Una volta a settimana, di…",
-    "glp1WeeklyPresetHelp": "La maggior parte degli agonisti del recettore GLP-1 viene iniettata una volta a settimana. Tocca un giorno per impostare il ritmo.",
-    "glp1WeeklyPresetSuggest": "Riprendi l’ultimo giorno scelto",
-    "glp1DosesPerUnit": "Dosi per penna / fiala",
-    "glp1DosesPerUnitPlaceholder": "es. 4 per una penna Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Opzionale — Mounjaro KwikPen = 4, Ozempic 0,25/0,5 mg = 4, Wegovy penna monouso = 1. Lascia vuoto se non vuoi monitorare le dosi per penna.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (tra {days} giorni)",
     "glp1NextInjectionToday": "oggi",
     "glp1NextInjectionTomorrow": "domani",
-    "glp1RotationLast": "Ultima sede: {site}",
     "glp1RotationSuggested": "Suggerita: {site}",
     "glp1LogSideEffect": "Registra effetto collaterale",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Aggiungi un altro programma",
           "edit": "Modifica",
           "remove": "Rimuovi",
-          "removeDisabled": "È richiesto almeno un programma.",
-          "empty": "Ancora nessun programma."
+          "removeDisabled": "È richiesto almeno un programma."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "Perdita di appetito",
     "sideEffectTagHeartburn": "Bruciore di stomaco",
     "sideEffectTagHeadache": "Mal di testa",
-    "newSchedule": "Nuova fascia oraria",
-    "removeSchedule": "Rimuovi fascia oraria",
-    "advancedEditing": "Modifica avanzata",
-    "advancedEditingHide": "Nascondi modifica avanzata",
-    "scheduleInterval": "Intervallo",
-    "scheduleEveryWeek": "ogni settimana",
-    "scheduleEveryNWeeks": "ogni {n} settimane",
-    "scheduleIntervalPrefix": "Intervallo:",
-    "nextSchedulePrefix": "Prossima fascia:",
-    "nextScheduleDaily": "quotidiano",
-    "importIntakesAction": "Importa assunzioni",
-    "apiEndpointAction": "Endpoint API",
-    "pause": "Metti in pausa",
-    "activate": "Attiva",
-    "disableNotifications": "Disattiva le notifiche",
-    "enableNotifications": "Attiva le notifiche",
-    "purgeRecords": "Elimina i record",
-    "formReset": "Reimposta modulo",
-    "createMedication": "Crea farmaco",
-    "deleteConfirmDescription": "Questo farmaco e tutte le sue assunzioni saranno eliminati in modo definitivo.",
-    "purgeConfirmTitle": "Eliminare tutte le assunzioni?",
-    "purgeConfirmDescription": "Tutte le assunzioni registrate per questo farmaco saranno eliminate in modo definitivo.",
-    "saveError": "Errore durante il salvataggio",
-    "deleteError": "Errore durante l’eliminazione",
-    "purgeError": "Errore durante l’eliminazione dei record",
-    "invalidTimestamp": "Scegli una data e un’ora valide.",
-    "noIntakesYet": "Ancora nessuna assunzione registrata.",
-    "actions": "Azioni",
-    "pageInfo": "Pagina {page} di {total}",
-    "previousPage": "Pagina precedente",
-    "nextPage": "Pagina successiva",
-    "loginRequiredIntakes": "Accedi per vedere la cronologia delle assunzioni.",
     "phaseConfig": "Fasi di promemoria",
     "phaseConfigDescription": "Configura i momenti dei promemoria.",
     "phaseGreen": "Verde",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Rosso",
     "phaseMinutes": "Min",
     "phasePercent": "%",
-    "phaseBeforeEnd": "prima della fine",
-    "phaseAfterEnd": "dopo la fine",
     "phaseResetDefaults": "Ripristina predefiniti",
     "phaseSaved": "Fasi di promemoria salvate",
-    "phaseReset": "Ripristinate ai valori predefiniti",
     "sourceWeb": "Web",
     "sourceApi": "App iOS",
     "sourceReminder": "Promemoria",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Pagina {page} di {total} · {count} voci",
     "intakeHistoryPrev": "Precedente",
     "intakeHistoryNext": "Successiva",
-    "unitDrops": "gocce",
-    "unitTablets": "compresse",
-    "unitCapsules": "capsule",
-    "unitPieces": "pezzi",
-    "namePlaceholder": "es. Ramipril",
-    "dosePlaceholder": "es. 5 mg",
-    "labelPlaceholder": "es. Al mattino",
-    "defaultDose": "Dose standard",
-    "dayDeactivate": "Disattiva {day}",
-    "dayActivate": "Attiva {day}",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "Visualizza cronologia assunzioni"
       },
       "history": {
-        "back": "Torna al farmaco",
-        "subtitle": "Cronologia completa delle assunzioni",
         "plannedSuffix": "pianificato"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Predefinito",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Personalizzato",
     "overrideToggleLabel": "Valori personali",
     "resetAction": "Ripristina predefinito",
     "resetAllAction": "Ripristina tutti ai predefiniti",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Disponibilità dei moduli",
       "description": "Disattiva un modulo per l'intero server. Un modulo disattivato qui è spento per ogni account, indipendentemente dalle preferenze personali. I domini principali (peso, pressione, polso, farmaci) sono sempre attivi e non possono essere disattivati.",
-      "disabledHint": "Disattivato a livello di server",
       "saveError": "Impossibile aggiornare la disponibilità dei moduli."
     },
     "bugReportRepo": "Repository",
@@ -5343,12 +5223,10 @@
         "subtitle": "Operazioni distruttive a livello di sistema."
       },
       "about": {
-        "title": "Informazioni",
-        "subtitle": "Versione, licenza, codice sorgente e verifica degli aggiornamenti."
+        "title": "Informazioni"
       }
     },
     "carrier": "Operatore",
-    "carrierUnknown": "Operatore sconosciuto",
     "carrierUnavailableGeoFallback": "{location} — operatore non disponibile"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Notifiche",
     "breadcrumbInbox": "Notifiche",
     "breadcrumbChannels": "Canali di notifica",
-    "breadcrumbSettings": "Impostazioni",
     "eventColumn": "Evento",
     "subtitle": "Scegli quali notifiche ricevere e su quale canale.",
     "loadError": "Impossibile caricare le impostazioni di notifica.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "vicino al range",
       "dotOutOfRange": "fuori range",
       "dotNotLogged": "non registrato",
-      "insufficientData": "Ancora pochi dati — continua a registrare.",
       "relativeDay": {
         "today": "Oggi",
         "yesterday": "Ieri",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Modifica il range obiettivo per {metric}",
       "title": "Modifica range obiettivo — {metric}",
       "description": "Regola il range obiettivo usato in grafici, insights e referto medico. Valori in {unit}.",
       "derivedHint": "Questa card è derivata da altre metriche. Modifica gli obiettivi sottostanti (es. pressione o peso).",
@@ -5825,13 +5700,6 @@
       "saveError": "Impossibile salvare il range obiettivo",
       "resetSuccess": "Range obiettivo ripristinato"
     },
-    "mood": {
-      "stability": {
-        "stable": "stabile",
-        "variable": "variabile",
-        "highlyVariable": "molto variabile"
-      }
-    },
     "currentValue": "Attuale: {value} {unit}",
     "targetRangeValue": "Range obiettivo: {min}–{max} {unit}",
     "sourceLabel": "Fonte: {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Scorte in esaurimento: {medName}",
-    "body": "{medName}: {units} unità rimaste — bastano per circa {days} giorni.",
     "bodyToday": "{medName}: {units} unità rimaste — meno di un giorno di scorta.",
     "bodyReorder": "{medName}: {units} unità rimaste. Le scorte finiscono intorno al {runsOutOn} — riordina entro il {reorderBy}.",
     "bodyLastDose": "{medName}: {units} unità rimaste — circa la tua ultima dose. Le scorte finiscono intorno al {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "Come si confronta ogni misurazione tra la fase luteale e quella follicolare, sui tuoi dati.",
         "pairLabel": "{metric} · luteale vs follicolare",
         "detail": "Luteale {lutealAvg} {unit} ({lutealDays} giorni) vs follicolare {follicularAvg} {unit} ({follicularDays} giorni).",
-        "footer": "Sono associazioni nei tuoi dati, non cause. Vengono mostrati solo gli schemi che superano un test di significatività.",
         "metricRestingHeartRate": "Frequenza cardiaca a riposo",
         "metricHrv": "Variabilità della frequenza cardiaca",
         "metricSleepDuration": "Durata del sonno",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "Affidabilità alta"
       },
       "title": "Analisi del ciclo",
-      "empty": "Le analisi per fase compaiono qui quando hai registrato abbastanza cicli. Confrontano le tue misure tra le fasi del ciclo, con la statistica mostrata apertamente.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Dimensione dell'effetto {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Pattern dei sintomi per fase",
       "symptomPatternsEmpty": "Registra i sintomi durante un ciclo per vedere in quale fase si concentrano.",
       "symptomMostlyIn": "Soprattutto in {phase} ({count}/{total} giorni)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "Il progesterone guida la seconda metà e la temperatura basale di solito si assesta un po' più in alto rispetto all'inizio del ciclo. Alcune persone notano cambiamenti nel sonno, nell'appetito, nell'umore o nell'energia con il passare dei giorni, mentre altre si sentono stabili per tutto il tempo. Lo schema è personale e spesso appare diverso da un mese all'altro."
       },
       "commonHere": "Questo lo noti spesso qui",
-      "trackNudge": "Registra oggi",
       "stillLearning": "Stiamo ancora imparando il tuo ciclo. Continua a registrare e questo si completerà con gli schemi delle tue giornate."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Mese precedente",
       "nextMonth": "Mese successivo",
       "loading": "Caricamento del calendario…",
-      "empty": "Inizia a registrare per riempire il calendario.",
       "learning": "Stiamo imparando il tuo ciclo: registra almeno tre cicli completi e si completeranno la finestra fertile, l'ovulazione e le fasi. Fino ad allora il calendario mostra solo ciò che hai registrato.",
-      "today": "Oggi",
-      "dayAria": "{date}",
       "legendSymptom": "Sintomi",
       "legendOvulationConfirmed": "Ovulazione confermata",
       "flowSpotting": "spotting",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "Cosa arriva dopo",
       "nextPeriod": "Prossimo ciclo",
-      "nextPeriodRange": "Intorno al {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Finestra fertile",
       "ovulation": "Ovulazione stimata",
-      "confidence": "Affidabilità",
       "confidenceHigh": "Alta",
       "confidenceMedium": "Media",
       "confidenceLow": "Bassa",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Registra la tua giornata",
       "description": "Annota flusso, sintomi e note di oggi.",
-      "date": "Data",
       "flow": "Flusso",
       "symptoms": "Sintomi",
       "temperature": "Temperatura basale",
@@ -6259,10 +6114,7 @@
       "save": "Salva",
       "saving": "Salvataggio…",
       "cancel": "Annulla",
-      "saved": "Giornata salvata",
       "saveError": "Impossibile salvare. Riprova.",
-      "periodStarted": "Inizio del ciclo registrato",
-      "clear": "Nessuno",
       "intermenstrualBleeding": "Spotting tra i cicli",
       "pregnancyTest": "Test di gravidanza",
       "progesteroneTest": "Test del progesterone",
@@ -6278,8 +6130,6 @@
     },
     "settings": {
       "title": "Impostazioni del ciclo",
-      "enable": "Monitoraggio del ciclo",
-      "enableDescription": "Attiva o disattiva la scheda ciclo per il tuo account.",
       "typicalCycleLength": "Durata tipica del ciclo (giorni)",
       "typicalPeriodLength": "Durata tipica delle mestruazioni (giorni)",
       "lutealPhaseLength": "Durata della fase luteale (giorni)",
@@ -6298,30 +6148,14 @@
       "encryptionDescription": "Cifra a riposo i campi che rivelano l'intenzione (test di gravidanza, contraccezione, rapporti), oltre alle note sempre cifrate.",
       "discreet": "Notifiche discrete",
       "discreetDescription": "Nascondi i dettagli del ciclo nel testo delle notifiche sulla schermata di blocco.",
-      "dataTitle": "I tuoi dati",
-      "dataDescription": "I tuoi dati del ciclo vivono solo su questo server. Esportali quando vuoi, o eliminali per sempre.",
-      "export": "Esporta i miei dati del ciclo",
-      "deleteData": "Elimina i miei dati del ciclo",
       "saved": "Impostazioni salvate",
       "saveError": "Impossibile salvare. Riprova.",
       "save": "Salva",
-      "purgeTitle": "Elimina tutti i dati del ciclo",
-      "purgeDescription": "Rimuove definitivamente ogni giorno registrato, ciclo, previsione e promemoria. Operazione irreversibile.",
-      "purgeButton": "Elimina tutti i dati del ciclo",
-      "purgeConfirmTitle": "Eliminare tutti i dati del ciclo?",
-      "purgeConfirmBody": "Questo elimina definitivamente ogni mestruazione, registro giornaliero, sintomo e previsione. L'operazione è irreversibile.",
-      "purgeConfirm": "Eliminare definitivamente tutti i dati del ciclo?",
-      "purgeCancel": "Annulla",
-      "purgeSuccess": "Tutti i dati del ciclo eliminati.",
-      "purgeError": "Impossibile eliminare i dati del ciclo.",
       "reminders": "Promemoria",
       "remindersDescription": "Attiva i promemoria del ciclo per canale nelle impostazioni di notifica.",
       "remindersLink": "Impostazioni di notifica",
       "fertileReminder": "Promemoria finestra fertile",
-      "fertileReminderDescription": "Ricevi un avviso alcuni giorni prima della tua finestra fertile stimata. Disattivato per impostazione predefinita: attivalo per canale nelle impostazioni di notifica.",
-      "purgeData": "Elimina i dati del ciclo",
-      "purgeConfirmAction": "Sì, elimina tutto",
-      "purgeDone": "Dati del ciclo eliminati."
+      "fertileReminderDescription": "Ricevi un avviso alcuni giorni prima della tua finestra fertile stimata. Disattivato per impostazione predefinita: attivalo per canale nelle impostazioni di notifica."
     },
     "testResult": {
       "POSITIVE": "Positivo",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Registra esami come HbA1c, LDL o ferritina per seguirli nel tempo e condividerli con il tuo medico.",
     "referenceLabel": "Riferimento",
     "readingsCount": "{count} misurazioni",
-    "deleteLatest": "Elimina l'ultimo valore",
     "deleteConfirmTitle": "Eliminare il risultato di laboratorio?",
     "deleteConfirmDescription": "Questo risultato di laboratorio verrà eliminato definitivamente.",
     "deletedToast": "Risultato eliminato",
@@ -6514,24 +6347,11 @@
       "above": "Sopra la norma"
     },
     "form": {
-      "analyte": "Biomarcatore",
-      "analytePlaceholder": "es. HbA1c, LDL, Ferritina",
       "value": "Valore",
-      "unit": "Unità",
-      "unitPlaceholder": "es. mg/dL, %, ng/mL",
       "takenAt": "Data del prelievo",
-      "optionalGroup": "Facoltativo",
-      "panel": "Pannello",
-      "panelPlaceholder": "es. Emocromo completo",
-      "referenceLow": "Riferimento minimo",
-      "referenceHigh": "Riferimento massimo",
-      "referenceLowPlaceholder": "Limite inferiore",
-      "referenceHighPlaceholder": "Limite superiore",
-      "referenceHint": "Copia l'intervallo di riferimento dal referto. Ciascun limite è facoltativo.",
       "note": "Nota",
       "notePlaceholder": "Contesto facoltativo per questo risultato",
       "requiredError": "Inserisci un valore.",
-      "rangeOrderError": "Il riferimento minimo non può superare quello massimo.",
       "save": "Salva",
       "savedToast": "Risultato salvato",
       "saveError": "Impossibile salvare il risultato",
@@ -6824,7 +6644,6 @@
       "countOther": "Hai registrato {count} episodi in questo periodo.",
       "typicalGap": "Divario di recupero tipico: {days} giorni tra il sentirti meglio e la stabilizzazione dei valori.",
       "typicalGapLearning": "Ancora qualche episodio risolto e qui apparirà un divario di recupero tipico.",
-      "byMonth": "Quando tendi a registrare episodi",
       "none": "Nessun episodio registrato in questo periodo."
     },
     "section": {
diff --git a/messages/pl.json b/messages/pl.json
index d91c6f7bd..f09755820 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -18,7 +18,6 @@
     "optional": "Opcjonalne",
     "active": "Aktywne",
     "inactive": "Nieaktywne",
-    "enabled": "Włączone",
     "disabled": "Wyłączone",
     "networkError": "Błąd sieci",
     "unknownError": "Nieznany błąd",
@@ -74,7 +73,6 @@
     "colTaken": "Przyjęte",
     "colSkipped": "Pominięte",
     "colMissed": "Pominięte",
-    "colTotal": "Razem",
     "colExpected": "Oczekiwane",
     "colComplianceRate": "Wskaźnik przestrzegania",
     "moodTitle": "Przebieg nastroju",
@@ -202,14 +200,12 @@
     "measurements": "Pomiary",
     "medications": "Leki",
     "insights": "Insights",
-    "targets": "Cele",
     "achievements": "Osiągnięcia",
     "settings": "Ustawienia",
     "bugreport": "Zgłoszenie błędu",
     "admin": "Konsola administratora",
     "logout": "Wyloguj",
     "login": "Zaloguj",
-    "about": "O HealthLog",
     "notifications": "Powiadomienia",
     "theme": "Wygląd",
     "themeSystem": "Systemowy",
@@ -219,13 +215,11 @@
     "userMenu": "Menu użytkownika",
     "accountSettings": "Ustawienia konta",
     "mood": "Nastrój",
-    "workouts": "Treningi",
     "coach": "Coach",
     "skipToContent": "Przejdź do treści",
     "sidebar": "Pasek boczny",
     "mainNavigation": "Nawigacja główna",
     "mobileNavigation": "Nawigacja mobilna",
-    "breadcrumb": "Nawigacja okruszkami",
     "loadingScreen": "Ładowanie…",
     "more": "Więcej",
     "moreSheetTitle": "Więcej",
@@ -242,7 +236,6 @@
     },
     "cycle": "Cykl",
     "labs": "Wyniki badań",
-    "recovery": "Regeneracja",
     "vorsorge": "Profilaktyka",
     "illness": "Choroba"
   },
@@ -330,7 +323,6 @@
     "sleepShort": "Sen",
     "stepsShort": "Kroki",
     "vo2MaxShort": "VO₂ max",
-    "bpInTargetShort": "RR-cel",
     "bpInTargetWindow90": "RR-cel · 90 d",
     "bpInTargetWindowDynamic": "RR-cel · {days} d",
     "bpInTargetCollecting": "zbieranie danych",
@@ -384,7 +376,6 @@
     "staleHintWeeksOther": "Ostatni odczyt {count} tygodni temu",
     "staleHintMonthsOne": "Ostatni odczyt 1 miesiąc temu",
     "staleHintMonthsOther": "Ostatni odczyt {count} miesięcy temu",
-    "coachCta": "Zapytaj coacha",
     "recentWorkouts": {
       "title": "Ostatnie treningi",
       "viewAll": "Zobacz wszystkie",
@@ -499,7 +490,6 @@
     "invalidTimestamp": "Wybierz poprawną datę i godzinę.",
     "loginRequired": "Zaloguj się, aby zobaczyć pomiary.",
     "allTypes": "Wszystkie typy",
-    "filterByType": "Filtruj według typu",
     "measurementCount": "{count} pomiarów",
     "emptyTitle": "Brak pomiarów",
     "emptyDescription": "Zarejestruj wagę, ciśnienie, tętno lub inne wartości, aby zauważyć trendy.",
@@ -550,7 +540,6 @@
     "typeCardioLoad": "Obciążenie kardio",
     "typeSleepScore": "Wynik snu",
     "typeBodyTemperatureDeviation": "Odchylenie temperatury ciała",
-    "filterBySource": "Filtruj według źródła",
     "sourceComputed": "Obliczone",
     "sourceWhoop": "WHOOP",
     "sourceFitbit": "Fitbit",
@@ -670,7 +659,6 @@
       "factorSadness": "smutek",
       "praise": "pochwała"
     },
-    "filterBySource": "Filtruj według źródła",
     "sourceManual": "Ręcznie",
     "sourceWeb": "Web",
     "sourceTelegram": "Telegram",
@@ -741,8 +729,6 @@
     "subtitle": "Leki, harmonogramy i przyjęcia",
     "loginRequired": "Zaloguj się, aby zarządzać lekami.",
     "addMedication": "Dodaj",
-    "editMedication": "Edytuj lek",
-    "newMedication": "Nowy lek",
     "firstMedication": "Dodaj pierwszy lek",
     "addChoice": {
       "logIntake": "Zarejestruj przyjęcie",
@@ -778,16 +764,9 @@
     "loadFailed": "Nie udało się załadować leków",
     "retryLoad": "Spróbuj ponownie",
     "name": "Nazwa",
-    "dose": "Dawka",
-    "scheduleFrom": "Od",
-    "scheduleTo": "Do",
-    "scheduleLabel": "Etykieta",
-    "scheduleDays": "Dni",
-    "scheduleDaily": "Codziennie",
     "inactive": "Wstrzymany",
     "intakeHistory": "Historia przyjęć",
     "openDetailPage": "Otwórz stronę szczegółów leku",
-    "deleteConfirm": "Usunąć lek?",
     "compliance": "Przestrzeganie zaleceń",
     "importIntakes": "Importuj przyjęcia",
     "importDescription": "Wklej tablicę JSON z danymi przyjęć. Oczekiwany format:",
@@ -802,19 +781,7 @@
     "importInvalidSkipped": "{count} nieprawidłowych wpisów pominięto",
     "importFailed": "Import nie powiódł się",
     "importInvalidFormat": "Nieprawidłowy format JSON",
-    "apiEndpointTitle": "Punkt końcowy API: {name}",
-    "apiEndpointDescription": "Użyj tego punktu końcowego do rejestrowania przyjęć przez API (np. Skrót iPhone lub zadanie cron).",
-    "apiEndpointActive": "Punkt końcowy API aktywny",
-    "apiEndpointActivated": "Punkt końcowy API aktywowany",
-    "apiEndpointDeactivated": "Punkt końcowy API dezaktywowany",
-    "apiTokenCount": "Aktywny ({count} tokenów)",
-    "apiToken": "Token API",
-    "apiTokenActiveHint": "Punkt końcowy jest aktywny. Istniejące tokeny pozostają ważne, ale nie można ich ponownie pokazać jako zwykły tekst.",
-    "apiTokenActivateHint": "Aktywuj punkt końcowy, aby utworzyć nowy token.",
-    "apiTokenOnceHint": "Token jest pokazywany jako zwykły tekst tylko raz, przy tworzeniu.",
     "requestExample": "Przykład żądania",
-    "statusLoadFailed": "Nie udało się wczytać statusu",
-    "changeFailed": "Zmiana nie powiodła się",
     "categoryBloodPressure": "Ciśnienie krwi",
     "categoryVitamin": "Witaminy",
     "categoryThyroid": "Tarczyca",
@@ -847,21 +814,15 @@
     "lastDoseDaysAgo": "Ostatnia dawka {count} dni temu",
     "overdue": "Po terminie",
     "veryOverdue": "Mocno po terminie",
-    "compliance7d": "Przestrzeganie 7 dni",
-    "compliance30d": "Przestrzeganie 30 dni",
     "complianceWindow": "Przestrzeganie {days} dni",
     "complianceUnavailable": "Nie udało się wczytać danych o przestrzeganiu",
     "complianceInfo": "Udział zarejestrowanych dawek względem oczekiwanych. Plany tygodniowe liczone są tydzień po tygodniu.",
     "complianceInfoLabel": "Co oznacza przestrzeganie zaleceń?",
-    "complianceDoses": "Dawki: {count}",
     "lastIntake": "Ostatnie przyjęcie:",
     "nextIntake": "Następne przyjęcie:",
     "nextIntakeOverdue": "Zaległa · {time} — wciąż można przyjąć",
     "dayStreak": "dni serii",
     "dayStreakOne": "dzień serii",
-    "cycleNextDoseToday": "Następna dawka dzisiaj",
-    "cycleNextDoseTomorrow": "Następna dawka jutro",
-    "cycleNextDoseInDays": "Następna dawka za {days} dni",
     "cycleDueToday": "Termin dzisiaj",
     "cycleOverdue": "Zaległa",
     "cycleNoClosedCycles": "Brak zakończonych cykli dawkowania",
@@ -873,40 +834,10 @@
     "intakeUndo": "Cofnij",
     "intakeUndone": "Wpis cofnięty",
     "intakeUndoFailed": "Nie udało się cofnąć — popraw w historii",
-    "weekdaySunday": "Niedziela",
-    "weekdayMonday": "Poniedziałek",
-    "weekdayTuesday": "Wtorek",
-    "weekdayWednesday": "Środa",
-    "weekdayThursday": "Czwartek",
-    "weekdayFriday": "Piątek",
-    "weekdaySaturday": "Sobota",
-    "weekdaySundayPlural": "Niedziele",
-    "weekdayMondayPlural": "Poniedziałki",
-    "weekdayTuesdayPlural": "Wtorki",
-    "weekdayWednesdayPlural": "Środy",
-    "weekdayThursdayPlural": "Czwartki",
-    "weekdayFridayPlural": "Piątki",
-    "weekdaySaturdayPlural": "Soboty",
-    "formType": "Typ",
-    "formDose": "Dawka",
-    "formUnit": "Jednostka",
-    "formSchedule": "Okno czasowe",
-    "formTreatmentClass": "Klasa terapii",
-    "formTreatmentClassHelp": "Wybierz „Iniekcja GLP-1” dla cotygodniowych iniekcji jak Mounjaro, Ozempic, Wegovy, Zepbound. Odblokowuje kartę ciała i dziennik GLP-1.",
-    "treatmentClassGeneric": "Lek standardowy",
-    "treatmentClassGlp1": "Iniekcja GLP-1",
-    "glp1WeeklyPresetTitle": "Raz w tygodniu, w…",
-    "glp1WeeklyPresetHelp": "Większość agonistów receptora GLP-1 podawana jest raz w tygodniu. Stuknij dzień, aby ustawić rytm.",
-    "glp1WeeklyPresetSuggest": "Przejmij ostatnio wybrany dzień",
-    "glp1DosesPerUnit": "Dawki na pen / fiolkę",
-    "glp1DosesPerUnitPlaceholder": "np. 4 dla pena Mounjaro KwikPen",
-    "glp1DosesPerUnitHelp": "Opcjonalne — Mounjaro KwikPen = 4, Ozempic 0,25/0,5 mg = 4, Wegovy pen jednorazowy = 1. Zostaw puste, jeśli nie chcesz śledzić dawek na pen.",
     "glp1LastInjection": "{label}",
-    "glp1LastInjectionWithSite": "{label} · {site}",
     "glp1NextInjectionDays": "{label} (za {days} dni)",
     "glp1NextInjectionToday": "dziś",
     "glp1NextInjectionTomorrow": "jutro",
-    "glp1RotationLast": "Ostatnie miejsce: {site}",
     "glp1RotationSuggested": "Sugerowane: {site}",
     "glp1LogSideEffect": "Zapisz działanie niepożądane",
     "sideEffects": {
@@ -1261,8 +1192,7 @@
           "add": "Dodaj kolejny harmonogram",
           "edit": "Edytuj",
           "remove": "Usuń",
-          "removeDisabled": "Wymagany jest co najmniej jeden harmonogram.",
-          "empty": "Brak harmonogramu."
+          "removeDisabled": "Wymagany jest co najmniej jeden harmonogram."
         }
       },
       "errors": {
@@ -1306,38 +1236,6 @@
     "sideEffectTagAppetiteLoss": "Utrata apetytu",
     "sideEffectTagHeartburn": "Zgaga",
     "sideEffectTagHeadache": "Ból głowy",
-    "newSchedule": "Nowe okno czasowe",
-    "removeSchedule": "Usuń okno czasowe",
-    "advancedEditing": "Edycja zaawansowana",
-    "advancedEditingHide": "Ukryj edycję zaawansowaną",
-    "scheduleInterval": "Interwał",
-    "scheduleEveryWeek": "co tydzień",
-    "scheduleEveryNWeeks": "co {n} tygodni",
-    "scheduleIntervalPrefix": "Interwał:",
-    "nextSchedulePrefix": "Następne okno:",
-    "nextScheduleDaily": "codziennie",
-    "importIntakesAction": "Importuj przyjęcia",
-    "apiEndpointAction": "Endpoint API",
-    "pause": "Wstrzymaj",
-    "activate": "Aktywuj",
-    "disableNotifications": "Wyłącz powiadomienia",
-    "enableNotifications": "Włącz powiadomienia",
-    "purgeRecords": "Usuń zapisy",
-    "formReset": "Resetuj formularz",
-    "createMedication": "Utwórz lek",
-    "deleteConfirmDescription": "Ten lek i wszystkie jego przyjęcia zostaną nieodwracalnie usunięte.",
-    "purgeConfirmTitle": "Usunąć wszystkie przyjęcia?",
-    "purgeConfirmDescription": "Wszystkie zarejestrowane przyjęcia tego leku zostaną nieodwracalnie usunięte.",
-    "saveError": "Błąd zapisu",
-    "deleteError": "Błąd usuwania",
-    "purgeError": "Błąd czyszczenia rekordów",
-    "invalidTimestamp": "Wybierz poprawną datę i godzinę.",
-    "noIntakesYet": "Brak zarejestrowanych przyjęć.",
-    "actions": "Akcje",
-    "pageInfo": "Strona {page} z {total}",
-    "previousPage": "Poprzednia strona",
-    "nextPage": "Następna strona",
-    "loginRequiredIntakes": "Zaloguj się, aby zobaczyć historię przyjęć.",
     "phaseConfig": "Fazy przypomnień",
     "phaseConfigDescription": "Skonfiguruj momenty przypomnień.",
     "phaseGreen": "Zielony",
@@ -1346,11 +1244,8 @@
     "phaseRed": "Czerwony",
     "phaseMinutes": "Min",
     "phasePercent": "%",
-    "phaseBeforeEnd": "przed końcem",
-    "phaseAfterEnd": "po końcu",
     "phaseResetDefaults": "Przywróć wartości domyślne",
     "phaseSaved": "Fazy przypomnień zapisane",
-    "phaseReset": "Przywrócono wartości domyślne",
     "sourceWeb": "Web",
     "sourceApi": "Aplikacja iOS",
     "sourceReminder": "Przypomnienie",
@@ -1370,16 +1265,6 @@
     "intakeHistoryPageInfo": "Strona {page} z {total} · {count} wpisów",
     "intakeHistoryPrev": "Poprzednia",
     "intakeHistoryNext": "Następna",
-    "unitDrops": "kropli",
-    "unitTablets": "tabletek",
-    "unitCapsules": "kapsułek",
-    "unitPieces": "sztuk",
-    "namePlaceholder": "np. Ramipril",
-    "dosePlaceholder": "np. 5 mg",
-    "labelPlaceholder": "np. Rano",
-    "defaultDose": "Dawka standardowa",
-    "dayDeactivate": "Wyłącz {day}",
-    "dayActivate": "Włącz {day}",
     "glp1": {
       "drug": {
         "tirzepatide": {
@@ -1636,8 +1521,6 @@
         "historyLabel": "Zobacz historię przyjęć"
       },
       "history": {
-        "back": "Powrót do leku",
-        "subtitle": "Pełna historia przyjęć",
         "plannedSuffix": "zaplanowane"
       },
       "tabs": {
@@ -3609,8 +3492,6 @@
   },
   "thresholds": {
     "defaultLabel": "Domyślne",
-    "autoModeLabel": "Auto",
-    "overrideModeLabel": "Niestandardowe",
     "overrideToggleLabel": "Własne wartości",
     "resetAction": "Przywróć wartość domyślną",
     "resetAllAction": "Przywróć wszystkie wartości domyślne",
@@ -4965,7 +4846,6 @@
     "modules": {
       "title": "Dostępność modułów",
       "description": "Wyłącz moduł dla całego serwera. Moduł wyłączony tutaj jest nieaktywny dla każdego konta, niezależnie od preferencji użytkownika. Domeny podstawowe (waga, ciśnienie, tętno, leki) są zawsze włączone i nie można ich wyłączyć.",
-      "disabledHint": "Wyłączone na całym serwerze",
       "saveError": "Nie udało się zaktualizować dostępności modułów."
     },
     "bugReportRepo": "Repozytorium",
@@ -5343,12 +5223,10 @@
         "subtitle": "Destrukcyjne operacje obejmujące cały system."
       },
       "about": {
-        "title": "O programie",
-        "subtitle": "Wersja, licencja, kod źródłowy i sprawdzanie aktualizacji."
+        "title": "O programie"
       }
     },
     "carrier": "Operator",
-    "carrierUnknown": "Nieznany operator",
     "carrierUnavailableGeoFallback": "{location} — operator niedostępny"
   },
   "achievements": {
@@ -5680,7 +5558,6 @@
     "title": "Powiadomienia",
     "breadcrumbInbox": "Powiadomienia",
     "breadcrumbChannels": "Kanały powiadomień",
-    "breadcrumbSettings": "Ustawienia",
     "eventColumn": "Zdarzenie",
     "subtitle": "Wybierz, które powiadomienia chcesz otrzymywać i którym kanałem.",
     "loadError": "Nie udało się załadować ustawień powiadomień.",
@@ -5797,7 +5674,6 @@
       "dotNearRange": "blisko zakresu",
       "dotOutOfRange": "poza zakresem",
       "dotNotLogged": "nie zarejestrowano",
-      "insufficientData": "Za mało danych — rejestruj dalej.",
       "relativeDay": {
         "today": "Dzisiaj",
         "yesterday": "Wczoraj",
@@ -5809,7 +5685,6 @@
       }
     },
     "edit": {
-      "openLabel": "Edytuj zakres docelowy dla {metric}",
       "title": "Edytuj zakres docelowy — {metric}",
       "description": "Dostosuj zakres docelowy używany w wykresach, insights i raporcie medycznym. Wartości w {unit}.",
       "derivedHint": "Ta karta jest wyprowadzona z innych metryk. Edytuj cele bazowe (np. ciśnienie lub waga).",
@@ -5825,13 +5700,6 @@
       "saveError": "Nie udało się zapisać zakresu docelowego",
       "resetSuccess": "Zakres docelowy przywrócono do domyślnego"
     },
-    "mood": {
-      "stability": {
-        "stable": "stabilny",
-        "variable": "zmienny",
-        "highlyVariable": "bardzo zmienny"
-      }
-    },
     "currentValue": "Aktualnie: {value} {unit}",
     "targetRangeValue": "Zakres docelowy: {min}–{max} {unit}",
     "sourceLabel": "Źródło: {source}",
@@ -5937,7 +5805,6 @@
   },
   "lowStockReminders": {
     "title": "Niski zapas: {medName}",
-    "body": "{medName}: pozostało {units} jednostek — wystarczy na około {days} dni.",
     "bodyToday": "{medName}: pozostało {units} jednostek — mniej niż jeden dzień zapasu.",
     "bodyReorder": "{medName}: pozostało {units} jednostek. Zapas skończy się około {runsOutOn} — zamów ponownie do {reorderBy}.",
     "bodyLastDose": "{medName}: pozostało {units} jednostek — to mniej więcej Twoja ostatnia dawka. Zapas skończy się około {runsOutOn}."
@@ -6045,7 +5912,6 @@
         "description": "Jak każdy pomiar wypada między fazą lutealną a folikularną, na Twoich danych.",
         "pairLabel": "{metric} · lutealna vs folikularna",
         "detail": "Lutealna {lutealAvg} {unit} ({lutealDays} dni) vs folikularna {follicularAvg} {unit} ({follicularDays} dni).",
-        "footer": "To powiązania w Twoich danych, nie przyczyny. Pokazywane są tylko wzorce, które przechodzą test istotności.",
         "metricRestingHeartRate": "Tętno spoczynkowe",
         "metricHrv": "Zmienność rytmu serca",
         "metricSleepDuration": "Czas snu",
@@ -6069,10 +5935,6 @@
         "confidenceHigh": "Wysoka pewność"
       },
       "title": "Analizy cyklu",
-      "empty": "Analizy faz pojawią się tutaj, gdy zapiszesz wystarczająco wiele cykli. Porównują twoje wskaźniki między fazami cyklu, z otwarcie pokazaną statystyką.",
-      "sampleSize": "n = {n}",
-      "effectSize": "Wielkość efektu {value}",
-      "qValue": "q = {value}",
       "symptomPatternsTitle": "Wzorce objawów wg fazy",
       "symptomPatternsEmpty": "Zapisuj objawy przez cały cykl, aby zobaczyć, w której fazie się grupują.",
       "symptomMostlyIn": "Głównie w fazie {phase} ({count}/{total} dni)"
@@ -6092,7 +5954,6 @@
         "LUTEAL": "Progesteron prowadzi przez drugą połowę cyklu, a podstawowa temperatura ciała zwykle ustala się nieco wyżej niż wcześniej. Niektóre osoby zauważają z dnia na dzień zmiany w śnie, apetycie, nastroju czy energii, podczas gdy inne czują się stabilnie przez cały czas. Ten wzorzec jest indywidualny i często wygląda inaczej z miesiąca na miesiąc."
       },
       "commonHere": "To często zauważasz tutaj",
-      "trackNudge": "Zapisz dziś",
       "stillLearning": "Wciąż poznajemy Twój cykl. Zapisuj dalej, a to wypełni się wzorcami z Twoich własnych dni."
     },
     "insightsSummary": {
@@ -6185,10 +6046,7 @@
       "prevMonth": "Poprzedni miesiąc",
       "nextMonth": "Następny miesiąc",
       "loading": "Ładowanie kalendarza…",
-      "empty": "Zacznij zapisywać, aby wypełnić kalendarz.",
       "learning": "Uczymy się Twojego cyklu — zapisz co najmniej trzy pełne cykle, a okno płodne, owulacja i fazy się uzupełnią. Do tego czasu kalendarz pokazuje tylko to, co zapisałaś.",
-      "today": "Dziś",
-      "dayAria": "{date}",
       "legendSymptom": "Objawy",
       "legendOvulationConfirmed": "Potwierdzona owulacja",
       "flowSpotting": "plamienie",
@@ -6199,11 +6057,9 @@
     "predictions": {
       "title": "Co dalej",
       "nextPeriod": "Następna miesiączka",
-      "nextPeriodRange": "Około {date}",
       "nextPeriodWindow": "{low} – {high}",
       "fertileWindow": "Okno płodne",
       "ovulation": "Szacowana owulacja",
-      "confidence": "Pewność",
       "confidenceHigh": "Wysoka",
       "confidenceMedium": "Średnia",
       "confidenceLow": "Niska",
@@ -6239,7 +6095,6 @@
     "sheet": {
       "title": "Zapisz swój dzień",
       "description": "Zapisz dzisiejsze krwawienie, objawy i notatki.",
-      "date": "Data",
       "flow": "Krwawienie",
       "symptoms": "Objawy",
       "temperature": "Podstawowa temperatura ciała",
@@ -6259,10 +6114,7 @@
       "save": "Zapisz",
       "saving": "Zapisywanie…",
       "cancel": "Anuluj",
-      "saved": "Dzień zapisany",
       "saveError": "Nie udało się zapisać. Spróbuj ponownie.",
-      "periodStarted": "Zapisano początek miesiączki",
-      "clear": "Brak",
       "intermenstrualBleeding": "Plamienie między okresami",
       "pregnancyTest": "Test ciążowy",
       "progesteroneTest": "Test progesteronu",
@@ -6278,8 +6130,6 @@
     },
     "settings": {
       "title": "Ustawienia cyklu",
-      "enable": "Śledzenie cyklu",
-      "enableDescription": "Włącz lub wyłącz zakładkę cyklu dla swojego konta.",
       "typicalCycleLength": "Typowa długość cyklu (dni)",
       "typicalPeriodLength": "Typowa długość miesiączki (dni)",
       "lutealPhaseLength": "Długość fazy lutealnej (dni)",
@@ -6298,30 +6148,14 @@
       "encryptionDescription": "Szyfruj w spoczynku pola ujawniające intencje (testy ciążowe, antykoncepcja, współżycie), obok zawsze szyfrowanych notatek.",
       "discreet": "Dyskretne powiadomienia",
       "discreetDescription": "Ukryj szczegóły cyklu w treści powiadomień na ekranie blokady.",
-      "dataTitle": "Twoje dane",
-      "dataDescription": "Twoje dane cyklu istnieją tylko na tym serwerze. Eksportuj je w każdej chwili lub usuń na zawsze.",
-      "export": "Eksportuj moje dane cyklu",
-      "deleteData": "Usuń moje dane cyklu",
       "saved": "Ustawienia zapisane",
       "saveError": "Nie udało się zapisać. Spróbuj ponownie.",
       "save": "Zapisz",
-      "purgeTitle": "Usuń wszystkie dane cyklu",
-      "purgeDescription": "Trwale usuwa każdy zapisany dzień, cykl, prognozę i przypomnienie. Tej operacji nie można cofnąć.",
-      "purgeButton": "Usuń wszystkie dane cyklu",
-      "purgeConfirmTitle": "Usunąć wszystkie dane cyklu?",
-      "purgeConfirmBody": "Spowoduje to trwałe usunięcie każdej miesiączki, wpisu dziennego, objawu i prognozy. Tej operacji nie można cofnąć.",
-      "purgeConfirm": "Trwale usunąć wszystkie dane cyklu?",
-      "purgeCancel": "Anuluj",
-      "purgeSuccess": "Usunięto wszystkie dane cyklu.",
-      "purgeError": "Nie udało się usunąć danych cyklu.",
       "reminders": "Przypomnienia",
       "remindersDescription": "Włącz przypomnienia o okresie dla każdego kanału w ustawieniach powiadomień.",
       "remindersLink": "Ustawienia powiadomień",
       "fertileReminder": "Przypomnienie o oknie płodności",
-      "fertileReminderDescription": "Otrzymaj powiadomienie kilka dni przed szacowanym oknem płodności. Domyślnie wyłączone – włącz je dla każdego kanału w ustawieniach powiadomień.",
-      "purgeData": "Usuń dane cyklu",
-      "purgeConfirmAction": "Tak, usuń wszystko",
-      "purgeDone": "Dane cyklu usunięte."
+      "fertileReminderDescription": "Otrzymaj powiadomienie kilka dni przed szacowanym oknem płodności. Domyślnie wyłączone – włącz je dla każdego kanału w ustawieniach powiadomień."
     },
     "testResult": {
       "POSITIVE": "Pozytywny",
@@ -6502,7 +6336,6 @@
     "emptyDescription": "Zapisuj badania takie jak HbA1c, LDL czy ferrytyna, aby śledzić je w czasie i udostępniać lekarzowi.",
     "referenceLabel": "Norma",
     "readingsCount": "{count} pomiarów",
-    "deleteLatest": "Usuń ostatni wynik",
     "deleteConfirmTitle": "Usunąć wynik laboratoryjny?",
     "deleteConfirmDescription": "Ten wynik laboratoryjny zostanie trwale usunięty.",
     "deletedToast": "Wynik usunięty",
@@ -6514,24 +6347,11 @@
       "above": "Powyżej normy"
     },
     "form": {
-      "analyte": "Biomarker",
-      "analytePlaceholder": "np. HbA1c, LDL, ferrytyna",
       "value": "Wartość",
-      "unit": "Jednostka",
-      "unitPlaceholder": "np. mg/dl, %, ng/ml",
       "takenAt": "Data pobrania",
-      "optionalGroup": "Opcjonalne",
-      "panel": "Panel",
-      "panelPlaceholder": "np. Morfologia krwi",
-      "referenceLow": "Norma dolna",
-      "referenceHigh": "Norma górna",
-      "referenceLowPlaceholder": "Dolna granica",
-      "referenceHighPlaceholder": "Górna granica",
-      "referenceHint": "Przepisz zakres referencyjny z wyniku laboratoryjnego. Każda z granic jest opcjonalna.",
       "note": "Notatka",
       "notePlaceholder": "Opcjonalny kontekst tego wyniku",
       "requiredError": "Podaj wartość.",
-      "rangeOrderError": "Norma dolna nie może przekraczać górnej.",
       "save": "Zapisz",
       "savedToast": "Wynik zapisany",
       "saveError": "Nie udało się zapisać wyniku",
@@ -6824,7 +6644,6 @@
       "countOther": "W tym okresie zapisałeś {count} epizodów.",
       "typicalGap": "Typowa luka rekonwalescencji: {days} dni między poprawą a ustabilizowaniem wartości.",
       "typicalGapLearning": "Jeszcze kilka zakończonych epizodów i pojawi się tu typowa luka rekonwalescencji.",
-      "byMonth": "Kiedy zwykle zapisujesz epizody",
       "none": "Brak epizodów zapisanych w tym okresie."
     },
     "section": {
diff --git a/src/__tests__/i18n-drift-guard.test.ts b/src/__tests__/i18n-drift-guard.test.ts
index 74a9cccdd..4910dc39b 100644
--- a/src/__tests__/i18n-drift-guard.test.ts
+++ b/src/__tests__/i18n-drift-guard.test.ts
@@ -68,7 +68,7 @@ const REQUIRED_KEY_SETS: Array<{
 }> = [
   {
     label: "admin.carrier (B3 — login carrier chip)",
-    required: ["admin.carrier", "admin.carrierUnknown"],
+    required: ["admin.carrier"],
   },
   {
     label: "insights.emptyState.* (B4 — per-metric empty states)",
diff --git a/src/__tests__/i18n-reverse-coverage.test.ts b/src/__tests__/i18n-reverse-coverage.test.ts
new file mode 100644
index 000000000..be205b095
--- /dev/null
+++ b/src/__tests__/i18n-reverse-coverage.test.ts
@@ -0,0 +1,232 @@
+/**
+ * v1.18.6 — reverse i18n coverage guard.
+ *
+ * The forward `i18n-call-site-coverage.test.ts` asserts every `t("ns.key")`
+ * call site resolves to a leaf in `messages/en.json`. This test asserts the
+ * REVERSE: every leaf in `messages/en.json` is reachable from at least one
+ * call site, so orphan keys can't accumulate in the bundle unnoticed.
+ *
+ * "Reachable" recognises the key-construction patterns the codebase actually
+ * uses:
+ *   - a literal `t("a.b.c")` (hyphens allowed — admin section slugs use them);
+ *   - a `t("a.b")` that returns a subtree, covering every descendant leaf;
+ *   - a dynamic key built inside a `t(`…`)` template, e.g. the per-metric
+ *     `${i18nPrefix}.title` insight pages, `cycle.calendar.flow${LEVEL}`, or
+ *     the `medications.site${Suffix}` label keys — captured by the static
+ *     leading-literal prefix and/or trailing-literal suffix of the template;
+ *   - a key string assembled outside the call (`return `medications.site${s}``
+ *     in `describeInjectionSite`) and passed to `t()`, recognised when the
+ *     template's leading literal is rooted at a real top-level namespace;
+ *   - an explicit allowlist for keys resolved through a DB column.
+ *
+ * Dynamic detection is scoped to `t(`…`)` and to namespace-rooted key
+ * templates only — NOT to every backtick string — so a cache key or
+ * wide-event action name that happens to start with a namespace word doesn't
+ * mask a genuinely dead key.
+ *
+ * If this fails after adding a key, either wire a call site, or — for a key
+ * resolved through a runtime value the static scan can't see — add its prefix
+ * to `DYNAMIC_ALLOWLIST_PREFIXES` with a one-line note on why.
+ */
+import { describe, it, expect } from "vitest";
+import { readFileSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
+
+const ROOT = join(__dirname, "../..");
+const SRC = join(ROOT, "src");
+const EN_BUNDLE_PATH = join(ROOT, "messages/en.json");
+
+const SKIP_DIRS = new Set(["__tests__", "node_modules", ".next", "generated"]);
+
+/**
+ * Keys resolved through a runtime value no static scan can see. Each entry is
+ * a leaf or a namespace prefix that is always live.
+ *  - `mood.tag` / `mood.tagCategory`: the catalogue is DB-driven; the label key
+ *    is built from a `MoodTag.messageKey` / `MoodTagCategory.messageKey` column,
+ *    so the leaf never appears as a string literal in the tree.
+ */
+const DYNAMIC_ALLOWLIST_PREFIXES = ["mood.tag", "mood.tagCategory"] as const;
+
+function walk(dir: string, out: string[] = []): string[] {
+  for (const name of readdirSync(dir)) {
+    if (SKIP_DIRS.has(name)) continue;
+    const p = join(dir, name);
+    const stat = statSync(p);
+    if (stat.isDirectory()) {
+      walk(p, out);
+    } else if (name.endsWith(".ts") || name.endsWith(".tsx")) {
+      out.push(p);
+    }
+  }
+  return out;
+}
+
+function leafPaths(obj: unknown, prefix: string, out: string[]): void {
+  if (!obj || typeof obj !== "object") return;
+  for (const [k, v] of Object.entries(obj as Record<string, unknown>)) {
+    const path = prefix ? `${prefix}.${k}` : k;
+    if (v && typeof v === "object" && !Array.isArray(v)) {
+      leafPaths(v, path, out);
+    } else {
+      out.push(path);
+    }
+  }
+}
+
+function nodePaths(obj: unknown, prefix: string, out: Set<string>): void {
+  if (!obj || typeof obj !== "object") return;
+  for (const [k, v] of Object.entries(obj as Record<string, unknown>)) {
+    const path = prefix ? `${prefix}.${k}` : k;
+    out.add(path);
+    if (v && typeof v === "object" && !Array.isArray(v)) {
+      nodePaths(v, path, out);
+    }
+  }
+}
+
+interface Reference {
+  /** Literal `t("…")` keys. */
+  literalKeys: Set<string>;
+  /** Dotted bases (`base.${…}` / a full string-literal node path): cover the subtree. */
+  dottedBases: Set<string>;
+  /** Dot-less concat prefixes (`medications.site${…}`): cover any leaf that string-starts with them. */
+  concatPrefixes: Set<string>;
+  /** Trailing static suffixes of a template key (`${…}.title`). */
+  dynamicSuffixes: Set<string>;
+}
+
+function collectReferences(
+  allNodes: Set<string>,
+  topNamespaces: Set<string>,
+): Reference {
+  const allText = walk(SRC)
+    .map((f) => readFileSync(f, "utf8"))
+    .join("\n");
+
+  const literalKeys = new Set<string>();
+  const literalKeyRe =
+    /(?<![a-zA-Z0-9_])t\(\s*["']([a-zA-Z][a-zA-Z0-9_.-]+)["']/g;
+  for (const m of allText.matchAll(literalKeyRe)) literalKeys.add(m[1]);
+
+  const dottedBases = new Set<string>();
+  const concatPrefixes = new Set<string>();
+  const dynamicSuffixes = new Set<string>();
+
+  const ingestTemplate = (content: string) => {
+    const open = content.indexOf("${");
+    if (open > 0) {
+      const lit = content.slice(0, open);
+      if (lit.includes(".")) {
+        if (lit.endsWith(".")) dottedBases.add(lit.slice(0, -1));
+        else concatPrefixes.add(lit);
+      }
+    }
+    const close = content.lastIndexOf("}");
+    if (close !== -1 && close < content.length - 1) {
+      const tail = content.slice(close + 1).replace(/^\./, "");
+      if (tail) dynamicSuffixes.add(tail);
+    }
+  };
+
+  // Templates passed directly to t(`…`).
+  const tTemplateRe = /(?<![a-zA-Z0-9_])t\(\s*`([^`]*)`/g;
+  for (const m of allText.matchAll(tTemplateRe)) ingestTemplate(m[1]);
+
+  // Key strings assembled outside the call and handed to t() (the
+  // `describeInjectionSite` pattern). Recognised only when the template's
+  // leading literal is rooted at a real top-level i18n namespace, so a cache
+  // key / action name that interpolates can't mask a dead key.
+  const assignTemplateRe = /`([a-zA-Z][a-zA-Z0-9_.-]*)\$\{/g;
+  for (const m of allText.matchAll(assignTemplateRe)) {
+    const lit = m[1];
+    if (!lit.includes(".")) continue;
+    if (!topNamespaces.has(lit.split(".")[0])) continue;
+    if (lit.endsWith(".")) dottedBases.add(lit.slice(0, -1));
+    else concatPrefixes.add(lit);
+  }
+
+  // String-concatenation prefixes: `"notifications.event" + eventType…`
+  // builds keys like `notifications.eventMoodReminder`. Recognised only when
+  // the literal is rooted at a real top-level namespace.
+  const plusConcatRe = /["']([a-zA-Z][a-zA-Z0-9_.]*)["']\s*\+/g;
+  for (const m of allText.matchAll(plusConcatRe)) {
+    const lit = m[1];
+    if (!lit.includes(".")) continue;
+    if (!topNamespaces.has(lit.split(".")[0])) continue;
+    if (lit.endsWith(".")) dottedBases.add(lit.slice(0, -1));
+    else concatPrefixes.add(lit);
+  }
+
+  // Full string-literal node paths (covers map values returned to t()).
+  const litPathRe = /["']([a-zA-Z][a-zA-Z0-9_-]*(?:\.[a-zA-Z0-9_-]+)+)["']/g;
+  for (const m of allText.matchAll(litPathRe)) {
+    if (allNodes.has(m[1])) dottedBases.add(m[1]);
+  }
+
+  return { literalKeys, dottedBases, concatPrefixes, dynamicSuffixes };
+}
+
+function isReferenced(leaf: string, ref: Reference): boolean {
+  if (ref.literalKeys.has(leaf)) return true;
+  for (const ck of ref.literalKeys) {
+    if (leaf.startsWith(`${ck}.`)) return true;
+  }
+  for (const base of ref.dottedBases) {
+    if (leaf === base || leaf.startsWith(`${base}.`)) return true;
+  }
+  for (const pre of ref.concatPrefixes) {
+    if (leaf.startsWith(pre)) return true;
+  }
+  for (const suffix of ref.dynamicSuffixes) {
+    if (leaf !== suffix && !leaf.endsWith(`.${suffix}`)) continue;
+    const base = leaf.slice(0, leaf.length - suffix.length).replace(/\.$/, "");
+    for (const b of ref.dottedBases) {
+      if (base === b || base.startsWith(`${b}.`) || b.startsWith(`${base}.`)) {
+        return true;
+      }
+    }
+    for (const ck of ref.literalKeys) {
+      if (base === ck || base.startsWith(`${ck}.`) || ck.startsWith(`${base}.`)) {
+        return true;
+      }
+    }
+    for (const pre of ref.concatPrefixes) {
+      if (base.startsWith(pre)) return true;
+    }
+  }
+  return false;
+}
+
+function isAllowlisted(leaf: string): boolean {
+  return DYNAMIC_ALLOWLIST_PREFIXES.some(
+    (p) => leaf === p || leaf.startsWith(`${p}.`),
+  );
+}
+
+describe("i18n reverse coverage", () => {
+  it("every key in messages/en.json has a call site or is allowlisted", () => {
+    const en = JSON.parse(readFileSync(EN_BUNDLE_PATH, "utf8"));
+    const leaves: string[] = [];
+    leafPaths(en, "", leaves);
+    expect(leaves.length).toBeGreaterThan(1000);
+
+    const allNodes = new Set<string>();
+    nodePaths(en, "", allNodes);
+    const topNamespaces = new Set<string>(Object.keys(en));
+    const ref = collectReferences(allNodes, topNamespaces);
+    // Sanity: the static scan must see the bulk of the bundle.
+    expect(ref.literalKeys.size).toBeGreaterThan(1000);
+
+    const orphans = leaves.filter(
+      (leaf) => !isAllowlisted(leaf) && !isReferenced(leaf, ref),
+    );
+
+    if (orphans.length > 0) {
+      const report = orphans.map((k) => `  ❌ ${k}`).join("\n");
+      throw new Error(
+        `Found ${orphans.length} key(s) in messages/en.json with no call site:\n${report}\n\n` +
+          "Wire a call site, or add a DB-driven prefix to DYNAMIC_ALLOWLIST_PREFIXES.",
+      );
+    }
+  });
+});
diff --git a/src/components/charts/__tests__/trend-card-baseline-alignment.test.tsx b/src/components/charts/__tests__/trend-card-baseline-alignment.test.tsx
index bed73b3f1..21377d57b 100644
--- a/src/components/charts/__tests__/trend-card-baseline-alignment.test.tsx
+++ b/src/components/charts/__tests__/trend-card-baseline-alignment.test.tsx
@@ -198,7 +198,6 @@ describe("dashboard.*Short keys exist across all six locales", () => {
     "sleepShort",
     "stepsShort",
     "vo2MaxShort",
-    "bpInTargetShort",
   ];
 
   // Resolved at test time so the assertion runs against the current

From 151a56fc6631837569a2aac0926f64ff19392388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:47:19 +0200
Subject: [PATCH 22/71] refactor(ui): adopt the React 19 ref-as-prop idiom and
 the toJson helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drop forwardRef from the textarea and native-select primitives — the last two
holdouts under components/ui — so they accept ref as a plain prop like the
input primitive already does. No call site passes a ref to either, and the
React 19 prop path is the forward-looking shape.

Route the inventory-consumption JSON-column write through the shared toJson
helper instead of an inline `as unknown as Prisma.InputJsonValue` cast, keeping
the WHY of the escape hatch in one place.
---
 src/components/ui/native-select.tsx          | 13 +++++++------
 src/components/ui/textarea.tsx               | 17 ++++++++---------
 src/lib/medications/inventory/consumption.ts |  3 ++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/ui/native-select.tsx b/src/components/ui/native-select.tsx
index 97f7b33a9..5cfac9a66 100644
--- a/src/components/ui/native-select.tsx
+++ b/src/components/ui/native-select.tsx
@@ -59,13 +59,14 @@ const NATIVE_SELECT_CLASS =
 
 export type NativeSelectProps = React.SelectHTMLAttributes<HTMLSelectElement>;
 
-export const NativeSelect = React.forwardRef<
-  HTMLSelectElement,
-  NativeSelectProps
->(function NativeSelect({ className, children, style, ...props }, ref) {
+export function NativeSelect({
+  className,
+  children,
+  style,
+  ...props
+}: NativeSelectProps) {
   return (
     <select
-      ref={ref}
       data-slot="native-select"
       className={cn(NATIVE_SELECT_CLASS, className)}
       style={style}
@@ -74,4 +75,4 @@ export const NativeSelect = React.forwardRef<
       {children}
     </select>
   );
-});
+}
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index d5c37b20f..5c0f9d8dc 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -39,13 +39,13 @@ import { cn } from "@/lib/utils";
  * Composition is via `cn(…)` so callers can override anything — the
  * primitive defaults are the strict pass, not the only pass.
  */
-const Textarea = React.forwardRef<
-  HTMLTextAreaElement,
-  React.ComponentProps<"textarea">
->(function Textarea(
-  { className, autoComplete, autoCapitalize, spellCheck, ...props },
-  ref,
-) {
+function Textarea({
+  className,
+  autoComplete,
+  autoCapitalize,
+  spellCheck,
+  ...props
+}: React.ComponentProps<"textarea">) {
   const resolvedAutoComplete = autoComplete ?? "off";
   const resolvedAutoCapitalize = autoCapitalize ?? "sentences";
   const resolvedSpellCheck = spellCheck ?? true;
@@ -53,7 +53,6 @@ const Textarea = React.forwardRef<
 
   return (
     <textarea
-      ref={ref}
       data-slot="textarea"
       autoComplete={resolvedAutoComplete}
       autoCapitalize={resolvedAutoCapitalize}
@@ -71,6 +70,6 @@ const Textarea = React.forwardRef<
       {...props}
     />
   );
-});
+}
 
 export { Textarea };
diff --git a/src/lib/medications/inventory/consumption.ts b/src/lib/medications/inventory/consumption.ts
index 7b3319e85..cc89e278b 100644
--- a/src/lib/medications/inventory/consumption.ts
+++ b/src/lib/medications/inventory/consumption.ts
@@ -34,6 +34,7 @@
  */
 
 import { Prisma, type PrismaClient } from "@/generated/prisma/client";
+import { toJson } from "@/lib/db";
 import { annotate } from "@/lib/logging/context";
 import {
   computeExpiresAt,
@@ -263,7 +264,7 @@ export async function consumeForIntake(input: {
       // registered later when a sync replay revisits the row.
       await tx.medicationIntakeEvent.update({
         where: { id: eventId },
-        data: { inventoryConsumption: stamp as unknown as Prisma.InputJsonValue },
+        data: { inventoryConsumption: toJson(stamp) },
       });
 
       annotate({

From 3465cbe81cdc722d2e16ef2212c5d1c01f240f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:47:19 +0200
Subject: [PATCH 23/71] fix(pwa): bound the persisted query cache and stop
 swallowing quota errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cap the serialized snapshot at 2 MB and skip the write when it's over — an
oversized blob is the likeliest IndexedDB quota trigger and its offline value
is marginal, so keeping the last good snapshot beats evicting it. When a write
still hits QuotaExceededError, log it and drop the persisted blob so the next
flush has room, instead of silently swallowing the failure and leaving the
offline cache stuck on a stale snapshot the user can't explain.

The allowlist and per-account binding are untouched.
---
 src/lib/pwa/__tests__/query-persister.test.ts | 122 ++++++++++++++++++
 src/lib/pwa/query-persister.ts                |  70 ++++++++--
 2 files changed, 183 insertions(+), 9 deletions(-)

diff --git a/src/lib/pwa/__tests__/query-persister.test.ts b/src/lib/pwa/__tests__/query-persister.test.ts
index 9ddf27bdb..d04314362 100644
--- a/src/lib/pwa/__tests__/query-persister.test.ts
+++ b/src/lib/pwa/__tests__/query-persister.test.ts
@@ -323,3 +323,125 @@ describe("persister round-trips through a fake IndexedDB", () => {
     expect(store.get("react-query")).toBeUndefined();
   });
 });
+
+describe("persister is bounded and surfaces quota failures", () => {
+  const original = (globalThis as { indexedDB?: unknown }).indexedDB;
+
+  afterEach(() => {
+    if (original !== undefined) {
+      (globalThis as { indexedDB?: unknown }).indexedDB = original;
+    } else {
+      delete (globalThis as { indexedDB?: unknown }).indexedDB;
+    }
+    vi.restoreAllMocks();
+  });
+
+  const makeReq = (run: () => void) => {
+    const req: Record<string, unknown> = {};
+    queueMicrotask(() => {
+      run();
+      (req.onsuccess as (() => void) | undefined)?.();
+    });
+    return req;
+  };
+
+  function installFakeIdb(opts: {
+    onPut: (value: unknown, key: string) => void;
+    store: Map<string, unknown>;
+  }) {
+    const fakeDb = {
+      close() {},
+      transaction() {
+        return {
+          objectStore() {
+            return {
+              put(value: unknown, key: string) {
+                opts.onPut(value, key);
+                return makeReq(() => {});
+              },
+              get(key: string) {
+                const req = makeReq(() => {});
+                (req as { result?: unknown }).result = opts.store.get(key);
+                return req;
+              },
+              delete(key: string) {
+                opts.store.delete(key);
+                return makeReq(() => {});
+              },
+            };
+          },
+          set oncomplete(fn: () => void) {
+            queueMicrotask(fn);
+          },
+          set onerror(_fn: () => void) {},
+        };
+      },
+    };
+    (globalThis as { indexedDB?: unknown }).indexedDB = {
+      open() {
+        const req: Record<string, unknown> = { result: fakeDb };
+        queueMicrotask(() => (req.onsuccess as () => void)?.());
+        return req;
+      },
+    };
+  }
+
+  it("skips a snapshot that exceeds the size cap, leaving the last write intact", async () => {
+    const store = new Map<string, unknown>();
+    let putCount = 0;
+    installFakeIdb({ store, onPut: () => (putCount += 1) });
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+
+    const source = new QueryClient();
+    // A persistable family with a payload well over the 2 MB ceiling.
+    const huge = "x".repeat(3 * 1024 * 1024);
+    source.setQueryData(["chart-data", "WEIGHT"], [{ blob: huge }]);
+    const stop = startPersistingQueryCache(source, "v1.18.6");
+    vi.useFakeTimers();
+    source.setQueryData(["chart-data", "WEIGHT"], [{ blob: huge }]);
+    vi.advanceTimersByTime(1100);
+    vi.useRealTimers();
+    await new Promise((r) => setTimeout(r, 0));
+    stop();
+
+    // The oversized snapshot was never written, and the skip was logged
+    // rather than silently dropped.
+    expect(putCount).toBe(0);
+    expect(store.get("react-query")).toBeUndefined();
+    expect(warn).toHaveBeenCalled();
+  });
+
+  it("clears the cache and warns on an IndexedDB quota error instead of swallowing it", async () => {
+    const store = new Map<string, unknown>();
+    let firstPut = true;
+    installFakeIdb({
+      store,
+      onPut: (value, key) => {
+        if (firstPut) {
+          firstPut = false;
+          // First write hits the storage quota.
+          throw new DOMException("quota", "QuotaExceededError");
+        }
+        store.set(key, value);
+      },
+    });
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+
+    const source = new QueryClient();
+    source.setQueryData(["dashboard", "snapshot"], { weightKg: 81 });
+    const stop = startPersistingQueryCache(source, "v1.18.6");
+    vi.useFakeTimers();
+    source.setQueryData(["chart-data", "WEIGHT"], [{ v: 81 }]);
+    vi.advanceTimersByTime(1100);
+    vi.useRealTimers();
+    await new Promise((r) => setTimeout(r, 0));
+    // Let the clear-on-quota microtasks settle.
+    await new Promise((r) => setTimeout(r, 0));
+    stop();
+
+    // The quota failure was surfaced, not swallowed, and the cache key was
+    // cleared so the next flush has room.
+    expect(warn).toHaveBeenCalled();
+    expect(store.get("react-query")).toBeUndefined();
+  });
+});
diff --git a/src/lib/pwa/query-persister.ts b/src/lib/pwa/query-persister.ts
index e512f54b7..2701f6431 100644
--- a/src/lib/pwa/query-persister.ts
+++ b/src/lib/pwa/query-persister.ts
@@ -38,6 +38,17 @@ const KEY = "react-query";
 const VERSION_KEY = "react-query-version";
 const MAX_AGE_MS = 24 * 60 * 60 * 1000; // discard anything older than a day
 
+/**
+ * Upper bound on the serialized snapshot. The allowlist already caps WHAT is
+ * persisted (dashboard snapshot + widget layout + daily series), but a tenant
+ * with a long chart history can still grow a single series past what's worth
+ * keeping on disk — and an oversized write is the most likely trigger for an
+ * IndexedDB `QuotaExceededError`. A snapshot above this ceiling is skipped
+ * rather than written: the offline read value of a multi-megabyte blob is
+ * marginal, and skipping keeps the last good (smaller) snapshot in place.
+ */
+const MAX_PERSIST_BYTES = 2 * 1024 * 1024; // 2 MB
+
 /**
  * Strict allowlist of the only query families written to disk — the
  * low-sensitivity reads the dashboard needs to paint last-known values when
@@ -78,13 +89,30 @@ function openDb(): Promise<IDBDatabase> {
 
 async function idbSet(value: unknown): Promise<void> {
   const db = await openDb();
-  await new Promise<void>((resolve, reject) => {
-    const tx = db.transaction(STORE, "readwrite");
-    tx.objectStore(STORE).put(value, KEY);
-    tx.oncomplete = () => resolve();
-    tx.onerror = () => reject(tx.error);
-  });
-  db.close();
+  try {
+    await new Promise<void>((resolve, reject) => {
+      const tx = db.transaction(STORE, "readwrite");
+      tx.objectStore(STORE).put(value, KEY);
+      tx.oncomplete = () => resolve();
+      tx.onerror = () => reject(tx.error);
+    });
+  } finally {
+    db.close();
+  }
+}
+
+/** True for the storage-quota error class across browsers. */
+function isQuotaError(err: unknown): boolean {
+  if (err instanceof DOMException) {
+    // Chromium/WebKit throw `QuotaExceededError`; Firefox historically
+    // throws `NS_ERROR_DOM_QUOTA_REACHED` (code 22).
+    return (
+      err.name === "QuotaExceededError" ||
+      err.name === "NS_ERROR_DOM_QUOTA_REACHED" ||
+      err.code === 22
+    );
+  }
+  return false;
 }
 
 async function idbGet<T>(): Promise<T | undefined> {
@@ -211,8 +239,32 @@ export function startPersistingQueryCache(
       userId: currentUserId(queryClient),
       state,
     };
-    void idbSet(payload).catch(() => {
-      /* best effort */
+
+    // Size-cap before touching disk: a snapshot past the ceiling is the
+    // likeliest quota trigger and its marginal offline value isn't worth
+    // evicting the last good (smaller) snapshot. Skip the write, keep what's
+    // there.
+    const serialized = JSON.stringify(payload);
+    if (serialized.length > MAX_PERSIST_BYTES) {
+      console.warn(
+        `[query-persister] skipping persist: snapshot ${serialized.length}B exceeds ${MAX_PERSIST_BYTES}B cap`,
+      );
+      return;
+    }
+
+    void idbSet(payload).catch((err) => {
+      // Don't silently swallow a full-disk failure: a quota error means the
+      // offline cache stopped updating, and a clear signal beats a stale
+      // snapshot the user can't explain. Drop the persisted blob so the next
+      // flush has room rather than failing again against a full store.
+      if (isQuotaError(err)) {
+        console.warn(
+          "[query-persister] IndexedDB quota exceeded; dropping persisted cache",
+        );
+        void clearPersistedQueryCache();
+        return;
+      }
+      console.warn("[query-persister] persist failed", err);
     });
   };
 

From 36090daa709842e306b03b8e117b5c3f2056c15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:47:19 +0200
Subject: [PATCH 24/71] docs: refresh the contributor-manual drift in one pass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correct the accreted drift in CLAUDE.md against the current tree: 61→80 Prisma
models (tech table + schema row), the React 19.2.x exact pin (drop the stale
patch digit), and the v1.12.x line marker → v1.18.x. Re-point the two paths
that are now directories — `src/lib/openapi/routes/` (23 modules) and
`src/lib/query-keys/` (16 modules), both with `index.ts` barrels. Replace the
exact line anchors that have since moved (requireAdmin, the rollup
whitelist-splice, isPublicUrl, the Dockerfile pg-boss/prisma-cli install,
api-handler LOC) with symbol references that survive line drift, fix the AI
providers row to cite `provider.ts`/`resolveProvider` plus the
`PROVIDER_CHAIN_TYPES` allowlist, and correct the `apiSuccess(data, status?)`
signature in the request-flow diagram.
---
 CLAUDE.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index b50def4aa..eeb174169 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -4,7 +4,7 @@ Working notes for anyone (human or otherwise) editing this repository. Skim befo
 
 ## What HealthLog is
 
-Self-hosted personal-health-tracking PWA: weight, blood pressure, pulse, body composition, glucose, sleep, mood, medication compliance. Withings + Apple Health sync, multi-provider AI Insights (BYOK or local), doctor-report PDF, native iOS client in public beta. Single `docker compose up`, Postgres-backed, AES-256-GCM at rest. PolyForm Noncommercial 1.0.0 (AGPL-3.0 through v1.15.18). Current line: v1.12.x.
+Self-hosted personal-health-tracking PWA: weight, blood pressure, pulse, body composition, glucose, sleep, mood, medication compliance. Withings + Apple Health sync, multi-provider AI Insights (BYOK or local), doctor-report PDF, native iOS client in public beta. Single `docker compose up`, Postgres-backed, AES-256-GCM at rest. PolyForm Noncommercial 1.0.0 (AGPL-3.0 through v1.15.18). Current line: v1.18.x.
 
 ## Voice and privacy
 
@@ -37,8 +37,8 @@ Prefer patch bumps. A release dominated by bug fixes plus additive features with
 | Runtime | Node 22 (Alpine) + pnpm 10.31 | Node version fixed only by the Dockerfile base image; no `.nvmrc` or `engines`. |
 | Framework | Next.js 16.2.6 — App Router, `output: "standalone"` | SWC strips `console.*` in prod except `error/warn`. |
 | Language | TypeScript 6, `strict: true`, `moduleResolution: "bundler"` | Path alias `@/*` → `./src/*`. `scripts/` excluded from typecheck. |
-| UI | React 19.2.5 (exact), Tailwind 4, shadcn/ui (new-york style, zinc base), Radix, Lucide | Recharts 3 for charts — stays; replacement requires explicit approval. |
-| Persistence | PostgreSQL 16 + Prisma 7.8 — 61 models | Generated client at `src/generated/prisma`. Production image ships a separate `/opt/prisma-cli` install + `/opt/pg-boss` runtime install (see `Dockerfile:74-83`). |
+| UI | React 19 (exact pin), Tailwind 4, shadcn/ui (new-york style, zinc base), Radix, Lucide | Recharts 3 for charts — stays; replacement requires explicit approval. |
+| Persistence | PostgreSQL 16 + Prisma 7.8 — 80 models | Generated client at `src/generated/prisma`. Production image ships a separate `/opt/prisma-cli` install + `/opt/pg-boss` runtime install (see `Dockerfile:93-100`). |
 | Queue | pg-boss 12.18 | Cron + retry semantics live in Postgres tables; workers under `src/lib/jobs/`. |
 | Auth | `@simplewebauthn/server` 13, `@node-rs/argon2` 2 | Passkey + Argon2id password, server-side sessions in Postgres. |
 | Notifications | `@parse/node-apn` 8 (APNs), `web-push` 3 (VAPID), raw fetch for Telegram + ntfy | Per-channel `recordPushAttempt` row, hard-reject classification. |
@@ -71,8 +71,9 @@ handler body                         Zod parse (`safeParse` + `returnAllZodIssue
   │                                  business logic, `annotate({ action, meta })`,
   │                                  `auditLog()` for sensitive ops.
   ▼
-src/lib/api-response.ts              `apiSuccess(data, meta?)` / `apiError(msg, status,
-  │                                  meta?)` — every response is `{ data, error, meta? }`.
+src/lib/api-response.ts              `apiSuccess(data, status?)` → `{ data, error: null }`;
+  │                                  `apiError(msg, status, meta?)` threads `meta` on the
+  │                                  error path only — `{ data: null, error, meta? }`.
   ▼
 src/proxy.ts                         security headers attach, request-id echoes.
   ▼
@@ -87,9 +88,9 @@ The architecture map in `.planning/codebase/arch.md` walks each layer with file:
 - **Every API route wraps in `apiHandler`.** Verified — zero exceptions in the current tree. Every body-accepting route runs Zod `safeParse` and returns 422 via `returnAllZodIssues` (multi-issue envelope sanitised against echoed input through `sanitiseZodIssues`).
 - **`userId` is always narrowed from session or Bearer.** No route accepts `userId` as a body field — it comes from `requireAuth()` and feeds the Prisma `where`. The batch endpoints (`/api/measurements/batch`, `/api/mood-entries/bulk`, `/api/medications/intake/bulk`, `/api/workouts/batch`) don't even declare a `userId` field in their Zod schemas.
 - **No mass assignment.** Every `prisma.X.{create,update}({ data: ... })` builds its `data` object field-by-field from `parsed.data`, never by spreading the parsed object whole. `tokens.create` hardcodes the narrow scope so the user-facing endpoint can never mint a wildcard token.
-- **`requireAdmin()` is cookie-only.** Bearer tokens — even with `["*"]` scope — cannot reach admin endpoints. This is a structural boundary at `src/lib/api-handler.ts:414-431`, not a runtime check that future code can soften.
-- **Raw SQL is parameter-bound or whitelist-spliced.** Every `$queryRaw` uses tagged-template parameters. Every `$queryRawUnsafe` / `$executeRawUnsafe` either passes positional `$N` placeholders with an argument array OR splices a value already asserted against a closed enum + regex (see `src/lib/rollups/measurement-rollups.ts:330-343`). Inline comments document the whitelist at the splice point.
-- **TanStack Query keys live in the centralised factory.** `src/lib/query-keys.ts` is the only legal source of `queryKey` / `mutationKey` arrays. The in-repo ESLint rule `healthlog/queryKey-factory` (set to `error`) flags any bare array. Same-key + different `queryFn` shape silently poisons the cache; the factory prevents it. Every read unwraps `(await res.json()).data` from the envelope.
+- **`requireAdmin()` is cookie-only.** Bearer tokens — even with `["*"]` scope — cannot reach admin endpoints. This is a structural boundary in `requireAdmin()` (`src/lib/api-handler.ts`), not a runtime check that future code can soften.
+- **Raw SQL is parameter-bound or whitelist-spliced.** Every `$queryRaw` uses tagged-template parameters. Every `$queryRawUnsafe` / `$executeRawUnsafe` either passes positional `$N` placeholders with an argument array OR splices a value already asserted against a closed enum + regex (see the whitelist-splice block in `src/lib/rollups/measurement-rollups.ts`, around the `$queryRawUnsafe` calls). Inline comments document the whitelist at the splice point.
+- **TanStack Query keys live in the centralised factory.** `src/lib/query-keys/` (16 modules, `index.ts` barrel) is the only legal source of `queryKey` / `mutationKey` arrays. The in-repo ESLint rule `healthlog/queryKey-factory` (set to `error`) flags any bare array. Same-key + different `queryFn` shape silently poisons the cache; the factory prevents it. Every read unwraps `(await res.json()).data` from the envelope.
 - **`annotate()` on every interesting code path.** Wide-event observability. Action names follow `<surface>.<noun>.<verb>` (`coach.budget.exceeded`, `measurement.batch.ingest`). Don't free-text in `meta` — pin the shape so dashboards stay stable.
 - **i18n keys exist for every `t()` call.** `i18n-call-site-coverage.test.ts` walks every `.ts(x)` under `src/`, extracts every `t("ns.key")` literal, and asserts each key resolves in `messages/en.json`. `i18n-locale-integrity.test.ts` propagates the EN guarantee across `de / en / es / fr / it / pl`. If a guard fails, fix the bundle, don't suppress the test.
 - **OpenAPI registry stays in sync.** Zod schemas carry `.meta()` annotations under `src/lib/openapi/`; `pnpm openapi:generate` emits `docs/api/openapi.yaml`. CI fails on drift. Re-run the generator after touching a request / response schema and commit the YAML alongside the Zod change.
@@ -112,7 +113,7 @@ The architecture map in `.planning/codebase/arch.md` walks each layer with file:
 | Concern | File | What it owns |
 |---|---|---|
 | HTTP edge | `src/proxy.ts` | Public-path allowlist, demo-mode block, onboarding redirect, request-id + CSP nonce, every security header, worker-only refusal. |
-| API kit | `src/lib/api-handler.ts` (490 LOC) | `apiHandler` wrapper, `requireAuth` / `requireAdmin`, idempotency plumbing, GlitchTip forwarder. |
+| API kit | `src/lib/api-handler.ts` | `apiHandler` wrapper, `requireAuth` / `requireAdmin`, idempotency plumbing, GlitchTip forwarder. |
 | Response envelope | `src/lib/api-response.ts` | `apiSuccess` / `apiError`, `safeJson` (now with opt-in `maxBytes`), trusted-proxy IP resolver, `returnAllZodIssues` + `sanitiseZodIssues`. |
 | Crypto at rest | `src/lib/crypto.ts` | AES-256-GCM with versioned key ids, `extractKeyId`, fail-closed loader, rotation primitives. Rotation CLI: `scripts/rotate-encryption-key.ts`. |
 | Session | `src/lib/auth/session.ts` + `src/lib/auth/secure-cookie.ts` | Postgres-backed sessions, sliding 30-day expiry, `shouldEmitSecureCookie()` the one source of truth for the `Secure` flag (every cookie setter routes through it). |
@@ -120,11 +121,11 @@ The architecture map in `.planning/codebase/arch.md` walks each layer with file:
 | Bearer tokens | `src/lib/auth/hmac.ts` + `src/lib/auth/issue-token.ts` | HMAC-SHA256 hashing under `API_TOKEN_HMAC_KEY`; no plaintext path; `lastUsedAt` updated fire-and-forget. |
 | Rollup tier | `src/lib/rollups/` | DAY / WEEK / MONTH / YEAR pre-aggregations. Read-swap pattern: try the rollup, fall back to live SQL only on coverage miss. Boot-time `rollup-full-backfill` queue handles new accounts. |
 | Compliance | `src/lib/analytics/compliance.ts` | Cadence-aware medication compliance — daysOfWeek + intervalWeeks honoured across the eight call sites that surface a rate (Coach prompt, BP-status gate, dashboard pillar, …). |
-| AI providers | `src/lib/ai/provider-chain.ts` + `src/lib/ai/{openai,anthropic,local,codex,mock}-client.ts` | Five providers, hand-rolled fetch over the documented wire (no vendor SDKs). Mock is not registered in `resolveProvider()` — production cannot reach it. |
+| AI providers | `src/lib/ai/provider.ts` (`resolveProvider`) + `src/lib/ai/provider-chain.ts` (`PROVIDER_CHAIN_TYPES`) + `src/lib/ai/{openai,anthropic,local,codex,mock}-client.ts` | Five providers, hand-rolled fetch over the documented wire (no vendor SDKs). Mock is excluded structurally by the `PROVIDER_CHAIN_TYPES` allowlist — production cannot reach it. |
 | Notification dispatcher | `src/lib/notifications/dispatcher.ts` + `src/lib/notifications/senders/` | APNs → Telegram → ntfy → Web Push cascade, hard-reject classification, `push_attempts` ledger with 90-day retention. |
 | Coach | `src/app/api/insights/chat/route.ts` + `src/lib/ai/coach/` | SSE stream, budget gate + per-user rate gate, refusal detector, snapshot builder, message persistence with `encryptedContent` Bytes column. |
-| OpenAPI | `src/lib/openapi/registry.ts` + `src/lib/openapi/routes.ts` | Source of truth for `docs/api/openapi.yaml`. |
-| Schema | `prisma/schema.prisma` (61 models) | `cuid()` PKs, `snake_case` columns via `@map`, encrypted columns mostly under `*Encrypted` (search the file). |
+| OpenAPI | `src/lib/openapi/registry.ts` + `src/lib/openapi/routes/` (23 modules, `index.ts` barrel) | Source of truth for `docs/api/openapi.yaml`. |
+| Schema | `prisma/schema.prisma` (80 models) | `cuid()` PKs, `snake_case` columns via `@map`, encrypted columns mostly under `*Encrypted` (search the file). |
 | Compose | `docker-compose.yml` | `app` + `db`. Env-var whitelist under `environment:` — vars not listed never reach the container. `pull_policy: always` is load-bearing. |
 
 `.planning/codebase/arch.md` carries the full annotated walk for every section.
@@ -134,7 +135,7 @@ The architecture map in `.planning/codebase/arch.md` walks each layer with file:
 The v1.5.2 audit produced `.planning/security-audit-v1.5.2.md` and a stack of per-domain findings under `.planning/security-audit-findings/`. The patterns worth preserving on future churn:
 
 - **Encryption: fail closed everywhere.** Missing keys, malformed JSON, unknown key ids — every path throws rather than silently writing plaintext. Operators rotating keys must keep the legacy entry in `ENCRYPTION_KEYS` until the rotation script reports zero remaining legacy rows. The script covers every `*Encrypted` column + `CoachMessage.encryptedContent` (Bytes) + `IntegrationStatus.lastError`.
-- **SSRF: input-time `isPublicUrl` is the floor.** The helper in `src/lib/validations/notifications.ts:64` catches every IPv4 / IPv6 alt-notation class (octal / hex / decimal IPv4, IPv4-mapped IPv6, IPv6 ULA, CGNAT, link-local, loopback, metadata). Use it for every outbound URL that comes from a user / admin input. DNS rebinding and the redirect-follow gap remain as architectural follow-ups (issues #217 + #218). Until those land, every NEW outbound `fetch()` that touches a user-controlled host must pin `redirect: "manual"` and an `AbortSignal.timeout`.
+- **SSRF: input-time `isPublicUrl` is the floor.** The helper `isPublicUrl()` in `src/lib/validations/notifications.ts` catches every IPv4 / IPv6 alt-notation class (octal / hex / decimal IPv4, IPv4-mapped IPv6, IPv6 ULA, CGNAT, link-local, loopback, metadata). Use it for every outbound URL that comes from a user / admin input. DNS rebinding and the redirect-follow gap remain as architectural follow-ups (issues #217 + #218). Until those land, every NEW outbound `fetch()` that touches a user-controlled host must pin `redirect: "manual"` and an `AbortSignal.timeout`.
 - **Outbound egress goes through `safeFetch`.** `src/lib/safe-fetch.ts` is the one documented egress entry (`redirect: "manual"` + `AbortSignal.timeout(15_000)` defaults; opt into the connect-time DNS-rebinding pin with `requirePublicHost: true` for any operator- or user-supplied host). The in-repo ESLint rule `healthlog/safe-fetch-required` (set to `error`) bans raw `fetch(` under `src/lib/` + `src/app/` outside the wrapper internals and test files; same-origin relative-path (`/api/…`) client fetches are exempt by construction.
 - **Rate limits live in Postgres.** `src/lib/rate-limit.ts` uses a single atomic SQL upsert returning `{count, reset_at}`. Multi-instance correctness is structural. Bucket-key convention: `<surface>:${identifier}` where identifier is `userId` for authenticated routes and the trusted-proxy IP for anonymous. Anonymous auth surfaces use `checkAuthSurfaceRateLimit(...)` so a trust-violation collapses every anonymous caller into a single tight bucket rather than a free-for-all under the unknown-IP bucket.
 - **Webhooks: shared-secret + `timingSafeEqual` + per-source rate limit BEFORE secret verification.** Withings, Telegram, moodLog, the Coolify deploy webhook, and the CSP report endpoint all follow this exact pattern. The Withings path-segment secret is scrubbed from `http.path` / `http.route` by `redactSecrets()` via the `PATH_SECRET_PATHS` registry in `src/lib/logging/redact.ts:40`.

From f22e39872e101c30a865b5a55edf3a99b5e95291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 18:53:07 +0200
Subject: [PATCH 25/71] refactor(tz): route coach/verdict/mood day-keys through
 userDayKey

The coach snapshot tzDayKey, the dashboard verdict dayKeyInTz, and the
mood-entry moodDateKey each carried their own Intl day-key formatter
(en-CA / en-CA / sv-SE). Delegate all three to the canonical userDayKey
so every day-bucket key stays byte-aligned and the locale decision
lives in one place. Behaviour-preserving.
---
 src/lib/ai/coach/snapshot.ts | 11 ++++-------
 src/lib/dashboard/verdict.ts | 13 ++-----------
 src/lib/mood/date-key.ts     | 12 +++++++-----
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/lib/ai/coach/snapshot.ts b/src/lib/ai/coach/snapshot.ts
index c7639ecfb..f8e82811a 100644
--- a/src/lib/ai/coach/snapshot.ts
+++ b/src/lib/ai/coach/snapshot.ts
@@ -23,6 +23,7 @@ import {
   type CoachDataCluster,
 } from "@/lib/validations/coach-prefs";
 import { DEFAULT_TIMEZONE } from "@/lib/tz/resolver";
+import { userDayKey } from "@/lib/tz/format";
 import { convertGlucose, resolveGlucoseUnit } from "@/lib/glucose";
 import {
   computeGlucoseClinicalMetrics,
@@ -223,15 +224,11 @@ function windowToDays(window: CoachScopeWindow): number {
  * "last night" answer has to use the user's clock, not UTC. Up to
  * v1.4.24 the day-key was UTC, so a 23:50 Pacific/Auckland reading
  * landed in the next UTC day's bucket and the Coach couldn't pair it
- * with the user's mental model.
+ * with the user's mental model. Delegates to the canonical
+ * `userDayKey` so every day-bucket surface stays byte-aligned.
  */
 function tzDayKey(date: Date, tz: string): string {
-  return new Intl.DateTimeFormat("en-CA", {
-    timeZone: tz,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-  }).format(date);
+  return userDayKey(date, tz);
 }
 
 /**
diff --git a/src/lib/dashboard/verdict.ts b/src/lib/dashboard/verdict.ts
index 59c62e330..101667268 100644
--- a/src/lib/dashboard/verdict.ts
+++ b/src/lib/dashboard/verdict.ts
@@ -31,6 +31,7 @@ import {
   COACH_NUDGE_SLEEP_DEFICIT_MARGIN_H,
 } from "@/lib/jobs/coach-nudge-thresholds";
 import { buildWeightRangeFromHeight } from "@/lib/analytics/value-bands";
+import { userDayKey } from "@/lib/tz/format";
 import type { DashboardSnapshot } from "@/lib/dashboard/snapshot";
 
 const DAY_MS = 24 * 60 * 60 * 1000;
@@ -93,16 +94,6 @@ export interface DashboardVerdict {
   cta: DashboardVerdictCta | null;
 }
 
-/** YYYY-MM-DD key of `d`'s calendar day in `tz`. */
-function dayKeyInTz(d: Date, tz: string): string {
-  return new Intl.DateTimeFormat("en-CA", {
-    timeZone: tz,
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-  }).format(d);
-}
-
 /** HH:mm wall-clock of `d` in `tz`. */
 function hmInTz(d: Date, tz: string): string {
   const parts = new Intl.DateTimeFormat("en-GB", {
@@ -176,7 +167,7 @@ export function resolveDashboardVerdict(
     if (
       untilDue >= 0 &&
       untilDue <= DOSE_UPCOMING_WINDOW_MS &&
-      dayKeyInTz(new Date(dueMs), tz) === dayKeyInTz(now, tz)
+      userDayKey(new Date(dueMs), tz) === userDayKey(now, tz)
     ) {
       return {
         variant: "doseUpcoming",
diff --git a/src/lib/mood/date-key.ts b/src/lib/mood/date-key.ts
index eb7801697..440561f0a 100644
--- a/src/lib/mood/date-key.ts
+++ b/src/lib/mood/date-key.ts
@@ -28,6 +28,8 @@
  * legacy date string (`effectiveMoodTz`).
  */
 
+import { userDayKey } from "@/lib/tz/format";
+
 export const DEFAULT_TIMEZONE = "Europe/Berlin";
 
 /**
@@ -35,14 +37,14 @@ export const DEFAULT_TIMEZONE = "Europe/Berlin";
  * timezone at write time. Used by `POST /api/mood-entries` and the
  * `PUT /api/mood-entries/:id` route when `moodLoggedAt` changes.
  *
- * The Swedish locale ("sv-SE") is the historical choice for ISO 8601
- * day output via `Intl.DateTimeFormat`; we keep it so the new path
- * produces byte-identical strings to the legacy `toBerlinDate()` for
- * Europe/Berlin users (the only path tested under the v1.4.24 suite).
+ * Delegates to the canonical `userDayKey` so the mood day-bucket key
+ * stays byte-identical to every other day-bucket surface. The ISO
+ * YYYY-MM-DD shape is unchanged from the legacy sv-SE formatter; the
+ * empty-tz fallback to Europe/Berlin is preserved here.
  */
 export function moodDateKey(date: Date, tz: string): string {
   const safe = tz && tz.length > 0 ? tz : DEFAULT_TIMEZONE;
-  return new Intl.DateTimeFormat("sv-SE", { timeZone: safe }).format(date);
+  return userDayKey(date, safe);
 }
 
 /**

From 63bca26177d3435fb4bd9d7010fd008faedd226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:02:05 +0200
Subject: [PATCH 26/71] refactor(dashboard): extract buildDashboardBands into a
 client-safe leaf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The band / target math lived inline in two places — the server snapshot
builder and the dashboard page's snapshot-disabled fallback — so a
threshold change had to be hand-mirrored or the two surfaces would grade
the same metric differently. Move the construction into the new
client-safe @/lib/dashboard/bands leaf (buildDashboardBands, with
buildTargetBands kept as an alias for the snapshot-era call sites) and
have both the snapshot builder and the page fallback call it. The page
always computes the client copy from the profile so a still-loading
snapshot frame keeps real bands, then prefers the server numbers once
they arrive. Behaviour-preserving.
---
 src/app/page.tsx              | 106 ++++++-------------------
 src/lib/dashboard/bands.ts    | 143 ++++++++++++++++++++++++++++++++++
 src/lib/dashboard/snapshot.ts | 125 ++---------------------------
 3 files changed, 173 insertions(+), 201 deletions(-)
 create mode 100644 src/lib/dashboard/bands.ts

diff --git a/src/app/page.tsx b/src/app/page.tsx
index c7a111143..8de115c44 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -106,18 +106,7 @@ import { isDashboardSnapshotEnabled } from "@/lib/dashboard/snapshot-flag";
 import type { DataSummary } from "@/lib/analytics/trends";
 import { mergeSlimAndThickAnalytics } from "@/lib/analytics/merge-slim-thick";
 import { isWindowSufficient } from "@/lib/analytics/window-confidence";
-import { getBpTargets } from "@/lib/analytics/bp-targets";
-import {
-  buildTrafficLightBands,
-  buildTrafficRange,
-  buildWeightBandsFromHeight,
-  buildWeightRangeFromHeight,
-  getBodyFatTargetRange,
-} from "@/lib/analytics/value-bands";
-import {
-  getAgeFromDateOfBirth,
-  getPersonalizedPulseTarget,
-} from "@/lib/analytics/pulse-targets";
+import { buildDashboardBands } from "@/lib/dashboard/bands";
 import { apiGet } from "@/lib/api/api-fetch";
 
 // v1.18.6 — the pure first-paint / skeleton-reservation gates moved to
@@ -537,34 +526,22 @@ export default function DashboardPage() {
   const serverBands = snapshotEnabled
     ? snapshotQuery.data?.targetBands
     : undefined;
-  const bpTargets = snapshotEnabled
-    ? (serverBands?.bpTargets ?? null)
-    : user?.dateOfBirth != null
-      ? getBpTargets(new Date(user.dateOfBirth))
-      : null;
-  const bodyFatRange = snapshotEnabled
-    ? (serverBands?.bodyFatRange ?? getBodyFatTargetRange(user?.gender))
-    : getBodyFatTargetRange(user?.gender);
-  const weightRange = snapshotEnabled
-    ? (serverBands?.weightRange ?? null)
-    : user?.heightCm
-      ? buildWeightRangeFromHeight(user.heightCm)
-      : null;
-  const weightBands = snapshotEnabled
-    ? (serverBands?.weightBands ?? undefined)
-    : user?.heightCm
-      ? buildWeightBandsFromHeight(user.heightCm, {
-          lowerBound: 30,
-          upperBound: 250,
-        })
-      : undefined;
-  // The pulse target range / bands carry no i18n — read them server-side
-  // under snapshot mode; recompute from the profile otherwise.
-  const pulseAge = getAgeFromDateOfBirth(user?.dateOfBirth ?? null);
-  const pulseTarget = getPersonalizedPulseTarget(
-    pulseAge,
-    (user?.gender as "MALE" | "FEMALE" | null | undefined) ?? null,
-  );
+  // Resolve the bands through the SAME `buildDashboardBands` helper the
+  // server snapshot uses, so the snapshot path and the client fallback
+  // are byte-identical by construction (no second inline copy of the
+  // band math to drift). Always compute the client copy from the profile
+  // — it is pure + cheap — so a still-loading snapshot frame keeps real
+  // bands rather than blank charts; `serverBands ?? clientBands` then
+  // prefers the authoritative server numbers the moment they arrive.
+  const clientBands = buildDashboardBands({
+    dateOfBirth: user?.dateOfBirth ? new Date(user.dateOfBirth) : null,
+    gender: (user?.gender as "MALE" | "FEMALE" | null | undefined) ?? null,
+    heightCm: user?.heightCm ?? null,
+  });
+  const bands = serverBands ?? clientBands;
+  const bpTargets = bands.bpTargets;
+  const weightRange = bands.weightRange;
+  const weightBands = bands.weightBands ?? undefined;
   const bpTargetZones = bpTargets
     ? [
         {
@@ -587,50 +564,11 @@ export default function DashboardPage() {
         },
       ]
     : undefined;
-  const bpSysRange = snapshotEnabled
-    ? (serverBands?.bpSysRange ?? null)
-    : bpTargets
-      ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
-      : null;
-  const bpDiaRange = snapshotEnabled
-    ? (serverBands?.bpDiaRange ?? null)
-    : bpTargets
-      ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
-      : null;
-  const pulseDisplayRange = serverBands?.pulseDisplayRange ?? {
-    greenMin: pulseTarget.greenMin,
-    greenMax: pulseTarget.greenMax,
-    orangeMin: pulseTarget.orangeMin,
-    orangeMax: pulseTarget.orangeMax,
-  };
-  const pulseBands = serverBands?.pulseBands ?? [
-    { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
-    {
-      min: pulseTarget.orangeMin,
-      max: pulseTarget.greenMin,
-      color: "#ffb86c",
-      opacity: 0.18,
-    },
-    {
-      min: pulseTarget.greenMin,
-      max: pulseTarget.greenMax,
-      color: "#50fa7b",
-      opacity: 0.2,
-    },
-    {
-      min: pulseTarget.greenMax,
-      max: pulseTarget.orangeMax,
-      color: "#ffb86c",
-      opacity: 0.18,
-    },
-    { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
-  ].filter((band) => band.max > band.min);
-  const bodyFatBands =
-    serverBands?.bodyFatBands ??
-    buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
-      lowerBound: 2,
-      upperBound: 55,
-    });
+  const bpSysRange = bands.bpSysRange;
+  const bpDiaRange = bands.bpDiaRange;
+  const pulseDisplayRange = bands.pulseDisplayRange;
+  const pulseBands = bands.pulseBands;
+  const bodyFatBands = bands.bodyFatBands;
 
   // v1.18.6 — ONE batched fetch for every visible non-sleep chart series
   // (audit finding #2). Pre-fix, each `<HealthChart>` fired its own
diff --git a/src/lib/dashboard/bands.ts b/src/lib/dashboard/bands.ts
new file mode 100644
index 000000000..8f2d1aed0
--- /dev/null
+++ b/src/lib/dashboard/bands.ts
@@ -0,0 +1,143 @@
+/**
+ * Dashboard band / target math — the single source of truth.
+ *
+ * Pure projection over a user's profile facts (DOB / gender / height):
+ * no DB read, no clock, no network, no `server-only` dep. Every building
+ * block it composes (`@/lib/analytics/{value-bands,bp-targets,pulse-targets}`)
+ * is itself client-safe, so this leaf imports cleanly into both the
+ * server-side snapshot builder (`@/lib/dashboard/snapshot`) and the
+ * `"use client"` dashboard page fallback (`src/app/page.tsx`).
+ *
+ * Before v1.18.6 the band construction lived inline in two places — the
+ * snapshot builder and the page's snapshot-disabled fallback — so a
+ * threshold change had to be mirrored by hand or the two surfaces would
+ * grade the same metric differently. Both now call `buildDashboardBands`,
+ * so the band/target math lives in exactly one place. `buildTargetBands`
+ * is kept as an alias for the snapshot-era import sites.
+ */
+import { getBpTargets, type BpTargets } from "@/lib/analytics/bp-targets";
+import {
+  buildTrafficLightBands,
+  buildTrafficRange,
+  buildWeightBandsFromHeight,
+  buildWeightRangeFromHeight,
+  getBodyFatTargetRange,
+  type ValueBand,
+  type TrafficRange,
+} from "@/lib/analytics/value-bands";
+import {
+  getAgeFromDateOfBirth,
+  getPersonalizedPulseTarget,
+} from "@/lib/analytics/pulse-targets";
+
+export interface DashboardTargetBands {
+  /** Personalised BP target numbers (null when no DOB). */
+  bpTargets: BpTargets | null;
+  /** Systolic traffic range (null when no DOB). */
+  bpSysRange: TrafficRange | null;
+  /** Diastolic traffic range (null when no DOB). */
+  bpDiaRange: TrafficRange | null;
+  /** Resting-pulse display range (always present — AHA fallback). */
+  pulseDisplayRange: {
+    greenMin: number;
+    greenMax: number;
+    orangeMin: number;
+    orangeMax: number;
+  };
+  /** Resting-pulse chart bands (always present — AHA fallback). */
+  pulseBands: ValueBand[];
+  /** Body-fat target range (gender-aware; always present). */
+  bodyFatRange: { min: number; max: number };
+  /** Body-fat chart bands (always present). */
+  bodyFatBands: ValueBand[];
+  /** Weight traffic range (null when no height). */
+  weightRange: TrafficRange | null;
+  /** Weight chart bands (null when no height). */
+  weightBands: ValueBand[] | null;
+}
+
+/**
+ * Resolve the band / target math from a user's profile facts. Pure; no
+ * DB read. The snapshot builder and the page fallback both call this so
+ * they produce byte-identical numbers.
+ */
+export function buildDashboardBands(profile: {
+  dateOfBirth: Date | null;
+  gender: "MALE" | "FEMALE" | null;
+  heightCm: number | null;
+}): DashboardTargetBands {
+  const bpTargets = profile.dateOfBirth
+    ? getBpTargets(profile.dateOfBirth)
+    : null;
+  const pulseAge = getAgeFromDateOfBirth(profile.dateOfBirth);
+  const pulseTarget = getPersonalizedPulseTarget(pulseAge, profile.gender);
+  const bodyFatRange = getBodyFatTargetRange(profile.gender);
+  const weightRange = profile.heightCm
+    ? buildWeightRangeFromHeight(profile.heightCm)
+    : null;
+  const weightBands = profile.heightCm
+    ? buildWeightBandsFromHeight(profile.heightCm, {
+        lowerBound: 30,
+        upperBound: 250,
+      })
+    : null;
+  const bpSysRange = bpTargets
+    ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
+    : null;
+  const bpDiaRange = bpTargets
+    ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
+    : null;
+  const pulseBands = [
+    { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
+    {
+      min: pulseTarget.orangeMin,
+      max: pulseTarget.greenMin,
+      color: "#ffb86c",
+      opacity: 0.18,
+    },
+    {
+      min: pulseTarget.greenMin,
+      max: pulseTarget.greenMax,
+      color: "#50fa7b",
+      opacity: 0.2,
+    },
+    {
+      min: pulseTarget.greenMax,
+      max: pulseTarget.orangeMax,
+      color: "#ffb86c",
+      opacity: 0.18,
+    },
+    { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
+  ].filter((band) => band.max > band.min);
+  const bodyFatBands = buildTrafficLightBands(
+    bodyFatRange.min,
+    bodyFatRange.max,
+    {
+      lowerBound: 2,
+      upperBound: 55,
+    },
+  );
+  return {
+    bpTargets,
+    bpSysRange,
+    bpDiaRange,
+    pulseDisplayRange: {
+      greenMin: pulseTarget.greenMin,
+      greenMax: pulseTarget.greenMax,
+      orangeMin: pulseTarget.orangeMin,
+      orangeMax: pulseTarget.orangeMax,
+    },
+    pulseBands,
+    bodyFatRange,
+    bodyFatBands,
+    weightRange,
+    weightBands,
+  };
+}
+
+/**
+ * Snapshot-era alias. The snapshot builder and its parity test still
+ * import `buildTargetBands`; keep the name pointing at the canonical
+ * builder so neither has to change.
+ */
+export const buildTargetBands = buildDashboardBands;
diff --git a/src/lib/dashboard/snapshot.ts b/src/lib/dashboard/snapshot.ts
index 969e4e9fa..668e38944 100644
--- a/src/lib/dashboard/snapshot.ts
+++ b/src/lib/dashboard/snapshot.ts
@@ -45,20 +45,7 @@ import {
   type DataPoint,
   type DataSummary,
 } from "@/lib/analytics/trends";
-import { getBpTargets, type BpTargets } from "@/lib/analytics/bp-targets";
-import {
-  buildTrafficLightBands,
-  buildTrafficRange,
-  buildWeightBandsFromHeight,
-  buildWeightRangeFromHeight,
-  getBodyFatTargetRange,
-  type ValueBand,
-  type TrafficRange,
-} from "@/lib/analytics/value-bands";
-import {
-  getAgeFromDateOfBirth,
-  getPersonalizedPulseTarget,
-} from "@/lib/analytics/pulse-targets";
+import { getBpTargets } from "@/lib/analytics/bp-targets";
 import {
   computeGlucoseClinicalMetrics,
   GLUCOSE_PANEL_WINDOW_DAYS,
@@ -90,6 +77,11 @@ import {
   type MedsTodayBlock,
 } from "@/lib/dashboard/meds-today";
 import { computeUserHealthScoreFastPath } from "@/lib/analytics/health-score-fast-path";
+import {
+  buildDashboardBands,
+  buildTargetBands,
+  type DashboardTargetBands,
+} from "@/lib/dashboard/bands";
 import type {
   HealthScoreBand,
   RestModeAnnotation,
@@ -225,31 +217,8 @@ export interface DashboardSnapshotUser {
  * personalisation, no height → weight band), matching the client's
  * previous null-guards exactly.
  */
-export interface DashboardTargetBands {
-  /** Personalised BP target numbers (null when no DOB). */
-  bpTargets: BpTargets | null;
-  /** Systolic traffic range (null when no DOB). */
-  bpSysRange: TrafficRange | null;
-  /** Diastolic traffic range (null when no DOB). */
-  bpDiaRange: TrafficRange | null;
-  /** Resting-pulse display range (always present — AHA fallback). */
-  pulseDisplayRange: {
-    greenMin: number;
-    greenMax: number;
-    orangeMin: number;
-    orangeMax: number;
-  };
-  /** Resting-pulse chart bands (always present — AHA fallback). */
-  pulseBands: ValueBand[];
-  /** Body-fat target range (gender-aware; always present). */
-  bodyFatRange: { min: number; max: number };
-  /** Body-fat chart bands (always present). */
-  bodyFatBands: ValueBand[];
-  /** Weight traffic range (null when no height). */
-  weightRange: TrafficRange | null;
-  /** Weight chart bands (null when no height). */
-  weightBands: ValueBand[] | null;
-}
+export { buildDashboardBands, buildTargetBands };
+export type { DashboardTargetBands };
 
 export interface DashboardSnapshotMoodEntry {
   date: string;
@@ -661,84 +630,6 @@ async function buildExtras(
   };
 }
 
-/**
- * v1.18.6 — resolve the band / target math server-side from the same
- * helpers the client used. Pure projection over the profile facts; no DB
- * read. Mirrors the exact construction `page.tsx` ran (same helper calls,
- * same literal pulse-band colours/opacities, same null-guards) so the
- * snapshot path and the legacy client-compute path produce byte-identical
- * numbers.
- */
-export function buildTargetBands(profile: {
-  dateOfBirth: Date | null;
-  gender: "MALE" | "FEMALE" | null;
-  heightCm: number | null;
-}): DashboardTargetBands {
-  const bpTargets = profile.dateOfBirth
-    ? getBpTargets(profile.dateOfBirth)
-    : null;
-  const pulseAge = getAgeFromDateOfBirth(profile.dateOfBirth);
-  const pulseTarget = getPersonalizedPulseTarget(pulseAge, profile.gender);
-  const bodyFatRange = getBodyFatTargetRange(profile.gender);
-  const weightRange = profile.heightCm
-    ? buildWeightRangeFromHeight(profile.heightCm)
-    : null;
-  const weightBands = profile.heightCm
-    ? buildWeightBandsFromHeight(profile.heightCm, {
-        lowerBound: 30,
-        upperBound: 250,
-      })
-    : null;
-  const bpSysRange = bpTargets
-    ? buildTrafficRange(bpTargets.sysLow, bpTargets.sysHigh)
-    : null;
-  const bpDiaRange = bpTargets
-    ? buildTrafficRange(bpTargets.diaLow, bpTargets.diaHigh)
-    : null;
-  const pulseBands = [
-    { min: 30, max: pulseTarget.orangeMin, color: "#ff5555", opacity: 0.16 },
-    {
-      min: pulseTarget.orangeMin,
-      max: pulseTarget.greenMin,
-      color: "#ffb86c",
-      opacity: 0.18,
-    },
-    {
-      min: pulseTarget.greenMin,
-      max: pulseTarget.greenMax,
-      color: "#50fa7b",
-      opacity: 0.2,
-    },
-    {
-      min: pulseTarget.greenMax,
-      max: pulseTarget.orangeMax,
-      color: "#ffb86c",
-      opacity: 0.18,
-    },
-    { min: pulseTarget.orangeMax, max: 220, color: "#ff5555", opacity: 0.16 },
-  ].filter((band) => band.max > band.min);
-  const bodyFatBands = buildTrafficLightBands(bodyFatRange.min, bodyFatRange.max, {
-    lowerBound: 2,
-    upperBound: 55,
-  });
-  return {
-    bpTargets,
-    bpSysRange,
-    bpDiaRange,
-    pulseDisplayRange: {
-      greenMin: pulseTarget.greenMin,
-      greenMax: pulseTarget.greenMax,
-      orangeMin: pulseTarget.orangeMin,
-      orangeMax: pulseTarget.orangeMax,
-    },
-    pulseBands,
-    bodyFatRange,
-    bodyFatBands,
-    weightRange,
-    weightBands,
-  };
-}
-
 /** Parse + validate the cached `dailyBriefing` block; null when unusable. */
 function parseCachedBriefing(
   cachedText: string | null,

From 3d213d1fbf2a3c4a5797f1f9977425a05015898b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:07:38 +0200
Subject: [PATCH 27/71] feat(insights): turn the no-provider dead-ends into
 guided setup

Coach, the daily briefing, and the per-metric assessment tiles all
default ON but need a connected AI provider that onboarding never
mentions, so a fresh user hits a bare error on the headline feature.

- The daily-briefing and per-metric no-provider states now explain what
  the AI does and why a provider is needed (your own key or a local
  model, data stays with you) rather than a one-line 'unavailable'.
- The per-metric tile gains a direct Settings link.
- The Coach 'no provider configured' turn maps to its own copy with a
  Settings link instead of the transient 'try again in a moment' that
  would 422 forever.

Adds insights.noProviderAction, insights.coach.errorNoProvider and
errorNoProviderAction across all six locales.
---
 messages/de.json                              |  7 +++++--
 messages/en.json                              |  7 +++++--
 messages/es.json                              |  7 +++++--
 messages/fr.json                              |  7 +++++--
 messages/it.json                              |  7 +++++--
 messages/pl.json                              |  7 +++++--
 .../__tests__/insight-status-card.test.tsx    |  6 +++++-
 .../__tests__/message-thread.test.tsx         |  9 +++++++-
 .../insights/coach-panel/message-thread.tsx   | 21 ++++++++++++++++++-
 .../insights/insight-status-card.tsx          | 12 +++++++++--
 10 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 36c227c57..dc5188ff6 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyAction": "Account-Einstellungen öffnen",
     "noAnalysisYet": "Noch keine Einschätzung vorhanden.",
     "assessmentPreparing": "Einschätzung wird vorbereitet…",
-    "noProviderConfigured": "Einschätzung nicht verfügbar.",
+    "noProviderConfigured": "Verbinde einen KI-Anbieter, um hier eine Einschätzung zu deinen Werten zu sehen.",
+    "noProviderAction": "Zu den KI-Einstellungen",
     "startAnalysis": "Einschätzung starten",
     "refreshAnalysis": "Einschätzung aktualisieren",
     "keyTakeaway": "Das Wichtigste",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Briefing erstellen",
       "loadingLabel": "Briefing wird zusammengestellt",
       "noProviderTitle": "Kein KI-Anbieter verbunden",
-      "noProviderDescription": "Verbinde einen KI-Anbieter in den Einstellungen, um tägliche Briefings zu erhalten.",
+      "noProviderDescription": "Das Tagesbriefing fasst deine Werte in Klartext zusammen. Dafür braucht HealthLog einen KI-Anbieter — nutze deinen eigenen Schlüssel (OpenAI, Anthropic) oder ein lokales Modell. Deine Daten bleiben dabei bei dir.",
       "noProviderAction": "Zu den KI-Einstellungen"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "In deiner Nachricht stehen Anweisungen, die meine Vorgaben überschreiben sollen. Ich bin der HealthLog-Coach und fasse ausschließlich deine eigenen Gesundheitsdaten zusammen — formuliere deine Frage bitte in diesem Rahmen neu.",
       "errorBudget": "Du hast das heutige Coach-Limit erreicht. Das Budget setzt sich um Mitternacht (UTC) zurück.",
       "errorProvider": "Der Coach konnte gerade keinen Auswertungs-Anbieter erreichen. Bitte versuche es in einem Moment erneut.",
+      "errorNoProvider": "Der Coach liest deine erfassten Gesundheitsdaten und beantwortet Fragen dazu (keine medizinische Beratung). Dafür braucht HealthLog einen KI-Anbieter — verbinde deinen eigenen Schlüssel oder ein lokales Modell.",
+      "errorNoProviderAction": "KI-Anbieter verbinden",
       "errorNetwork": "Keine Internetverbindung — versuche es erneut, sobald du online bist.",
       "prefsSaveError": "Coach-Einstellungen konnten nicht gespeichert werden. Bitte versuche es erneut.",
       "errorCredentialExpired": "Deine Verbindung zum KI-Anbieter ist abgelaufen. Stelle sie in den Einstellungen wieder her, damit der Coach weiterläuft.",
diff --git a/messages/en.json b/messages/en.json
index 18cf5182a..2cc1234f7 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyTitle": "Set your height to see BMI",
     "bmiEmptyDescription": "BMI needs your height. Add it under Settings → Account.",
     "bmiEmptyAction": "Open account settings",
-    "noProviderConfigured": "Assessment unavailable.",
+    "noProviderConfigured": "Connect an AI provider to see an assessment of your readings here.",
+    "noProviderAction": "Open AI settings",
     "startAnalysis": "Start assessment",
     "refreshAnalysis": "Refresh assessment",
     "keyTakeaway": "Key Takeaway",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Generate briefing",
       "loadingLabel": "Synthesising today's briefing",
       "noProviderTitle": "No AI provider connected",
-      "noProviderDescription": "Connect an AI provider in settings to receive daily briefings.",
+      "noProviderDescription": "The daily briefing turns your readings into plain-language summary. HealthLog needs an AI provider for that — use your own key (OpenAI, Anthropic) or a local model. Your data stays with you.",
       "noProviderAction": "Open AI settings"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "I noticed wording that tries to override my instructions. I am the HealthLog Coach and only summarise your own health data — please rephrase your question in those terms.",
       "errorBudget": "You've reached today's Coach usage limit. The budget refreshes at midnight UTC.",
       "errorProvider": "The Coach could not reach an Insights provider just now. Please try again in a moment.",
+      "errorNoProvider": "The Coach reads your logged health data and answers questions about it (not medical advice). HealthLog needs an AI provider for that — connect your own key or a local model.",
+      "errorNoProviderAction": "Connect an AI provider",
       "errorNetwork": "No internet connection — try again once you're back online.",
       "prefsSaveError": "Couldn't save your Coach preferences. Please try again.",
       "errorCredentialExpired": "Your AI provider connection has expired. Reconnect it in Settings to keep the Coach running.",
diff --git a/messages/es.json b/messages/es.json
index 1b2e2c7a0..649638cc1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyTitle": "Añade tu altura para calcular el IMC",
     "bmiEmptyDescription": "El IMC necesita tu altura. Guárdala en Ajustes → Cuenta.",
     "bmiEmptyAction": "Abrir ajustes de cuenta",
-    "noProviderConfigured": "Valoración no disponible.",
+    "noProviderConfigured": "Conecta un proveedor de IA para ver aquí una valoración de tus lecturas.",
+    "noProviderAction": "Abrir ajustes de IA",
     "startAnalysis": "Iniciar valoración",
     "refreshAnalysis": "Actualizar valoración",
     "keyTakeaway": "Lo más importante",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Generar resumen",
       "loadingLabel": "Preparando el resumen",
       "noProviderTitle": "Ningún proveedor de IA conectado",
-      "noProviderDescription": "Conecta un proveedor de IA en los ajustes para recibir resúmenes diarios.",
+      "noProviderDescription": "El briefing diario resume tus lecturas en lenguaje claro. HealthLog necesita un proveedor de IA para ello: usa tu propia clave (OpenAI, Anthropic) o un modelo local. Tus datos siguen siendo tuyos.",
       "noProviderAction": "Abrir ajustes de IA"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "Tu mensaje contiene instrucciones que pretenden sobrescribir mis indicaciones. Soy el coach de HealthLog y solo resumo tus propios datos de salud — reformula tu pregunta dentro de ese marco.",
       "errorBudget": "Has alcanzado el límite diario del coach. El cupo se reinicia a medianoche (UTC).",
       "errorProvider": "El coach no ha podido contactar con un proveedor de análisis ahora mismo. Inténtalo en un momento.",
+      "errorNoProvider": "El coach lee tus datos de salud registrados y responde preguntas sobre ellos (no es consejo médico). HealthLog necesita un proveedor de IA para ello: conecta tu propia clave o un modelo local.",
+      "errorNoProviderAction": "Conectar un proveedor de IA",
       "errorNetwork": "Sin conexión a Internet — inténtalo de nuevo cuando vuelvas a estar en línea.",
       "prefsSaveError": "No se pudieron guardar tus preferencias del Coach. Inténtalo de nuevo.",
       "errorCredentialExpired": "Tu conexión con el proveedor de IA ha caducado. Vuelve a conectarla en Ajustes para que el Coach siga funcionando.",
diff --git a/messages/fr.json b/messages/fr.json
index e278cc028..9fe484ea4 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyTitle": "Ajoute ta taille pour l’IMC",
     "bmiEmptyDescription": "L’IMC nécessite ta taille. Renseigne-la dans Paramètres → Compte.",
     "bmiEmptyAction": "Ouvrir les paramètres du compte",
-    "noProviderConfigured": "Évaluation indisponible.",
+    "noProviderConfigured": "Connecte un fournisseur d'IA pour voir ici une évaluation de tes mesures.",
+    "noProviderAction": "Ouvrir les réglages IA",
     "startAnalysis": "Lancer l’évaluation",
     "refreshAnalysis": "Actualiser l’évaluation",
     "keyTakeaway": "L’essentiel",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Générer le briefing",
       "loadingLabel": "Préparation du briefing",
       "noProviderTitle": "Aucun fournisseur d'IA connecté",
-      "noProviderDescription": "Connecte un fournisseur d'IA dans les réglages pour recevoir des briefings quotidiens.",
+      "noProviderDescription": "Le briefing quotidien résume tes mesures en langage clair. HealthLog a besoin d'un fournisseur d'IA pour cela : utilise ta propre clé (OpenAI, Anthropic) ou un modèle local. Tes données restent chez toi.",
       "noProviderAction": "Ouvrir les réglages IA"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "Ton message contient des instructions qui cherchent à remplacer mes consignes. Je suis le coach HealthLog et je ne résume que tes propres données de santé — reformule ta question dans ce cadre.",
       "errorBudget": "Tu as atteint la limite quotidienne du coach. Le quota se réinitialise à minuit (UTC).",
       "errorProvider": "Le coach n’a pas pu joindre un fournisseur d’analyse maintenant. Réessaie dans un instant.",
+      "errorNoProvider": "Le coach lit tes données de santé enregistrées et répond aux questions à leur sujet (pas un avis médical). HealthLog a besoin d'un fournisseur d'IA pour cela : connecte ta propre clé ou un modèle local.",
+      "errorNoProviderAction": "Connecter un fournisseur d'IA",
       "errorNetwork": "Pas de connexion Internet — réessaie une fois reconnecté.",
       "prefsSaveError": "Impossible d’enregistrer vos préférences du Coach. Réessayez.",
       "errorCredentialExpired": "Ta connexion au fournisseur d'IA a expiré. Reconnecte-la dans les Réglages pour que le Coach continue de fonctionner.",
diff --git a/messages/it.json b/messages/it.json
index e5fb79eb1..a50e007a6 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyTitle": "Aggiungi l’altezza per il BMI",
     "bmiEmptyDescription": "Per il BMI serve la tua altezza. Salvala in Impostazioni → Account.",
     "bmiEmptyAction": "Apri impostazioni account",
-    "noProviderConfigured": "Valutazione non disponibile.",
+    "noProviderConfigured": "Collega un provider IA per vedere qui una valutazione delle tue misurazioni.",
+    "noProviderAction": "Apri impostazioni IA",
     "startAnalysis": "Avvia valutazione",
     "refreshAnalysis": "Aggiorna valutazione",
     "keyTakeaway": "Ciò che conta",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Genera briefing",
       "loadingLabel": "Preparazione del briefing",
       "noProviderTitle": "Nessun provider IA collegato",
-      "noProviderDescription": "Collega un provider IA nelle impostazioni per ricevere briefing giornalieri.",
+      "noProviderDescription": "Il briefing giornaliero riassume le tue misurazioni in linguaggio chiaro. HealthLog ha bisogno di un provider IA per questo: usa la tua chiave (OpenAI, Anthropic) o un modello locale. I tuoi dati restano tuoi.",
       "noProviderAction": "Apri impostazioni IA"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "Nel tuo messaggio ci sono istruzioni che cercano di sovrascrivere le mie indicazioni. Sono il coach di HealthLog e riassumo solo i tuoi dati di salute — riformula la domanda in questo perimetro.",
       "errorBudget": "Hai raggiunto il limite giornaliero del coach. Il budget si reimposta a mezzanotte (UTC).",
       "errorProvider": "Il coach non è riuscito a contattare un provider di analisi ora. Riprova fra poco.",
+      "errorNoProvider": "Il coach legge i tuoi dati di salute registrati e risponde a domande su di essi (non è consulenza medica). HealthLog ha bisogno di un provider IA per questo: collega la tua chiave o un modello locale.",
+      "errorNoProviderAction": "Collega un provider IA",
       "errorNetwork": "Nessuna connessione Internet — riprova quando sei di nuovo online.",
       "prefsSaveError": "Impossibile salvare le preferenze del Coach. Riprova.",
       "errorCredentialExpired": "La connessione al provider di IA è scaduta. Riconnettila nelle Impostazioni per mantenere attivo il Coach.",
diff --git a/messages/pl.json b/messages/pl.json
index f09755820..b3353ef57 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -1892,7 +1892,8 @@
     "bmiEmptyTitle": "Dodaj wzrost, aby obliczyć BMI",
     "bmiEmptyDescription": "BMI wymaga twojego wzrostu. Zapisz go w Ustawieniach → Konto.",
     "bmiEmptyAction": "Otwórz ustawienia konta",
-    "noProviderConfigured": "Ocena niedostępna.",
+    "noProviderConfigured": "Połącz dostawcę AI, aby zobaczyć tutaj ocenę swoich pomiarów.",
+    "noProviderAction": "Otwórz ustawienia AI",
     "startAnalysis": "Uruchom ocenę",
     "refreshAnalysis": "Odśwież ocenę",
     "keyTakeaway": "Najważniejsze",
@@ -2007,7 +2008,7 @@
       "emptyAction": "Wygeneruj briefing",
       "loadingLabel": "Przygotowanie briefingu",
       "noProviderTitle": "Brak połączonego dostawcy AI",
-      "noProviderDescription": "Połącz dostawcę AI w ustawieniach, aby otrzymywać codzienne briefingi.",
+      "noProviderDescription": "Codzienny briefing podsumowuje Twoje pomiary prostym językiem. HealthLog potrzebuje do tego dostawcy AI — użyj własnego klucza (OpenAI, Anthropic) lub modelu lokalnego. Twoje dane pozostają u Ciebie.",
       "noProviderAction": "Otwórz ustawienia AI"
     },
     "trendsRow": {
@@ -2072,6 +2073,8 @@
       "refusalInjection": "Twoja wiadomość zawiera instrukcje, które próbują nadpisać moje wytyczne. Jestem coachem HealthLog i podsumowuję wyłącznie twoje własne dane zdrowotne — przeformułuj pytanie w tych ramach.",
       "errorBudget": "Osiągnięto dzienny limit coacha. Limit resetuje się o północy (UTC).",
       "errorProvider": "Coach nie mógł teraz skontaktować się z dostawcą analizy. Spróbuj za chwilę.",
+      "errorNoProvider": "Coach czyta Twoje zapisane dane zdrowotne i odpowiada na pytania o nie (to nie porada medyczna). HealthLog potrzebuje do tego dostawcy AI — połącz własny klucz lub model lokalny.",
+      "errorNoProviderAction": "Połącz dostawcę AI",
       "errorNetwork": "Brak połączenia z Internetem — spróbuj ponownie, gdy wrócisz online.",
       "prefsSaveError": "Nie udało się zapisać ustawień Coacha. Spróbuj ponownie.",
       "errorCredentialExpired": "Połączenie z dostawcą AI wygasło. Połącz je ponownie w Ustawieniach, aby Coach działał dalej.",
diff --git a/src/components/insights/__tests__/insight-status-card.test.tsx b/src/components/insights/__tests__/insight-status-card.test.tsx
index 6ecabe3fc..d55bf0954 100644
--- a/src/components/insights/__tests__/insight-status-card.test.tsx
+++ b/src/components/insights/__tests__/insight-status-card.test.tsx
@@ -80,7 +80,11 @@ describe("<InsightStatusCard>", () => {
         text="ignored when hasProvider is false"
       />,
     );
-    expect(html).toContain("Assessment unavailable.");
+    // v1.18.6 — the no-provider tile is a guided-setup explainer + a
+    // Settings link, not a bare "unavailable" line.
+    expect(html).toContain("Connect an AI provider");
+    expect(html).toContain("Open AI settings");
+    expect(html).toContain("/settings/ai");
     expect(html).not.toContain("ignored when hasProvider is false");
   });
 
diff --git a/src/components/insights/coach-panel/__tests__/message-thread.test.tsx b/src/components/insights/coach-panel/__tests__/message-thread.test.tsx
index fc6cea16c..e09507a2f 100644
--- a/src/components/insights/coach-panel/__tests__/message-thread.test.tsx
+++ b/src/components/insights/coach-panel/__tests__/message-thread.test.tsx
@@ -662,13 +662,20 @@ describe("errorCodeToI18nKey", () => {
     for (const code of [
       "coach.provider.unavailable",
       "coach.provider.empty",
-      "coach.provider.none",
       "coach.stream",
     ]) {
       expect(errorCodeToI18nKey(code)).toBe("insights.coach.errorProvider");
     }
   });
 
+  // v1.18.6 — a "no provider configured anywhere" turn is a setup gap,
+  // not a transient failure, so it carries its own guided-setup copy.
+  it("maps the no-provider case to its dedicated guided-setup copy", () => {
+    expect(errorCodeToI18nKey("coach.provider.none")).toBe(
+      "insights.coach.errorNoProvider",
+    );
+  });
+
   // v1.4.43 QoL (M6) — `coach.network` no longer collapses to the
   // generic provider copy; the user needs the actionable offline hint.
   it("maps coach.network to the dedicated offline key", () => {
diff --git a/src/components/insights/coach-panel/message-thread.tsx b/src/components/insights/coach-panel/message-thread.tsx
index 59f0755e2..75a632f59 100644
--- a/src/components/insights/coach-panel/message-thread.tsx
+++ b/src/components/insights/coach-panel/message-thread.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Fragment, useEffect, useId, useMemo, useRef, useState } from "react";
+import Link from "next/link";
 import { useMutation } from "@tanstack/react-query";
 import { toast } from "sonner";
 import {
@@ -168,9 +169,14 @@ export function errorCodeToI18nKey(code: string): string {
       // (auth-class failure). The next action is "reconnect", not "try
       // again later", so it carries its own copy pointing at Settings.
       return "insights.coach.errorCredentialExpired";
+    case "coach.provider.none":
+      // v1.18.6 — no AI provider is configured anywhere, so "try again
+      // in a moment" is the wrong instruction (it will 422 forever). Send
+      // the user to guided setup with a one-line explainer + a Settings
+      // link rendered alongside the bubble copy.
+      return "insights.coach.errorNoProvider";
     case "coach.provider.unavailable":
     case "coach.provider.empty":
-    case "coach.provider.none":
     case "coach.stream":
       return "insights.coach.errorProvider";
     default:
@@ -613,6 +619,19 @@ function ChatBubble({
         {safeError && content && (
           <p className="text-warning/90 text-xs">{safeError}</p>
         )}
+        {/* v1.18.6 — a "no provider configured anywhere" turn is a
+            setup gap, not a transient failure: surface a direct link to
+            Settings → AI so the Coach guides the user into BYOK / local
+            setup instead of inviting an endless retry. */}
+        {errorCode === "coach.provider.none" && (
+          <Link
+            href="/settings/ai"
+            data-slot="coach-no-provider-cta"
+            className="text-primary text-xs font-medium underline-offset-4 hover:underline"
+          >
+            {t("insights.coach.errorNoProviderAction")}
+          </Link>
+        )}
         {/* v1.12.0 — collapse the whole provenance block ("what was
             included") behind one disclosure, collapsed by default. The
             source chips used to render fully expanded above the
diff --git a/src/components/insights/insight-status-card.tsx b/src/components/insights/insight-status-card.tsx
index b0a5b2dfc..a4682ed07 100644
--- a/src/components/insights/insight-status-card.tsx
+++ b/src/components/insights/insight-status-card.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEffect, useRef, useState } from "react";
+import Link from "next/link";
 
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
@@ -144,14 +145,21 @@ export function InsightStatusCard({
 
   if (!hasProvider) {
     return (
-      <Card className="gap-1.5 py-4 opacity-60 md:py-5">
+      <Card className="gap-1.5 py-4 opacity-80 md:py-5">
         <CardHeader className="pb-1">
           <TileHeader icon={nodeIcon(icon)} title={title} />
         </CardHeader>
-        <CardContent>
+        <CardContent className="flex flex-col gap-1.5">
           <p className="text-muted-foreground text-sm">
             {t("insights.noProviderConfigured")}
           </p>
+          <Link
+            href="/settings/ai"
+            data-slot="insight-status-no-provider-cta"
+            className="text-primary text-sm font-medium underline-offset-4 hover:underline"
+          >
+            {t("insights.noProviderAction")}
+          </Link>
         </CardContent>
       </Card>
     );

From cd816607e46e8f9b2a8f290d59a79f8d3af20ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:09:12 +0200
Subject: [PATCH 28/71] feat(onboarding): surface AI-provider setup on the done
 step

AI Insights, Coach and the daily briefing are default-ON but need a BYOK
or local provider that onboarding never mentioned, so a fresh user met
the flagship feature as a cold error. Add an optional, skippable card to
the onboarding done step that explains what the AI does (plain-language
summaries of your readings, data stays with you) and deep-links to
Settings -> AI. Adds onboarding.done.aiTitle/aiBody/aiCta across all six
locales.
---
 messages/de.json                         |  5 +++-
 messages/en.json                         |  5 +++-
 messages/es.json                         |  5 +++-
 messages/fr.json                         |  5 +++-
 messages/it.json                         |  5 +++-
 messages/pl.json                         |  5 +++-
 src/components/onboarding/DoneScreen.tsx | 35 +++++++++++++++++++++++-
 7 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index dc5188ff6..ecf2d8338 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -3626,7 +3626,10 @@
       "learning": "Manche Einblicke – Glukose, Schlafrhythmus, Blutdrucktrends, Zyklus – schärfen sich in den ersten ein bis zwei Wochen, sobald sich deine Daten ansammeln. Leere Kacheln heißen jetzt nur, dass wir deine Basislinie noch lernen.",
       "connectCta": "Gerät verbinden",
       "logCta": "Ersten Wert eintragen",
-      "importCta": "Bestehende Daten importieren"
+      "importCta": "Bestehende Daten importieren",
+      "aiTitle": "KI-Einblicke aktivieren (optional)",
+      "aiBody": "Coach, Tagesbriefing und Einschätzungen fassen deine Werte in Klartext zusammen. Dafür verbindest du deinen eigenen KI-Schlüssel (OpenAI, Anthropic) oder ein lokales Modell — deine Daten bleiben bei dir.",
+      "aiCta": "KI-Anbieter verbinden"
     },
     "welcomeBack": {
       "title": "Willkommen zurück",
diff --git a/messages/en.json b/messages/en.json
index 2cc1234f7..63d8a76e0 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3626,7 +3626,10 @@
       "learning": "Some insights — glucose, sleep rhythm, blood-pressure trends, cycle — sharpen over the first week or two as your data builds up. Empty tiles now just mean we're still learning your baseline.",
       "connectCta": "Connect a device",
       "logCta": "Log your first measurement",
-      "importCta": "Import existing history"
+      "importCta": "Import existing history",
+      "aiTitle": "Turn on AI Insights (optional)",
+      "aiBody": "Coach, the daily briefing and assessments turn your readings into plain language. For that you connect your own AI key (OpenAI, Anthropic) or a local model — your data stays with you.",
+      "aiCta": "Connect an AI provider"
     },
     "welcomeBack": {
       "title": "Welcome back",
diff --git a/messages/es.json b/messages/es.json
index 649638cc1..fe84dfe60 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -3626,7 +3626,10 @@
       "learning": "Algunas conclusiones —glucosa, ritmo de sueño, tendencias de presión arterial, ciclo— se afinan durante la primera semana o dos a medida que se acumulan tus datos. Las casillas vacías ahora solo significan que aún estamos aprendiendo tu línea base.",
       "connectCta": "Conectar un dispositivo",
       "logCta": "Registra tu primera medición",
-      "importCta": "Importar historial existente"
+      "importCta": "Importar historial existente",
+      "aiTitle": "Activar Insights con IA (opcional)",
+      "aiBody": "El coach, el briefing diario y las valoraciones convierten tus lecturas en lenguaje claro. Para ello conectas tu propia clave de IA (OpenAI, Anthropic) o un modelo local: tus datos siguen siendo tuyos.",
+      "aiCta": "Conectar un proveedor de IA"
     },
     "welcomeBack": {
       "title": "Bienvenido de nuevo",
diff --git a/messages/fr.json b/messages/fr.json
index 9fe484ea4..fd10e6d92 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -3626,7 +3626,10 @@
       "learning": "Certaines analyses — glycémie, rythme de sommeil, tendances de tension, cycle — s'affinent au cours de la première semaine ou deux à mesure que vos données s'accumulent. Des tuiles vides signifient simplement que nous apprenons encore votre référence.",
       "connectCta": "Connecter un appareil",
       "logCta": "Enregistrez votre première mesure",
-      "importCta": "Importer un historique existant"
+      "importCta": "Importer un historique existant",
+      "aiTitle": "Activer les Insights IA (facultatif)",
+      "aiBody": "Le coach, le briefing quotidien et les évaluations traduisent tes mesures en langage clair. Pour cela, connecte ta propre clé IA (OpenAI, Anthropic) ou un modèle local — tes données restent chez toi.",
+      "aiCta": "Connecter un fournisseur d'IA"
     },
     "welcomeBack": {
       "title": "Bon retour",
diff --git a/messages/it.json b/messages/it.json
index a50e007a6..841d260b7 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -3626,7 +3626,10 @@
       "learning": "Alcune analisi — glicemia, ritmo del sonno, tendenze della pressione, ciclo — si affinano nella prima settimana o due man mano che i tuoi dati si accumulano. Le caselle vuote ora indicano solo che stiamo ancora imparando il tuo riferimento.",
       "connectCta": "Collega un dispositivo",
       "logCta": "Registra la tua prima misurazione",
-      "importCta": "Importa la cronologia esistente"
+      "importCta": "Importa la cronologia esistente",
+      "aiTitle": "Attiva gli Insight IA (facoltativo)",
+      "aiBody": "Il coach, il briefing giornaliero e le valutazioni trasformano le tue misurazioni in linguaggio chiaro. Per farlo colleghi la tua chiave IA (OpenAI, Anthropic) o un modello locale: i tuoi dati restano tuoi.",
+      "aiCta": "Collega un provider IA"
     },
     "welcomeBack": {
       "title": "Bentornato",
diff --git a/messages/pl.json b/messages/pl.json
index b3353ef57..29520337d 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -3626,7 +3626,10 @@
       "learning": "Niektóre wnioski — glukoza, rytm snu, trendy ciśnienia, cykl — wyostrzają się w ciągu pierwszego tygodnia lub dwóch, w miarę gromadzenia danych. Puste kafelki oznaczają teraz tylko, że wciąż poznajemy Twój punkt odniesienia.",
       "connectCta": "Połącz urządzenie",
       "logCta": "Zapisz pierwszy pomiar",
-      "importCta": "Importuj istniejącą historię"
+      "importCta": "Importuj istniejącą historię",
+      "aiTitle": "Włącz Insighty AI (opcjonalnie)",
+      "aiBody": "Coach, codzienny briefing i oceny zamieniają Twoje pomiary w prosty język. W tym celu łączysz własny klucz AI (OpenAI, Anthropic) lub model lokalny — Twoje dane pozostają u Ciebie.",
+      "aiCta": "Połącz dostawcę AI"
     },
     "welcomeBack": {
       "title": "Witaj ponownie",
diff --git a/src/components/onboarding/DoneScreen.tsx b/src/components/onboarding/DoneScreen.tsx
index 9b924a123..3c6d7e01e 100644
--- a/src/components/onboarding/DoneScreen.tsx
+++ b/src/components/onboarding/DoneScreen.tsx
@@ -1,7 +1,13 @@
 "use client";
 
 import Link from "next/link";
-import { CheckCircle2, FileUp, PlusCircle, Plug } from "lucide-react";
+import {
+  CheckCircle2,
+  FileUp,
+  PlusCircle,
+  Plug,
+  Sparkles,
+} from "lucide-react";
 
 import { Button } from "@/components/ui/button";
 import { useTranslations } from "@/lib/i18n/context";
@@ -51,6 +57,33 @@ export function DoneScreen() {
         </p>
       </header>
 
+      {/* v1.18.6 — surface the AI Insights / Coach / briefing setup at
+          the highest-intent moment. The flagship feature needs a BYOK or
+          local provider that the rest of onboarding never mentions, so a
+          fresh user otherwise discovers it as a cold error. This card is
+          skippable by construction — it is an optional deep-link, not a
+          gate. */}
+      <div className="border-border/60 bg-muted/30 mx-auto flex w-full max-w-md flex-col items-center gap-2 rounded-lg border p-4 text-center">
+        <span
+          aria-hidden="true"
+          className="from-dracula-purple to-dracula-pink flex size-9 items-center justify-center rounded-full bg-gradient-to-br"
+        >
+          <Sparkles className="text-background size-4" />
+        </span>
+        <p className="text-foreground text-sm font-medium">
+          {t("onboarding.done.aiTitle")}
+        </p>
+        <p className="text-muted-foreground text-sm leading-relaxed">
+          {t("onboarding.done.aiBody")}
+        </p>
+        <Link
+          href="/settings/ai"
+          className="text-primary text-sm font-medium underline-offset-4 hover:underline"
+        >
+          {t("onboarding.done.aiCta")}
+        </Link>
+      </div>
+
       <div className="flex w-full max-w-xs flex-col gap-2">
         <Button asChild size="lg">
           <Link

From ef1fbb83968230ed6bba4fd5026af8939f472e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:11:58 +0200
Subject: [PATCH 29/71] feat(insights): state Rest Mode on the health-score
 card
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During an active illness episode the server suppresses (never penalises)
the health score, but the card gave no sign of it, so a held number read
as a silent decline. The card now carries an explicit 'paused during
illness — not being judged today' line when Rest Mode is active, driven
from the value-free annotation already on the analytics payload. Adds
insights.healthScore.restModePaused across all six locales.
---
 messages/de.json                              |  1 +
 messages/en.json                              |  1 +
 messages/es.json                              |  1 +
 messages/fr.json                              |  1 +
 messages/it.json                              |  1 +
 messages/pl.json                              |  1 +
 src/components/insights/health-score-card.tsx | 27 ++++++++++++++++++-
 src/components/insights/hero-strip.tsx        |  7 +++++
 8 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/messages/de.json b/messages/de.json
index ecf2d8338..ff302577a 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Gesundheitsscore-Fortschritt",
       "deltaVsLastWeek": "{delta} im Vergleich zur Vorwoche",
       "deltaUnavailable": "Noch keine Historie — schau nächste Woche wieder vorbei.",
+      "restModePaused": "Während einer Krankheitsphase pausiert — dein Score wird heute nicht bewertet.",
       "componentBp": "Blutdruck",
       "componentWeight": "Gewicht",
       "componentMood": "Stimmung",
diff --git a/messages/en.json b/messages/en.json
index 63d8a76e0..5b51a4331 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Health Score progress",
       "deltaVsLastWeek": "{delta} vs last week",
       "deltaUnavailable": "No history yet — check back next week.",
+      "restModePaused": "Paused during illness — your score isn't being judged today.",
       "componentBp": "BP",
       "componentWeight": "Weight",
       "componentMood": "Mood",
diff --git a/messages/es.json b/messages/es.json
index fe84dfe60..af96478e9 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Progreso de la puntuación de salud",
       "deltaVsLastWeek": "{delta} respecto a la semana anterior",
       "deltaUnavailable": "Aún no hay historial — vuelve la semana que viene.",
+      "restModePaused": "En pausa durante la enfermedad — hoy tu puntuación no se evalúa.",
       "componentBp": "PA",
       "componentWeight": "Peso",
       "componentMood": "Estado de ánimo",
diff --git a/messages/fr.json b/messages/fr.json
index fd10e6d92..217d9afe0 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Progression du score de santé",
       "deltaVsLastWeek": "{delta} par rapport à la semaine précédente",
       "deltaUnavailable": "Pas encore d’historique — reviens la semaine prochaine.",
+      "restModePaused": "En pause pendant la maladie — ton score n'est pas évalué aujourd'hui.",
       "componentBp": "TA",
       "componentWeight": "Poids",
       "componentMood": "Humeur",
diff --git a/messages/it.json b/messages/it.json
index 841d260b7..abb275f53 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Avanzamento del punteggio di salute",
       "deltaVsLastWeek": "{delta} rispetto alla settimana scorsa",
       "deltaUnavailable": "Ancora nessuno storico — ripassa la prossima settimana.",
+      "restModePaused": "In pausa durante la malattia — oggi il tuo punteggio non viene valutato.",
       "componentBp": "PA",
       "componentWeight": "Peso",
       "componentMood": "Umore",
diff --git a/messages/pl.json b/messages/pl.json
index 29520337d..77c41a83d 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -1966,6 +1966,7 @@
       "progressAria": "Postęp wyniku zdrowia",
       "deltaVsLastWeek": "{delta} w porównaniu z ubiegłym tygodniem",
       "deltaUnavailable": "Brak historii — zajrzyj w przyszłym tygodniu.",
+      "restModePaused": "Wstrzymane podczas choroby — Twój wynik nie jest dziś oceniany.",
       "componentBp": "RR",
       "componentWeight": "Waga",
       "componentMood": "Nastrój",
diff --git a/src/components/insights/health-score-card.tsx b/src/components/insights/health-score-card.tsx
index ee2091d43..985454608 100644
--- a/src/components/insights/health-score-card.tsx
+++ b/src/components/insights/health-score-card.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useId, useMemo, useState } from "react";
-import { ArrowDown, ArrowUp, ChevronDown, Minus } from "lucide-react";
+import { ArrowDown, ArrowUp, ChevronDown, Minus, Moon } from "lucide-react";
 import { useTranslations } from "@/lib/i18n/context";
 import { cn } from "@/lib/utils";
 import { HealthScoreDeltaExplainer } from "./health-score-delta-explainer";
@@ -87,6 +87,15 @@ export interface HealthScoreCardProps {
    * four-row layout for the common (mood-enabled) case.
    */
   moodEnabled?: boolean;
+  /**
+   * v1.18.6 — Rest Mode annotation. When an illness episode is active the
+   * server suppresses (never penalises) the score; the card itself then
+   * carries an explicit "paused during illness — not being judged today"
+   * line so a frozen/held number reads as intentional rather than as a
+   * silent drop. Value-free: the card only needs to know that it is
+   * active, not the episode details. Default off (the common case).
+   */
+  restModeActive?: boolean;
 }
 
 type ComponentKey = keyof HealthScoreCardProps["components"];
@@ -174,6 +183,7 @@ export function HealthScoreCard({
   onAskCoach: _onAskCoach,
   initiallyExpanded = false,
   moodEnabled = true,
+  restModeActive = false,
 }: HealthScoreCardProps) {
   const { t, locale } = useTranslations();
   // The asOf timestamps render under the source pill as a tooltip
@@ -404,6 +414,21 @@ export function HealthScoreCard({
           )}
         </p>
 
+        {/* v1.18.6 — Rest Mode legibility. While an illness episode is
+            active the server suppresses (never penalises) the score, so
+            the card states plainly that the number is paused and not being
+            judged today. Without this the held score reads as a silent
+            decline. */}
+        {restModeActive && (
+          <p
+            data-slot="health-score-card-rest-mode"
+            className="text-muted-foreground inline-flex items-start gap-1.5 text-[11px] leading-relaxed"
+          >
+            <Moon className="mt-0.5 size-3 shrink-0" aria-hidden="true" />
+            <span>{t("insights.healthScore.restModePaused")}</span>
+          </p>
+        )}
+
         <ul
           data-slot="health-score-card-components"
           // v1.8.5 W4a — the always-visible "Zusammensetzung" breakdown is
diff --git a/src/components/insights/hero-strip.tsx b/src/components/insights/hero-strip.tsx
index 9b71bd770..f7fdedfac 100644
--- a/src/components/insights/hero-strip.tsx
+++ b/src/components/insights/hero-strip.tsx
@@ -90,6 +90,12 @@ interface HeroStripProps {
     band: HealthScoreCardProps["band"];
     components: HealthScoreCardProps["components"];
     delta: HealthScoreCardProps["delta"];
+    /**
+     * v1.18.6 — value-free Rest Mode annotation off the analytics
+     * payload. When present + active the score card states it is paused
+     * during illness (suppressed, not penalised).
+     */
+    restMode?: { active: boolean } | null;
   } | null;
   /**
    * v1.16.8 — true while the analytics payload that carries
@@ -346,6 +352,7 @@ export function HeroStrip({
             components={healthScore.components}
             delta={healthScore.delta}
             moodEnabled={moodEnabled}
+            restModeActive={healthScore.restMode?.active ?? false}
             onAskCoach={
               // v1.4.37 W5 — short-circuit the prop drilling even
               // though `HealthScoreCard` retired its inline button in

From 04adcc6aa5037af68217271cb0e3c33fe2938aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:15:51 +0200
Subject: [PATCH 30/71] feat(settings,measurements): restore module-hub intro
 and clarify list/insights split
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The module hub lost its intro line in v1.18.1, so a new user could not
tell that the page drives the navigation, tiles and assessments they
see. Restore the section intro and the toggleable-modules hint (both
strings already in the bundle). Reframe the measurements subtitle from a
metric list to its role — log + full history here, trends and analysis
under Insights — so the two homes for 'look at my data' read as distinct
rather than redundant.
---
 messages/de.json                            |  2 +-
 messages/en.json                            |  2 +-
 messages/es.json                            |  2 +-
 messages/fr.json                            |  2 +-
 messages/it.json                            |  2 +-
 messages/pl.json                            |  2 +-
 src/components/settings/modules-section.tsx | 16 ++++++++++++----
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index ff302577a..6f1f0195d 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Messungen",
-    "subtitle": "Gewicht, Blutdruck, Puls und mehr",
+    "subtitle": "Werte erfassen und die vollständige Historie einsehen. Trends und Auswertungen findest du unter Auswertungen.",
     "addMeasurement": "Hinzufügen",
     "editMeasurement": "Messwert bearbeiten",
     "type": "Typ",
diff --git a/messages/en.json b/messages/en.json
index 5b51a4331..22cd11dae 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Measurements",
-    "subtitle": "Weight, blood pressure, pulse and more",
+    "subtitle": "Log readings and browse the full history. Trends and analysis live under Insights.",
     "addMeasurement": "Add",
     "editMeasurement": "Edit measurement",
     "type": "Type",
diff --git a/messages/es.json b/messages/es.json
index af96478e9..eeda31fe0 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Mediciones",
-    "subtitle": "Peso, tensión arterial, pulso y más",
+    "subtitle": "Registra lecturas y consulta el historial completo. Las tendencias y los análisis están en Análisis.",
     "addMeasurement": "Añadir",
     "editMeasurement": "Editar medición",
     "type": "Tipo",
diff --git a/messages/fr.json b/messages/fr.json
index 217d9afe0..91ec14d05 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Mesures",
-    "subtitle": "Poids, tension artérielle, pouls et plus",
+    "subtitle": "Saisis tes mesures et consulte l'historique complet. Les tendances et analyses sont dans Analyses.",
     "addMeasurement": "Ajouter",
     "editMeasurement": "Modifier la mesure",
     "type": "Type",
diff --git a/messages/it.json b/messages/it.json
index abb275f53..83ca7fdb9 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Misurazioni",
-    "subtitle": "Peso, pressione arteriosa, pulsazioni e altro",
+    "subtitle": "Registra le misurazioni e consulta lo storico completo. Tendenze e analisi sono in Analisi.",
     "addMeasurement": "Aggiungi",
     "editMeasurement": "Modifica misurazione",
     "type": "Tipo",
diff --git a/messages/pl.json b/messages/pl.json
index 77c41a83d..4916f3dc7 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -414,7 +414,7 @@
   },
   "measurements": {
     "title": "Pomiary",
-    "subtitle": "Waga, ciśnienie tętnicze, tętno i więcej",
+    "subtitle": "Zapisuj pomiary i przeglądaj pełną historię. Trendy i analizy znajdziesz w Analizach.",
     "addMeasurement": "Dodaj",
     "editMeasurement": "Edytuj pomiar",
     "type": "Typ",
diff --git a/src/components/settings/modules-section.tsx b/src/components/settings/modules-section.tsx
index 95f1ae25b..f90fff8f7 100644
--- a/src/components/settings/modules-section.tsx
+++ b/src/components/settings/modules-section.tsx
@@ -118,21 +118,29 @@ export function ModulesSection() {
       aria-labelledby="settings-section-modules-title"
       className="space-y-6"
     >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
+      {/* v1.18.6 — restore a short intro line so a new user understands
+          that this page drives the nav, tiles and assessments they see.
+          (Dropped in v1.18.1 D0 for top alignment; the orientation cost
+          outweighed the alignment.) */}
+      <header className="space-y-1">
         <h1 id="settings-section-modules-title" className="sr-only">
           {t("settings.sections.modules.title")}
         </h1>
+        <p className="text-muted-foreground text-sm leading-relaxed">
+          {t("settings.sections.modules.description")}
+        </p>
       </header>
 
-      {/* Toggleable modules. v1.18.1 (D2) — the explanatory line above the
-          first card dropped; the per-row labels carry the meaning. */}
       <div className="bg-card border-border rounded-xl border p-4 sm:p-6">
         <SettingsCardHeader
           icon={Blocks}
           title={t("settings.sections.modules.toggleable.title")}
           className="mb-2"
         />
+        {/* v1.18.6 — restore the one-line "what this section does" hint. */}
+        <p className="text-muted-foreground mb-3 pl-7 text-sm leading-relaxed">
+          {t("settings.sections.modules.toggleable.description")}
+        </p>
         <div className="divide-border divide-y pl-7">
           {(Object.keys(MODULE_REGISTRY) as ModuleKey[]).map((key) => {
             const def = MODULE_REGISTRY[key];

From e0d4d809dd40d071bc44811506474f592ea3c4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:17:36 +0200
Subject: [PATCH 31/71] feat(glucose): cross-link the clinical panel to Labs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Glucose has three front doors — measurements/CGM as readings over time,
the clinical panel as derived TIR/GMI/estimated-A1c, and Labs as dated
panel results — with no signpost between them. The clinical panel now
carries a one-line cross-link clarifying that a blood-draw HbA1c or
fasting glucose belongs in Labs, so the spot-estimate view and the
lab-result view reference each other instead of competing. Adds
insights.bloodGlucose.clinical.labsLink across all six locales.
---
 messages/de.json                              |  1 +
 messages/en.json                              |  1 +
 messages/es.json                              |  1 +
 messages/fr.json                              |  1 +
 messages/it.json                              |  1 +
 messages/pl.json                              |  1 +
 .../glucose/glucose-clinical-panel.tsx        | 29 ++++++++++++++++++-
 7 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/messages/de.json b/messages/de.json
index 6f1f0195d..21ee4c4f2 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2713,6 +2713,7 @@
         "title": "Glukose-Überblick",
         "subtitle": "Ein Blick auf deine letzten {days} Tage, aus {count} Messungen.",
         "spotCaveat": "Das sind Schätzungen aus einzelnen Stichproben-Messungen, kein Profil eines kontinuierlichen Sensors – lies sie als Richtung, nicht als klinisches Urteil.",
+        "labsLink": "Laborergebnisse? HbA1c und Nüchternglukose aus einer Blutabnahme trägst du unter Labor ein.",
         "learningTitle": "Lerne deine Glukose noch kennen",
         "learningBody": "Bisher sind das {count} über {days}. Mit etwas mehr Verlauf wird das Bild klarer – mess weiter oder lass es ein verbundenes Gerät ergänzen.",
         "learningBodyEmpty": "Sobald ein paar Messungen vorliegen – von dir erfasst oder von einem Gerät synchronisiert – nehmen Zeit-im-Zielbereich, Durchschnitt und Schwankung hier Gestalt an.",
diff --git a/messages/en.json b/messages/en.json
index 22cd11dae..e91951fe9 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2713,6 +2713,7 @@
         "title": "Glucose overview",
         "subtitle": "A read on your last {days} days, from {count} readings.",
         "spotCaveat": "These are spot-reading estimates from individual measurements, not a continuous-monitor profile — read them as a direction of travel rather than a clinical verdict.",
+        "labsLink": "Lab results? Log a blood-draw HbA1c or fasting glucose under Labs.",
         "learningTitle": "Still learning your glucose",
         "learningBody": "So far that's {count} over {days}. A little more history and a fuller picture comes into focus — keep logging, or let a connected device fill it in.",
         "learningBodyEmpty": "Once a handful of readings come in — logged by you or synced from a device — your time-in-range, average, and variability take shape here.",
diff --git a/messages/es.json b/messages/es.json
index eeda31fe0..6f2928108 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2713,6 +2713,7 @@
         "title": "Resumen de glucosa",
         "subtitle": "Una lectura de tus últimos {days} días, a partir de {count} mediciones.",
         "spotCaveat": "Son estimaciones a partir de mediciones puntuales, no un perfil de un sensor continuo: léelas como una tendencia, no como un veredicto clínico.",
+        "labsLink": "¿Resultados de laboratorio? Registra una HbA1c o glucosa en ayunas de una analítica en Laboratorio.",
         "learningTitle": "Aún conociendo tu glucosa",
         "learningBody": "De momento son {count} en {days}. Con algo más de historial el panorama se aclara: sigue registrando o deja que lo complete un dispositivo conectado.",
         "learningBodyEmpty": "En cuanto lleguen unas cuantas mediciones —registradas por ti o sincronizadas desde un dispositivo— tu tiempo en rango, promedio y variabilidad tomarán forma aquí.",
diff --git a/messages/fr.json b/messages/fr.json
index 91ec14d05..d2a4076fe 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2713,6 +2713,7 @@
         "title": "Aperçu du glucose",
         "subtitle": "Un point sur vos {days} derniers jours, à partir de {count} mesures.",
         "spotCaveat": "Ce sont des estimations issues de mesures ponctuelles, pas le profil d’un capteur continu : lisez-les comme une tendance, non comme un verdict clinique.",
+        "labsLink": "Résultats de laboratoire ? Saisis une HbA1c ou une glycémie à jeun issue d'une prise de sang dans Laboratoire.",
         "learningTitle": "Votre glucose se découvre encore",
         "learningBody": "Pour l’instant, cela fait {count} sur {days}. Avec un peu plus d’historique, le tableau se précise : continuez à enregistrer ou laissez un appareil connecté compléter.",
         "learningBodyEmpty": "Dès que quelques mesures arrivent — saisies par vous ou synchronisées depuis un appareil — votre temps dans la cible, votre moyenne et votre variabilité prennent forme ici.",
diff --git a/messages/it.json b/messages/it.json
index 83ca7fdb9..8873b3ec7 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2713,6 +2713,7 @@
         "title": "Panoramica della glicemia",
         "subtitle": "Una lettura dei tuoi ultimi {days} giorni, da {count} misurazioni.",
         "spotCaveat": "Sono stime da singole misurazioni puntuali, non il profilo di un sensore continuo: leggile come una tendenza, non come un verdetto clinico.",
+        "labsLink": "Risultati di laboratorio? Registra una HbA1c o la glicemia a digiuno da un prelievo in Laboratorio.",
         "learningTitle": "Stiamo ancora imparando la tua glicemia",
         "learningBody": "Per ora sono {count} su {days}. Con un po’ più di storico il quadro si chiarisce: continua a registrare o lascia che lo completi un dispositivo connesso.",
         "learningBodyEmpty": "Appena arrivano alcune misurazioni — registrate da te o sincronizzate da un dispositivo — il tempo nel range, la media e la variabilità prendono forma qui.",
diff --git a/messages/pl.json b/messages/pl.json
index 4916f3dc7..0f4eb78f3 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2713,6 +2713,7 @@
         "title": "Przegląd glukozy",
         "subtitle": "Spojrzenie na ostatnie {days} dni, na podstawie {count} pomiarów.",
         "spotCaveat": "To szacunki z pojedynczych pomiarów punktowych, a nie profil z czujnika ciągłego — traktuj je jako kierunek, nie jako diagnozę.",
+        "labsLink": "Wyniki laboratoryjne? HbA1c lub glukozę na czczo z pobrania krwi zapisz w sekcji Laboratorium.",
         "learningTitle": "Wciąż poznajemy Twoją glukozę",
         "learningBody": "Na razie to {count} w ciągu {days}. Przy nieco dłuższej historii obraz się wyostrza — rejestruj dalej lub pozwól uzupełnić to podłączonemu urządzeniu.",
         "learningBodyEmpty": "Gdy pojawi się kilka pomiarów — wpisanych przez Ciebie lub zsynchronizowanych z urządzenia — czas w zakresie, średnia i zmienność nabiorą tu kształtu.",
diff --git a/src/components/insights/glucose/glucose-clinical-panel.tsx b/src/components/insights/glucose/glucose-clinical-panel.tsx
index 144447eff..3e233c593 100644
--- a/src/components/insights/glucose/glucose-clinical-panel.tsx
+++ b/src/components/insights/glucose/glucose-clinical-panel.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { Activity, Droplet, TrendingUp } from "lucide-react";
+import Link from "next/link";
+import { Activity, Droplet, FlaskConical, TrendingUp } from "lucide-react";
 
 import { Badge } from "@/components/ui/badge";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -113,6 +114,9 @@ export function GlucoseClinicalPanel() {
             }
             caveat={t("insights.bloodGlucose.clinical.spotCaveat")}
           />
+          <div className="mt-4">
+            <LabsCrossLink />
+          </div>
         </CardContent>
       </Card>
     );
@@ -225,11 +229,34 @@ export function GlucoseClinicalPanel() {
             byContext={byContext}
           />
         ) : null}
+
+        <LabsCrossLink />
       </CardContent>
     </Card>
   );
 }
 
+/**
+ * v1.18.6 — signpost the measurement-vs-lab mental model. This panel
+ * estimates A1c / GMI from spot or CGM readings over time; a lab-ordered
+ * HbA1c or fasting-glucose result is a dated panel value that lives under
+ * Labs. The cross-link keeps the two surfaces referencing each other so a
+ * user knows which door to use rather than treating them as rivals.
+ */
+function LabsCrossLink() {
+  const { t } = useTranslations();
+  return (
+    <Link
+      href="/labs"
+      data-slot="glucose-labs-link"
+      className="text-muted-foreground hover:text-foreground border-border/60 flex items-start gap-1.5 border-t pt-3 text-xs leading-relaxed underline-offset-4 hover:underline"
+    >
+      <FlaskConical className="mt-0.5 size-3 shrink-0" aria-hidden="true" />
+      <span>{t("insights.bloodGlucose.clinical.labsLink")}</span>
+    </Link>
+  );
+}
+
 function Metric({
   icon,
   label,

From 59e7b332858523f93f6bcb021d59a105e129c63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:27:28 +0200
Subject: [PATCH 32/71] feat(onboarding): add resumable module-tour progress
 field + API

Add nullable onboarding_tour_progress_json to users (migration 0173),
a Zod-validated progress shape, and extend POST /api/onboarding/tour to
accept a mid-tour resume checkpoint and clear it on replay. Surface the
resume point on GET /api/auth/me and register the contract in OpenAPI so
the native client mirrors it.
---
 docs/api/openapi.yaml                         | 139 ++++++++++++++++++
 .../0173_v1186_tour_progress/migration.sql    |  22 +++
 prisma/schema.prisma                          |  16 ++
 src/app/api/auth/me/route.ts                  |   6 +
 src/app/api/onboarding/tour/route.ts          |  67 ++++++---
 .../__tests__/disable-coach-card.test.tsx     |   1 +
 .../__tests__/modules-section.test.tsx        |   1 +
 .../__tests__/time-format-select.test.tsx     |   1 +
 .../__tests__/unit-preference-select.test.tsx |   1 +
 src/hooks/use-auth.ts                         |  17 +++
 .../__tests__/coach-user-disable.test.tsx     |   1 +
 .../__tests__/tour-progress.test.ts           |  51 +++++++
 src/lib/onboarding/tour-progress.ts           |  53 +++++++
 src/lib/openapi/routes/index.ts               |   2 +
 src/lib/openapi/routes/onboarding.ts          |  81 ++++++++++
 15 files changed, 442 insertions(+), 17 deletions(-)
 create mode 100644 prisma/migrations/0173_v1186_tour_progress/migration.sql
 create mode 100644 src/lib/onboarding/__tests__/tour-progress.test.ts
 create mode 100644 src/lib/onboarding/tour-progress.ts
 create mode 100644 src/lib/openapi/routes/onboarding.ts

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index 6868782b2..b55ba0e06 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -6749,6 +6749,30 @@ paths:
         "401": *a1
         "422": *a3
         "429": *a4
+  /api/onboarding/tour:
+    post:
+      tags:
+        - Onboarding
+      summary: Update module-tour completion + resume point
+      description: Persists the module-tour state. The client posts a fire-and-forget `progress` checkpoint on each step so a
+        reload resumes at the right module, and a terminal `completed:true` with `outcome` when the tour ends.
+        `completed:false` is a replay reset that also clears the resume point.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/TourUpdateRequest"
+      responses:
+        "200":
+          description: Tour state updated.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/TourUpdateEnvelope"
+        "401": *a1
+        "422": *a3
+        "429": *a4
 components:
   schemas:
     PasskeyLoginVerifyRequest:
@@ -8079,6 +8103,55 @@ components:
             type: string
       required:
         - ids
+    TourUpdateRequest:
+      type: object
+      properties:
+        completed:
+          description: Flip the coarse completion flag. `false` is a replay reset and clears the stored progress point.
+          type: boolean
+        outcome:
+          description: Informational — distinguishes reaching the end from a skip.
+          type: string
+          enum:
+            - completed
+            - skipped
+        progress:
+          description: Mid-tour resume checkpoint. May arrive alone or with `completed`.
+          $ref: "#/components/schemas/TourProgress"
+      description: Update the module-tour state. Provide `completed` and/or `progress`.
+    TourProgress:
+      type: object
+      properties:
+        lastStopId:
+          anyOf:
+            - type: string
+              minLength: 1
+              maxLength: 64
+            - type: "null"
+        completedStopIds:
+          default: []
+          maxItems: 64
+          type: array
+          items:
+            type: string
+            minLength: 1
+            maxLength: 64
+        status:
+          type: string
+          enum:
+            - in_progress
+            - completed
+            - skipped
+        updatedAt:
+          type: string
+          format: date-time
+          pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z))$
+      required:
+        - lastStopId
+        - status
+        - updatedAt
+      description: Resumable module-tour progress point. `lastStopId` seeds the resume index; `status` is the running/terminal
+        state.
     MedicationTreatmentClass:
       type: string
       enum:
@@ -19363,6 +19436,37 @@ components:
       description: "Cross-episode retrospective summary over the trailing window: episode + resolved counts, the typical
         (median) recovery gap (null below the min-sample floor — withholds a thin claim), a recurrence-by-month tally,
         and a per-type breakdown. Retrospective only."
+    TourUpdateEnvelope:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/TourUpdateResponse"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    TourUpdateResponse:
+      type: object
+      properties:
+        onboardingTourCompleted:
+          type: boolean
+        progress:
+          anyOf:
+            - $ref: "#/components/schemas/TourProgressOutput"
+            - type: "null"
+      required:
+        - onboardingTourCompleted
+        - progress
+      additionalProperties: false
+      description: The persisted completion flag and resume point after the write.
     MedicationScheduleOutput:
       type: object
       properties:
@@ -19634,6 +19738,41 @@ components:
         compatibility and are normalised to their English equivalents before persisting; GET responses always carry the
         canonical English ids. Section ids are English-only. The legacy tile ids are deprecated and will be removed in a
         future major version."
+    TourProgressOutput:
+      type: object
+      properties:
+        lastStopId:
+          anyOf:
+            - type: string
+              minLength: 1
+              maxLength: 64
+            - type: "null"
+        completedStopIds:
+          default: []
+          maxItems: 64
+          type: array
+          items:
+            type: string
+            minLength: 1
+            maxLength: 64
+        status:
+          type: string
+          enum:
+            - in_progress
+            - completed
+            - skipped
+        updatedAt:
+          type: string
+          format: date-time
+          pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z))$
+      required:
+        - lastStopId
+        - completedStopIds
+        - status
+        - updatedAt
+      additionalProperties: false
+      description: Resumable module-tour progress point. `lastStopId` seeds the resume index; `status` is the running/terminal
+        state.
     Medication:
       type: object
       properties:
diff --git a/prisma/migrations/0173_v1186_tour_progress/migration.sql b/prisma/migrations/0173_v1186_tour_progress/migration.sql
new file mode 100644
index 000000000..498a859f5
--- /dev/null
+++ b/prisma/migrations/0173_v1186_tour_progress/migration.sql
@@ -0,0 +1,22 @@
+-- v1.18.6 — resumable module-tour progress.
+--
+-- A single nullable JSONB column on `users` carrying the fine-grained
+-- resume point for the module-by-module guided tour. Follows the
+-- established per-user JSON-column convention (`dashboard_widgets_json`,
+-- `insights_layout_json`, `coach_prefs_json`).
+--
+-- Shape (validated by `src/lib/onboarding/tour-progress.ts`):
+--   { "lastStopId": string | null,
+--     "completedStopIds": string[],
+--     "status": "in_progress" | "completed" | "skipped",
+--     "updatedAt": string (ISO 8601) }
+--
+-- NULL = the user has not started the module tour. The coarse
+-- `onboarding_tour_completed` boolean stays the launcher's auto-launch
+-- gate; this column is purely the resume point and is cleared back to
+-- NULL on a Settings replay so the tour genuinely restarts.
+--
+-- Additive + nullable: every existing account keeps NULL and the
+-- application resolver treats NULL as "not started".
+
+ALTER TABLE "users" ADD COLUMN "onboarding_tour_progress_json" JSONB;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index a69270678..948d0db58 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -256,6 +256,22 @@ model User {
   // Settings → Account.
   onboardingTourCompleted Boolean   @default(false) @map("onboarding_tour_completed")
 
+  // v1.18.6 — resumable module-tour progress. The coarse boolean above
+  // stays as the "did the user ever finish/dismiss" flag the launcher
+  // gates on; this column carries the fine-grained resume point so a
+  // mid-tour reload reopens at the right module. Follows the per-user
+  // JSON-column convention (`dashboardWidgetsJson` / `insightsLayoutJson`
+  // / `coachPrefsJson`). Shape (validated by
+  // `src/lib/onboarding/tour-progress.ts`):
+  //   { lastStopId: string | null,
+  //     completedStopIds: string[],
+  //     status: "in_progress" | "completed" | "skipped",
+  //     updatedAt: string (ISO) }
+  // Null = the user has not started the module tour (fresh account or a
+  // legacy account that only carries the boolean flag). Cleared back to
+  // null on a Settings replay so the tour genuinely restarts.
+  onboardingTourProgressJson Json? @map("onboarding_tour_progress_json")
+
   // HealthKit (iOS) integration config — list of per-metric direction toggles.
   // Shape: { entries: [{ id, kind, direction, enabled }], lastSyncedAt }
   healthKitConfigJson   Json?     @map("healthkit_config_json")
diff --git a/src/app/api/auth/me/route.ts b/src/app/api/auth/me/route.ts
index f7fec1a52..d23f63b8e 100644
--- a/src/app/api/auth/me/route.ts
+++ b/src/app/api/auth/me/route.ts
@@ -10,6 +10,7 @@ import {
   resolveModuleMap,
   getOperatorModuleAvailability,
 } from "@/lib/modules/gate";
+import { parseTourProgress } from "@/lib/onboarding/tour-progress";
 
 export const dynamic = "force-dynamic";
 
@@ -70,6 +71,11 @@ export const GET = apiHandler(async () => {
     timezone: user.timezone,
     onboardingCompletedAt: user.onboardingCompletedAt,
     onboardingTourCompleted: user.onboardingTourCompleted,
+    // v1.18.6 — resumable module-tour progress. Null when the user has
+    // not started the tour; otherwise the resume point the launcher
+    // seeds its index from. Fail-soft parse: a corrupt blob degrades to
+    // null ("start from the top") rather than 500-ing the /me read.
+    onboardingTourProgress: parseTourProgress(user.onboardingTourProgressJson),
     // v1.5.5 — self-hosted avatar. Replaces the Gravatar leak; the
     // URL is relative so PWA + native clients render identically
     // and the `?v={updatedAtMs}` suffix busts the browser cache on
diff --git a/src/app/api/onboarding/tour/route.ts b/src/app/api/onboarding/tour/route.ts
index 9e9b72a4a..8d88d408a 100644
--- a/src/app/api/onboarding/tour/route.ts
+++ b/src/app/api/onboarding/tour/route.ts
@@ -5,30 +5,45 @@ import { prisma } from "@/lib/db";
 import { apiHandler, requireAuth } from "@/lib/api-handler";
 import { annotate } from "@/lib/logging/context";
 import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
+import { tourProgressSchema } from "@/lib/onboarding/tour-progress";
+import { Prisma } from "@/generated/prisma/client";
 
 /**
  * v1.4.15 Phase B5 — onboarding tour completion endpoint.
+ * v1.18.6 — extended with the resumable module-tour progress point.
  *
- * Two operations on a single resource:
+ * Operations on a single resource:
  *
  *   POST { completed: true,  outcome: "completed" | "skipped" }
  *     → flips `users.onboarding_tour_completed` to true. Auto-fires
- *       when the user reaches the end of the spotlight tour OR
- *       explicitly dismisses it.
+ *       when the user reaches the end of the module tour OR explicitly
+ *       dismisses it.
  *
  *   POST { completed: false }
  *     → resets the flag so the user can replay the tour from
- *       Settings → Account → "Restart onboarding tour".
+ *       Settings → Advanced → "Modul-Tour neu starten". Also CLEARS
+ *       `onboarding_tour_progress_json` back to null so the replay
+ *       genuinely starts from the first module.
  *
- * The `outcome` field is informational — it lands in the structured
- * Wide Event annotation so analytics can tell completion from
- * dismiss without writing two columns. Same DB write either way.
+ *   POST { progress: { lastStopId, completedStopIds, status, updatedAt } }
+ *     → fire-and-forget mid-tour checkpoint so a reload resumes at the
+ *       right module. May arrive WITH `completed` (the terminal
+ *       checkpoint sends both) or alone (every `nextStep`).
+ *
+ * `outcome` is informational — it lands in the structured Wide Event
+ * annotation so analytics can tell completion from dismiss without a
+ * second column. Same DB write either way.
  */
 
-const tourBodySchema = z.object({
-  completed: z.boolean(),
-  outcome: z.enum(["completed", "skipped"]).optional(),
-});
+const tourBodySchema = z
+  .object({
+    completed: z.boolean().optional(),
+    outcome: z.enum(["completed", "skipped"]).optional(),
+    progress: tourProgressSchema.optional(),
+  })
+  .refine((b) => b.completed !== undefined || b.progress !== undefined, {
+    message: "Provide `completed` and/or `progress`.",
+  });
 
 export const POST = apiHandler(async (request: NextRequest) => {
   const { user } = await requireAuth();
@@ -43,18 +58,36 @@ export const POST = apiHandler(async (request: NextRequest) => {
     return apiError("Invalid input", 422);
   }
 
-  await prisma.user.update({
-    where: { id: user.id },
-    data: { onboardingTourCompleted: parsed.data.completed },
-  });
+  // Build the update field-by-field (no mass assignment). `completed`
+  // drives the coarse boolean; a replay (`completed:false`) wipes the
+  // resume point; a progress checkpoint writes the JSON column.
+  const data: Prisma.UserUpdateInput = {};
+  if (parsed.data.completed !== undefined) {
+    data.onboardingTourCompleted = parsed.data.completed;
+    if (parsed.data.completed === false) {
+      // Replay — start the resume point over.
+      data.onboardingTourProgressJson = Prisma.JsonNull;
+    }
+  }
+  if (parsed.data.progress !== undefined) {
+    data.onboardingTourProgressJson = parsed.data.progress;
+  }
+
+  await prisma.user.update({ where: { id: user.id }, data });
 
   annotate({
     action: { name: "onboarding.tour.update" },
     meta: {
-      completed: parsed.data.completed,
+      completed: parsed.data.completed ?? null,
       outcome: parsed.data.outcome ?? null,
+      progressStatus: parsed.data.progress?.status ?? null,
+      lastStopId: parsed.data.progress?.lastStopId ?? null,
     },
   });
 
-  return apiSuccess({ onboardingTourCompleted: parsed.data.completed });
+  return apiSuccess({
+    onboardingTourCompleted:
+      parsed.data.completed ?? user.onboardingTourCompleted,
+    progress: parsed.data.progress ?? null,
+  });
 });
diff --git a/src/components/settings/__tests__/disable-coach-card.test.tsx b/src/components/settings/__tests__/disable-coach-card.test.tsx
index 495fa9a59..aaf77d38b 100644
--- a/src/components/settings/__tests__/disable-coach-card.test.tsx
+++ b/src/components/settings/__tests__/disable-coach-card.test.tsx
@@ -63,6 +63,7 @@ function buildUser(disableCoach: boolean): AuthUser {
     timezone: "Europe/Berlin",
     onboardingCompletedAt: null,
     onboardingTourCompleted: true,
+    onboardingTourProgress: null,
     avatarUrl: null,
     glucoseUnit: null,
     unitPreference: "metric",
diff --git a/src/components/settings/__tests__/modules-section.test.tsx b/src/components/settings/__tests__/modules-section.test.tsx
index af1183e3b..32d23c180 100644
--- a/src/components/settings/__tests__/modules-section.test.tsx
+++ b/src/components/settings/__tests__/modules-section.test.tsx
@@ -69,6 +69,7 @@ function buildUser(modules: AuthUser["modules"]): AuthUser {
     timezone: "Europe/Berlin",
     onboardingCompletedAt: null,
     onboardingTourCompleted: true,
+    onboardingTourProgress: null,
     avatarUrl: null,
     glucoseUnit: null,
     unitPreference: "metric",
diff --git a/src/components/settings/__tests__/time-format-select.test.tsx b/src/components/settings/__tests__/time-format-select.test.tsx
index 848d95017..2bb55ac6b 100644
--- a/src/components/settings/__tests__/time-format-select.test.tsx
+++ b/src/components/settings/__tests__/time-format-select.test.tsx
@@ -41,6 +41,7 @@ function buildUser(timeFormat: TimeFormatPreference): AuthUser {
     timezone: "Europe/Berlin",
     onboardingCompletedAt: null,
     onboardingTourCompleted: true,
+    onboardingTourProgress: null,
     avatarUrl: null,
     glucoseUnit: null,
     unitPreference: "metric",
diff --git a/src/components/settings/__tests__/unit-preference-select.test.tsx b/src/components/settings/__tests__/unit-preference-select.test.tsx
index 13430adf1..c5e0a3b13 100644
--- a/src/components/settings/__tests__/unit-preference-select.test.tsx
+++ b/src/components/settings/__tests__/unit-preference-select.test.tsx
@@ -44,6 +44,7 @@ function buildUser(unitPreference: "metric" | "imperial"): AuthUser {
     timezone: "Europe/Berlin",
     onboardingCompletedAt: null,
     onboardingTourCompleted: true,
+    onboardingTourProgress: null,
     avatarUrl: null,
     glucoseUnit: null,
     unitPreference,
diff --git a/src/hooks/use-auth.ts b/src/hooks/use-auth.ts
index ba079e0c7..4fcf04a7d 100644
--- a/src/hooks/use-auth.ts
+++ b/src/hooks/use-auth.ts
@@ -10,8 +10,15 @@ import { useTranslations } from "@/lib/i18n/context";
 import type { TimeFormatPreference } from "@/lib/format-locale";
 import { isTimeFormatPreference, storeTimeFormat } from "@/lib/time-format";
 import type { ModuleKey } from "@/lib/modules/registry";
+import type { TourProgress } from "@/lib/onboarding/tour-progress";
 import { clearOfflineCachesForSessionEnd } from "@/lib/pwa/query-persister";
 
+/**
+ * v1.18.6 — resume point for the module tour as the client sees it on
+ * `/api/auth/me`. Mirrors the server-side `TourProgress` shape.
+ */
+export type AuthTourProgress = TourProgress;
+
 export interface AuthUser {
   id: string;
   username: string;
@@ -29,6 +36,13 @@ export interface AuthUser {
    * `<TourLauncher>` component for the gating logic.
    */
   onboardingTourCompleted: boolean;
+  /**
+   * v1.18.6 — resumable module-tour progress, or null when the user
+   * has not started the tour. The `<TourLauncher>` seeds its resume
+   * index from `lastStopId`. Distinct from the coarse
+   * `onboardingTourCompleted` boolean, which stays the auto-launch gate.
+   */
+  onboardingTourProgress: AuthTourProgress | null;
   /**
    * v1.5.5 — relative URL of the user's self-hosted avatar, served
    * from `/api/user/avatar/{id}?v={updatedAtMs}`. Replaces the
@@ -137,6 +151,9 @@ async function fetchMe(): Promise<AuthUser> {
   return {
     ...(data as AuthUser),
     disableCoach: data.disableCoach ?? false,
+    // v1.18.6 — coerce against a stale /me payload (older server image
+    // without the field) to null so the tour starts from the top.
+    onboardingTourProgress: data.onboardingTourProgress ?? null,
     // v1.7.0 — coerce against a stale /me payload (older server image
     // without the field) so the display defaults to metric.
     unitPreference: data.unitPreference === "imperial" ? "imperial" : "metric",
diff --git a/src/lib/feature-flags/__tests__/coach-user-disable.test.tsx b/src/lib/feature-flags/__tests__/coach-user-disable.test.tsx
index 594a040ad..9120db140 100644
--- a/src/lib/feature-flags/__tests__/coach-user-disable.test.tsx
+++ b/src/lib/feature-flags/__tests__/coach-user-disable.test.tsx
@@ -91,6 +91,7 @@ function buildUser(disableCoach: boolean): AuthUser {
     timezone: "Europe/Berlin",
     onboardingCompletedAt: null,
     onboardingTourCompleted: true,
+    onboardingTourProgress: null,
     avatarUrl: null,
     glucoseUnit: null,
     unitPreference: "metric",
diff --git a/src/lib/onboarding/__tests__/tour-progress.test.ts b/src/lib/onboarding/__tests__/tour-progress.test.ts
new file mode 100644
index 000000000..52a108e8d
--- /dev/null
+++ b/src/lib/onboarding/__tests__/tour-progress.test.ts
@@ -0,0 +1,51 @@
+import { describe, it, expect } from "vitest";
+
+import {
+  parseTourProgress,
+  tourProgressSchema,
+  type TourProgress,
+} from "@/lib/onboarding/tour-progress";
+
+const valid: TourProgress = {
+  lastStopId: "labs",
+  completedStopIds: ["dashboardOverview", "quickAdd"],
+  status: "in_progress",
+  updatedAt: "2026-06-18T10:00:00.000Z",
+};
+
+describe("tour-progress", () => {
+  it("parses a well-formed progress object", () => {
+    expect(parseTourProgress(valid)).toEqual(valid);
+  });
+
+  it("treats null / undefined as not-started", () => {
+    expect(parseTourProgress(null)).toBeNull();
+    expect(parseTourProgress(undefined)).toBeNull();
+  });
+
+  it("degrades a corrupt blob to null rather than throwing", () => {
+    expect(parseTourProgress({ status: "bogus" })).toBeNull();
+    expect(parseTourProgress({ lastStopId: 42 })).toBeNull();
+    expect(parseTourProgress("not-an-object")).toBeNull();
+  });
+
+  it("defaults completedStopIds to an empty array", () => {
+    const parsed = tourProgressSchema.parse({
+      lastStopId: null,
+      status: "skipped",
+      updatedAt: "2026-06-18T10:00:00.000Z",
+    });
+    expect(parsed.completedStopIds).toEqual([]);
+  });
+
+  it("accepts a null lastStopId (centred/wrap stop or fresh start)", () => {
+    expect(parseTourProgress({ ...valid, lastStopId: null })).not.toBeNull();
+  });
+
+  it("rejects an over-long completedStopIds array", () => {
+    const tooMany = Array.from({ length: 65 }, (_, i) => `s${i}`);
+    expect(
+      parseTourProgress({ ...valid, completedStopIds: tooMany }),
+    ).toBeNull();
+  });
+});
diff --git a/src/lib/onboarding/tour-progress.ts b/src/lib/onboarding/tour-progress.ts
new file mode 100644
index 000000000..b186ce7d3
--- /dev/null
+++ b/src/lib/onboarding/tour-progress.ts
@@ -0,0 +1,53 @@
+/**
+ * v1.18.6 — resumable module-tour progress.
+ *
+ * Pure data + Zod schema for the `users.onboarding_tour_progress_json`
+ * column. Kept DOM-free + free of Prisma imports so vitest (node env)
+ * and the OpenAPI registry can both consume it.
+ *
+ * The coarse `onboardingTourCompleted` boolean stays the launcher's
+ * auto-launch gate; this object is the fine-grained resume point so a
+ * mid-tour reload reopens at the right module. `null` = the user has
+ * not started the module tour.
+ */
+
+import { z } from "zod/v4";
+
+/** Terminal / running status of the module tour. */
+export const TOUR_PROGRESS_STATUSES = [
+  "in_progress",
+  "completed",
+  "skipped",
+] as const;
+
+export type TourProgressStatus = (typeof TOUR_PROGRESS_STATUSES)[number];
+
+/**
+ * The persisted progress shape. `lastStopId` seeds the resume index;
+ * `completedStopIds` is informational (analytics + future per-module
+ * "already seen" hints). Stop ids are bounded strings — the client
+ * sends a known stop id from `buildTourStops()`, but the server does
+ * not couple to that closed set (a future stop must not 422 an older
+ * client and vice-versa), so the field is a length-capped string array
+ * rather than a hard enum.
+ */
+export const tourProgressSchema = z.object({
+  lastStopId: z.string().min(1).max(64).nullable(),
+  completedStopIds: z.array(z.string().min(1).max(64)).max(64).default([]),
+  status: z.enum(TOUR_PROGRESS_STATUSES),
+  updatedAt: z.iso.datetime(),
+});
+
+export type TourProgress = z.infer<typeof tourProgressSchema>;
+
+/**
+ * Parse a value read from the JSON column. Returns `null` for a null /
+ * absent column AND for any malformed payload — the resume point is a
+ * non-critical convenience, so a corrupt blob degrades to "start from
+ * the top" rather than throwing into the auth/me read path.
+ */
+export function parseTourProgress(value: unknown): TourProgress | null {
+  if (value == null) return null;
+  const parsed = tourProgressSchema.safeParse(value);
+  return parsed.success ? parsed.data : null;
+}
diff --git a/src/lib/openapi/routes/index.ts b/src/lib/openapi/routes/index.ts
index dbab3937c..0ac6f7361 100644
--- a/src/lib/openapi/routes/index.ts
+++ b/src/lib/openapi/routes/index.ts
@@ -42,6 +42,7 @@ import { measurementReminderPaths } from "./measurement-reminders";
 import { medicationPaths, medicationResource } from "./medications";
 import { metaPaths } from "./meta";
 import { moodPaths } from "./mood";
+import { onboardingPaths } from "./onboarding";
 import { profilePaths } from "./profile";
 import { settingsPaths } from "./settings";
 import { syncPaths } from "./sync";
@@ -72,6 +73,7 @@ export const openApiPaths: NonNullable<ZodOpenApiObject["paths"]> = {
   ...labsPaths,
   ...biomarkerPaths,
   ...illnessPaths,
+  ...onboardingPaths,
 };
 
 export const openApiComponents: NonNullable<ZodOpenApiObject["components"]> = {
diff --git a/src/lib/openapi/routes/onboarding.ts b/src/lib/openapi/routes/onboarding.ts
new file mode 100644
index 000000000..efdc1b4cf
--- /dev/null
+++ b/src/lib/openapi/routes/onboarding.ts
@@ -0,0 +1,81 @@
+/**
+ * OpenAPI route table — onboarding module tour.
+ *
+ * Part of the OpenAPI route table; aggregated in `./index.ts`.
+ * The request schema comes from `src/lib/onboarding/tour-progress.ts`
+ * so the wire contract stays single-source with the runtime parser.
+ *
+ * v1.18.6 — the resumable module-tour contract the iOS client mirrors:
+ * a fire-and-forget progress checkpoint plus the coarse completion
+ * flip. The resume point also rides `GET /api/auth/me` as
+ * `onboardingTourProgress`.
+ */
+import { z } from "zod/v4";
+import type { ZodOpenApiObject } from "zod-openapi";
+
+import { tourProgressSchema } from "@/lib/onboarding/tour-progress";
+import { dataEnvelope, stdResponses } from "./shared";
+
+const tourProgressResource = tourProgressSchema.meta({
+  id: "TourProgress",
+  description:
+    "Resumable module-tour progress point. `lastStopId` seeds the resume index; `status` is the running/terminal state.",
+});
+
+const tourUpdateRequest = z
+  .object({
+    completed: z
+      .boolean()
+      .optional()
+      .describe(
+        "Flip the coarse completion flag. `false` is a replay reset and clears the stored progress point.",
+      ),
+    outcome: z
+      .enum(["completed", "skipped"])
+      .optional()
+      .describe("Informational — distinguishes reaching the end from a skip."),
+    progress: tourProgressResource
+      .optional()
+      .describe("Mid-tour resume checkpoint. May arrive alone or with `completed`."),
+  })
+  .meta({
+    id: "TourUpdateRequest",
+    description:
+      "Update the module-tour state. Provide `completed` and/or `progress`.",
+  });
+
+const tourUpdateResponse = z
+  .object({
+    onboardingTourCompleted: z.boolean(),
+    progress: tourProgressResource.nullable(),
+  })
+  .meta({
+    id: "TourUpdateResponse",
+    description: "The persisted completion flag and resume point after the write.",
+  });
+
+export const onboardingPaths: NonNullable<ZodOpenApiObject["paths"]> = {
+  "/api/onboarding/tour": {
+    post: {
+      tags: ["Onboarding"],
+      summary: "Update module-tour completion + resume point",
+      description:
+        "Persists the module-tour state. The client posts a fire-and-forget `progress` checkpoint on each step so a reload resumes at the right module, and a terminal `completed:true` with `outcome` when the tour ends. `completed:false` is a replay reset that also clears the resume point.",
+      requestBody: {
+        required: true,
+        content: { "application/json": { schema: tourUpdateRequest } },
+      },
+      responses: {
+        "200": {
+          description: "Tour state updated.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(tourUpdateResponse, "TourUpdateEnvelope"),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
+};

From f0c25cc275abc427808486255082e8047d8169bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:39:10 +0200
Subject: [PATCH 33/71] feat(onboarding): rebuild the tour as a 15-stop
 cross-page module walk

Replace the five chrome-pointer stops with a module-by-module guided tour
in the data->intelligence->export order. Each stop teaches the module's
value, one hidden capability, and how it feeds the others. Stops carry a
route + module gate; the overlay router.pushes to the route, waits for the
anchor to mount, then measures, so a single tour walks the whole product.

Move the launcher to the app shell so the overlay survives navigation,
auto-open immediately after anamnesis for fresh users (24h path stays the
fallback for wizard-skippers), resume from the persisted checkpoint, and
gate stops + the step counter on the resolved module map. Add tour copy
for all 15 stops across the six locales.
---
 messages/de.json                              |  71 +++-
 messages/en.json                              |  71 +++-
 messages/es.json                              |  71 +++-
 messages/fr.json                              |  71 +++-
 messages/it.json                              |  71 +++-
 messages/pl.json                              |  71 +++-
 src/app/page.tsx                              |  14 +-
 src/components/layout/auth-shell.tsx          |   8 +
 src/components/onboarding/DoneScreen.tsx      |  14 +
 .../onboarding/__tests__/tour.test.tsx        |  47 +--
 src/components/onboarding/tour-launcher.tsx   | 137 +++++--
 src/components/onboarding/tour.tsx            | 158 ++++++--
 .../onboarding/__tests__/tour-state.test.ts   | 188 ++++++----
 src/lib/onboarding/tour-state.ts              | 353 +++++++++++++-----
 14 files changed, 1008 insertions(+), 337 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 0d6890d30..83131c9e2 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -3647,31 +3647,72 @@
       "back": "Zurück",
       "skip": "Tour überspringen",
       "done": "Verstanden",
-      "restart": "Tour neu starten",
-      "restartHint": "Zeige die Dashboard-Tour beim nächsten Aufruf erneut.",
-      "restartConfirmation": "Die Tour startet bei deinem nächsten Dashboard-Besuch erneut.",
+      "restart": "Modul-Tour neu starten",
+      "restartHint": "Zeigt die geführte Modul-Tour beim nächsten Dashboard-Besuch von vorne.",
+      "restartConfirmation": "Die Modul-Tour startet bei deinem nächsten Dashboard-Besuch von vorne.",
       "steps": {
-        "tileStrip": {
-          "title": "Deine Tageswerte",
-          "body": "Die Kachel-Leiste zeigt den letzten Wert und den 7-Tage-Trend für jede Metrik — Gewicht, Blutdruck, Puls, Stimmung. Was du nicht brauchst, blendest du in Einstellungen → Dashboard aus."
+        "dashboardOverview": {
+          "title": "Dein Dashboard",
+          "body": "Das Dashboard bündelt alle Module auf einen Blick. Halte eine Kachel lange gedrückt, um sie neu anzuordnen oder auszublenden (Einstellungen → Dashboard-Layout). Jede Kachel ist nur so aussagekräftig wie die Daten dahinter — die folgenden Module füllen sie."
         },
         "quickAdd": {
-          "title": "In zwei Taps erfasst",
-          "body": "Über den Hinzufügen-Button kannst du Messungen oder Stimmungseinträge anlegen, ohne das Dashboard zu verlassen. Das Formular merkt sich deinen letzten Kontext und Tags."
+          "title": "In Sekunden erfasst",
+          "body": "Über „+ Hinzufügen“ trägst du jeden Messwert in Sekunden ein — Gewicht, Blutdruck, Puls, Glukose. Versteckte Stärke: Werte lassen sich nachträglich datieren. Alles, was du hier einträgst, fließt in Trends, Health-Score und die KI-Insights."
+        },
+        "measurements": {
+          "title": "Messwerte & Zielbereiche",
+          "body": "Messwerte zeigt Verlauf und Zielbereiche pro Metrik. Hidden Gem: Zielbereiche pro Wert definieren, damit Abweichungen farblich auffallen. Diese Reihen sind die Grundlage für Korrelationen im Coach und den Arztbericht."
+        },
+        "medications": {
+          "title": "Medikamente & Einnahmen",
+          "body": "Medikamente verwaltet Zeitpläne, Einnahmen, Bestand und Titration. Versteckt: wiederkehrende Pläne (RRULE/rollierend) und Bestandswarnungen. Deine Einnahmequote speist die Compliance-Säule im Dashboard und den Kontext der KI."
+        },
+        "labs": {
+          "title": "Laborwerte",
+          "body": "Labore erfasst Biomarker mit Referenzbereichen — Blutbild, Cholesterin, HbA1c. Stärke: Import und FHIR-Export. Auffällige Laborwerte tauchen als Belege in den Insights und im Arztbericht wieder auf."
+        },
+        "illness": {
+          "title": "Krankheits-Journal",
+          "body": "Das Krankheits-Journal dokumentiert akute Episoden und chronische Diagnosen samt Schüben. Versteckt: die Korrelation einer Episode mit deinen Messwerten und der Ruhemodus, der Reminder pausiert. So versteht der Coach, warum Werte zeitweise abweichen."
+        },
+        "vorsorge": {
+          "title": "Vorsorge",
+          "body": "Vorsorge erinnert an Untersuchungen und Impfungen mit eigenem Intervall. Tipp: „Erledigt“ kann direkt eine Messung oder ein Laborergebnis anlegen. Fällige Vorsorgen erscheinen als Reminder und im Arztbericht."
+        },
+        "cycle": {
+          "title": "Zyklus",
+          "body": "Die Zyklus-Verfolgung protokolliert Phasen und Symptome. Versteckt: Symptome lassen sich Stimmung und Schlaf gegenüberstellen. Der Zyklus liefert Kontext für Schwankungen, die sonst unerklärlich wären."
+        },
+        "mood": {
+          "title": "Stimmung",
+          "body": "Stimmung erfasst dein Befinden und Tags in zwei Sekunden. Stärke: eigene Tags. Stimmungsverläufe korrelieren mit Schlaf, Medikamenten und Zyklus — der Coach erkennt Muster."
         },
         "insights": {
-          "title": "Automatische Einblicke",
-          "body": "Insights verwandelt deine Werte in eine klare Gesundheits-Zusammenfassung, mit Einordnung von Blutdruck, Gewicht und Stimmung. Eigener Provider-Key oder Standard — du entscheidest."
+          "title": "Insights",
+          "body": "Insights ist das Herzstück: belegbasierte, dynamische Auswertungen statt generischer Tipps — jede Aussage verweist auf deine echten Daten. Versteckt: das Layout ist anpassbar. Insights zieht alles zusammen, was die Module oben liefern."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "Der Coach beantwortet Fragen zu deinen Daten im Dialog und nutzt Anamnese, Medikamente und Laborwerte als Kontext. Den KI-Anbieter wählst du selbst (eigener Schlüssel oder lokal). Er rechnet nichts neu — er liest dieselben Zahlen wie das Dashboard."
         },
         "integrations": {
-          "title": "Geräte verbinden",
-          "body": "In den Einstellungen verbindest du Withings (Auto-Sync für Gewicht, Blutdruck, Puls), moodLog oder deinen Auswertungs-Provider. Alles bleibt optional und verschlüsselt."
+          "title": "Integrationen",
+          "body": "Integrationen synchronisieren Withings, WHOOP, Polar, Oura und Apple Health automatisch. So füllen sich Gewicht, Schlaf und Erholung ohne manuelles Tippen — und nähren wiederum Insights und Coach."
+        },
+        "export": {
+          "title": "Arztbericht",
+          "body": "Der Arztbericht bündelt Messwerte, Medikamente, Laborwerte und Vorsorge als PDF oder FHIR für den Termin. Hier laufen alle Module zusammen — ein vollständiger Bericht entsteht nur bei gepflegten Daten."
         },
         "achievements": {
-          "title": "Streaks und Badges sammeln",
-          "body": "Die Achievements-Seite trackt tägliche Logging-Streaks, Blutdruck-Meilensteine und Konsistenz-Abzeichen. Ein kleiner Anreiz, dranzubleiben."
+          "title": "Erfolge",
+          "body": "Erfolge belohnen Konsistenz — Streaks und Meilensteine. Ein kleiner Motivations-Loop, der das Dranbleiben leichter macht."
+        },
+        "wrapUp": {
+          "title": "Das war die Tour",
+          "body": "Du kannst jedes Modul jederzeit einzeln erneut ansehen („Diese Tour zeigen“ auf jeder Seite) oder die komplette Tour unter Einstellungen → Erweitert neu starten."
         }
-      }
+      },
+      "moduleTrigger": "Diese Tour zeigen"
     },
     "shell": {
       "back": "Zurück",
diff --git a/messages/en.json b/messages/en.json
index 0895bb5d8..092fe42e9 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3647,31 +3647,72 @@
       "back": "Back",
       "skip": "Skip tour",
       "done": "Got it",
-      "restart": "Restart onboarding tour",
-      "restartHint": "Replay the dashboard walkthrough from the start.",
-      "restartConfirmation": "Tour will restart on your next dashboard visit.",
+      "restart": "Restart module tour",
+      "restartHint": "Replays the guided module tour from the start on your next dashboard visit.",
+      "restartConfirmation": "The module tour will restart from the beginning on your next dashboard visit.",
       "steps": {
-        "tileStrip": {
-          "title": "Your daily numbers",
-          "body": "The tile strip shows the latest reading and a 7-day trend for every metric you log — weight, blood pressure, pulse, mood. Hide what you don't need from Settings → Dashboard."
+        "dashboardOverview": {
+          "title": "Your dashboard",
+          "body": "The dashboard pulls every module together at a glance. Long-press a tile to reorder or hide it (Settings → Dashboard layout). Each tile is only as telling as the data behind it — the modules ahead fill them."
         },
         "quickAdd": {
-          "title": "Log anything in two taps",
-          "body": "Use the Add button to drop a measurement or mood entry without leaving the dashboard. The form remembers your last context and tags."
+          "title": "Logged in seconds",
+          "body": "Use “+ Add” to log any reading in seconds — weight, blood pressure, pulse, glucose. Hidden strength: backdate readings you forgot to enter. Everything you log here feeds trends, the health score, and the AI insights."
+        },
+        "measurements": {
+          "title": "Readings & target ranges",
+          "body": "Measurements shows the history and target range for each metric. Hidden gem: set a target range per value so deviations stand out in colour. These series are the basis for the Coach’s correlations and the doctor report."
+        },
+        "medications": {
+          "title": "Medications & intakes",
+          "body": "Medications manages schedules, intakes, stock, and titration. Hidden: recurring plans (RRULE/rolling) and low-stock warnings. Your intake rate feeds the compliance pillar on the dashboard and the AI’s context."
+        },
+        "labs": {
+          "title": "Lab values",
+          "body": "Labs captures biomarkers with reference ranges — blood count, cholesterol, HbA1c. Strength: import and FHIR export. Out-of-range lab values resurface as evidence in the insights and the doctor report."
+        },
+        "illness": {
+          "title": "Illness journal",
+          "body": "The illness journal records acute episodes and chronic diagnoses with their flares. Hidden: correlate an episode with your readings, and Rest Mode that pauses reminders. That’s how the Coach understands why values drift for a while."
+        },
+        "vorsorge": {
+          "title": "Preventive care",
+          "body": "Preventive care reminds you of check-ups and vaccinations on their own interval. Tip: “Done” can create a reading or a lab result directly. Due items appear as reminders and in the doctor report."
+        },
+        "cycle": {
+          "title": "Cycle",
+          "body": "Cycle tracking logs phases and symptoms. Hidden: compare symptoms against mood and sleep. The cycle gives context for swings that would otherwise look unexplained."
+        },
+        "mood": {
+          "title": "Mood",
+          "body": "Mood captures how you feel plus tags in two seconds. Strength: your own tags. Mood trends correlate with sleep, medications, and cycle — the Coach spots the patterns."
         },
         "insights": {
-          "title": "Automatic insights",
-          "body": "Insights turns your readings into a plain-English health summary, with classifications for blood pressure, weight trend and mood. Bring your own provider key or use the built-in default."
+          "title": "Insights",
+          "body": "Insights is the heart of it: evidence-based, dynamic analysis instead of generic tips — every statement points at your real data. Hidden: the layout is customizable. Insights pulls together everything the modules above provide."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "The Coach answers questions about your data in a dialogue, using your history, medications, and lab values as context. Pick your AI provider yourself (your own key or local). It recomputes nothing — it reads the same numbers as the dashboard."
         },
         "integrations": {
-          "title": "Connect your devices",
-          "body": "Open Settings to link Withings (auto-sync weight, BP and pulse), moodLog, or your Insights provider. Everything stays optional and encrypted — and under Settings → Modules you can turn whole areas like sleep, mood or achievements on or off to keep HealthLog focused on what you track."
+          "title": "Integrations",
+          "body": "Integrations sync Withings, WHOOP, Polar, Oura, and Apple Health automatically. Weight, sleep, and recovery fill in without manual typing — and feed the insights and Coach in turn."
+        },
+        "export": {
+          "title": "Doctor report",
+          "body": "The doctor report bundles readings, medications, lab values, and preventive care as PDF or FHIR for the appointment. This is where every module converges — a complete report only comes from well-kept data."
         },
         "achievements": {
-          "title": "Earn streaks and badges",
-          "body": "The Achievements page tracks daily logging streaks, blood-pressure milestones and consistency badges. A small nudge to keep going."
+          "title": "Achievements",
+          "body": "Achievements reward consistency — streaks and milestones. A small motivation loop that makes sticking with it easier."
+        },
+        "wrapUp": {
+          "title": "That’s the tour",
+          "body": "You can revisit any module on its own at any time (“Show this tour” on every page) or restart the whole tour under Settings → Advanced."
         }
-      }
+      },
+      "moduleTrigger": "Show this tour"
     },
     "shell": {
       "back": "Back",
diff --git a/messages/es.json b/messages/es.json
index ecc64c96c..2110b8cd6 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -3647,31 +3647,72 @@
       "back": "Atrás",
       "skip": "Saltar tour",
       "done": "Entendido",
-      "restart": "Reiniciar tour",
-      "restartHint": "Vuelve a mostrar el tour del panel la próxima vez.",
-      "restartConfirmation": "El tour se reiniciará en tu próxima visita al panel.",
+      "restart": "Reiniciar la visita de módulos",
+      "restartHint": "Vuelve a reproducir la visita guiada de módulos desde el principio en tu próxima visita al panel.",
+      "restartConfirmation": "La visita de módulos se reiniciará desde el principio en tu próxima visita al panel.",
       "steps": {
-        "tileStrip": {
-          "title": "Tus valores del día",
-          "body": "La fila de tarjetas muestra el último valor y la tendencia de 7 días de cada métrica — peso, tensión arterial, pulso, ánimo. Oculta lo que no necesites en Ajustes → Panel."
+        "dashboardOverview": {
+          "title": "Tu panel",
+          "body": "El panel reúne todos los módulos de un vistazo. Mantén pulsada una tarjeta para reordenarla u ocultarla (Ajustes → Diseño del panel). Cada tarjeta vale tanto como los datos que tiene detrás: los módulos siguientes los rellenan."
         },
         "quickAdd": {
-          "title": "Registrado en dos toques",
-          "body": "Con el botón Añadir puedes registrar mediciones o entradas de ánimo sin salir del panel. El formulario recuerda tu último contexto y etiquetas."
+          "title": "Registrado en segundos",
+          "body": "Con «+ Añadir» registras cualquier medición en segundos: peso, tensión, pulso, glucosa. Fuerza oculta: fechar valores olvidados. Todo lo que registras aquí alimenta las tendencias, la puntuación de salud y las ideas de IA."
+        },
+        "measurements": {
+          "title": "Mediciones y rangos objetivo",
+          "body": "Mediciones muestra el historial y el rango objetivo de cada métrica. Joya oculta: define un rango por valor para que las desviaciones resalten en color. Estas series son la base de las correlaciones del Coach y del informe médico."
+        },
+        "medications": {
+          "title": "Medicación y tomas",
+          "body": "Medicación gestiona horarios, tomas, existencias y titulación. Oculto: planes recurrentes (RRULE/rotativos) y avisos de poco stock. Tu tasa de tomas alimenta el pilar de cumplimiento del panel y el contexto de la IA."
+        },
+        "labs": {
+          "title": "Valores de laboratorio",
+          "body": "Laboratorio recoge biomarcadores con rangos de referencia: hemograma, colesterol, HbA1c. Fuerza: importación y exportación FHIR. Los valores fuera de rango reaparecen como pruebas en las ideas y en el informe médico."
+        },
+        "illness": {
+          "title": "Diario de enfermedades",
+          "body": "El diario de enfermedades registra episodios agudos y diagnósticos crónicos con sus brotes. Oculto: correlacionar un episodio con tus mediciones y el Modo descanso que pausa los recordatorios. Así el Coach entiende por qué los valores varían un tiempo."
+        },
+        "vorsorge": {
+          "title": "Prevención",
+          "body": "Prevención te recuerda revisiones y vacunas con su propio intervalo. Consejo: «Hecho» puede crear directamente una medición o un resultado de laboratorio. Lo pendiente aparece como recordatorio y en el informe médico."
+        },
+        "cycle": {
+          "title": "Ciclo",
+          "body": "El seguimiento del ciclo registra fases y síntomas. Oculto: comparar síntomas con el ánimo y el sueño. El ciclo aporta contexto a variaciones que de otro modo parecerían inexplicables."
+        },
+        "mood": {
+          "title": "Ánimo",
+          "body": "Ánimo capta cómo te sientes y etiquetas en dos segundos. Fuerza: tus propias etiquetas. Las tendencias de ánimo se correlacionan con el sueño, la medicación y el ciclo: el Coach detecta los patrones."
         },
         "insights": {
-          "title": "Insights automáticos",
-          "body": "Insights convierte tus valores en un resumen claro de salud, con interpretación de tensión arterial, peso y ánimo. Clave propia o por defecto — tú eliges."
+          "title": "Ideas",
+          "body": "Ideas es el corazón: análisis dinámico y basado en pruebas en lugar de consejos genéricos; cada afirmación apunta a tus datos reales. Oculto: el diseño es personalizable. Ideas reúne todo lo que aportan los módulos anteriores."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "El Coach responde preguntas sobre tus datos en diálogo, usando tu historial, medicación y valores de laboratorio como contexto. Tú eliges el proveedor de IA (tu propia clave o local). No recalcula nada: lee las mismas cifras que el panel."
         },
         "integrations": {
-          "title": "Conectar dispositivos",
-          "body": "En Ajustes conectas Withings (sincronización automática de peso, tensión y pulso), moodLog o tu proveedor de análisis. Todo es opcional y queda cifrado."
+          "title": "Integraciones",
+          "body": "Las integraciones sincronizan Withings, WHOOP, Polar, Oura y Apple Health automáticamente. Peso, sueño y recuperación se rellenan sin teclear, y a su vez alimentan las ideas y el Coach."
+        },
+        "export": {
+          "title": "Informe médico",
+          "body": "El informe médico reúne mediciones, medicación, valores de laboratorio y prevención en PDF o FHIR para la cita. Aquí convergen todos los módulos: un informe completo solo sale de datos bien cuidados."
         },
         "achievements": {
-          "title": "Acumula rachas e insignias",
-          "body": "La página de Logros lleva la cuenta de rachas de registro diario, hitos de tensión arterial e insignias de constancia. Un pequeño empujón para no abandonar."
+          "title": "Logros",
+          "body": "Los logros premian la constancia: rachas e hitos. Un pequeño bucle de motivación que facilita seguir adelante."
+        },
+        "wrapUp": {
+          "title": "Esto es la visita",
+          "body": "Puedes volver a ver cualquier módulo por separado cuando quieras («Mostrar esta visita» en cada página) o reiniciar la visita completa en Ajustes → Avanzado."
         }
-      }
+      },
+      "moduleTrigger": "Mostrar esta visita"
     },
     "shell": {
       "back": "Atrás",
diff --git a/messages/fr.json b/messages/fr.json
index ea1705a4a..8f6e5a3d4 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -3647,31 +3647,72 @@
       "back": "Précédent",
       "skip": "Passer la visite",
       "done": "Compris",
-      "restart": "Relancer la visite",
-      "restartHint": "Affiche à nouveau la visite du tableau de bord à la prochaine ouverture.",
-      "restartConfirmation": "La visite redémarrera lors de ta prochaine visite du tableau de bord.",
+      "restart": "Relancer la visite des modules",
+      "restartHint": "Rejoue la visite guidée des modules depuis le début lors de votre prochaine ouverture du tableau de bord.",
+      "restartConfirmation": "La visite des modules redémarrera depuis le début à votre prochaine ouverture du tableau de bord.",
       "steps": {
-        "tileStrip": {
-          "title": "Tes valeurs du jour",
-          "body": "La barre de tuiles affiche la dernière valeur et la tendance 7 jours de chaque métrique — poids, tension, pouls, humeur. Masque ce qui ne te sert pas dans Paramètres → Tableau de bord."
+        "dashboardOverview": {
+          "title": "Votre tableau de bord",
+          "body": "Le tableau de bord rassemble tous les modules d’un coup d’œil. Appuyez longuement sur une tuile pour la réorganiser ou la masquer (Réglages → Disposition du tableau de bord). Une tuile ne vaut que par les données derrière elle — les modules suivants les remplissent."
         },
         "quickAdd": {
-          "title": "Saisi en deux tapotements",
-          "body": "Via le bouton Ajouter, tu saisis des mesures ou des humeurs sans quitter le tableau de bord. Le formulaire mémorise le dernier contexte et les étiquettes."
+          "title": "Saisi en quelques secondes",
+          "body": "Avec « + Ajouter », saisissez n’importe quelle mesure en quelques secondes — poids, tension, pouls, glycémie. Atout caché : antidater les valeurs oubliées. Tout ce que vous saisissez ici alimente les tendances, le score santé et les analyses IA."
+        },
+        "measurements": {
+          "title": "Mesures et plages cibles",
+          "body": "Mesures affiche l’historique et la plage cible de chaque métrique. Astuce cachée : définir une plage par valeur pour que les écarts ressortent en couleur. Ces séries sont la base des corrélations du Coach et du rapport médical."
+        },
+        "medications": {
+          "title": "Médicaments et prises",
+          "body": "Médicaments gère plannings, prises, stock et titration. Caché : plans récurrents (RRULE/glissants) et alertes de stock bas. Votre taux de prise alimente le pilier d’observance du tableau de bord et le contexte de l’IA."
+        },
+        "labs": {
+          "title": "Valeurs de laboratoire",
+          "body": "Laboratoire recense les biomarqueurs avec plages de référence — hémogramme, cholestérol, HbA1c. Atout : import et export FHIR. Les valeurs hors plage réapparaissent comme preuves dans les analyses et le rapport médical."
+        },
+        "illness": {
+          "title": "Journal des maladies",
+          "body": "Le journal des maladies consigne les épisodes aigus et les diagnostics chroniques avec leurs poussées. Caché : corréler un épisode à vos mesures et le Mode repos qui suspend les rappels. Le Coach comprend ainsi pourquoi les valeurs dérivent un temps."
+        },
+        "vorsorge": {
+          "title": "Prévention",
+          "body": "Prévention vous rappelle examens et vaccins selon leur propre intervalle. Astuce : « Fait » peut créer directement une mesure ou un résultat de laboratoire. Les échéances apparaissent en rappels et dans le rapport médical."
+        },
+        "cycle": {
+          "title": "Cycle",
+          "body": "Le suivi du cycle consigne phases et symptômes. Caché : comparer les symptômes à l’humeur et au sommeil. Le cycle donne du contexte aux variations qui paraîtraient autrement inexpliquées."
+        },
+        "mood": {
+          "title": "Humeur",
+          "body": "Humeur saisit votre ressenti et des tags en deux secondes. Atout : vos propres tags. Les tendances d’humeur se corrèlent au sommeil, aux médicaments et au cycle — le Coach repère les schémas."
         },
         "insights": {
-          "title": "Insights automatiques",
-          "body": "Insights transforme tes valeurs en un résumé santé clair, avec un classement de la tension, du poids et de l’humeur. Clé personnelle ou par défaut — c’est toi qui choisis."
+          "title": "Analyses",
+          "body": "Analyses, c’est le cœur : une analyse dynamique et fondée sur des preuves plutôt que des conseils génériques — chaque affirmation pointe vos données réelles. Caché : la disposition est personnalisable. Analyses réunit tout ce que les modules ci-dessus fournissent."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "Le Coach répond à vos questions sur vos données en dialogue, en utilisant antécédents, médicaments et résultats comme contexte. Vous choisissez le fournisseur IA (votre clé ou local). Il ne recalcule rien — il lit les mêmes chiffres que le tableau de bord."
         },
         "integrations": {
-          "title": "Connecter des appareils",
-          "body": "Dans les paramètres, tu connectes Withings (synchronisation automatique du poids, de la tension et du pouls), moodLog ou ton fournisseur d’analyse. Tout reste optionnel et chiffré."
+          "title": "Intégrations",
+          "body": "Les intégrations synchronisent Withings, WHOOP, Polar, Oura et Apple Santé automatiquement. Poids, sommeil et récupération se remplissent sans saisie, et alimentent à leur tour les analyses et le Coach."
+        },
+        "export": {
+          "title": "Rapport médical",
+          "body": "Le rapport médical regroupe mesures, médicaments, valeurs de laboratoire et prévention en PDF ou FHIR pour le rendez-vous. Tous les modules convergent ici — un rapport complet ne vient que de données bien tenues."
         },
         "achievements": {
-          "title": "Collecter séries et badges",
-          "body": "La page Succès suit les séries de saisie quotidienne, les paliers de tension et les badges de constance. Un petit coup de pouce pour rester régulier."
+          "title": "Réussites",
+          "body": "Les réussites récompensent la régularité — séries et jalons. Une petite boucle de motivation qui aide à tenir bon."
+        },
+        "wrapUp": {
+          "title": "C’est la fin de la visite",
+          "body": "Vous pouvez revoir chaque module séparément à tout moment (« Afficher cette visite » sur chaque page) ou relancer la visite complète dans Réglages → Avancé."
         }
-      }
+      },
+      "moduleTrigger": "Afficher cette visite"
     },
     "shell": {
       "back": "Retour",
diff --git a/messages/it.json b/messages/it.json
index 3aef973cb..2f80c5675 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -3647,31 +3647,72 @@
       "back": "Indietro",
       "skip": "Salta tour",
       "done": "Ho capito",
-      "restart": "Riavvia tour",
-      "restartHint": "Mostra di nuovo il tour della dashboard alla prossima apertura.",
-      "restartConfirmation": "Il tour ripartirà alla tua prossima visita alla dashboard.",
+      "restart": "Riavvia la visita ai moduli",
+      "restartHint": "Riproduce la visita guidata ai moduli dall’inizio al tuo prossimo accesso alla dashboard.",
+      "restartConfirmation": "La visita ai moduli ripartirà dall’inizio al tuo prossimo accesso alla dashboard.",
       "steps": {
-        "tileStrip": {
-          "title": "I tuoi valori di oggi",
-          "body": "La striscia di tile mostra l’ultimo valore e il trend a 7 giorni di ogni metrica — peso, pressione, pulsazioni, umore. Nascondi ciò che non ti serve in Impostazioni → Dashboard."
+        "dashboardOverview": {
+          "title": "La tua dashboard",
+          "body": "La dashboard riunisce tutti i moduli a colpo d’occhio. Tieni premuta una scheda per riordinarla o nasconderla (Impostazioni → Layout dashboard). Una scheda vale quanto i dati che ha dietro: i moduli successivi li riempiono."
         },
         "quickAdd": {
-          "title": "Registrato in due tap",
-          "body": "Con il pulsante Aggiungi registri misurazioni o voci di umore senza lasciare la dashboard. Il modulo ricorda il contesto e i tag più recenti."
+          "title": "Registrato in pochi secondi",
+          "body": "Con « + Aggiungi » registri qualsiasi misurazione in pochi secondi — peso, pressione, polso, glicemia. Forza nascosta: retrodatare i valori dimenticati. Tutto ciò che inserisci qui alimenta tendenze, punteggio salute e analisi IA."
+        },
+        "measurements": {
+          "title": "Misurazioni e intervalli obiettivo",
+          "body": "Misurazioni mostra lo storico e l’intervallo obiettivo per ogni metrica. Chicca nascosta: definire un intervallo per valore così gli scostamenti risaltano a colori. Queste serie sono la base delle correlazioni del Coach e del referto medico."
+        },
+        "medications": {
+          "title": "Farmaci e assunzioni",
+          "body": "Farmaci gestisce orari, assunzioni, scorte e titolazione. Nascosto: piani ricorrenti (RRULE/scorrevoli) e avvisi di scorte basse. La tua aderenza alimenta il pilastro di compliance nella dashboard e il contesto dell’IA."
+        },
+        "labs": {
+          "title": "Valori di laboratorio",
+          "body": "Laboratorio raccoglie i biomarcatori con intervalli di riferimento — emocromo, colesterolo, HbA1c. Forza: importazione ed esportazione FHIR. I valori fuori intervallo riemergono come prove nelle analisi e nel referto medico."
+        },
+        "illness": {
+          "title": "Diario delle malattie",
+          "body": "Il diario delle malattie registra episodi acuti e diagnosi croniche con le loro riacutizzazioni. Nascosto: correlare un episodio alle tue misurazioni e la Modalità riposo che mette in pausa i promemoria. Così il Coach capisce perché i valori variano per un periodo."
+        },
+        "vorsorge": {
+          "title": "Prevenzione",
+          "body": "Prevenzione ti ricorda controlli e vaccinazioni con un proprio intervallo. Suggerimento: «Fatto» può creare direttamente una misurazione o un risultato di laboratorio. Le scadenze compaiono come promemoria e nel referto medico."
+        },
+        "cycle": {
+          "title": "Ciclo",
+          "body": "Il monitoraggio del ciclo registra fasi e sintomi. Nascosto: confrontare i sintomi con umore e sonno. Il ciclo dà contesto alle variazioni che altrimenti sembrerebbero inspiegabili."
+        },
+        "mood": {
+          "title": "Umore",
+          "body": "Umore cattura come ti senti e dei tag in due secondi. Forza: i tuoi tag personalizzati. Gli andamenti dell’umore si correlano con sonno, farmaci e ciclo — il Coach coglie gli schemi."
         },
         "insights": {
-          "title": "Insights automatici",
-          "body": "Insights trasforma i tuoi valori in un riepilogo chiaro della salute, con inquadramento di pressione, peso e umore. Chiave personale o predefinita — scegli tu."
+          "title": "Analisi",
+          "body": "Analisi è il cuore: analisi dinamica e basata su prove invece di consigli generici — ogni affermazione punta ai tuoi dati reali. Nascosto: il layout è personalizzabile. Analisi raccoglie tutto ciò che forniscono i moduli sopra."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "Il Coach risponde alle domande sui tuoi dati in dialogo, usando anamnesi, farmaci e valori di laboratorio come contesto. Scegli tu il fornitore IA (chiave tua o locale). Non ricalcola nulla: legge gli stessi numeri della dashboard."
         },
         "integrations": {
-          "title": "Collegare dispositivi",
-          "body": "Dalle impostazioni colleghi Withings (sincronizzazione automatica di peso, pressione e pulsazioni), moodLog o il tuo provider di analisi. Tutto resta opzionale e cifrato."
+          "title": "Integrazioni",
+          "body": "Le integrazioni sincronizzano Withings, WHOOP, Polar, Oura e Apple Salute automaticamente. Peso, sonno e recupero si riempiono senza digitare e a loro volta alimentano analisi e Coach."
+        },
+        "export": {
+          "title": "Referto medico",
+          "body": "Il referto medico raccoglie misurazioni, farmaci, valori di laboratorio e prevenzione in PDF o FHIR per la visita. Qui convergono tutti i moduli: un referto completo nasce solo da dati ben curati."
         },
         "achievements": {
-          "title": "Accumula serie e badge",
-          "body": "La pagina Traguardi tiene traccia delle serie di registrazioni giornaliere, dei traguardi di pressione e dei badge di costanza. Un piccolo incentivo per non mollare."
+          "title": "Traguardi",
+          "body": "I traguardi premiano la costanza — serie e tappe. Un piccolo ciclo di motivazione che rende più facile non mollare."
+        },
+        "wrapUp": {
+          "title": "Questa è la visita guidata",
+          "body": "Puoi rivedere ogni modulo singolarmente in qualsiasi momento («Mostra questa visita» su ogni pagina) o riavviare l’intera visita da Impostazioni → Avanzate."
         }
-      }
+      },
+      "moduleTrigger": "Mostra questa visita"
     },
     "shell": {
       "back": "Indietro",
diff --git a/messages/pl.json b/messages/pl.json
index d91c6f7bd..2c637227b 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -3647,31 +3647,72 @@
       "back": "Wstecz",
       "skip": "Pomiń tour",
       "done": "Rozumiem",
-      "restart": "Uruchom tour ponownie",
-      "restartHint": "Pokaż tour panelu przy następnym wejściu.",
-      "restartConfirmation": "Tour ruszy ponownie przy twojej następnej wizycie w panelu.",
+      "restart": "Uruchom przewodnik modułów ponownie",
+      "restartHint": "Odtwarza przewodnik po modułach od początku przy następnej wizycie na pulpicie.",
+      "restartConfirmation": "Przewodnik po modułach uruchomi się od początku przy następnej wizycie na pulpicie.",
       "steps": {
-        "tileStrip": {
-          "title": "Twoje wartości dzienne",
-          "body": "Pasek kafelków pokazuje ostatnią wartość i 7-dniowy trend dla każdej metryki — waga, ciśnienie, tętno, nastrój. Niepotrzebne wyłączysz w Ustawienia → Panel."
+        "dashboardOverview": {
+          "title": "Twój pulpit",
+          "body": "Pulpit zbiera wszystkie moduły na jednym ekranie. Przytrzymaj kafelek, aby go przestawić lub ukryć (Ustawienia → Układ pulpitu). Kafelek jest wart tyle, ile dane za nim — kolejne moduły je wypełniają."
         },
         "quickAdd": {
-          "title": "Zarejestrowane w dwóch stuknięciach",
-          "body": "Przyciskiem Dodaj zapisujesz pomiary lub nastroje bez opuszczania panelu. Formularz zapamiętuje ostatni kontekst i tagi."
+          "title": "Zapisane w kilka sekund",
+          "body": "Przez „+ Dodaj” zapiszesz każdy pomiar w sekundy — wagę, ciśnienie, tętno, glukozę. Ukryta moc: datowanie wstecz zapomnianych wartości. Wszystko, co tu wpiszesz, zasila trendy, wynik zdrowia i analizy AI."
+        },
+        "measurements": {
+          "title": "Pomiary i zakresy docelowe",
+          "body": "Pomiary pokazują historię i zakres docelowy każdej metryki. Ukryta perełka: ustaw zakres na wartość, aby odchylenia rzucały się w oczy kolorem. Te serie są podstawą korelacji Coacha i raportu dla lekarza."
+        },
+        "medications": {
+          "title": "Leki i przyjęcia",
+          "body": "Leki zarządzają harmonogramami, przyjęciami, zapasem i titracją. Ukryte: plany cykliczne (RRULE/przesuwne) i ostrzeżenia o niskim zapasie. Twój wskaźnik przyjęć zasila filar stosowania na pulpicie oraz kontekst AI."
+        },
+        "labs": {
+          "title": "Wyniki laboratoryjne",
+          "body": "Laboratorium gromadzi biomarkery z zakresami referencyjnymi — morfologia, cholesterol, HbA1c. Atut: import i eksport FHIR. Wartości poza zakresem wracają jako dowody w analizach i w raporcie dla lekarza."
+        },
+        "illness": {
+          "title": "Dziennik chorób",
+          "body": "Dziennik chorób zapisuje ostre epizody i przewlekłe diagnozy wraz z zaostrzeniami. Ukryte: korelacja epizodu z pomiarami oraz Tryb odpoczynku wstrzymujący przypomnienia. Dzięki temu Coach rozumie, czemu wartości przez chwilę odbiegają."
+        },
+        "vorsorge": {
+          "title": "Profilaktyka",
+          "body": "Profilaktyka przypomina o badaniach i szczepieniach z własnym interwałem. Wskazówka: „Wykonane” może od razu utworzyć pomiar lub wynik laboratoryjny. Terminy pojawiają się jako przypomnienia i w raporcie dla lekarza."
+        },
+        "cycle": {
+          "title": "Cykl",
+          "body": "Śledzenie cyklu zapisuje fazy i objawy. Ukryte: zestawienie objawów z nastrojem i snem. Cykl daje kontekst wahaniom, które inaczej wyglądałyby na niewyjaśnione."
+        },
+        "mood": {
+          "title": "Nastrój",
+          "body": "Nastrój zapisuje samopoczucie i tagi w dwie sekundy. Atut: własne tagi. Trendy nastroju korelują ze snem, lekami i cyklem — Coach dostrzega wzorce."
         },
         "insights": {
-          "title": "Automatyczne insights",
-          "body": "Insights zamienia twoje wartości w przejrzysty przegląd zdrowia, z oceną ciśnienia, wagi i nastroju. Własny klucz lub domyślny — ty decydujesz."
+          "title": "Analizy",
+          "body": "Analizy to serce aplikacji: dynamiczna analiza oparta na dowodach zamiast ogólnych porad — każde stwierdzenie wskazuje na Twoje realne dane. Ukryte: układ można dostosować. Analizy łączą wszystko, co dostarczają moduły powyżej."
+        },
+        "coach": {
+          "title": "Coach",
+          "body": "Coach odpowiada na pytania o Twoje dane w dialogu, korzystając z wywiadu, leków i wyników jako kontekstu. Dostawcę AI wybierasz sam (własny klucz lub lokalnie). Niczego nie przelicza — czyta te same liczby co pulpit."
         },
         "integrations": {
-          "title": "Połącz urządzenia",
-          "body": "W ustawieniach łączysz Withings (auto-sync wagi, ciśnienia i tętna), moodLog lub dostawcę analizy. Wszystko zostaje opcjonalne i zaszyfrowane."
+          "title": "Integracje",
+          "body": "Integracje synchronizują Withings, WHOOP, Polar, Oura i Apple Health automatycznie. Waga, sen i regeneracja uzupełniają się bez wpisywania, a z kolei zasilają analizy i Coacha."
+        },
+        "export": {
+          "title": "Raport dla lekarza",
+          "body": "Raport dla lekarza łączy pomiary, leki, wyniki laboratoryjne i profilaktykę w PDF lub FHIR na wizytę. Tu zbiegają się wszystkie moduły — pełny raport powstaje tylko z zadbanych danych."
         },
         "achievements": {
-          "title": "Zbieraj serie i odznaki",
-          "body": "Strona Osiągnięć śledzi codzienne serie zapisów, kamienie milowe ciśnienia i odznaki konsekwencji. Drobna motywacja do trzymania się planu."
+          "title": "Osiągnięcia",
+          "body": "Osiągnięcia nagradzają konsekwencję — passy i kamienie milowe. Mała pętla motywacji, dzięki której łatwiej wytrwać."
+        },
+        "wrapUp": {
+          "title": "To koniec przewodnika",
+          "body": "Każdy moduł możesz obejrzeć osobno w dowolnej chwili („Pokaż ten przewodnik” na każdej stronie) lub uruchomić cały przewodnik ponownie w Ustawienia → Zaawansowane."
         }
-      }
+      },
+      "moduleTrigger": "Pokaż ten przewodnik"
     },
     "shell": {
       "back": "Wstecz",
diff --git a/src/app/page.tsx b/src/app/page.tsx
index c7a111143..4d03b3ff8 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -52,7 +52,6 @@ import { TrendCardSkeleton } from "@/components/charts/trend-card-skeleton";
 import { TrendHint } from "@/components/charts/trend-hint";
 import { summaryToTrend7Delta } from "@/lib/analytics/trend-delta";
 import { GettingStartedChecklist } from "@/components/onboarding/getting-started-checklist";
-import { TourLauncher } from "@/components/onboarding/tour-launcher";
 import { RecentAchievementsCard } from "@/components/gamification/recent-achievements-card";
 import { RecentWorkoutsTile } from "@/components/dashboard/recent-workouts-tile";
 import { VorsorgeDashboardCard } from "@/components/measurement-reminders/vorsorge-dashboard-card";
@@ -753,15 +752,10 @@ export default function DashboardPage() {
           />
         ))}
 
-      {/* v1.4.15 Phase B5 — spotlight tour for first-time users.
-       * Self-gates on `user.onboardingTourCompleted` (DB flag) plus
-       * a session-storage dismiss guard. We pass `ready=true` only
-       * after analytics has resolved — the tour anchors to the tile
-       * strip and we don't want the cutout snapping to a 0×0
-       * placeholder before tiles render. The launcher mounts a no-op
-       * `null` when the user has already seen the tour, so this
-       * line is free for established users. */}
-      <TourLauncher ready={data !== undefined} />
+      {/* v1.18.6 — the spotlight tour launcher moved to the app-shell
+       * (`AuthShell`) so its overlay survives the cross-page
+       * `router.push`es the module tour makes. The dashboard no longer
+       * mounts it. */}
 
       {/* Quick Entry Sheets — bottom-sheet on `<md`, centred Dialog on `md+`. */}
       <QuickEntrySheets
diff --git a/src/components/layout/auth-shell.tsx b/src/components/layout/auth-shell.tsx
index 8d4a27ba6..8e3eba3da 100644
--- a/src/components/layout/auth-shell.tsx
+++ b/src/components/layout/auth-shell.tsx
@@ -7,6 +7,7 @@ import { AchievementUnlockNotifier } from "@/components/gamification/achievement
 import { MaintainershipBanner } from "@/components/i18n/maintainership-banner";
 import { LayoutCoachFab } from "@/components/insights/layout-coach-fab";
 import { LayoutCoachMount } from "@/components/insights/layout-coach-mount";
+import { TourLauncher } from "@/components/onboarding/tour-launcher";
 import { useAuth } from "@/hooks/use-auth";
 import { clearOfflineCachesForSessionEnd } from "@/lib/pwa/query-persister";
 import { useTranslations } from "@/lib/i18n/context";
@@ -280,6 +281,13 @@ export function AuthShell({
         <BottomNav />
       </div>
       <LayoutCoachMount />
+      {/* v1.18.6 — the module-tour launcher lives at the shell level so its
+          overlay survives the cross-page `router.push`es the tour makes. It
+          self-gates: it only auto-opens on the dashboard for a user who has
+          not finished/dismissed the tour, and otherwise renders null. Stays
+          out of demo mode (the tour PATCHes `/api/onboarding/tour`, which the
+          proxy blocks for demo visitors). */}
+      {!demoMode && <TourLauncher />}
       {/* v1.16.13 — the Coach FAB stays hidden in demo mode. Its send hits
           `/api/insights/chat`, which is not in the proxy's
           `DEMO_MUTATION_ALLOWLIST`, so a demo visitor who tapped it and sent
diff --git a/src/components/onboarding/DoneScreen.tsx b/src/components/onboarding/DoneScreen.tsx
index 9b924a123..46d8ca25b 100644
--- a/src/components/onboarding/DoneScreen.tsx
+++ b/src/components/onboarding/DoneScreen.tsx
@@ -1,9 +1,12 @@
 "use client";
 
 import Link from "next/link";
+import { useEffect } from "react";
 import { CheckCircle2, FileUp, PlusCircle, Plug } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
+import { useAuth } from "@/hooks/use-auth";
+import { setTourReferrer } from "@/components/onboarding/tour-launcher";
 import { useTranslations } from "@/lib/i18n/context";
 
 /**
@@ -18,10 +21,21 @@ import { useTranslations } from "@/lib/i18n/context";
  * through `next/link` so the regular client-side navigation kicks in
  * (the proxy redirect was cleared with the same step-API write that
  * landed the user here).
+ *
+ * v1.18.6 — on mount we write the per-user wizard-return marker so the
+ * shell-level `<TourLauncher>` auto-opens the module tour immediately
+ * on the next dashboard arrival (sequenced after the post-wizard
+ * grace), instead of waiting out the 24 h fallback. Whichever exit the
+ * user picks from this screen, the next `/` mount finds the marker.
  */
 
 export function DoneScreen() {
   const { t } = useTranslations();
+  const { user } = useAuth();
+
+  useEffect(() => {
+    if (user?.id) setTourReferrer(user.id);
+  }, [user?.id]);
 
   return (
     <section
diff --git a/src/components/onboarding/__tests__/tour.test.tsx b/src/components/onboarding/__tests__/tour.test.tsx
index ae74efea3..9b7ed282b 100644
--- a/src/components/onboarding/__tests__/tour.test.tsx
+++ b/src/components/onboarding/__tests__/tour.test.tsx
@@ -2,23 +2,27 @@ import { describe, expect, it, vi } from "vitest";
 import { renderToStaticMarkup } from "react-dom/server";
 
 // vitest runs in the Node environment (no jsdom). The tour's interactive
-// behaviour (keyboard navigation, focus management, target measurement)
-// is exercised by the pure state machine at
+// behaviour (keyboard navigation, focus management, target measurement,
+// cross-page navigation) is exercised by the pure state machine at
 // `src/lib/onboarding/__tests__/tour-state.test.ts` and by the e2e
 // suite at `e2e/onboarding-tour.spec.ts`. Here we lock the SSR contract:
-// initial render shape, ARIA wiring, i18n keys, and that the first
-// step is the tile strip.
+// initial render shape, ARIA wiring, i18n keys, and that the first step
+// is the dashboard overview.
+//
+// The overlay reads Next's navigation hooks for the cross-page push; we
+// stub them so the static render resolves.
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({ push: vi.fn() }),
+  usePathname: () => "/",
+}));
 
 import { I18nProvider } from "@/lib/i18n/context";
 import { OnboardingTour } from "../tour";
 
-function renderTour(includeAchievements = true) {
+function renderTour(modules?: Record<string, boolean>) {
   return renderToStaticMarkup(
     <I18nProvider initialLocale="en">
-      <OnboardingTour
-        includeAchievements={includeAchievements}
-        onClose={vi.fn()}
-      />
+      <OnboardingTour modules={modules} onClose={vi.fn()} />
     </I18nProvider>,
   );
 }
@@ -31,25 +35,23 @@ describe("<OnboardingTour>", () => {
     expect(html).toContain('aria-labelledby="onboarding-tour-title"');
   });
 
-  it("starts on the tile-strip step (1 of 5 by default)", () => {
+  it("starts on the dashboard-overview step (1 of 15 by default)", () => {
     const html = renderTour();
-    expect(html).toContain("Step 1 of 5");
-    expect(html).toContain("Your daily numbers");
-    // Body of the first step should mention the tile strip context.
-    expect(html).toContain("tile strip");
+    expect(html).toContain("Step 1 of 15");
   });
 
-  it("drops the achievements stop when the flag is off (1 of 4)", () => {
-    const html = renderTour(false);
-    expect(html).toContain("Step 1 of 4");
+  it("keeps the counter honest when modules are disabled", () => {
+    // cycle + mood + achievements off ⇒ 12 stops.
+    const html = renderTour({
+      cycle: false,
+      mood: false,
+      achievements: false,
+    });
+    expect(html).toContain("Step 1 of 12");
   });
 
   it("exposes a skip control with an accessible label", () => {
     const html = renderTour();
-    // After v1.4.33 F2 the dim panels are purely visual
-    // (pointer-events: none) so skip lives entirely on the explicit
-    // tooltip-footer Skip button. The visible label still has to be
-    // there — both for sighted users and for screen readers.
     expect(html).toContain("Skip tour");
   });
 
@@ -77,8 +79,7 @@ describe("<OnboardingTour>", () => {
         <OnboardingTour onClose={vi.fn()} />
       </I18nProvider>,
     );
-    expect(html).toContain("Schritt 1 von 5");
-    expect(html).toContain("Deine Tageswerte");
+    expect(html).toContain("Schritt 1 von 15");
     expect(html).toContain("Tour überspringen");
   });
 });
diff --git a/src/components/onboarding/tour-launcher.tsx b/src/components/onboarding/tour-launcher.tsx
index 3095542df..4254e0770 100644
--- a/src/components/onboarding/tour-launcher.tsx
+++ b/src/components/onboarding/tour-launcher.tsx
@@ -47,11 +47,13 @@
  * manual replay always works.
  */
 
+import { usePathname } from "next/navigation";
 import { useEffect, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 
 import { useAuth } from "@/hooks/use-auth";
 import { apiPost } from "@/lib/api/api-fetch";
+import type { TourStopId } from "@/lib/onboarding/tour-state";
 import { OnboardingTour } from "./tour";
 
 const POST_WIZARD_GRACE_MS = 1500;
@@ -90,6 +92,16 @@ export function shouldAutoLaunchTour(args: {
   onboardingTourCompleted: boolean;
   onboardingCompletedAt: string | null;
   nowMs: number;
+  /**
+   * v1.18.6 — true when the user has just returned from the wizard's
+   * DoneScreen this session (the `tourReferrerKey` marker). A fresh
+   * user finishing anamnesis should get the module tour IMMEDIATELY —
+   * the post-wizard grace below still sequences it after the toast.
+   * The old 24 h delay over-corrected and removed first-run capability
+   * education entirely; it now only applies to a user who SKIPPED the
+   * wizard (no referrer marker, completion ≥ 24 h ago).
+   */
+  justFromWizard?: boolean;
 }): boolean {
   if (args.onboardingTourCompleted) return false;
   if (args.onboardingCompletedAt == null) return false;
@@ -98,6 +110,9 @@ export function shouldAutoLaunchTour(args: {
   // unparseable case as "no completion yet" so a malformed payload
   // never auto-launches the tour into an unsuspecting brand-new user.
   if (Number.isNaN(completedMs)) return false;
+  // Fresh-from-anamnesis: launch now (sequenced after the post-wizard
+  // grace by the launcher), no 24 h wait.
+  if (args.justFromWizard) return true;
   return args.nowMs - completedMs >= TOUR_AUTOLAUNCH_DELAY_MS;
 }
 
@@ -189,6 +204,22 @@ function readAndClearForceLaunch(userId: string): boolean {
  * does not consult sessionStorage at all (the gating effect waits
  * for `inputsReady` first).
  */
+/**
+ * v1.18.6 — write the wizard-return marker. Called from the wizard's
+ * `DoneScreen` on mount so the launcher knows the user JUST finished
+ * anamnesis and should get the module tour immediately (sequenced after
+ * the post-wizard grace) rather than after the 24 h fallback delay.
+ * Per-user keyed so a shared browser keeps each identity's state apart.
+ */
+export function setTourReferrer(userId: string): void {
+  if (typeof window === "undefined") return;
+  try {
+    window.sessionStorage.setItem(tourReferrerKey(userId), "1");
+  } catch {
+    /* ignore — sandboxed iframes etc. */
+  }
+}
+
 function readAndClearJustFromWizard(userId: string): boolean {
   if (typeof window === "undefined") return false;
   try {
@@ -233,24 +264,30 @@ function clearSessionDismissed(userId: string) {
 
 interface TourLauncherProps {
   /**
-   * The dashboard passes a sentinel — true once analytics has
-   * resolved at least once. Without this gate the spotlight would
-   * try to anchor to tiles that haven't rendered yet, and Recharts
-   * widgets defer mounting too. This is a simple, race-free signal
-   * the dashboard already computes.
+   * v1.18.6 — optional readiness sentinel. The dashboard used to pass
+   * `true` once analytics resolved so the spotlight didn't anchor to a
+   * 0×0 tile. The overlay now polls for its anchor (bounded retry), so
+   * the gate is no longer load-bearing; it defaults to `true` for the
+   * shell-level mount. The launcher still only auto-opens on the
+   * dashboard route, where the first stop's anchor lives.
    */
-  ready: boolean;
+  ready?: boolean;
 }
 
-export function TourLauncher({ ready }: TourLauncherProps) {
+export function TourLauncher({ ready = true }: TourLauncherProps) {
   const { user, isAuthenticated, isLoading } = useAuth();
   const queryClient = useQueryClient();
+  const pathname = usePathname();
 
   // `null` = decision not yet made; `true` = render the tour;
   // `false` = don't render. We only flip null→true ONCE per mount;
   // closing the tour transitions true→false and we never re-open
   // unless the restart event fires.
   const [showTour, setShowTour] = useState<boolean | null>(null);
+  // v1.18.6 — when the tour opens for a single-module re-entry
+  // ("Diese Tour zeigen" on a module page) this carries the stop id so
+  // the overlay renders just that card. `null` = the full tour.
+  const [singleStop, setSingleStop] = useState<TourStopId | null>(null);
   // Track post-wizard deferral as a boolean so the render path stays
   // pure (no Date.now() comparisons). The effect below reads / clears it.
   const [deferredFromWizard, setDeferredFromWizard] = useState(false);
@@ -275,7 +312,14 @@ export function TourLauncher({ ready }: TourLauncherProps) {
   // tour on their next page-load — acceptable for a one-shot welcome).
   const [mountedAtMs] = useState(() => Date.now());
 
-  const inputsReady = !isLoading && isAuthenticated && !!user && ready;
+  // v1.18.6 — the launcher now mounts at the app-shell level so the
+  // overlay survives the cross-page `router.push`es the tour makes. It
+  // must only AUTO-open on the dashboard, where the first stop's anchor
+  // lives. A manual re-entry / restart can fire from any route (handled
+  // by the event listeners below, which don't consult this gate).
+  const onDashboard = pathname === "/";
+  const inputsReady =
+    !isLoading && isAuthenticated && !!user && ready && onDashboard;
   // The set-state-in-render pattern (mirrors `account-section.tsx`'s
   // `seededUserId` — React-recommended for "compute initial state
   // from props once they arrive"). Pure: branches on prop values
@@ -289,6 +333,10 @@ export function TourLauncher({ ready }: TourLauncherProps) {
       decidedFor.flag !== user.onboardingTourCompleted)
   ) {
     setDecidedFor({ userId: user.id, flag: user.onboardingTourCompleted });
+    // v1.18.6 — consume the wizard-return marker once so the
+    // fresh-from-anamnesis path launches immediately (sequenced after
+    // the post-wizard grace) instead of waiting 24 h.
+    const justFromWizard = readAndClearJustFromWizard(user.id);
     // sessionStorage reads happen via per-user keyed helpers, so a
     // browser shared by two HealthLog users (admin impersonation,
     // family laptop, etc.) keeps each user's tour state independent.
@@ -309,17 +357,21 @@ export function TourLauncher({ ready }: TourLauncherProps) {
     // user expectation ("I clicked replay, now show me the tour").
     if (readAndClearForceLaunch(user.id)) {
       setShowTour(true);
-    } else if (!shouldAutoLaunchTour({
-      onboardingTourCompleted: user.onboardingTourCompleted,
-      onboardingCompletedAt: user.onboardingCompletedAt,
-      nowMs: mountedAtMs,
-    })) {
+    } else if (
+      !shouldAutoLaunchTour({
+        onboardingTourCompleted: user.onboardingTourCompleted,
+        onboardingCompletedAt: user.onboardingCompletedAt,
+        nowMs: mountedAtMs,
+        justFromWizard,
+      })
+    ) {
       setShowTour(false);
     } else if (readSessionDismissed(user.id)) {
       setShowTour(false);
-    } else if (readAndClearJustFromWizard(user.id)) {
-      // Mark "deferred"; the effect below schedules a fixed-duration
-      // timer + flips `showTour` from inside the timeout callback
+    } else if (justFromWizard) {
+      // Fresh from anamnesis — defer past the post-wizard grace so the
+      // green-tick toast doesn't double-overlay, then open. The effect
+      // below schedules the timer and flips `showTour` in its callback
       // (which the set-state-in-effect rule allows).
       setShowTour(false);
       setDeferredFromWizard(true);
@@ -344,13 +396,15 @@ export function TourLauncher({ ready }: TourLauncherProps) {
     return () => window.clearTimeout(id);
   }, [deferredFromWizard, user?.id]);
 
-  // Listen for explicit restart events from Settings → Account.
+  // Listen for explicit restart events from Settings → Advanced. A
+  // restart opens the FULL tour from the top (singleStop cleared).
   // setState inside a window-event listener is fine under the
   // set-state-in-effect rule.
   const userIdForRestart = user?.id;
   useEffect(() => {
     function onRestart() {
       if (userIdForRestart) clearSessionDismissed(userIdForRestart);
+      setSingleStop(null);
       setShowTour(true);
     }
     window.addEventListener("healthlog:tour-restart", onRestart);
@@ -359,17 +413,48 @@ export function TourLauncher({ ready }: TourLauncherProps) {
     };
   }, [userIdForRestart]);
 
+  // v1.18.6 — per-module "Diese Tour zeigen" re-entry. A module page
+  // dispatches `healthlog:module-tour` with `{ stopId }`; the launcher
+  // opens the overlay narrowed to that single card on the current page
+  // (no cross-page navigation, no completion flip).
+  useEffect(() => {
+    function onModuleTour(e: Event) {
+      const detail = (e as CustomEvent<{ stopId?: string }>).detail;
+      if (!detail?.stopId) return;
+      setSingleStop(detail.stopId as TourStopId);
+      setShowTour(true);
+    }
+    window.addEventListener("healthlog:module-tour", onModuleTour);
+    return () => {
+      window.removeEventListener("healthlog:module-tour", onModuleTour);
+    };
+  }, []);
+
   if (showTour !== true) return null;
 
-  // v1.18.0 B5 — drop the achievements tour stop when the account has the
-  // achievements module turned off. Reads the per-user module map the same
-  // way every other client gate does (`modules?.<key> !== false`,
-  // default-on).
-  const includeAchievements = tourIncludesAchievements(user?.modules);
+  // The resolved module map gates which stops appear (default-on) and
+  // keeps the "Schritt n/total" counter honest.
+  const modules = user?.modules;
+  // v1.18.6 — resume the full tour from the persisted checkpoint. The
+  // single-stop re-entry ignores the resume point (it opens its card).
+  const resumeFromStopId = singleStop
+    ? null
+    : (user?.onboardingTourProgress?.lastStopId ?? null);
 
   return (
     <OnboardingTour
-      includeAchievements={includeAchievements}
+      modules={modules}
+      resumeFromStopId={resumeFromStopId}
+      filterToStop={singleStop ?? undefined}
+      onProgress={(progress) => {
+        // Fire-and-forget checkpoint so a mid-tour reload resumes at the
+        // right module. Skipped implicitly by the overlay for the
+        // single-stop re-entry. A failed write is non-fatal — the resume
+        // point is a convenience, not a correctness invariant.
+        void apiPost("/api/onboarding/tour", {
+          progress: { ...progress, updatedAt: new Date().toISOString() },
+        }).catch(() => {});
+      }}
       onClose={async (outcome) => {
         // Optimistic: hide the overlay immediately, persist in the
         // background. The flag is idempotent so re-fires are safe;
@@ -378,7 +463,13 @@ export function TourLauncher({ ready }: TourLauncherProps) {
         // for the rest of the session, and the next refetch of
         // `/api/auth/me` (which the user gets on any nav) will
         // surface any divergence.
+        const wasSingleStop = singleStop !== null;
         setShowTour(false);
+        setSingleStop(null);
+        // A single-stop re-entry must NOT flip the global completion
+        // flag or write the session-dismiss guard — it's one card, not
+        // "the tour". Just close.
+        if (wasSingleStop) return;
         if (user?.id) writeSessionDismissed(user.id);
         try {
           await apiPost("/api/onboarding/tour", { completed: true, outcome });
diff --git a/src/components/onboarding/tour.tsx b/src/components/onboarding/tour.tsx
index ae350d47e..852828568 100644
--- a/src/components/onboarding/tour.tsx
+++ b/src/components/onboarding/tour.tsx
@@ -36,6 +36,7 @@
  * `skipped` to the API + audit log).
  */
 
+import { usePathname, useRouter } from "next/navigation";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { Button } from "@/components/ui/button";
@@ -43,26 +44,46 @@ import { useTranslations } from "@/lib/i18n/context";
 import {
   buildTourStops,
   currentStop,
+  deriveProgress,
   initTourState,
   isTourFinished,
   nextStep,
   prevStep,
   skipTour,
   stepCounter,
+  type TourModuleMap,
+  type TourState,
   type TourStop,
+  type TourStopId,
 } from "@/lib/onboarding/tour-state";
 
 interface TourProps {
   /**
-   * Whether the achievements page exists and should be a tour stop.
-   * The launcher passes `false` if B4 hasn't shipped to skip the
-   * stop without renumbering.
+   * Resolved module map (`GET /api/auth/me`'s `modules`). Stops whose
+   * `requiresModule` resolves to `false` are dropped; the counter total
+   * tracks the resolved list so "Schritt n/total" stays honest.
    */
-  includeAchievements?: boolean;
+  modules?: TourModuleMap;
   /**
-   * Called when the tour finishes (Done OR Skip OR Esc OR Backdrop
-   * click). Receives the terminal outcome so the launcher can audit
-   * the difference.
+   * v1.18.6 — open at this stop id (the persisted resume point). When
+   * the id is absent from the resolved list the tour starts at the top.
+   */
+  resumeFromStopId?: string | null;
+  /**
+   * v1.18.6 — narrow the tour to a single module card (the per-page
+   * "Diese Tour zeigen" re-entry). When set, the overlay shows just
+   * that stop with a Done button and no cross-page navigation.
+   */
+  filterToStop?: TourStopId;
+  /**
+   * v1.18.6 — fire-and-forget progress checkpoint on every step change
+   * + terminal. The launcher PATCHes it so a reload resumes correctly.
+   * Not called for the single-stop re-entry (`filterToStop`).
+   */
+  onProgress?: (progress: ReturnType<typeof deriveProgress>) => void;
+  /**
+   * Called when the tour finishes (Done OR Skip OR Esc). Receives the
+   * terminal outcome so the launcher can audit the difference.
    */
   onClose: (outcome: "completed" | "skipped") => void;
 }
@@ -216,56 +237,125 @@ const COLLISION_PAD = 8;
 const SHEET_BREAKPOINT = 480;
 
 export function OnboardingTour({
-  includeAchievements = true,
+  modules,
+  resumeFromStopId,
+  filterToStop,
+  onProgress,
   onClose,
 }: TourProps) {
   const { t } = useTranslations();
+  const router = useRouter();
+  const pathname = usePathname();
 
   const stops = useMemo(
-    () => buildTourStops({ includeAchievements }),
-    [includeAchievements],
+    () => buildTourStops({ modules, filterToStop }),
+    [modules, filterToStop],
+  );
+  // Single-stop re-entry never resumes from a checkpoint — it opens on
+  // the one card the page asked for.
+  const [state, setState] = useState<TourState>(() =>
+    initTourState(stops, filterToStop ? null : resumeFromStopId),
   );
-  const [state, setState] = useState(() => initTourState(stops));
   const [rect, setRect] = useState<SpotlightRect | null>(null);
 
   const stop = currentStop(state);
 
-  // Re-measure on step change, viewport resize, and scroll. We intentionally
-  // *don't* MutationObserver the whole document — the targets are stable in
-  // the layout and re-measuring on rAF after scroll/resize is plenty.
+  // v1.18.6 — cross-page step change. A stop on another route triggers a
+  // `router.push` first; the overlay survives the navigation because it is
+  // mounted at the app-shell level (not inside the dashboard). After the
+  // route settles we must wait for the new page's anchor to MOUNT before
+  // measuring — anchoring against a not-yet-rendered (0×0) target would snap
+  // the spotlight to centre-screen. We poll on rAF with a bounded retry, then
+  // give up to the centred fallback so the tour never blocks indefinitely.
+  //
+  // We intentionally *don't* MutationObserver the whole document — the
+  // targets are stable once mounted; bounded rAF polling on step change plus
+  // re-measuring on scroll/resize is plenty.
   useEffect(() => {
     if (!stop) return;
+    if (typeof document === "undefined") return;
+
     let raf = 0;
+    let cancelled = false;
+    const reduceMotion =
+      typeof window !== "undefined" &&
+      window.matchMedia?.("(prefers-reduced-motion: reduce)").matches === true;
+
+    // Navigate to the stop's route if we're not already there. Same-route
+    // stops (the two dashboard stops while on `/`, or the wrap-up which has
+    // no route) skip the push. `filterToStop` re-entry never navigates — it
+    // runs on the page the user is already viewing.
+    if (!filterToStop && stop.route && stop.route !== pathname) {
+      router.push(stop.route);
+    }
+
+    const measureNow = () => {
+      if (cancelled) return;
+      setRect(measureTarget(stop.targetId));
+    };
     const measure = () => {
       cancelAnimationFrame(raf);
-      raf = requestAnimationFrame(() => {
-        setRect(measureTarget(stop.targetId));
-      });
+      raf = requestAnimationFrame(measureNow);
     };
-    // Bring the target into view BEFORE the first measurement of this
-    // step — anchors low on the page (e.g. the Settings nav item) can
-    // sit entirely below the fold, and positioning against an
-    // off-screen rect put the popover under the viewport bottom where
-    // its Next button was unreachable. `block: "center"` keeps room on
-    // both sides for the flipped placement; the rAF in `measure()`
-    // runs after the instant scroll so we measure post-scroll
-    // coordinates. Optional-chained: jsdom and older engines lack it.
-    if (stop.targetId && typeof document !== "undefined") {
-      document
-        .querySelector<HTMLElement>(
-          `[data-tour-id="${CSS.escape(stop.targetId)}"]`,
-        )
-        ?.scrollIntoView?.({ block: "center", inline: "nearest" });
-    }
-    measure();
+
+    // Wait for the anchor to mount (after navigation it isn't in the DOM on
+    // the first frame). Bounded poll: ~40 frames (~650 ms) before falling
+    // back to the centred tooltip via `measureTarget` returning null.
+    let attempts = 0;
+    const MAX_ATTEMPTS = 40;
+    const settleAndMeasure = () => {
+      if (cancelled) return;
+      const el = stop.targetId
+        ? document.querySelector<HTMLElement>(
+            `[data-tour-id="${CSS.escape(stop.targetId)}"]`,
+          )
+        : null;
+      if (el) {
+        // Bring the anchor into view BEFORE measuring — anchors below the
+        // fold positioned the popover under the viewport bottom otherwise.
+        // Reduced-motion users get an instant jump, not a smooth scroll.
+        el.scrollIntoView?.({
+          block: "center",
+          inline: "nearest",
+          behavior: reduceMotion ? "auto" : "smooth",
+        });
+        measure();
+        return;
+      }
+      // Centred / route-less stop (wrap-up): measure immediately.
+      if (!stop.targetId) {
+        measureNow();
+        return;
+      }
+      attempts += 1;
+      if (attempts < MAX_ATTEMPTS) {
+        raf = requestAnimationFrame(settleAndMeasure);
+      } else {
+        // Anchor never mounted — centre the tooltip rather than block.
+        measureNow();
+      }
+    };
+    settleAndMeasure();
+
     window.addEventListener("resize", measure);
     window.addEventListener("scroll", measure, true);
     return () => {
+      cancelled = true;
       cancelAnimationFrame(raf);
       window.removeEventListener("resize", measure);
       window.removeEventListener("scroll", measure, true);
     };
-  }, [stop]);
+    // `pathname` is intentionally a dep: after the route settles the effect
+    // re-runs and the anchor poll finds the now-mounted target.
+  }, [stop, filterToStop, router, pathname]);
+
+  // v1.18.6 — fire-and-forget progress checkpoint on every step / terminal
+  // transition so a mid-tour reload resumes at the right module. Skipped for
+  // the single-stop re-entry (it isn't "the tour", just one card).
+  useEffect(() => {
+    if (filterToStop || !onProgress) return;
+    onProgress(deriveProgress(state));
+  }, [state, filterToStop, onProgress]);
 
   // Focus management — moves focus to the primary action when the
   // step changes so keyboard users can hit Enter to advance. The
diff --git a/src/lib/onboarding/__tests__/tour-state.test.ts b/src/lib/onboarding/__tests__/tour-state.test.ts
index 450d73ce2..b46b1c8d6 100644
--- a/src/lib/onboarding/__tests__/tour-state.test.ts
+++ b/src/lib/onboarding/__tests__/tour-state.test.ts
@@ -3,6 +3,7 @@ import { describe, expect, it } from "vitest";
 import {
   buildTourStops,
   currentStop,
+  deriveProgress,
   initTourState,
   isTourFinished,
   nextStep,
@@ -11,48 +12,82 @@ import {
   stepCounter,
 } from "../tour-state";
 
+const FULL_ORDER = [
+  "dashboardOverview",
+  "quickAdd",
+  "measurements",
+  "medications",
+  "labs",
+  "illness",
+  "vorsorge",
+  "cycle",
+  "mood",
+  "insights",
+  "coach",
+  "integrations",
+  "export",
+  "achievements",
+  "wrapUp",
+];
+
 describe("tour-state", () => {
   describe("buildTourStops()", () => {
-    it("includes the achievements stop by default (5 stops)", () => {
+    it("returns all 15 module stops in order with every module on", () => {
       const stops = buildTourStops();
-      expect(stops.map((s) => s.id)).toEqual([
-        "tile-strip",
-        "quick-add",
-        "insights",
-        "integrations",
-        "achievements",
-      ]);
+      expect(stops.map((s) => s.id)).toEqual(FULL_ORDER);
     });
 
-    it("omits the achievements stop when the flag is off (4 stops)", () => {
-      const stops = buildTourStops({ includeAchievements: false });
-      expect(stops.map((s) => s.id)).toEqual([
-        "tile-strip",
-        "quick-add",
-        "insights",
-        "integrations",
-      ]);
+    it("drops a stop whose module resolves to false (default-on otherwise)", () => {
+      const stops = buildTourStops({
+        modules: { cycle: false, mood: false, achievements: false },
+      });
+      const ids = stops.map((s) => s.id);
+      expect(ids).not.toContain("cycle");
+      expect(ids).not.toContain("mood");
+      expect(ids).not.toContain("achievements");
+      // Core + un-disabled modules survive.
+      expect(ids).toContain("dashboardOverview");
+      expect(ids).toContain("labs");
+      expect(ids).toContain("wrapUp");
     });
 
-    it("every stop carries a non-empty i18n title and body key", () => {
-      const stops = buildTourStops();
-      for (const s of stops) {
+    it("keeps a module stop when its key is absent or true (fail-open)", () => {
+      const stops = buildTourStops({ modules: { labs: true } });
+      expect(stops.map((s) => s.id)).toContain("labs");
+      expect(stops.map((s) => s.id)).toContain("mood");
+    });
+
+    it("filterToStop narrows to a single module card", () => {
+      const stops = buildTourStops({ filterToStop: "labs" });
+      expect(stops.map((s) => s.id)).toEqual(["labs"]);
+    });
+
+    it("filterToStop yields nothing when the module is disabled", () => {
+      const stops = buildTourStops({
+        filterToStop: "cycle",
+        modules: { cycle: false },
+      });
+      expect(stops).toEqual([]);
+    });
+
+    it("every stop carries a distinct, namespaced i18n title and body key", () => {
+      for (const s of buildTourStops()) {
         expect(s.titleKey).toMatch(/^onboarding\.tour\.steps\./);
         expect(s.bodyKey).toMatch(/^onboarding\.tour\.steps\./);
         expect(s.titleKey).not.toBe(s.bodyKey);
       }
     });
 
-    it("every stop declares a stable targetId for the data-tour-id contract", () => {
-      const stops = buildTourStops();
-      for (const s of stops) {
-        // `null` is allowed (centred-screen tooltip without a
-        // spotlight cutout) but we currently use real targets for
-        // every stop — a regression here would mean the spotlight
-        // silently falls back to centre-screen.
-        expect(typeof s.targetId === "string" && s.targetId.length > 0).toBe(
-          true,
-        );
+    it("every cross-page stop declares a route; the wrap-up is centred + routeless", () => {
+      for (const s of buildTourStops()) {
+        if (s.id === "wrapUp") {
+          expect(s.targetId).toBeNull();
+          expect(s.route).toBeUndefined();
+          expect(s.placement).toBe("center");
+        } else {
+          expect(typeof s.route).toBe("string");
+          expect(s.targetId).toBeTruthy();
+        }
       }
     });
   });
@@ -62,76 +97,97 @@ describe("tour-state", () => {
       const state = initTourState(buildTourStops());
       expect(state.index).toBe(0);
       expect(state.outcome).toBeNull();
-      expect(isTourFinished(state)).toBe(false);
-      expect(currentStop(state)?.id).toBe("tile-strip");
+      expect(currentStop(state)?.id).toBe("dashboardOverview");
+    });
+
+    it("resumes from a persisted stop id", () => {
+      const state = initTourState(buildTourStops(), "labs");
+      expect(currentStop(state)?.id).toBe("labs");
+    });
+
+    it("ignores a resume id absent from the resolved list", () => {
+      const state = initTourState(
+        buildTourStops({ modules: { cycle: false } }),
+        "cycle",
+      );
+      expect(state.index).toBe(0);
     });
 
     it("nextStep advances through the list", () => {
       let state = initTourState(buildTourStops());
       state = nextStep(state);
-      expect(currentStop(state)?.id).toBe("quick-add");
-      state = nextStep(state);
-      expect(currentStop(state)?.id).toBe("insights");
+      expect(currentStop(state)?.id).toBe("quickAdd");
     });
 
-    it("nextStep on the last step finishes the tour with outcome=completed", () => {
+    it("nextStep on the last step finishes with outcome=completed", () => {
       const stops = buildTourStops();
       let state = initTourState(stops);
-      // step through every stop
-      for (let i = 0; i < stops.length; i++) {
-        state = nextStep(state);
-      }
+      for (let i = 0; i < stops.length; i++) state = nextStep(state);
       expect(state.outcome).toBe("completed");
       expect(isTourFinished(state)).toBe(true);
       expect(currentStop(state)).toBeNull();
     });
 
-    it("prevStep is pinned at index 0 (LeftArrow on first step is a no-op)", () => {
+    it("prevStep is pinned at index 0", () => {
       const state = initTourState(buildTourStops());
-      const back = prevStep(state);
-      expect(back.index).toBe(0);
-      expect(back.outcome).toBeNull();
-    });
-
-    it("prevStep walks backward when not at the start", () => {
-      let state = initTourState(buildTourStops());
-      state = nextStep(state);
-      state = nextStep(state);
-      expect(state.index).toBe(2);
-      const back = prevStep(state);
-      expect(back.index).toBe(1);
+      expect(prevStep(state).index).toBe(0);
     });
 
     it("skipTour from any step finishes with outcome=skipped", () => {
       let state = initTourState(buildTourStops());
-      state = nextStep(state); // on step 2 of 5
+      state = nextStep(state);
       const skipped = skipTour(state);
       expect(skipped.outcome).toBe("skipped");
-      expect(isTourFinished(skipped)).toBe(true);
       expect(currentStop(skipped)).toBeNull();
     });
-
-    it("nextStep / prevStep / skipTour are no-ops once finished", () => {
-      let state = initTourState(buildTourStops());
-      state = skipTour(state);
-      const after = nextStep(prevStep(skipTour(state)));
-      expect(after).toEqual(state);
-    });
   });
 
   describe("stepCounter", () => {
-    it("reports 1-based current and the total step count", () => {
+    it("reports 1-based current and the resolved total", () => {
       const stops = buildTourStops();
       let state = initTourState(stops);
       expect(stepCounter(state)).toEqual({ current: 1, total: stops.length });
       state = nextStep(state);
-      expect(stepCounter(state)).toEqual({ current: 2, total: stops.length });
+      expect(stepCounter(state).current).toBe(2);
     });
 
-    it("clamps `current` to total when the tour is finished", () => {
-      let state = initTourState(buildTourStops({ includeAchievements: false }));
+    it("total tracks the gated list so the counter stays honest", () => {
+      const stops = buildTourStops({ modules: { cycle: false, mood: false } });
+      const state = initTourState(stops);
+      expect(stepCounter(state).total).toBe(stops.length);
+      expect(stops.length).toBe(13);
+    });
+  });
+
+  describe("deriveProgress", () => {
+    it("reports the current stop as the resume point while running", () => {
+      let state = initTourState(buildTourStops());
+      state = nextStep(state);
+      state = nextStep(state);
+      const p = deriveProgress(state);
+      expect(p.lastStopId).toBe("measurements");
+      expect(p.status).toBe("in_progress");
+      expect(p.completedStopIds).toEqual([
+        "dashboardOverview",
+        "quickAdd",
+        "measurements",
+      ]);
+    });
+
+    it("marks completed with every stop reached and a null resume point", () => {
+      const stops = buildTourStops();
+      let state = initTourState(stops);
+      for (let i = 0; i < stops.length; i++) state = nextStep(state);
+      const p = deriveProgress(state);
+      expect(p.status).toBe("completed");
+      expect(p.lastStopId).toBeNull();
+      expect(p.completedStopIds).toHaveLength(stops.length);
+    });
+
+    it("marks skipped", () => {
+      let state = initTourState(buildTourStops());
       state = skipTour(state);
-      expect(stepCounter(state)).toEqual({ current: 4, total: 4 });
+      expect(deriveProgress(state).status).toBe("skipped");
     });
   });
 });
diff --git a/src/lib/onboarding/tour-state.ts b/src/lib/onboarding/tour-state.ts
index a8776cfc5..adff4cd9f 100644
--- a/src/lib/onboarding/tour-state.ts
+++ b/src/lib/onboarding/tour-state.ts
@@ -1,114 +1,245 @@
 /**
  * v1.4.15 Phase B5 — onboarding tour state model.
+ * v1.18.6 — rebuilt as a 15-stop module-by-module guided tour.
  *
- * Pure data + state-machine helpers for the spotlight tour overlaid on
- * the dashboard for first-time users. Kept DOM-free so vitest (Node
- * environment, no jsdom) can exercise the navigation logic directly,
- * matching the project test-style elsewhere.
+ * Pure data + state-machine helpers for the spotlight tour. Kept
+ * DOM-free so vitest (Node environment, no jsdom) can exercise the
+ * navigation logic directly.
  *
- * The UI layer (`src/components/onboarding/tour.tsx`) builds the
- * step list once on mount and then drives navigation through these
- * helpers.
+ * The tour walks every module in the order data → intelligence →
+ * export, teaching each module's value, one hidden capability, and how
+ * it feeds the others. The UI layer (`src/components/onboarding/tour.tsx`)
+ * builds the step list once on mount and then drives navigation through
+ * these helpers.
  *
- * Tour stops are anchored to UI targets via `data-tour-id` attributes
- * (NOT class-name selectors — class names change too often during
- * Tailwind tweaks; `data-tour-id` is a stable contract). Every stop
- * declares its `targetId`; the spotlight component looks up the live
- * element via `document.querySelector('[data-tour-id="<id>"]')`.
- *
- * If a target element is missing at runtime (e.g. user is on a
- * resized layout that hides it), the spotlight falls back to a
- * centred-screen tooltip so the tour never blocks indefinitely.
+ * Stops anchor to UI targets via `data-tour-id` attributes (NOT
+ * class-name selectors — class names churn during Tailwind tweaks;
+ * `data-tour-id` is a stable contract). A stop on another route also
+ * carries a `route`; the overlay `router.push`es there, waits for the
+ * anchor to mount, then measures. A missing target at runtime falls
+ * back to a centred-screen tooltip so the tour never blocks.
  */
 
-/** Stable IDs for every stop in the tour. */
+import type { ModuleKey } from "@/lib/modules/registry";
+
+/** Stable IDs for every stop in the tour, in presentation order. */
 export type TourStopId =
-  | "tile-strip"
-  | "quick-add"
+  | "dashboardOverview"
+  | "quickAdd"
+  | "measurements"
+  | "medications"
+  | "labs"
+  | "illness"
+  | "vorsorge"
+  | "cycle"
+  | "mood"
   | "insights"
+  | "coach"
   | "integrations"
-  | "achievements";
+  | "export"
+  | "achievements"
+  | "wrapUp";
 
 /**
  * One step in the tour. The `targetId` matches a `data-tour-id` on a
- * live element somewhere in the app; the title/body i18n keys live
- * under `onboarding.tour.steps.<id>.*`.
+ * live element; the title/body i18n keys live under
+ * `onboarding.tour.steps.<id>.*`.
  */
 export interface TourStop {
   id: TourStopId;
   /**
    * The `data-tour-id` value of the element to anchor the spotlight
-   * to. May be `null` if the stop is purely informational and should
-   * render in a centred-screen tooltip without a spotlight cutout.
+   * to. `null` for a purely informational centred stop (the wrap-up).
    */
   targetId: string | null;
   /**
-   * Preferred placement of the tooltip relative to the target. The UI
-   * layer is allowed to flip this if the target is too close to a
-   * viewport edge.
+   * Preferred tooltip placement relative to the target. The UI layer
+   * may flip it if the target is too close to a viewport edge.
    */
   placement: "top" | "bottom" | "left" | "right" | "center";
   /** i18n key for the step title. */
   titleKey: string;
   /** i18n key for the step body. */
   bodyKey: string;
+  /**
+   * v1.18.6 — the route this stop's anchor lives on. Absent ⇒ the
+   * anchor is on the current page (the wrap-up centred stop). When set,
+   * the overlay navigates there before measuring. `"/"` is explicit for
+   * the two dashboard stops so the resume path can route back from any
+   * page.
+   */
+  route?: string;
+  /**
+   * v1.18.6 — module gate. When set, the stop is dropped unless the
+   * account's resolved module map has the key enabled (default-on:
+   * only an explicit `false` drops it, mirroring the nav gate).
+   */
+  requiresModule?: ModuleKey;
 }
 
 /**
- * Build the canonical tour-step list. Caller may inject a feature
- * flag — e.g. `includeAchievements: false` if B4 hasn't shipped yet
- * — and we omit that stop without renumbering.
+ * v1.18.6 — the canonical 15-stop module tour. Each entry is a literal
+ * so the order, anchors, routes and gates are one auditable list.
+ */
+const ALL_STOPS: readonly TourStop[] = [
+  {
+    id: "dashboardOverview",
+    targetId: "dashboard-tile-strip",
+    placement: "bottom",
+    route: "/",
+    titleKey: "onboarding.tour.steps.dashboardOverview.title",
+    bodyKey: "onboarding.tour.steps.dashboardOverview.body",
+  },
+  {
+    id: "quickAdd",
+    targetId: "dashboard-quick-add",
+    placement: "bottom",
+    route: "/",
+    titleKey: "onboarding.tour.steps.quickAdd.title",
+    bodyKey: "onboarding.tour.steps.quickAdd.body",
+  },
+  {
+    id: "measurements",
+    targetId: "measurements-hero",
+    placement: "bottom",
+    route: "/measurements",
+    titleKey: "onboarding.tour.steps.measurements.title",
+    bodyKey: "onboarding.tour.steps.measurements.body",
+  },
+  {
+    id: "medications",
+    targetId: "medications-hero",
+    placement: "bottom",
+    route: "/medications",
+    requiresModule: "medications",
+    titleKey: "onboarding.tour.steps.medications.title",
+    bodyKey: "onboarding.tour.steps.medications.body",
+  },
+  {
+    id: "labs",
+    targetId: "labs-hero",
+    placement: "bottom",
+    route: "/labs",
+    requiresModule: "labs",
+    titleKey: "onboarding.tour.steps.labs.title",
+    bodyKey: "onboarding.tour.steps.labs.body",
+  },
+  {
+    id: "illness",
+    targetId: "illness-hero",
+    placement: "bottom",
+    route: "/illness",
+    requiresModule: "illness",
+    titleKey: "onboarding.tour.steps.illness.title",
+    bodyKey: "onboarding.tour.steps.illness.body",
+  },
+  {
+    id: "vorsorge",
+    targetId: "vorsorge-hero",
+    placement: "bottom",
+    route: "/vorsorge",
+    titleKey: "onboarding.tour.steps.vorsorge.title",
+    bodyKey: "onboarding.tour.steps.vorsorge.body",
+  },
+  {
+    id: "cycle",
+    targetId: "cycle-hero",
+    placement: "bottom",
+    route: "/cycle",
+    requiresModule: "cycle",
+    titleKey: "onboarding.tour.steps.cycle.title",
+    bodyKey: "onboarding.tour.steps.cycle.body",
+  },
+  {
+    id: "mood",
+    targetId: "mood-hero",
+    placement: "bottom",
+    route: "/mood",
+    requiresModule: "mood",
+    titleKey: "onboarding.tour.steps.mood.title",
+    bodyKey: "onboarding.tour.steps.mood.body",
+  },
+  {
+    id: "insights",
+    targetId: "insights-hero",
+    placement: "bottom",
+    route: "/insights",
+    requiresModule: "insights",
+    titleKey: "onboarding.tour.steps.insights.title",
+    bodyKey: "onboarding.tour.steps.insights.body",
+  },
+  {
+    id: "coach",
+    targetId: "coach-hero",
+    placement: "bottom",
+    route: "/coach",
+    requiresModule: "coach",
+    titleKey: "onboarding.tour.steps.coach.title",
+    bodyKey: "onboarding.tour.steps.coach.body",
+  },
+  {
+    id: "integrations",
+    targetId: "integrations-hero",
+    placement: "bottom",
+    route: "/settings/integrations",
+    titleKey: "onboarding.tour.steps.integrations.title",
+    bodyKey: "onboarding.tour.steps.integrations.body",
+  },
+  {
+    id: "export",
+    targetId: "export-hero",
+    placement: "bottom",
+    route: "/settings/advanced",
+    titleKey: "onboarding.tour.steps.export.title",
+    bodyKey: "onboarding.tour.steps.export.body",
+  },
+  {
+    id: "achievements",
+    targetId: "achievements-hero",
+    placement: "bottom",
+    route: "/achievements",
+    requiresModule: "achievements",
+    titleKey: "onboarding.tour.steps.achievements.title",
+    bodyKey: "onboarding.tour.steps.achievements.body",
+  },
+  {
+    id: "wrapUp",
+    targetId: null,
+    placement: "center",
+    titleKey: "onboarding.tour.steps.wrapUp.title",
+    bodyKey: "onboarding.tour.steps.wrapUp.body",
+  },
+];
+
+/**
+ * A partial map of `ModuleKey → enabled` — the `modules` field from
+ * `GET /api/auth/me`. Default-on: a missing key or `true` keeps the
+ * stop; only an explicit `false` drops it.
+ */
+export type TourModuleMap = Partial<Record<ModuleKey, boolean>>;
+
+/**
+ * Build the resolved tour-step list for the given module map. Stops
+ * whose `requiresModule` resolves to `false` are dropped without
+ * renumbering the rest.
+ *
+ * `filterToStop` narrows the list to a single stop — the per-module
+ * "Diese Tour zeigen" re-entry shows just that module's card. An
+ * unknown / module-disabled stop id yields an empty list (caller
+ * renders nothing).
  */
 export function buildTourStops(opts?: {
-  includeAchievements?: boolean;
+  modules?: TourModuleMap;
+  filterToStop?: TourStopId;
 }): TourStop[] {
-  const includeAchievements = opts?.includeAchievements ?? true;
-
-  const stops: TourStop[] = [
-    {
-      id: "tile-strip",
-      targetId: "dashboard-tile-strip",
-      placement: "bottom",
-      titleKey: "onboarding.tour.steps.tileStrip.title",
-      bodyKey: "onboarding.tour.steps.tileStrip.body",
-    },
-    {
-      id: "quick-add",
-      targetId: "dashboard-quick-add",
-      placement: "bottom",
-      titleKey: "onboarding.tour.steps.quickAdd.title",
-      bodyKey: "onboarding.tour.steps.quickAdd.body",
-    },
-    {
-      id: "insights",
-      targetId: "nav-insights",
-      placement: "right",
-      titleKey: "onboarding.tour.steps.insights.title",
-      bodyKey: "onboarding.tour.steps.insights.body",
-    },
-    {
-      id: "integrations",
-      // The integrations link sits behind the Settings sub-menu on
-      // some viewports — we anchor to the Settings nav item instead
-      // so the spotlight is always visible without forcing a hover.
-      targetId: "nav-settings",
-      placement: "right",
-      titleKey: "onboarding.tour.steps.integrations.title",
-      bodyKey: "onboarding.tour.steps.integrations.body",
-    },
-  ];
-
-  if (includeAchievements) {
-    stops.push({
-      id: "achievements",
-      targetId: "nav-achievements",
-      placement: "right",
-      titleKey: "onboarding.tour.steps.achievements.title",
-      bodyKey: "onboarding.tour.steps.achievements.body",
-    });
+  const modules = opts?.modules;
+  const gated = ALL_STOPS.filter(
+    (s) => !s.requiresModule || modules?.[s.requiresModule] !== false,
+  );
+  if (opts?.filterToStop) {
+    return gated.filter((s) => s.id === opts.filterToStop);
   }
-
-  return stops;
+  return gated;
 }
 
 /**
@@ -116,29 +247,39 @@ export function buildTourStops(opts?: {
  * helper returns a fresh state instead of mutating in place.
  */
 export interface TourState {
-  /** Index into the steps array. May equal `steps.length` to indicate the tour is complete. */
+  /** Index into the steps array. May equal `steps.length` when complete. */
   index: number;
   /** Cached step list — handy for the renderer. */
   steps: TourStop[];
   /**
-   * `null` while the tour is still running, `"completed"` once the
-   * user reached the end and clicked Done, `"skipped"` if they hit
-   * Skip on any step. Both terminal states cause the same DB write
-   * (`onboardingTourCompleted = true`); we keep them distinct purely
-   * so analytics can tell them apart in audit logs.
+   * `null` while running, `"completed"` once the user reached the end
+   * and clicked Done, `"skipped"` if they hit Skip on any step.
    */
   outcome: "completed" | "skipped" | null;
 }
 
-/** Initial state at the first step. */
-export function initTourState(steps: TourStop[]): TourState {
-  return { index: 0, steps, outcome: null };
+/**
+ * Initial state. `resumeFromStopId` (v1.18.6) seeds the index from a
+ * persisted resume point — if the id is present in the resolved list,
+ * the tour opens there; otherwise it starts at the first stop (e.g. the
+ * resume stop's module was disabled since the checkpoint was written).
+ */
+export function initTourState(
+  steps: TourStop[],
+  resumeFromStopId?: string | null,
+): TourState {
+  let index = 0;
+  if (resumeFromStopId) {
+    const found = steps.findIndex((s) => s.id === resumeFromStopId);
+    if (found >= 0) index = found;
+  }
+  return { index, steps, outcome: null };
 }
 
 /**
- * Advance to the next step. If we're already on the last step, mark
- * the tour `completed`. Calling on a terminal state is a no-op so
- * the renderer can fire-and-forget on rapid double-clicks.
+ * Advance to the next step. On the last step, mark `completed`. A
+ * no-op on a terminal state so the renderer can fire-and-forget on
+ * rapid double-clicks.
  */
 export function nextStep(state: TourState): TourState {
   if (state.outcome !== null) return state;
@@ -151,8 +292,7 @@ export function nextStep(state: TourState): TourState {
 
 /**
  * Step backwards. Pinned at index 0 — the first step has no Back
- * button visually; this helper just no-ops to keep the keyboard
- * shortcut (LeftArrow) safe.
+ * button visually; this keeps the LeftArrow shortcut safe.
  */
 export function prevStep(state: TourState): TourState {
   if (state.outcome !== null) return state;
@@ -187,3 +327,34 @@ export function stepCounter(state: TourState): {
     total: state.steps.length,
   };
 }
+
+/**
+ * v1.18.6 — derive the persisted progress checkpoint from the live
+ * navigation state. Pure so the overlay can fire-and-forget it without
+ * touching the DOM. `completedStopIds` accumulates every stop the user
+ * has reached up to (and including) the current index; `lastStopId` is
+ * the resume point.
+ */
+export function deriveProgress(state: TourState): {
+  lastStopId: string | null;
+  completedStopIds: string[];
+  status: "in_progress" | "completed" | "skipped";
+} {
+  const status =
+    state.outcome === "completed"
+      ? "completed"
+      : state.outcome === "skipped"
+        ? "skipped"
+        : "in_progress";
+  const reachedCount =
+    state.outcome !== null
+      ? state.steps.length
+      : Math.min(state.index + 1, state.steps.length);
+  const completedStopIds = state.steps.slice(0, reachedCount).map((s) => s.id);
+  const current = currentStop(state);
+  return {
+    lastStopId: current?.id ?? null,
+    completedStopIds,
+    status,
+  };
+}

From 33fec28b297a06836a3176249623ecbc1257f8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:49:37 +0200
Subject: [PATCH 34/71] feat(onboarding): per-module tour re-entry +
 consolidated replay

Add a 'Diese Tour zeigen' affordance to every module header that opens the
tour narrowed to that module's card in place, plus additive data-tour
anchors (measurements/medications/labs/illness/vorsorge/cycle/mood/
insights/coach/integrations/export/achievements) so the cross-page walk
has a real target on each page. Consolidate the full-tour replay onto a
single Settings -> Advanced card, relabel it, and drop the duplicate from
About. The replay reset clears the stored progress so it restarts cleanly.
---
 messages/de.json                              |   4 +-
 messages/en.json                              |   4 +-
 messages/es.json                              |   4 +-
 messages/fr.json                              |   4 +-
 messages/it.json                              |   4 +-
 messages/pl.json                              |   4 +-
 src/app/achievements/page.tsx                 |  23 +++-
 src/app/admin/[section]/renderer.tsx          |   6 +-
 src/app/coach/page.tsx                        |  29 +++--
 src/app/labs/page.tsx                         |   7 +-
 src/app/measurements/page.tsx                 |  23 ++--
 src/app/medications/page.tsx                  |   7 +-
 src/app/mood/page.tsx                         |   7 +-
 src/components/cycle/cycle-view.tsx           |  23 ++--
 src/components/dashboard/dashboard-header.tsx |   3 +
 src/components/illness/illness-view.tsx       |  23 ++--
 .../insights/insights-tab-strip.tsx           |   6 +
 .../vorsorge-section.tsx                      |   3 +
 .../onboarding/module-tour-trigger.tsx        |  53 ++++++++
 .../settings/__tests__/sections.test.tsx      |  35 ++---
 src/components/settings/about-section.tsx     | 121 +-----------------
 .../settings/gesundheitsakte-section.tsx      |   8 +-
 .../settings/integrations-section.tsx         |   9 +-
 src/lib/onboarding/tour-state.ts              |   2 +-
 24 files changed, 202 insertions(+), 210 deletions(-)
 create mode 100644 src/components/onboarding/module-tour-trigger.tsx

diff --git a/messages/de.json b/messages/de.json
index 83131c9e2..d67ae50ec 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Dokumentation",
       "linksHeading": "Quellen & Dokumentation",
-      "newerAvailable": "Neue Version: {tag}",
-      "tourReplay": "Tour ansehen",
-      "tourReplayHint": "Zeige die Dashboard-Tour — praktisch, falls du sie beim ersten Besuch übersprungen hast."
+      "newerAvailable": "Neue Version: {tag}"
     },
     "testConnection": {
       "test": "Verbindung testen",
diff --git a/messages/en.json b/messages/en.json
index 092fe42e9..79fe8ba31 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Documentation",
       "linksHeading": "Sources & docs",
-      "newerAvailable": "Newer version: {tag}",
-      "tourReplay": "Replay the tour",
-      "tourReplayHint": "Watch the dashboard walkthrough — handy if you skipped it on first visit."
+      "newerAvailable": "Newer version: {tag}"
     },
     "testConnection": {
       "test": "Test connection",
diff --git a/messages/es.json b/messages/es.json
index 2110b8cd6..e979134af 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Documentación",
       "linksHeading": "Fuentes y documentación",
-      "newerAvailable": "Nueva versión: {tag}",
-      "tourReplay": "Volver a ver el recorrido",
-      "tourReplayHint": "Mira el recorrido del panel — útil si lo saltaste en la primera visita."
+      "newerAvailable": "Nueva versión: {tag}"
     },
     "testConnection": {
       "test": "Probar conexión",
diff --git a/messages/fr.json b/messages/fr.json
index 8f6e5a3d4..ccb1c3e92 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Documentation",
       "linksHeading": "Sources et documentation",
-      "newerAvailable": "Nouvelle version : {tag}",
-      "tourReplay": "Revoir la visite",
-      "tourReplayHint": "Voir la visite guidée du tableau de bord — pratique si tu l'as sautée à la première visite."
+      "newerAvailable": "Nouvelle version : {tag}"
     },
     "testConnection": {
       "test": "Tester la connexion",
diff --git a/messages/it.json b/messages/it.json
index 2f80c5675..3aea8285f 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Documentazione",
       "linksHeading": "Fonti e documentazione",
-      "newerAvailable": "Nuova versione: {tag}",
-      "tourReplay": "Rivedi il tour",
-      "tourReplayHint": "Guarda il tour della dashboard — utile se l'hai saltato alla prima visita."
+      "newerAvailable": "Nuova versione: {tag}"
     },
     "testConnection": {
       "test": "Prova connessione",
diff --git a/messages/pl.json b/messages/pl.json
index 2c637227b..41f7b38be 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -4621,9 +4621,7 @@
       "changelog": "Changelog",
       "docs": "Dokumentacja",
       "linksHeading": "Źródła i dokumentacja",
-      "newerAvailable": "Nowa wersja: {tag}",
-      "tourReplay": "Obejrzyj samouczek",
-      "tourReplayHint": "Zobacz przewodnik po panelu — przydatne, jeśli pominąłeś go przy pierwszej wizycie."
+      "newerAvailable": "Nowa wersja: {tag}"
     },
     "testConnection": {
       "test": "Testuj połączenie",
diff --git a/src/app/achievements/page.tsx b/src/app/achievements/page.tsx
index 513927772..f0a9448c3 100644
--- a/src/app/achievements/page.tsx
+++ b/src/app/achievements/page.tsx
@@ -34,6 +34,7 @@ import { Badge } from "@/components/ui/badge";
 import { EmptyState } from "@/components/ui/empty-state";
 import { useAuth } from "@/hooks/use-auth";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { formatDate } from "@/lib/format";
 import { useAchievementsQuery } from "@/lib/queries/use-achievements-query";
 import {
@@ -317,13 +318,21 @@ export default function AchievementsPage() {
 
   return (
     <div className="space-y-6">
-      <div>
-        <h1 className="text-2xl font-bold tracking-tight">
-          {t("achievements.title")}
-        </h1>
-        <p className="text-muted-foreground text-sm">
-          {t("achievements.subtitle")}
-        </p>
+      <div className="flex items-start justify-between gap-3">
+        <div className="min-w-0">
+          <h1
+            data-tour-id="achievements-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
+            {t("achievements.title")}
+          </h1>
+          <p className="text-muted-foreground text-sm">
+            {t("achievements.subtitle")}
+          </p>
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="achievements" />
+        </div>
       </div>
 
       <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
diff --git a/src/app/admin/[section]/renderer.tsx b/src/app/admin/[section]/renderer.tsx
index 8bd9e34be..aeea25435 100644
--- a/src/app/admin/[section]/renderer.tsx
+++ b/src/app/admin/[section]/renderer.tsx
@@ -194,9 +194,9 @@ export function AdminSectionRenderer({
       // v1.4.36 W4e — About section reused as-is from the settings
       // surface. The component owns its own heading + cards layout
       // so no SectionFrame wrapper.
-      // v1.18.1 E5 — hide the onboarding "Replay tour" card on the admin
-      // surface; it's a user-facing affordance with no admin-side use.
-      return <AboutSection hideTourReplay />;
+      // v1.18.6 — the About surface no longer carries the tour-replay card
+      // (consolidated onto Settings → Advanced), so there's nothing to hide.
+      return <AboutSection />;
     default:
       slug satisfies never;
       return null;
diff --git a/src/app/coach/page.tsx b/src/app/coach/page.tsx
index 23363d12e..d8c0d5402 100644
--- a/src/app/coach/page.tsx
+++ b/src/app/coach/page.tsx
@@ -6,6 +6,7 @@ import { Minimize2 } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
 import { CoachConversation } from "@/components/insights/coach-panel/coach-conversation";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { useTranslations } from "@/lib/i18n/context";
 import { useCoachLaunch } from "@/lib/insights/coach-launch-context";
 import { useFeatureFlags } from "@/hooks/use-feature-flags";
@@ -61,6 +62,7 @@ export default function CoachPage() {
   return (
     <div
       data-slot="coach-page"
+      data-tour-id="coach-hero"
       // v1.18.1 (W-COACH-UI C1/C3) — the card was capped at
       // `100dvh-13rem`, leaving a band of wasted space below it on a
       // standalone route that no longer carries the Insights tab strip.
@@ -77,18 +79,21 @@ export default function CoachPage() {
           <h1 className="min-w-0 truncate text-sm font-semibold">{title}</h1>
         )}
         leadingHeaderActions={
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            onClick={handleMinimize}
-            data-slot="coach-page-minimize"
-            aria-label={t("insights.coach.minimizeAriaLabel")}
-            title={t("insights.coach.minimizeAriaLabel")}
-            className="text-muted-foreground hover:text-foreground size-11 shrink-0"
-          >
-            <Minimize2 className="size-4" aria-hidden="true" />
-          </Button>
+          <>
+            <ModuleTourTrigger stopId="coach" />
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              onClick={handleMinimize}
+              data-slot="coach-page-minimize"
+              aria-label={t("insights.coach.minimizeAriaLabel")}
+              title={t("insights.coach.minimizeAriaLabel")}
+              className="text-muted-foreground hover:text-foreground size-11 shrink-0"
+            >
+              <Minimize2 className="size-4" aria-hidden="true" />
+            </Button>
+          </>
         }
       />
     </div>
diff --git a/src/app/labs/page.tsx b/src/app/labs/page.tsx
index 8ef9835e3..98196c102 100644
--- a/src/app/labs/page.tsx
+++ b/src/app/labs/page.tsx
@@ -22,6 +22,7 @@ import { useMounted } from "@/hooks/use-mounted";
 import { usePullToRefresh } from "@/hooks/use-pull-to-refresh";
 import { useTranslations } from "@/lib/i18n/context";
 import { queryKeys } from "@/lib/query-keys";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export default function LabsPage() {
   const { isAuthenticated, isLoading } = useAuth();
@@ -63,7 +64,10 @@ export default function LabsPage() {
       <PullToRefreshIndicator {...pull} />
       <div className="flex items-start justify-between gap-3">
         <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="labs-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("labs.title")}
           </h1>
           <p className="text-muted-foreground text-xs sm:text-sm">
@@ -71,6 +75,7 @@ export default function LabsPage() {
           </p>
         </div>
         <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="labs" />
           <Button
             onClick={() => setDialogOpen(true)}
             className="min-h-11 sm:min-h-9"
diff --git a/src/app/measurements/page.tsx b/src/app/measurements/page.tsx
index 1689ed852..7e72ff863 100644
--- a/src/app/measurements/page.tsx
+++ b/src/app/measurements/page.tsx
@@ -16,6 +16,7 @@ import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
 import { Plus, Loader2 } from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export default function MeasurementsPage() {
   const { isAuthenticated, isLoading } = useAuth();
@@ -110,7 +111,10 @@ export default function MeasurementsPage() {
       <PullToRefreshIndicator {...pull} />
       <div className="flex items-center justify-between">
         <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="measurements-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("measurements.title")}
           </h1>
           {/* v1.4.34 IW-G — subtitle now stays visible on mobile so
@@ -120,13 +124,16 @@ export default function MeasurementsPage() {
             {t("measurements.subtitle")}
           </p>
         </div>
-        <Button
-          className="min-h-11 shrink-0 sm:min-h-9"
-          onClick={() => setDialogOpen(true)}
-        >
-          <Plus className="h-4 w-4" />
-          {t("measurements.addMeasurement")}
-        </Button>
+        <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="measurements" />
+          <Button
+            className="min-h-11 sm:min-h-9"
+            onClick={() => setDialogOpen(true)}
+          >
+            <Plus className="h-4 w-4" />
+            {t("measurements.addMeasurement")}
+          </Button>
+        </div>
       </div>
 
       <ResponsiveSheet
diff --git a/src/app/medications/page.tsx b/src/app/medications/page.tsx
index cc2ab5653..7aa906b6c 100644
--- a/src/app/medications/page.tsx
+++ b/src/app/medications/page.tsx
@@ -7,6 +7,7 @@ import { useRouter, useSearchParams } from "next/navigation";
 import { useAuth } from "@/hooks/use-auth";
 import { useTranslations } from "@/lib/i18n/context";
 import { queryKeys } from "@/lib/query-keys";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { MedicationWizardDialog } from "@/components/medications/wizard/MedicationWizardDialog";
 import { MedicationCard } from "@/components/medications/medication-card";
 import { Glp1MedicationCard } from "@/components/medications/glp1-medication-card";
@@ -328,7 +329,10 @@ export default function MedicationsPage() {
     <div className="space-y-6">
       <div className="flex items-start justify-between gap-3">
         <div className="min-w-0 space-y-1">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="medications-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("medications.title")}
           </h1>
           {/* v1.4.34 IW-G — subtitle stays visible on mobile so the
@@ -338,6 +342,7 @@ export default function MedicationsPage() {
           </p>
         </div>
         <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="medications" />
           {/* v1.16.11 (#316) — "Alle fälligen einnehmen". Contextual, not a
               permanent fixture: it renders only while at least TWO
               medications are currently due (a single due dose is the
diff --git a/src/app/mood/page.tsx b/src/app/mood/page.tsx
index 8d959076e..9a8485974 100644
--- a/src/app/mood/page.tsx
+++ b/src/app/mood/page.tsx
@@ -15,6 +15,7 @@ import { Plus, Loader2, Wrench } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export default function MoodPage() {
   const { isAuthenticated, isLoading } = useAuth();
@@ -65,7 +66,10 @@ export default function MoodPage() {
       <PullToRefreshIndicator {...pull} />
       <div className="flex items-center justify-between">
         <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="mood-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("mood.title")}
           </h1>
           {/* v1.4.34 IW-G — subtitle stays visible on mobile so the
@@ -75,6 +79,7 @@ export default function MoodPage() {
           </p>
         </div>
         <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="mood" />
           {/* v1.17 — the wrench is the one customize entry point: it
               links to /settings/mood, which owns the tag groups, custom
               tags, visibility, and picker order. Same glyph, slot (left
diff --git a/src/components/cycle/cycle-view.tsx b/src/components/cycle/cycle-view.tsx
index 35e831be1..381316336 100644
--- a/src/components/cycle/cycle-view.tsx
+++ b/src/components/cycle/cycle-view.tsx
@@ -8,6 +8,7 @@ import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { cn } from "@/lib/utils";
 import { CycleRing } from "./cycle-ring";
 import { BbtChart } from "./bbt-chart";
@@ -139,20 +140,26 @@ export function CycleView() {
     <div className="space-y-6">
       <div className="flex items-start justify-between gap-3">
         <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="cycle-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("cycle.title")}
           </h1>
           <p className="text-muted-foreground text-xs sm:text-sm">
             {t("cycle.subtitle")}
           </p>
         </div>
-        <Button
-          onClick={() => openSheet(today)}
-          className="min-h-11 shrink-0 sm:min-h-9"
-        >
-          <Plus className="h-4 w-4" />
-          {t("cycle.logToday")}
-        </Button>
+        <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="cycle" />
+          <Button
+            onClick={() => openSheet(today)}
+            className="min-h-11 sm:min-h-9"
+          >
+            <Plus className="h-4 w-4" />
+            {t("cycle.logToday")}
+          </Button>
+        </div>
       </div>
 
       {/* Desktop: ring (left) + tabs (right). Single column below lg. */}
diff --git a/src/components/dashboard/dashboard-header.tsx b/src/components/dashboard/dashboard-header.tsx
index 79aa15331..54ce87021 100644
--- a/src/components/dashboard/dashboard-header.tsx
+++ b/src/components/dashboard/dashboard-header.tsx
@@ -23,6 +23,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { useAuth } from "@/hooks/use-auth";
 import { useMounted } from "@/hooks/use-mounted";
 import { getHourForTimeZone } from "@/components/dashboard/range-display";
@@ -96,6 +97,8 @@ export function DashboardHeader({
         ) : null}
       </div>
       <div className="flex shrink-0 items-center gap-2">
+        {/* v1.18.6 — re-enter the guided module tour from the dashboard. */}
+        <ModuleTourTrigger stopId="dashboardOverview" />
         {/* Customize shortcut to the dashboard-customization settings
             (the tile/layout editor at /settings/dashboard). Sits to
             the left of the add button as a monochrome ghost icon, with
diff --git a/src/components/illness/illness-view.tsx b/src/components/illness/illness-view.tsx
index 88d533285..49ffe5b9c 100644
--- a/src/components/illness/illness-view.tsx
+++ b/src/components/illness/illness-view.tsx
@@ -32,6 +32,7 @@ import { EmptyState } from "@/components/ui/empty-state";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
 import { useTranslations, useFormatters } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 import { LogDaySheet } from "./log-day-sheet";
 import { NewEpisodeSheet } from "./new-episode-sheet";
@@ -256,20 +257,26 @@ export function IllnessView() {
     <div className="space-y-6">
       <div className="flex items-start justify-between gap-3">
         <div className="min-w-0">
-          <h1 className="text-2xl font-bold tracking-tight">
+          <h1
+            data-tour-id="illness-hero"
+            className="text-2xl font-bold tracking-tight"
+          >
             {t("illness.title")}
           </h1>
           <p className="text-muted-foreground text-xs sm:text-sm">
             {t("illness.subtitle")}
           </p>
         </div>
-        <Button
-          onClick={() => setNewOpen(true)}
-          className="min-h-11 shrink-0 sm:min-h-9"
-        >
-          <Plus className="h-4 w-4" />
-          {t("illness.newEpisode")}
-        </Button>
+        <div className="flex shrink-0 items-center gap-2">
+          <ModuleTourTrigger stopId="illness" />
+          <Button
+            onClick={() => setNewOpen(true)}
+            className="min-h-11 sm:min-h-9"
+          >
+            <Plus className="h-4 w-4" />
+            {t("illness.newEpisode")}
+          </Button>
+        </div>
       </div>
 
       <p className="text-muted-foreground text-xs">{t("illness.disclaimer")}</p>
diff --git a/src/components/insights/insights-tab-strip.tsx b/src/components/insights/insights-tab-strip.tsx
index 3897468e7..67c74ab16 100644
--- a/src/components/insights/insights-tab-strip.tsx
+++ b/src/components/insights/insights-tab-strip.tsx
@@ -19,6 +19,7 @@ import {
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { cn } from "@/lib/utils";
 import { prefersReducedMotion } from "@/lib/charts/reduced-motion";
 import {
@@ -656,6 +657,7 @@ function InsightsTabStripImpl({
   return (
     <nav
       data-slot="insights-tab-strip"
+      data-tour-id="insights-hero"
       aria-label={t("insights.navAriaLabel")}
       // v1.4.28 FB-D3 — `touch-action: pan-y` lets vertical swipes that
       // begin on the sticky strip scroll the page through it. The
@@ -858,6 +860,10 @@ function InsightsTabStripImpl({
             "from-background/95 pointer-events-none absolute inset-y-0 right-0 w-8 bg-gradient-to-l to-transparent sm:hidden",
           )}
         />
+        {/* v1.18.6 — per-module tour re-entry, travelling with the
+            top-right control cluster. Anchors to this strip's
+            `insights-hero` and opens the Insights tour card on the spot. */}
+        <ModuleTourTrigger stopId="insights" />
         {/* v1.15.18 — customise cog. Sits immediately LEFT of the
             regenerate button and links to the Insights settings section
             (overview arrange + pill sort), matching the Dashboard cog
diff --git a/src/components/measurement-reminders/vorsorge-section.tsx b/src/components/measurement-reminders/vorsorge-section.tsx
index eb814c05b..3ec86c63a 100644
--- a/src/components/measurement-reminders/vorsorge-section.tsx
+++ b/src/components/measurement-reminders/vorsorge-section.tsx
@@ -32,6 +32,7 @@ import { useState } from "react";
 import { CalendarClock, CheckCircle2, Plus, Settings2 } from "lucide-react";
 
 import { useFormatters, useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { SettingsCardHeader } from "@/components/settings/_card-header";
 import {
   AlertDialog,
@@ -370,6 +371,7 @@ export function VorsorgeSection({
           <div className="min-w-0">
             <h1
               id="vorsorge-section-title"
+              data-tour-id="vorsorge-hero"
               className="text-2xl font-bold tracking-tight"
             >
               {t("measurementReminders.sectionTitle")}
@@ -379,6 +381,7 @@ export function VorsorgeSection({
             </p>
           </div>
           <div className="flex shrink-0 items-center gap-2">
+            <ModuleTourTrigger stopId="vorsorge" />
             {addButton}
             {wrenchButton}
           </div>
diff --git a/src/components/onboarding/module-tour-trigger.tsx b/src/components/onboarding/module-tour-trigger.tsx
new file mode 100644
index 000000000..a502cbf16
--- /dev/null
+++ b/src/components/onboarding/module-tour-trigger.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+/**
+ * v1.18.6 — per-module "Diese Tour zeigen" re-entry.
+ *
+ * A small ghost button each module page drops into its header action
+ * cluster. It dispatches the `healthlog:module-tour` window event with
+ * the page's stop id; the shell-level `<TourLauncher>` picks it up and
+ * opens the spotlight narrowed to that single module card on the
+ * current page (no cross-page navigation, no completion flip).
+ *
+ * Anchors to the page's `data-tour="<…>-hero"` element via the launcher
+ * → overlay path. The button itself carries no anchor — it only fires
+ * the event.
+ */
+
+import { Compass } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import { useTranslations } from "@/lib/i18n/context";
+import type { TourStopId } from "@/lib/onboarding/tour-state";
+
+export function ModuleTourTrigger({ stopId }: { stopId: TourStopId }) {
+  const { t } = useTranslations();
+
+  function show() {
+    if (typeof window === "undefined") return;
+    try {
+      window.dispatchEvent(
+        new CustomEvent("healthlog:module-tour", { detail: { stopId } }),
+      );
+    } catch {
+      /* ignore — sandboxed iframes etc. */
+    }
+  }
+
+  return (
+    <Button
+      type="button"
+      variant="ghost"
+      size="sm"
+      onClick={show}
+      // 44px mobile tap floor, matching the rest of the module headers.
+      className="text-muted-foreground hover:text-foreground min-h-11 sm:min-h-9"
+      data-testid={`module-tour-trigger-${stopId}`}
+    >
+      <Compass className="h-4 w-4" />
+      <span className="sr-only sm:not-sr-only">
+        {t("onboarding.tour.moduleTrigger")}
+      </span>
+    </Button>
+  );
+}
diff --git a/src/components/settings/__tests__/sections.test.tsx b/src/components/settings/__tests__/sections.test.tsx
index 1eddc6cca..50704d6e9 100644
--- a/src/components/settings/__tests__/sections.test.tsx
+++ b/src/components/settings/__tests__/sections.test.tsx
@@ -119,12 +119,13 @@ describe("settings sections — SSR smoke", () => {
     expect(html).not.toContain("settings.sections.");
   });
 
-  it("<AdvancedSection> exposes the Restart-tour button (moved from Account)", () => {
-    // v1.18.1 (D1) — the "Restart onboarding tour" card moved from Settings →
-    // Account into Settings → Advanced (a maintenance/reset action).
+  it("<AdvancedSection> exposes the single Restart-tour card", () => {
+    // v1.18.1 (D1) — the tour-replay card moved from Account into Advanced.
+    // v1.18.6 — relabelled "Restart module tour" and consolidated as the one
+    // full-tour replay home (the About duplicate was removed).
     const html = render(<AdvancedSection />);
     expect(html).toContain('data-testid="settings-restart-tour"');
-    expect(html).toContain("Restart onboarding tour");
+    expect(html).toContain("Restart module tour");
     // No raw i18n key leaks.
     expect(html).not.toContain("onboarding.tour.");
   });
@@ -148,27 +149,13 @@ describe("settings sections — SSR smoke", () => {
     expect(html).not.toContain("settings.about.");
   });
 
-  it("<AboutSection> exposes a Replay-tour button for the W5 chain gate", () => {
+  it("<AboutSection> no longer carries a tour-replay card (consolidated to Advanced)", () => {
+    // v1.18.6 — the tour replay lives on one home in Settings → Advanced;
+    // the About duplicate was removed. Per-module "Diese Tour zeigen"
+    // affordances cover in-context re-entry.
     const html = render(<AboutSection />);
-    // v1.4.47 W5 — the spotlight tour now auto-launches only ≥ 24 h
-    // after the wizard finishes (see `shouldAutoLaunchTour` in
-    // `components/onboarding/tour-launcher.tsx`). A first-day user who
-    // *does* want the tour needs a discoverable manual trigger, and
-    // Settings → About is the surface every user can find. Pin both
-    // the data-testid and the visible copy so a future refactor can't
-    // silently drop the button.
-    expect(html).toContain('data-testid="about-replay-tour"');
-    expect(html).toContain("Replay the tour");
-    // No raw i18n key leaks past the i18n layer.
-    expect(html).not.toContain("settings.about.tourReplay");
-  });
-
-  it("<AboutSection> renders the German Replay-tour label end-to-end", () => {
-    // project-voice + i18n parity: the W5 spec explicitly names this
-    // surface "Tour ansehen" in German. Lock the resolved copy so a
-    // future locale-bundle drift doesn't silently fall back to English.
-    const html = render(<AboutSection />, "de");
-    expect(html).toContain("Tour ansehen");
+    expect(html).not.toContain('data-testid="about-replay-tour"');
+    expect(html).not.toContain("Replay the tour");
   });
 
   it("<AiSection> renders the AI Insights heading", () => {
diff --git a/src/components/settings/about-section.tsx b/src/components/settings/about-section.tsx
index e79e452f8..847c43357 100644
--- a/src/components/settings/about-section.tsx
+++ b/src/components/settings/about-section.tsx
@@ -5,7 +5,6 @@ import { useQuery } from "@tanstack/react-query";
 import {
   ArrowUpCircle,
   BookOpen,
-  Compass,
   ExternalLink,
   GitBranch,
   Info,
@@ -15,9 +14,7 @@ import {
 
 import { Button } from "@/components/ui/button";
 import { SettingsCardHeader } from "@/components/settings/_card-header";
-import { useAuth } from "@/hooks/use-auth";
 import { useFormatters, useTranslations } from "@/lib/i18n/context";
-import { restartOnboardingTour } from "@/lib/onboarding/tour-restart";
 import { queryKeys } from "@/lib/query-keys";
 import { apiFetchRaw, apiGet } from "@/lib/api/api-fetch";
 
@@ -118,25 +115,9 @@ export function UpdateBadge({
   );
 }
 
-export interface AboutSectionProps {
-  /**
-   * v1.18.1 E5 — suppress the "Replay tour" card. The admin → Über
-   * surface reuses this component but the onboarding tour is a
-   * user-facing affordance with no place in the admin console, so the
-   * admin renderer passes `hideTourReplay`. The Settings → About surface
-   * leaves it on.
-   */
-  hideTourReplay?: boolean;
-}
-
-export function AboutSection({ hideTourReplay = false }: AboutSectionProps = {}) {
+export function AboutSection() {
   const { t } = useTranslations();
   const fmt = useFormatters();
-  // Pull the auth user — only needed so the "Replay the tour" button
-  // can stamp a per-user force-launch marker into sessionStorage. The
-  // hook is cheap (a cached `/api/auth/me` read) and every settings
-  // page already lives behind the same auth boundary.
-  const { user } = useAuth();
 
   const { data: version, isLoading } = useQuery({
     queryKey: queryKeys.apiVersion(),
@@ -147,45 +128,6 @@ export function AboutSection({ hideTourReplay = false }: AboutSectionProps = {})
     staleTime: Infinity,
   });
 
-  // v1.4.47 W5 — onboarding chain-gate: the spotlight tour now auto-
-  // launches only ≥ 24 h after the wizard finishes (see
-  // `shouldAutoLaunchTour` in `components/onboarding/tour-launcher.tsx`).
-  // The carousel + tour no longer stack into ~90 s of forced onboarding
-  // on first visit. The tradeoff: a first-day user who *does* want the
-  // tour needs a discoverable manual trigger. Settings → About is the
-  // surface every user can find (every locale puts "About" right on the
-  // settings shell), so it carries the replay button next to the
-  // sources/docs links. Settings → Account still has its own
-  // "Restart onboarding tour" — both buttons share the same flow.
-  const [replayingTour, setReplayingTour] = useState(false);
-  // v1.4.48 M6c — text + type collapsed into one discriminated state so
-  // the two values can never drift (a "success" message rendered in the
-  // destructive colour was the latent bug class).
-  const [tourFeedback, setTourFeedback] = useState<{
-    text: string;
-    type: "success" | "error";
-  } | null>(null);
-
-  async function handleReplayTour() {
-    setReplayingTour(true);
-    setTourFeedback(null);
-    // v1.4.48 M6b — both Settings → Account and Settings → About now
-    // delegate to the shared `restartOnboardingTour()` worker so the
-    // server flip + force-launch marker + window event live in one
-    // place. The helper returns a discriminated result; this surface
-    // only owns the translation + feedback rendering.
-    const result = await restartOnboardingTour(user?.id);
-    if (result.ok) {
-      setTourFeedback({
-        text: t("onboarding.tour.restartConfirmation"),
-        type: "success",
-      });
-    } else {
-      setTourFeedback({ text: t(result.messageKey), type: "error" });
-    }
-    setReplayingTour(false);
-  }
-
   // v1.4.36 W4f — the explicit "Check for updates" button is gone;
   // only the 24 h auto-check stays. When the auto-check reports
   // `newer_available`, a subtle upward-arrow badge appears next to
@@ -364,63 +306,10 @@ export function AboutSection({ hideTourReplay = false }: AboutSectionProps = {})
         </div>
       )}
 
-      {/* v1.4.47 W5 — Replay tour card. The dashboard spotlight
-          tour now auto-launches only ≥ 24 h after the wizard finishes,
-          so a first-day user who wants to see it still needs a
-          discoverable manual trigger. About is the surface every user
-          can find (it's the standard "where am I?" stop in the
-          settings shell), so the button lives here next to version +
-          links. Mirrors the stack-on-mobile / right-align-on-desktop
-          contract used by the Account section's "Restart onboarding
-          tour" card so the two surfaces feel consistent.
-
-          v1.18.1 E5 — hidden on the admin → Über surface (`hideTourReplay`):
-          the onboarding tour is a user-facing affordance with no place in
-          the admin console. */}
-      {!hideTourReplay && (
-        <div className="bg-card border-border rounded-xl border p-4 sm:p-6">
-          <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between sm:gap-2">
-            <div className="flex items-start gap-2">
-              <Compass className="text-muted-foreground mt-0.5 h-5 w-5 shrink-0" />
-              <div className="space-y-1">
-                <h2 className="text-lg font-semibold">
-                  {t("settings.about.tourReplay")}
-                </h2>
-                <p className="text-muted-foreground text-xs">
-                  {t("settings.about.tourReplayHint")}
-                </p>
-              </div>
-            </div>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={handleReplayTour}
-              disabled={replayingTour}
-              data-testid="about-replay-tour"
-              className="w-full shrink-0 sm:w-auto"
-            >
-              {replayingTour ? (
-                <Loader2 className="h-4 w-4 animate-spin motion-reduce:animate-none" />
-              ) : (
-                <Compass className="h-4 w-4" />
-              )}
-              {t("settings.about.tourReplay")}
-            </Button>
-          </div>
-          {tourFeedback && (
-            <p
-              role="alert"
-              className={`mt-2 pl-7 text-xs ${
-                tourFeedback.type === "success"
-                  ? "text-success"
-                  : "text-destructive"
-              }`}
-            >
-              {tourFeedback.text}
-            </p>
-          )}
-        </div>
-      )}
+      {/* v1.18.6 — the tour-replay card consolidated onto a single home in
+          Settings → Advanced ("Modul-Tour neu starten"). The About surface
+          no longer duplicates it; per-module "Diese Tour zeigen" affordances
+          on every module page cover in-context re-entry. */}
 
       {/* v1.4.36 W4f — the dedicated "Updates" card with the
           manual "Check for updates" button is gone. The 24 h auto-
diff --git a/src/components/settings/gesundheitsakte-section.tsx b/src/components/settings/gesundheitsakte-section.tsx
index dfa9d047d..7bf511e54 100644
--- a/src/components/settings/gesundheitsakte-section.tsx
+++ b/src/components/settings/gesundheitsakte-section.tsx
@@ -19,6 +19,7 @@
 
 import { HealthRecordExportPanel } from "@/components/settings/health-record-export-panel";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export function GesundheitsakteSection() {
   const { t } = useTranslations();
@@ -28,13 +29,18 @@ export function GesundheitsakteSection() {
       className="space-y-6"
     >
       {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
+      <header className="flex items-center justify-end">
         <h1
           id="settings-section-gesundheitsakte-title"
           className="sr-only"
         >
           {t("settings.sections.gesundheitsakte.title")}
         </h1>
+        {/* v1.18.6 — guided-tour re-entry for the doctor-report module + a
+            real spotlight anchor (the section h1 is sr-only). */}
+        <span data-tour-id="export-hero">
+          <ModuleTourTrigger stopId="export" />
+        </span>
       </header>
 
       <HealthRecordExportPanel />
diff --git a/src/components/settings/integrations-section.tsx b/src/components/settings/integrations-section.tsx
index 6ed4792c8..2bd9fc16c 100644
--- a/src/components/settings/integrations-section.tsx
+++ b/src/components/settings/integrations-section.tsx
@@ -17,6 +17,7 @@
 
 import { ConnectionsPanel } from "@/components/settings/integrations/connections-panel";
 import { useTranslations } from "@/lib/i18n/context";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export {
   parseOAuthOutcome,
@@ -32,10 +33,16 @@ export function IntegrationsSection() {
       className="space-y-6"
     >
       {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
+      <header className="flex items-center justify-end">
         <h1 id="settings-section-integrations-title" className="sr-only">
           {t("settings.sections.integrations.title")}
         </h1>
+        {/* v1.18.6 — guided-tour re-entry for the integrations module. The
+            visible affordance also gives the spotlight a real anchor (the
+            section h1 is sr-only). */}
+        <span data-tour-id="integrations-hero">
+          <ModuleTourTrigger stopId="integrations" />
+        </span>
       </header>
 
       <ConnectionsPanel />
diff --git a/src/lib/onboarding/tour-state.ts b/src/lib/onboarding/tour-state.ts
index adff4cd9f..6106f2b67 100644
--- a/src/lib/onboarding/tour-state.ts
+++ b/src/lib/onboarding/tour-state.ts
@@ -189,7 +189,7 @@ const ALL_STOPS: readonly TourStop[] = [
     id: "export",
     targetId: "export-hero",
     placement: "bottom",
-    route: "/settings/advanced",
+    route: "/settings/gesundheitsakte",
     titleKey: "onboarding.tour.steps.export.title",
     bodyKey: "onboarding.tour.steps.export.body",
   },

From 91fd0b438e302e689039c66c86e63861116e5333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 19:52:40 +0200
Subject: [PATCH 35/71] refactor(onboarding): stabilise the tour progress
 callback

Memoise the launcher's progress handler so the overlay checkpoint effect
fires on a real step transition rather than on every launcher re-render.
---
 src/components/onboarding/tour-launcher.tsx | 27 +++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/onboarding/tour-launcher.tsx b/src/components/onboarding/tour-launcher.tsx
index 4254e0770..c76b6c0d1 100644
--- a/src/components/onboarding/tour-launcher.tsx
+++ b/src/components/onboarding/tour-launcher.tsx
@@ -48,7 +48,7 @@
  */
 
 import { usePathname } from "next/navigation";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 
 import { useAuth } from "@/hooks/use-auth";
@@ -430,6 +430,17 @@ export function TourLauncher({ ready = true }: TourLauncherProps) {
     };
   }, []);
 
+  // v1.18.6 — stable progress callback so the overlay's checkpoint effect
+  // fires on a real step transition, not on every launcher re-render.
+  const handleProgress = useCallback(
+    (progress: { lastStopId: string | null; completedStopIds: string[]; status: "in_progress" | "completed" | "skipped" }) => {
+      void apiPost("/api/onboarding/tour", {
+        progress: { ...progress, updatedAt: new Date().toISOString() },
+      }).catch(() => {});
+    },
+    [],
+  );
+
   if (showTour !== true) return null;
 
   // The resolved module map gates which stops appear (default-on) and
@@ -446,15 +457,11 @@ export function TourLauncher({ ready = true }: TourLauncherProps) {
       modules={modules}
       resumeFromStopId={resumeFromStopId}
       filterToStop={singleStop ?? undefined}
-      onProgress={(progress) => {
-        // Fire-and-forget checkpoint so a mid-tour reload resumes at the
-        // right module. Skipped implicitly by the overlay for the
-        // single-stop re-entry. A failed write is non-fatal — the resume
-        // point is a convenience, not a correctness invariant.
-        void apiPost("/api/onboarding/tour", {
-          progress: { ...progress, updatedAt: new Date().toISOString() },
-        }).catch(() => {});
-      }}
+      // Fire-and-forget checkpoint so a mid-tour reload resumes at the
+      // right module. Skipped implicitly by the overlay for the single-
+      // stop re-entry. A failed write is non-fatal — the resume point is
+      // a convenience, not a correctness invariant.
+      onProgress={handleProgress}
       onClose={async (outcome) => {
         // Optimistic: hide the overlay immediately, persist in the
         // background. The flag is idempotent so re-fires are safe;

From 9be30897faa7814876ef1423fd3a194bb82cbc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:13:25 +0200
Subject: [PATCH 36/71] feat(insights): add a cited reference-range backbone
 and richer metric explainers

Introduce src/lib/reference-ranges.ts: a structured, citation-backed
per-metric reference-range backbone (band + source body + year) with a
deterministic four-state placement helper, read by the UI surfaces. Each
band traces to the medical-citations registry, which gains the supporting
sources (ACC/AHA 2017 and ESC 2024 blood pressure, StatPearls pulse
pressure and mean arterial pressure, ESC/ESH 2018 pulse-wave velocity,
FDA 2024 and StatPearls pulse oximetry, J Gen Intern Med 2019 temperature,
RCP NEWS2 and American Lung Association respiratory rate, visceral-fat
imaging literature, AHA 2024 resting heart rate, ESC/NASPE 1996 HRV,
Wilcox 2000, ACOG 651, Phillips 2017 and CDC 2024 sleep).

Blood pressure keeps ESH 2023 as the labelled default; ACC/AHA 2017 and
ESC 2024 appear only as displayed placement context. Enrich the metric
explainers with concise cited reference bands and a general-guidance
tooltip on every metric page: a darker-skin pulse-oximeter over-read
caveat, device-proxy honesty for readiness/recovery/strain/stress, an
HRV day-to-day-noise note, and a resting-heart-rate clarification. Fill
the empty registry normal ranges, reconcile the steps green floor to
8,000, and tighten the body-temperature band below the fever line. Add
free pulse-pressure and mean-arterial-pressure context on the blood-
pressure detail page, plus cycle-physiology and sleep-hygiene copy across
all six locales. Cycle thresholds carry a verification marker pending an
ACOG source check.
---
 messages/de.json                           |  34 +-
 messages/en.json                           |  46 ++-
 messages/es.json                           |  20 +-
 messages/fr.json                           |  20 +-
 messages/it.json                           |  20 +-
 messages/pl.json                           |  20 +-
 src/app/insights/blood-pressure/page.tsx   |  26 ++
 src/components/insights/sub-page-shell.tsx |  35 +-
 src/lib/__tests__/reference-ranges.test.ts |  98 ++++++
 src/lib/insights/metric-status-registry.ts |  31 +-
 src/lib/medical-citations.ts               | 287 ++++++++++++++++
 src/lib/reference-ranges.ts                | 377 +++++++++++++++++++++
 12 files changed, 985 insertions(+), 29 deletions(-)
 create mode 100644 src/lib/__tests__/reference-ranges.test.ts
 create mode 100644 src/lib/reference-ranges.ts

diff --git a/messages/de.json b/messages/de.json
index d9fab76e8..f30923a92 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2395,7 +2395,7 @@
       "explainer": {
         "trigger": "Was ist {title}?",
         "bloodPressureTitle": "Blutdruck",
-        "bloodPressureBody": "Der Blutdruck ist die Kraft, die das Blut auf die Gefäßwände ausübt, angegeben als systolisch zu diastolisch (Spitzenwert beim Herzschlag über dem Ruhewert dazwischen). Dauerhaft hohe Werte belasten Herz und Gefäße auf Dauer.",
+        "bloodPressureBody": "Der Blutdruck ist die Kraft, die das Blut auf die Gefäßwände ausübt, angegeben als systolisch zu diastolisch (Spitzenwert beim Herzschlag über dem Ruhewert dazwischen). Dauerhaft hohe Werte belasten Herz und Gefäße auf Dauer. Als allgemeine Orientierung gilt nach europäischer Leitlinie (ESH 2023) unter 120/80 als optimal und ab 140/90 als Bluthochdruck; die US-Leitlinie (ACC/AHA 2017) setzt mit 130–139/80–89 (Stadium 1) eine strengere Grenze. Einordnung immer aus einer ruhigen, sitzenden Messung, nie aus einem einzelnen Wert.",
         "pulseTitle": "Puls",
         "pulseBody": "Der Puls gibt an, wie oft das Herz pro Minute schlägt. Eine Einzelmessung spiegelt den Moment wider – in Ruhe liegt er meist bei 60–100 Schlägen pro Minute und steigt natürlicherweise bei Bewegung, Stress oder Koffein.",
         "weightTitle": "Gewicht",
@@ -2413,7 +2413,7 @@
         "hrvTitle": "Herzfrequenzvariabilität (HRV)",
         "hrvBody": "Die HRV ist die kleine Schwankung der Zeit zwischen aufeinanderfolgenden Herzschlägen. Eine höhere Variabilität spiegelt meist ein gut erholtes, anpassungsfähiges Nervensystem wider, ein anhaltender Rückgang kann auf Erschöpfung, Stress oder mangelnde Erholung hinweisen.",
         "oxygenSaturationTitle": "Sauerstoffsättigung (SpO₂)",
-        "oxygenSaturationBody": "Die SpO₂ ist der Prozentsatz der roten Blutkörperchen, die Sauerstoff transportieren. Werte von 95–100 % sind in Ruhe normal; Werte, die dauerhaft unter 90 % liegen, verdienen Aufmerksamkeit, kurze nächtliche Abfälle sind jedoch häufig.",
+        "oxygenSaturationBody": "Die SpO₂ ist der Prozentsatz der roten Blutkörperchen, die Sauerstoff transportieren. Als allgemeine Orientierung sind Werte von 95–100 % in Ruhe normal (StatPearls/NIH 2023); Werte dauerhaft unter 90 % verdienen Aufmerksamkeit, kurze nächtliche Abfälle sind häufig und über ~98 % bringt nichts. Optische Sensoren können die wahre Sättigung bei dunklerer Haut überschätzen (US FDA 2024) — ein einzelner normnaher Wert ist daher keine Entwarnung; bei Sorge warm und ruhig erneut messen.",
         "bodyTemperatureTitle": "Körpertemperatur",
         "bodyTemperatureBody": "Die Körpertemperatur spiegelt deinen Kernwärmezustand wider, normalerweise um 37 °C mit kleinen Tagesschwankungen. Ein anhaltender Anstieg kann auf eine Infektion hindeuten; nächtliche Messungen am Handgelenk erfassen vor allem relative Änderungen, keinen klinischen Wert.",
         "activeEnergyTitle": "Aktive Energie",
@@ -2485,14 +2485,32 @@
         "breathingDisturbancesTitle": "Atemaussetzer im Schlaf",
         "breathingDisturbancesBody": "Deine Apple Watch kann schätzen, wie oft deine Atmung im Schlaf unterbrochen war. Ein niedriger Index ist besser; ein von Apple als erhöht eingestufter Wert — vor allem über viele Nächte — sollte mit einer Ärztin oder einem Arzt besprochen werden.",
         "stepsTitle": "Schritte",
-        "stepsBody": "Die Schrittzahl ist die Gesamtzahl der Schritte, die du täglich gehst. Sie ist das einfachste Maß für Alltagsbewegung — eine höhere Tageszahl spiegelt meist einen aktiveren Lebensstil wider, und eine stetige Gewohnheit zählt mehr als ein einzelner großer Tag.",
-        "readinessBody": "Die Tagesform ist ein einzelner Tageswert dafür, wie bereit dein Körper für den Tag ist — er verbindet Ruhepuls, Herzfrequenzvariabilität, Schlaf und die Beständigkeit deiner letzten Nächte. Ein höherer Wert heißt erholt und belastbar; ein niedrigerer ist ein sanfter Hinweis, einen Gang zurückzuschalten.",
+        "stepsBody": "Die Schrittzahl ist die Gesamtzahl der Schritte, die du täglich gehst. Sie ist das einfachste Maß für Alltagsbewegung, und eine stetige Gewohnheit zählt mehr als ein einzelner großer Tag. Als allgemeine Orientierung fällt das Sterblichkeitsrisiko deutlich Richtung etwa 8.000 Schritte pro Tag, mit weiterem Nutzen bis rund 12.000 (Saint-Maurice JAMA 2020); bei älteren Menschen liegt der optimale Wert niedriger. Die „10.000“ ist ein Werbeslogan, keine Forschung.",
+        "readinessBody": "Die Tagesform ist ein einzelner Tageswert dafür, wie bereit dein Körper für den Tag ist — er verbindet Ruhepuls, Herzfrequenzvariabilität, Schlaf und die Beständigkeit deiner letzten Nächte. Es ist ein Geräte-Näherungswert, der an deinem eigenen Ausgangswert gemessen wird, keine klinische Messung, und zwischen Geräten nicht vergleichbar. Ein höherer Wert heißt erholt und belastbar; ein niedrigerer ist ein sanfter Hinweis, einen Gang zurückzuschalten.",
         "sleepScoreBody": "Dein Schlafscore fasst eine ganze Nacht in einer Zahl zusammen — aus Dauer, Effizienz, Regelmäßigkeit und der Verteilung von Leicht-, Tief- und REM-Schlaf. Achte eher auf das Muster über Wochen als auf einen perfekten Wert in einer einzelnen Nacht.",
-        "recoveryBody": "Die Erholung zeigt, wie gut sich dein Körper regeneriert hat — gestützt auf nächtliche Signale wie Herzfrequenzvariabilität und Ruhepuls. Ein hoher Wert ist grünes Licht, mehr zu geben; ein niedrigerer deutet an, dass dein System noch aufbaut.",
-        "strainBody": "Die Belastung erfasst, wie viel kardiovaskuläre und körperliche Last du deinem Körper zugemutet hast — von Workouts bis zu einem aktiven Tag auf den Beinen. Sobald genügend Verlauf vorliegt, wird sie an deinem eigenen üblichen Aufwand gemessen, nicht an einem fremden Maßstab.",
-        "stressBody": "Stress ist hier eine Schätzung der körperlichen Last auf deinem Nervensystem, vor allem aus Mustern der Herzfrequenzvariabilität abgelesen — nicht daraus, wie du dich bewusst fühlst. Ein niedrigerer Wert deutet auf einen ruhigen, gut regulierten Zustand hin; ein höherer ist eine Einladung, Erholung einzuplanen.",
+        "recoveryBody": "Die Erholung zeigt, wie gut sich dein Körper regeneriert hat — gestützt auf nächtliche Signale wie Herzfrequenzvariabilität und Ruhepuls. Es ist ein geräteabgeleiteter Näherungswert an deinem eigenen Ausgangswert, keine klinische Messung, und zwischen Geräten nicht vergleichbar. Ein hoher Wert ist grünes Licht, mehr zu geben; ein niedrigerer deutet an, dass dein System noch aufbaut.",
+        "strainBody": "Die Belastung erfasst, wie viel kardiovaskuläre und körperliche Last du deinem Körper zugemutet hast — von Workouts bis zu einem aktiven Tag auf den Beinen. Es ist ein geräteabgeleiteter Index, gemessen an deinem eigenen üblichen Aufwand, keine klinische Messung, und der Kennwert ist zwischen Geräten nicht vergleichbar.",
+        "stressBody": "Stress ist hier eine Geräte-Heuristik aus Mustern der Herzfrequenzvariabilität — keine Cortisol-Messung und nicht, wie du dich bewusst fühlst, und auch kein klinischer Stress-Score. Lies ihn an deinem eigenen Ausgangswert; zwischen Geräten ist er nicht vergleichbar. Ein niedrigerer Wert deutet auf einen ruhigen, gut regulierten Zustand hin; ein höherer ist eine Einladung, Erholung einzuplanen.",
         "recoveryPageTitle": "Erholung",
-        "recoveryPageBody": "Die Erholung fasst die nächtlichen Signale deines Wearables zusammen – Recharge, Belastung, Load sowie deine Herzfrequenz- und Energiewerte des Tages – und zeigt, wie gut sich dein Körper erholt hat. Achte eher auf das Muster über mehrere Tage als auf einen einzelnen Wert; ein schwächerer Wert ist eine Einladung, kürzerzutreten, kein Alarm."
+        "recoveryPageBody": "Die Erholung fasst die nächtlichen Signale deines Wearables zusammen – Recharge, Belastung, Load sowie deine Herzfrequenz- und Energiewerte des Tages – und zeigt, wie gut sich dein Körper erholt hat. Achte eher auf das Muster über mehrere Tage als auf einen einzelnen Wert; ein schwächerer Wert ist eine Einladung, kürzerzutreten, kein Alarm.",
+        "pulsePressureTitle": "Pulsdruck",
+        "pulsePressureBody": "Der Pulsdruck ist die Differenz zwischen deinem systolischen und diastolischen Wert (systolisch minus diastolisch). Als allgemeine Orientierung sind etwa 40 mmHg in Ruhe typisch; eine große Differenz über rund 60 mmHg im mittleren Alter kann auf versteifte Arterien hinweisen, eine kleine Differenz unter etwa 25 mmHg kann mit niedrigem Schlagvolumen einhergehen (StatPearls/NIH 2023). Ein Gesprächsanlass, keine Diagnose.",
+        "meanArterialPressureTitle": "Mittlerer arterieller Druck",
+        "meanArterialPressureBody": "Der mittlere arterielle Druck ist der durchschnittliche Druck, den deine Organe über einen Herzschlag sehen – grob der diastolische Wert plus ein Drittel der Differenz zum systolischen. Als allgemeine Orientierung liegt ein Ruhewert bei etwa 70–100 mmHg (StatPearls/NIH 2023). Die oft genannte Grenze von ~60 mmHg ist ein Konzept der Akutmedizin, kein Alarm für die Selbstmessung.",
+        "cycleEducationBody": "Dein Zyklus durchläuft vier hormongesteuerte Phasen, und seine Länge und Regelmäßigkeit sind ein gut zugängliches Fenster auf die allgemeine Gesundheit. Als allgemeine Orientierung dauern Zyklen bei Erwachsenen typischerweise 21–35 Tage (klinische Referenzen nennen 24–38), mit einer Blutung von rund fünf Tagen (ACOG 2015). Die Lutealphase ist der stabile Anker, daher schätzt man den Eisprung am besten durch Rückrechnen von der nächsten erwarteten Periode – nie über einen festen „Tag 14“. Ein vorhergesagtes fruchtbares Fenster ist eine Schätzung, die mehrere erfasste Zyklen braucht und ungefähr bleibt, und die Basaltemperatur bestätigt den Eisprung im Nachhinein, statt ihn vorherzusagen. Dies ist keine Verhütungsmethode.",
+        "sleepHygieneBody": "Einige evidenzbasierte Gewohnheiten unterstützen den Schlaf: gleichbleibende Zubett- und Aufstehzeiten auch am Wochenende, helles Morgenlicht und gedämpfte Abende, ein kühles, dunkles und ruhiges Zimmer sowie der Verzicht auf Koffein am Nachmittag, späten Alkohol und große späte Mahlzeiten (CDC 2024). Regelmäßigkeit sagt die Gesundheit mindestens so stark voraus wie die Dauer, und die Gesamtschlafzeit eines Wearables ist weit verlässlicher als seine Aufteilung in Tief-, Leicht- und REM-Schlaf.",
+        "referenceGuidance": "Allgemeine Orientierung, keine medizinische Beratung. Referenzbereiche sind Populationswerte, die sich mit Alter, Geschlecht und Erkrankungen verschieben – dein eigener Verlauf über die Zeit führt die Einordnung.",
+        "referenceState": {
+          "within": "Dein letzter Wert liegt im allgemeinen Referenzbereich.",
+          "slightlyOutside": "Dein letzter Wert liegt knapp außerhalb des üblichen Bereichs – behalte den Verlauf im Blick.",
+          "outside": "Dein letzter Wert liegt außerhalb des üblichen Bereichs. Das ist eine Einordnungshilfe, keine Diagnose; besprich ein anhaltendes Muster mit einer Ärztin oder einem Arzt.",
+          "insufficient": "Es gibt noch nicht genug Daten, oder dieses Signal hat keinen festen Populationsbereich – dein eigener Ausgangswert führt die Einordnung."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "Der Pulsdruck (die Differenz zwischen deinen Werten) beträgt etwa {value} mmHg – rund 40 ist in Ruhe typisch.",
+        "meanArterialPressure": "Der mittlere arterielle Druck (der Durchschnitt, den deine Organe sehen) liegt bei etwa {value} mmHg, normalerweise um 70–100.",
+        "caveat": "Diese Werte werden als allgemeine Orientierung aus deiner letzten Messung abgeleitet, nicht als Diagnose."
       },
       "stats": {
         "label": "Zusammenfassende Statistik",
diff --git a/messages/en.json b/messages/en.json
index eed712aac..642d77684 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2395,7 +2395,7 @@
       "explainer": {
         "trigger": "What is {title}?",
         "bloodPressureTitle": "Blood pressure",
-        "bloodPressureBody": "Blood pressure is the force your blood exerts on the artery walls, written as systolic over diastolic (the peak during a heartbeat over the resting value between beats). Consistently high readings strain the heart and blood vessels over time.",
+        "bloodPressureBody": "Blood pressure is the force your blood exerts on the artery walls, written as systolic over diastolic (the peak during a heartbeat over the resting value between beats). Consistently high readings strain the heart and blood vessels over time. As general guidance, European guidance (ESH 2023) calls under 120/80 optimal and 140/90 or above hypertension; US guidance (ACC/AHA 2017) sets a stricter line, labelling 130–139/80–89 as Stage 1. Categorise from a calm seated reading, never a single number.",
         "pulseTitle": "Pulse",
         "pulseBody": "Your pulse is how many times your heart beats per minute. A spot reading reflects what you were doing in the moment — at rest it is typically 60–100 beats per minute, and it rises naturally with movement, stress, or caffeine.",
         "weightTitle": "Weight",
@@ -2409,19 +2409,19 @@
         "medicationsTitle": "Medication adherence",
         "medicationsBody": "Adherence is how reliably you take your medication as prescribed, shown here as the share of expected doses you actually logged. Steady intake is often what makes a treatment work as intended.",
         "restingHrTitle": "Resting heart rate",
-        "restingHrBody": "Resting heart rate is your heart rate when you are completely at rest, usually measured overnight. A lower resting rate generally points to better cardiovascular fitness, and a rising trend can be an early sign of stress or illness.",
+        "restingHrBody": "Resting heart rate is your heart rate when you are completely at rest, usually measured overnight — distinct from your pulse during activity. A lower resting rate generally points to better cardiovascular fitness, and a rising trend can be an early sign of stress or illness. As general guidance, a normal adult resting rate is 60–100 beats per minute (AHA 2024); a trained heart can sit benignly at 40–60.",
         "hrvTitle": "Heart rate variability (HRV)",
         "hrvBody": "HRV is the tiny variation in time between consecutive heartbeats. Higher variability usually reflects a well-recovered, adaptable nervous system, while a sustained drop can signal fatigue, stress, or insufficient recovery.",
         "oxygenSaturationTitle": "Oxygen saturation (SpO₂)",
-        "oxygenSaturationBody": "SpO₂ is the percentage of your red blood cells carrying oxygen. Readings of 95–100% are normal at rest; values that stay below 90% warrant attention, though brief nightly dips are common.",
+        "oxygenSaturationBody": "SpO₂ is the percentage of your red blood cells carrying oxygen. As general guidance, readings of 95–100% are normal at rest (StatPearls/NIH 2023); values that stay below 90% warrant attention, though brief nightly dips are common and above ~98% adds no benefit. Optical readers can over-read true saturation in people with darker skin (US FDA 2024), so a single near-normal reading is not a clearance — retake when warm and still if concerned.",
         "bodyTemperatureTitle": "Body temperature",
-        "bodyTemperatureBody": "Body temperature reflects your core thermal state, normally around 37 °C with small daily swings. A sustained rise can indicate infection, while overnight wrist readings mainly track relative changes rather than a clinical value.",
+        "bodyTemperatureBody": "Body temperature reflects your core thermal state. As general guidance, the population mean is about 36.6 °C — not 37.0 °C — with a normal oral range of roughly 35.7–37.4 °C and a fever from 38.0 °C (J Gen Intern Med 2019). It swings about 0.5 °C across the day, and sites differ by up to ~1 °C, so tag where you measured. Overnight wrist readings track relative change, not a clinical fever value.",
         "activeEnergyTitle": "Active energy",
         "activeEnergyBody": "Active energy is the calories you burn through movement, on top of the baseline your body uses at rest. It is a direct measure of how physically active your day was.",
         "workoutsTitle": "Workouts",
         "workoutsBody": "Workouts are the structured exercise sessions your devices record, with type, duration, and energy. Tracking them shows how regular training accumulates over weeks and how it relates to your other health signals.",
         "respiratoryRateTitle": "Respiratory rate",
-        "respiratoryRateBody": "Respiratory rate is the number of breaths you take per minute. At rest most adults breathe roughly twelve to twenty times a minute; a sustained rise can accompany illness, exertion, or stress.",
+        "respiratoryRateBody": "Respiratory rate is the number of breaths you take per minute. As general guidance, at rest most adults breathe 12–20 times a minute (American Lung Association); it is meaningful only truly at rest or asleep. A sustained rise of about +3 above your own nightly baseline can be an early illness signal — clinical escalation cutoffs are hospital tools, not self-alarms.",
         "bodyWaterTitle": "Total body water",
         "bodyWaterBody": "Total body water is the share of your body weight made up of fluid, inside and around your cells. It shifts with hydration, food, and activity, so the trend over weeks tells you more than any single reading.",
         "boneMassTitle": "Bone mass",
@@ -2433,7 +2433,7 @@
         "muscleMassTitle": "Muscle mass",
         "muscleMassBody": "Muscle mass is the estimated weight of the muscle in your body. More muscle supports strength, metabolism, and mobility, and it tends to need active effort to preserve as you age.",
         "visceralFatTitle": "Visceral fat",
-        "visceralFatBody": "Visceral fat is the fat stored deep in the abdomen around your organs. Unlike fat under the skin, a high level is closely linked to heart disease and type 2 diabetes, so lower is generally better.",
+        "visceralFatBody": "Visceral fat is the fat stored deep in the abdomen around your organs. Unlike fat under the skin, a high level is closely linked to heart disease and type 2 diabetes, so lower is generally better. The scale shows a unitless rating (about 1–12 is the healthy range, 13 and up elevated); this is a separate scale from the imaging cm² thresholds clinicians use and is not interchangeable with them.",
         "leanBodyMassTitle": "Lean body mass",
         "leanBodyMassBody": "Lean body mass is your total weight minus body fat — muscle, bone, organs, and water combined. Tracking it alongside weight shows whether changes come from muscle or from fat.",
         "flightsClimbedTitle": "Flights climbed",
@@ -2453,7 +2453,7 @@
         "walkingSpeedTitle": "Walking speed",
         "walkingSpeedBody": "Walking speed is how fast you move on a level walk. It is a well-studied marker of overall health and mobility, and a steady or rising pace is a good sign.",
         "pulseWaveVelocityTitle": "Pulse wave velocity",
-        "pulseWaveVelocityBody": "Pulse wave velocity measures how fast the pressure wave from each heartbeat travels along your arteries. A faster wave indicates stiffer arteries, which is linked to higher cardiovascular risk.",
+        "pulseWaveVelocityBody": "Pulse wave velocity measures how fast the pressure wave from each heartbeat travels along your arteries. A faster wave indicates stiffer arteries, which is linked to higher cardiovascular risk. As general guidance, European clinical reference flags carotid-femoral velocity above 10 m/s (ESC/ESH 2018) — but a consumer estimate is a proxy, not interchangeable with that clinical measurement.",
         "vascularAgeTitle": "Vascular age",
         "vascularAgeBody": "Vascular age estimates how old your arteries behave compared with your actual age, based on arterial stiffness. A vascular age below your real age suggests healthier blood vessels.",
         "environmentalAudioTitle": "Environmental sound levels",
@@ -2465,7 +2465,7 @@
         "daylightTitle": "Time in daylight",
         "daylightBody": "Time in daylight is how long you spend in outdoor light each day. Regular daylight supports a healthy sleep-wake rhythm and mood, and time outdoors is linked to eye health.",
         "bloodGlucoseTitle": "Blood glucose",
-        "bloodGlucoseBody": "Blood glucose is the amount of sugar in your blood, the body's main energy source. It rises after eating and settles between meals; readings that stay high over time can signal diabetes or prediabetes.",
+        "bloodGlucoseBody": "Blood glucose is the amount of sugar in your blood, the body's main energy source. It rises after eating and settles between meals. As general guidance for adults without diabetes, a fasting reading under 100 mg/dL is normal, 100–125 is prediabetes, and 126 or above falls in the diabetes range (ADA 2024). A single high reading does not diagnose — a clinician confirms with a repeat test, and people managing diabetes use different, clinician-set targets.",
         "skinTemperatureTitle": "Skin temperature",
         "skinTemperatureBody": "Skin temperature here is the small nightly change in your wrist temperature from your own baseline, not an absolute fever reading. Shifts can track sleep, environment, illness, or menstrual-cycle phase.",
         "cardioFitnessTitle": "Cardio fitness (VO₂ max)",
@@ -2485,14 +2485,32 @@
         "breathingDisturbancesTitle": "Sleep breathing disturbances",
         "breathingDisturbancesBody": "Your Apple Watch can estimate how often your breathing was interrupted during sleep. A lower index is better; a level Apple flags as elevated, especially over many nights, is worth raising with a clinician.",
         "stepsTitle": "Steps",
-        "stepsBody": "Step count is the total number of steps you take each day. It is the simplest measure of everyday movement — a higher daily count generally reflects a more active lifestyle, and a steady habit matters more than any single big day.",
-        "readinessBody": "Readiness is a single daily read on how prepared your body is to take on the day, blending resting heart rate, heart-rate variability, sleep, and how steady your recent nights have been. A higher score means recovered and resourced; a lower one is a gentle cue to ease off.",
+        "stepsBody": "Step count is the total number of steps you take each day. It is the simplest measure of everyday movement, and a steady habit matters more than any single big day. As general guidance, mortality risk falls steeply toward about 8,000 steps a day with continued benefit through roughly 12,000 (Saint-Maurice JAMA 2020); the optimal count is lower for older adults. The '10,000' figure is a marketing slogan, not research.",
+        "readinessBody": "Readiness is a single daily read on how prepared your body is to take on the day, blending resting heart rate, heart-rate variability, sleep, and how steady your recent nights have been. It is a device proxy benchmarked against your own baseline, not a clinical measure, and scores are not comparable across devices. A higher score means recovered and resourced; a lower one is a gentle cue to ease off.",
         "sleepScoreBody": "Your sleep score distils a whole night into one number — duration, efficiency, regularity, and the balance of light, deep, and REM. Watch the pattern across weeks rather than chasing a perfect score on any single night.",
-        "recoveryBody": "Recovery reflects how well your body has bounced back, drawing on overnight signals like heart-rate variability and resting heart rate. A strong score is a green light to push; a softer one suggests your system is still rebuilding.",
-        "strainBody": "Strain captures how much cardiovascular and physical load you have put on your body, from workouts to an active day on your feet. Once you have enough history it is judged against your own typical effort, not someone else's baseline.",
-        "stressBody": "Stress here is an estimate of physiological load on your nervous system, read mainly from heart-rate-variability patterns rather than how you consciously feel. A lower score points to a calm, well-regulated state; a higher one is an invitation to build in recovery.",
+        "recoveryBody": "Recovery reflects how well your body has bounced back, drawing on overnight signals like heart-rate variability and resting heart rate. It is a device-derived proxy read against your own baseline, not a clinical measure, and is not comparable across devices. A strong score is a green light to push; a softer one suggests your system is still rebuilding.",
+        "strainBody": "Strain captures how much cardiovascular and physical load you have put on your body, from workouts to an active day on your feet. It is a device-derived index judged against your own typical effort, not a clinical measure, and the headline number is not comparable across devices.",
+        "stressBody": "Stress here is a device heuristic derived from heart-rate-variability patterns, not a cortisol measurement or how you consciously feel — and not a clinical stress score. Read it against your own baseline; it is not comparable across devices. A lower score points to a calm, well-regulated state; a higher one is an invitation to build in recovery.",
         "recoveryPageTitle": "Recovery",
-        "recoveryPageBody": "Recovery brings together the overnight signals your wearable records — recharge, strain, load and your day's heart-rate and energy totals — to show how well your body has bounced back. Read the pattern across days rather than any single number; a softer reading is an invitation to ease off, not an alarm."
+        "recoveryPageBody": "Recovery brings together the overnight signals your wearable records — recharge, strain, load and your day's heart-rate and energy totals — to show how well your body has bounced back. Read the pattern across days rather than any single number; a softer reading is an invitation to ease off, not an alarm.",
+        "pulsePressureTitle": "Pulse pressure",
+        "pulsePressureBody": "Pulse pressure is the gap between your systolic and diastolic readings (systolic minus diastolic). As general guidance, about 40 mmHg is typical at rest; a wide gap above roughly 60 mmHg in middle age can reflect stiffening arteries, while a narrow gap under about 25 mmHg can accompany low stroke volume (StatPearls/NIH 2023). It is a discussion prompt, not a diagnosis.",
+        "meanArterialPressureTitle": "Mean arterial pressure",
+        "meanArterialPressureBody": "Mean arterial pressure is the average pressure your organs see across a heartbeat, roughly the diastolic plus a third of the gap to systolic. As general guidance, a resting value sits around 70–100 mmHg (StatPearls/NIH 2023). The often-cited ~60 mmHg floor is an acute-care concept, not a consumer self-alarm.",
+        "cycleEducationBody": "Your cycle runs through four phases driven by shifting hormones, and its length and regularity are an accessible window on overall health. As general guidance, adult cycles typically run 21–35 days (clinical references cite 24–38), with bleeding around five days (ACOG 2015). The luteal phase is the steady anchor, so ovulation is best estimated by counting back from your next expected period — never a fixed 'day 14'. A predicted fertile window is an estimate that needs several recorded cycles and stays approximate, and basal body temperature confirms ovulation after the fact rather than predicting it. This is not a contraceptive method.",
+        "sleepHygieneBody": "A few evidence-based habits support sleep: keep consistent bed and wake times including weekends, get bright morning daylight and dim your evenings, keep the room cool, dark and quiet, and avoid afternoon caffeine, late alcohol and large late meals (CDC 2024). Regularity predicts health at least as strongly as duration, and a wearable's total sleep time is far more trustworthy than its deep, light and REM split.",
+        "referenceGuidance": "General guidance, not medical advice. Reference ranges are population anchors that shift with your age, sex and health conditions — your own trend over time leads the read.",
+        "referenceState": {
+          "within": "Your recent value sits within the general reference range.",
+          "slightlyOutside": "Your recent value sits just outside the usual range — worth keeping an eye on the trend.",
+          "outside": "Your recent value sits outside the usual range. This is a placement aid, not a diagnosis; discuss a sustained pattern with a clinician.",
+          "insufficient": "There isn't enough data yet, or this signal has no fixed population range — your own baseline carries the read."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "Pulse pressure (the gap between your readings) is about {value} mmHg — roughly 40 is typical at rest.",
+        "meanArterialPressure": "Mean arterial pressure (the average your organs see) is about {value} mmHg, normally around 70–100.",
+        "caveat": "These are derived from your latest reading as general guidance, not a diagnosis."
       },
       "stats": {
         "label": "Summary statistics",
diff --git a/messages/es.json b/messages/es.json
index 2bafb2f5c..fff5381c9 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2492,7 +2492,25 @@
         "strainBody": "El esfuerzo capta cuánta carga cardiovascular y física le has impuesto a tu cuerpo, desde los entrenamientos hasta un día activo de pie. Cuando ya hay suficiente historial, se valora frente a tu propio esfuerzo habitual, no frente a un estándar ajeno.",
         "stressBody": "El estrés aquí es una estimación de la carga fisiológica sobre tu sistema nervioso, leída sobre todo a partir de patrones de variabilidad de la frecuencia cardíaca y no de cómo te sientes conscientemente. Una puntuación más baja apunta a un estado calmado y bien regulado; una más alta es una invitación a incorporar recuperación.",
         "recoveryPageTitle": "Recuperación",
-        "recoveryPageBody": "La recuperación reúne las señales nocturnas que registra tu wearable —recarga, esfuerzo, carga y los totales de frecuencia cardiaca y energía del día— para mostrar cómo se ha recuperado tu cuerpo. Fíjate en el patrón a lo largo de los días más que en un solo número; un valor más bajo es una invitación a bajar el ritmo, no una alarma."
+        "recoveryPageBody": "La recuperación reúne las señales nocturnas que registra tu wearable —recarga, esfuerzo, carga y los totales de frecuencia cardiaca y energía del día— para mostrar cómo se ha recuperado tu cuerpo. Fíjate en el patrón a lo largo de los días más que en un solo número; un valor más bajo es una invitación a bajar el ritmo, no una alarma.",
+        "pulsePressureTitle": "Presión de pulso",
+        "pulsePressureBody": "La presión de pulso es la diferencia entre tu valor sistólico y diastólico (sistólico menos diastólico). Como orientación general, unos 40 mmHg es lo típico en reposo; una diferencia amplia por encima de unos 60 mmHg en la mediana edad puede reflejar arterias más rígidas, mientras que una diferencia estrecha por debajo de unos 25 mmHg puede acompañar a un bajo volumen sistólico (StatPearls/NIH 2023). Es un motivo de conversación, no un diagnóstico.",
+        "meanArterialPressureTitle": "Presión arterial media",
+        "meanArterialPressureBody": "La presión arterial media es la presión promedio que ven tus órganos a lo largo de un latido, aproximadamente la diastólica más un tercio de la diferencia con la sistólica. Como orientación general, un valor en reposo ronda los 70–100 mmHg (StatPearls/NIH 2023). El umbral de ~60 mmHg que se suele citar es un concepto de cuidados agudos, no una alarma para el autocontrol.",
+        "cycleEducationBody": "Tu ciclo atraviesa cuatro fases impulsadas por hormonas, y su duración y regularidad son una ventana accesible a la salud general. Como orientación general, los ciclos en personas adultas suelen durar 21–35 días (las referencias clínicas citan 24–38), con un sangrado de unos cinco días (ACOG 2015). La fase lútea es el ancla estable, así que la ovulación se estima mejor contando hacia atrás desde tu próxima regla prevista, nunca con un «día 14» fijo. Una ventana fértil predicha es una estimación que necesita varios ciclos registrados y sigue siendo aproximada, y la temperatura basal confirma la ovulación a posteriori en lugar de predecirla. No es un método anticonceptivo.",
+        "sleepHygieneBody": "Algunos hábitos con respaldo de evidencia favorecen el sueño: mantener horarios constantes de acostarse y levantarse incluso los fines de semana, recibir luz brillante por la mañana y atenuar las noches, una habitación fresca, oscura y silenciosa, y evitar la cafeína por la tarde, el alcohol tardío y las comidas copiosas a última hora (CDC 2024). La regularidad predice la salud al menos tanto como la duración, y el tiempo total de sueño de un wearable es mucho más fiable que su reparto entre sueño profundo, ligero y REM.",
+        "referenceGuidance": "Orientación general, no consejo médico. Los rangos de referencia son valores poblacionales que cambian con tu edad, sexo y condiciones de salud; tu propia tendencia a lo largo del tiempo guía la lectura.",
+        "referenceState": {
+          "within": "Tu valor reciente se sitúa dentro del rango de referencia general.",
+          "slightlyOutside": "Tu valor reciente queda justo fuera del rango habitual; conviene vigilar la tendencia.",
+          "outside": "Tu valor reciente queda fuera del rango habitual. Es una ayuda de ubicación, no un diagnóstico; comenta un patrón sostenido con un profesional sanitario.",
+          "insufficient": "Aún no hay datos suficientes, o esta señal no tiene un rango poblacional fijo; tu propia base guía la lectura."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "La presión de pulso (la diferencia entre tus valores) es de unos {value} mmHg; alrededor de 40 es lo típico en reposo.",
+        "meanArterialPressure": "La presión arterial media (el promedio que ven tus órganos) es de unos {value} mmHg, normalmente entre 70 y 100.",
+        "caveat": "Estos valores se derivan de tu última lectura como orientación general, no como diagnóstico."
       },
       "stats": {
         "label": "Estadísticas resumidas",
diff --git a/messages/fr.json b/messages/fr.json
index 591813a41..4b1daec6e 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2492,7 +2492,25 @@
         "strainBody": "La charge mesure l'effort cardiovasculaire et physique que vous avez imposé à votre corps, des entraînements à une journée active debout. Dès qu'il y a assez d'historique, elle est évaluée par rapport à votre propre effort habituel, pas à un standard extérieur.",
         "stressBody": "Le stress est ici une estimation de la charge physiologique sur votre système nerveux, lue surtout à partir des schémas de variabilité de la fréquence cardiaque et non de ce que vous ressentez consciemment. Un score plus bas indique un état calme et bien régulé ; un score plus élevé invite à prévoir de la récupération.",
         "recoveryPageTitle": "Récupération",
-        "recoveryPageBody": "La récupération rassemble les signaux nocturnes enregistrés par votre wearable — recharge, effort, charge ainsi que vos totaux de fréquence cardiaque et d'énergie du jour — pour montrer à quel point votre corps a récupéré. Observez la tendance sur plusieurs jours plutôt qu'un seul chiffre ; une valeur plus faible invite à lever le pied, ce n'est pas une alarme."
+        "recoveryPageBody": "La récupération rassemble les signaux nocturnes enregistrés par votre wearable — recharge, effort, charge ainsi que vos totaux de fréquence cardiaque et d'énergie du jour — pour montrer à quel point votre corps a récupéré. Observez la tendance sur plusieurs jours plutôt qu'un seul chiffre ; une valeur plus faible invite à lever le pied, ce n'est pas une alarme.",
+        "pulsePressureTitle": "Pression pulsée",
+        "pulsePressureBody": "La pression pulsée est l'écart entre votre valeur systolique et diastolique (systolique moins diastolique). À titre indicatif général, environ 40 mmHg est typique au repos ; un écart large au-dessus d'environ 60 mmHg à l'âge moyen peut refléter des artères rigidifiées, tandis qu'un écart étroit en dessous d'environ 25 mmHg peut accompagner un faible volume d'éjection (StatPearls/NIH 2023). C'est un sujet de discussion, pas un diagnostic.",
+        "meanArterialPressureTitle": "Pression artérielle moyenne",
+        "meanArterialPressureBody": "La pression artérielle moyenne est la pression moyenne que voient vos organes sur un battement, soit grosso modo la diastolique plus un tiers de l'écart avec la systolique. À titre indicatif général, une valeur au repos se situe autour de 70–100 mmHg (StatPearls/NIH 2023). Le seuil de ~60 mmHg souvent cité est un concept de soins aigus, pas une alarme pour l'autosurveillance.",
+        "cycleEducationBody": "Votre cycle traverse quatre phases pilotées par les hormones, et sa durée et sa régularité sont une fenêtre accessible sur la santé globale. À titre indicatif général, les cycles chez l'adulte durent typiquement 21–35 jours (les références cliniques citent 24–38), avec des règles d'environ cinq jours (ACOG 2015). La phase lutéale est l'ancrage stable, donc l'ovulation s'estime au mieux en comptant à rebours depuis vos prochaines règles prévues, jamais à un « jour 14 » fixe. Une fenêtre fertile prédite est une estimation qui demande plusieurs cycles enregistrés et reste approximative, et la température basale confirme l'ovulation après coup plutôt qu'elle ne la prédit. Ce n'est pas une méthode de contraception.",
+        "sleepHygieneBody": "Quelques habitudes fondées sur les preuves favorisent le sommeil : des heures de coucher et de lever régulières, week-ends compris, une lumière vive le matin et des soirées tamisées, une chambre fraîche, sombre et calme, et éviter la caféine l'après-midi, l'alcool tardif et les repas copieux tard le soir (CDC 2024). La régularité prédit la santé au moins autant que la durée, et le temps de sommeil total d'un wearable est bien plus fiable que sa répartition entre sommeil profond, léger et paradoxal.",
+        "referenceGuidance": "Indication générale, pas un avis médical. Les plages de référence sont des repères de population qui évoluent avec votre âge, votre sexe et vos conditions de santé ; votre propre tendance dans le temps guide la lecture.",
+        "referenceState": {
+          "within": "Votre valeur récente se situe dans la plage de référence générale.",
+          "slightlyOutside": "Votre valeur récente est juste en dehors de la plage habituelle — il vaut la peine de surveiller la tendance.",
+          "outside": "Votre valeur récente est en dehors de la plage habituelle. C'est une aide au repérage, pas un diagnostic ; parlez d'un schéma persistant à un professionnel de santé.",
+          "insufficient": "Il n'y a pas encore assez de données, ou ce signal n'a pas de plage de population fixe — votre propre référence guide la lecture."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "La pression pulsée (l'écart entre vos valeurs) est d'environ {value} mmHg ; environ 40 est typique au repos.",
+        "meanArterialPressure": "La pression artérielle moyenne (la moyenne que voient vos organes) est d'environ {value} mmHg, normalement autour de 70–100.",
+        "caveat": "Ces valeurs sont dérivées de votre dernière mesure à titre indicatif général, pas comme un diagnostic."
       },
       "stats": {
         "label": "Statistiques récapitulatives",
diff --git a/messages/it.json b/messages/it.json
index 2a850296e..3eadf6c84 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2492,7 +2492,25 @@
         "strainBody": "Lo sforzo misura quanto carico cardiovascolare e fisico hai imposto al tuo corpo, dagli allenamenti a una giornata attiva in piedi. Quando c'è abbastanza storico, viene valutato rispetto al tuo sforzo abituale, non rispetto a uno standard esterno.",
         "stressBody": "Lo stress qui è una stima del carico fisiologico sul tuo sistema nervoso, letto soprattutto dagli schemi di variabilità della frequenza cardiaca e non da come ti senti consapevolmente. Un punteggio più basso indica uno stato calmo e ben regolato; uno più alto è un invito a inserire del recupero.",
         "recoveryPageTitle": "Recupero",
-        "recoveryPageBody": "Il recupero riunisce i segnali notturni registrati dal tuo wearable — ricarica, sforzo, carico e i totali di frequenza cardiaca ed energia della giornata — per mostrare quanto bene il tuo corpo si è ripreso. Guarda l'andamento su più giorni piuttosto che un singolo numero; un valore più basso è un invito a rallentare, non un allarme."
+        "recoveryPageBody": "Il recupero riunisce i segnali notturni registrati dal tuo wearable — ricarica, sforzo, carico e i totali di frequenza cardiaca ed energia della giornata — per mostrare quanto bene il tuo corpo si è ripreso. Guarda l'andamento su più giorni piuttosto che un singolo numero; un valore più basso è un invito a rallentare, non un allarme.",
+        "pulsePressureTitle": "Pressione differenziale",
+        "pulsePressureBody": "La pressione differenziale è la differenza tra il valore sistolico e quello diastolico (sistolica meno diastolica). Come orientamento generale, circa 40 mmHg è tipico a riposo; un divario ampio sopra i 60 mmHg circa nella mezza età può riflettere arterie più rigide, mentre un divario stretto sotto i 25 mmHg circa può accompagnare una bassa gittata sistolica (StatPearls/NIH 2023). È uno spunto di discussione, non una diagnosi.",
+        "meanArterialPressureTitle": "Pressione arteriosa media",
+        "meanArterialPressureBody": "La pressione arteriosa media è la pressione media che i tuoi organi vedono in un battito, all'incirca la diastolica più un terzo del divario con la sistolica. Come orientamento generale, un valore a riposo si aggira sui 70–100 mmHg (StatPearls/NIH 2023). La soglia di ~60 mmHg spesso citata è un concetto di terapia intensiva, non un allarme per l'automisurazione.",
+        "cycleEducationBody": "Il tuo ciclo attraversa quattro fasi guidate dagli ormoni, e la sua durata e regolarità sono una finestra accessibile sulla salute generale. Come orientamento generale, nei adulti i cicli durano tipicamente 21–35 giorni (i riferimenti clinici citano 24–38), con un sanguinamento di circa cinque giorni (ACOG 2015). La fase luteale è l'ancora stabile, quindi l'ovulazione si stima meglio contando a ritroso dalla prossima mestruazione attesa, mai con un «giorno 14» fisso. Una finestra fertile prevista è una stima che richiede più cicli registrati e resta approssimativa, e la temperatura basale conferma l'ovulazione a posteriori anziché prevederla. Non è un metodo contraccettivo.",
+        "sleepHygieneBody": "Alcune abitudini basate sull'evidenza favoriscono il sonno: orari costanti per coricarsi e svegliarsi anche nel weekend, luce intensa al mattino e serate soffuse, una stanza fresca, buia e silenziosa, ed evitare la caffeina nel pomeriggio, l'alcol a tarda ora e i pasti abbondanti a fine giornata (CDC 2024). La regolarità predice la salute almeno quanto la durata, e il tempo di sonno totale di un wearable è molto più affidabile della sua suddivisione tra sonno profondo, leggero e REM.",
+        "referenceGuidance": "Orientamento generale, non un consiglio medico. Gli intervalli di riferimento sono valori di popolazione che cambiano con la tua età, il sesso e le condizioni di salute; il tuo andamento nel tempo guida la lettura.",
+        "referenceState": {
+          "within": "Il tuo valore recente rientra nell'intervallo di riferimento generale.",
+          "slightlyOutside": "Il tuo valore recente è appena fuori dall'intervallo abituale: vale la pena tenere d'occhio l'andamento.",
+          "outside": "Il tuo valore recente è fuori dall'intervallo abituale. È un aiuto alla collocazione, non una diagnosi; parla di un andamento persistente con un medico.",
+          "insufficient": "Non ci sono ancora dati sufficienti, oppure questo segnale non ha un intervallo di popolazione fisso: il tuo riferimento personale guida la lettura."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "La pressione differenziale (il divario tra i tuoi valori) è di circa {value} mmHg; circa 40 è tipico a riposo.",
+        "meanArterialPressure": "La pressione arteriosa media (la media che vedono i tuoi organi) è di circa {value} mmHg, normalmente intorno a 70–100.",
+        "caveat": "Questi valori sono derivati dalla tua ultima misurazione come orientamento generale, non come diagnosi."
       },
       "stats": {
         "label": "Statistiche riepilogative",
diff --git a/messages/pl.json b/messages/pl.json
index 345078605..f232aaf25 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2492,7 +2492,25 @@
         "strainBody": "Obciążenie ujmuje, ile wysiłku sercowo-naczyniowego i fizycznego nałożyłeś na swoje ciało — od treningów po aktywny dzień na nogach. Gdy zbierze się wystarczająco danych, jest oceniane względem Twojego własnego typowego wysiłku, a nie cudzej miary.",
         "stressBody": "Stres jest tu szacunkiem fizjologicznego obciążenia Twojego układu nerwowego, odczytywanym głównie ze wzorców zmienności rytmu serca, a nie z tego, jak się świadomie czujesz. Niższy wynik wskazuje na spokojny, dobrze regulowany stan; wyższy to zachęta, by wpleść regenerację.",
         "recoveryPageTitle": "Regeneracja",
-        "recoveryPageBody": "Regeneracja łączy nocne sygnały rejestrowane przez Twoje urządzenie – recharge, obciążenie, load oraz dzienne sumy tętna i energii – aby pokazać, jak dobrze Twój organizm się zregenerował. Patrz na wzorzec w ciągu kilku dni, a nie na pojedynczą liczbę; niższy wynik to zaproszenie do zwolnienia tempa, a nie alarm."
+        "recoveryPageBody": "Regeneracja łączy nocne sygnały rejestrowane przez Twoje urządzenie – recharge, obciążenie, load oraz dzienne sumy tętna i energii – aby pokazać, jak dobrze Twój organizm się zregenerował. Patrz na wzorzec w ciągu kilku dni, a nie na pojedynczą liczbę; niższy wynik to zaproszenie do zwolnienia tempa, a nie alarm.",
+        "pulsePressureTitle": "Ciśnienie tętna",
+        "pulsePressureBody": "Ciśnienie tętna to różnica między wartością skurczową a rozkurczową (skurczowe minus rozkurczowe). Jako ogólna wskazówka, około 40 mmHg jest typowe w spoczynku; szeroka różnica powyżej około 60 mmHg w średnim wieku może odzwierciedlać usztywnienie tętnic, a wąska różnica poniżej około 25 mmHg może towarzyszyć niskiej objętości wyrzutowej (StatPearls/NIH 2023). To powód do rozmowy, nie diagnoza.",
+        "meanArterialPressureTitle": "Średnie ciśnienie tętnicze",
+        "meanArterialPressureBody": "Średnie ciśnienie tętnicze to przeciętne ciśnienie, jakie widzą Twoje narządy w trakcie uderzenia serca, w przybliżeniu rozkurczowe plus jedna trzecia różnicy do skurczowego. Jako ogólna wskazówka, wartość spoczynkowa mieści się w okolicy 70–100 mmHg (StatPearls/NIH 2023). Często przywoływany próg ~60 mmHg to pojęcie z medycyny ostrej, nie alarm do samodzielnego pomiaru.",
+        "cycleEducationBody": "Twój cykl przebiega przez cztery fazy sterowane hormonami, a jego długość i regularność to dostępne okno na ogólny stan zdrowia. Jako ogólna wskazówka, u osób dorosłych cykle trwają zwykle 21–35 dni (źródła kliniczne podają 24–38), z krwawieniem około pięciu dni (ACOG 2015). Faza lutealna jest stałą kotwicą, dlatego owulację najlepiej szacować, licząc wstecz od następnej spodziewanej miesiączki, nigdy według stałego „14. dnia”. Przewidziane okno płodne to oszacowanie, które wymaga kilku zarejestrowanych cykli i pozostaje przybliżone, a podstawowa temperatura ciała potwierdza owulację po fakcie, a nie ją przewiduje. To nie jest metoda antykoncepcji.",
+        "sleepHygieneBody": "Kilka opartych na dowodach nawyków wspiera sen: stałe pory kładzenia się i wstawania także w weekendy, jasne światło rano i przyciemnione wieczory, chłodna, ciemna i cicha sypialnia oraz unikanie kofeiny po południu, alkoholu późnym wieczorem i obfitych posiłków przed snem (CDC 2024). Regularność przewiduje zdrowie co najmniej tak silnie jak długość snu, a całkowity czas snu z urządzenia jest znacznie bardziej wiarygodny niż jego podział na sen głęboki, lekki i REM.",
+        "referenceGuidance": "Ogólna wskazówka, nie porada medyczna. Zakresy referencyjne to wartości populacyjne, które zmieniają się wraz z Twoim wiekiem, płcią i stanem zdrowia; to Twój własny trend w czasie prowadzi odczyt.",
+        "referenceState": {
+          "within": "Twoja ostatnia wartość mieści się w ogólnym zakresie referencyjnym.",
+          "slightlyOutside": "Twoja ostatnia wartość jest tuż poza zwykłym zakresem – warto obserwować trend.",
+          "outside": "Twoja ostatnia wartość jest poza zwykłym zakresem. To pomoc w umiejscowieniu, nie diagnoza; omów utrzymujący się wzorzec z lekarzem.",
+          "insufficient": "Nie ma jeszcze wystarczających danych lub ten sygnał nie ma stałego zakresu populacyjnego – odczyt prowadzi Twoja własna wartość bazowa."
+        }
+      },
+      "bpDerived": {
+        "pulsePressure": "Ciśnienie tętna (różnica między Twoimi wartościami) wynosi około {value} mmHg – około 40 jest typowe w spoczynku.",
+        "meanArterialPressure": "Średnie ciśnienie tętnicze (średnia, jaką widzą Twoje narządy) wynosi około {value} mmHg, zwykle w okolicy 70–100.",
+        "caveat": "Te wartości są wyliczone z ostatniego pomiaru jako ogólna wskazówka, nie jako diagnoza."
       },
       "stats": {
         "label": "Statystyki podsumowujące",
diff --git a/src/app/insights/blood-pressure/page.tsx b/src/app/insights/blood-pressure/page.tsx
index 7cb330f84..ea184b33c 100644
--- a/src/app/insights/blood-pressure/page.tsx
+++ b/src/app/insights/blood-pressure/page.tsx
@@ -170,6 +170,32 @@ export default function InsightsBlutdruckPage() {
           average). */}
       <MetricTargetSummary slug="blood-pressure" />
 
+      {/* v1.18.6 — free derived BP context: pulse pressure (SBP − DBP) and
+          mean arterial pressure ((SBP + 2·DBP)/3), computed from the most
+          recent reading. Pure derivation of stored BP — no schema, no extra
+          fetch. Calm, cited, non-alarming. */}
+      {(() => {
+        const sbp = sysSummary?.latest ?? null;
+        const dbp = diaSummary?.latest ?? null;
+        if (sbp == null || dbp == null || sbp <= dbp) return null;
+        const pp = Math.round(sbp - dbp);
+        const map = Math.round((sbp + 2 * dbp) / 3);
+        return (
+          <p
+            data-slot="bp-derived-caption"
+            className="text-muted-foreground text-sm leading-relaxed"
+          >
+            {t("insights.subPage.bpDerived.pulsePressure", {
+              value: pp,
+            })}{" "}
+            {t("insights.subPage.bpDerived.meanArterialPressure", {
+              value: map,
+            })}{" "}
+            {t("insights.subPage.bpDerived.caveat")}
+          </p>
+        );
+      })()}
+
       {/* v1.12.4 — Einschätzung is the last content block; the stat strip
           (rendered by the shell) closes the spine below it. */}
       <SlugInsightStatusCard
diff --git a/src/components/insights/sub-page-shell.tsx b/src/components/insights/sub-page-shell.tsx
index b2d71f045..ba30ea838 100644
--- a/src/components/insights/sub-page-shell.tsx
+++ b/src/components/insights/sub-page-shell.tsx
@@ -3,10 +3,16 @@
 import { useEffect, useRef, type ReactNode } from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { ListOrdered } from "lucide-react";
+import { Info, ListOrdered } from "lucide-react";
 
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { CoachLaunchButton } from "@/components/insights/coach-launch-button";
 import { TargetAdjustButton } from "@/components/insights/target-adjust-button";
 import { TargetAdjustProvider } from "@/lib/insights/target-adjust-context";
@@ -291,6 +297,33 @@ export function SubPageShell({
               className="text-muted-foreground text-sm leading-relaxed"
             >
               {t(`insights.subPage.explainer.${explainerMetric}Body`)}
+              {/* v1.18.6 — a discreet general-guidance tooltip travels with
+                every metric definition. The reference bands in the body
+                above are population anchors, not medical advice; this
+                caption pins that framing without crowding the prose. */}
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      data-slot="metric-reference-guidance"
+                      className={cn(
+                        "text-muted-foreground hover:text-foreground ml-1.5 inline-flex",
+                        "align-middle focus-visible:ring-ring/50 rounded-full",
+                        "focus-visible:ring-2 focus-visible:outline-none",
+                      )}
+                      aria-label={t(
+                        "insights.subPage.explainer.referenceGuidance",
+                      )}
+                    >
+                      <Info className="size-3.5" aria-hidden="true" />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent className="max-w-xs text-pretty">
+                    {t("insights.subPage.explainer.referenceGuidance")}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
             </p>
           ) : null}
           {description && !explainerMetric ? (
diff --git a/src/lib/__tests__/reference-ranges.test.ts b/src/lib/__tests__/reference-ranges.test.ts
new file mode 100644
index 000000000..910e80e05
--- /dev/null
+++ b/src/lib/__tests__/reference-ranges.test.ts
@@ -0,0 +1,98 @@
+import { describe, it, expect } from "vitest";
+
+import { CITATIONS } from "../medical-citations";
+import {
+  REFERENCE_RANGES,
+  REFERENCE_METRICS,
+  classifyReference,
+  getReferenceRange,
+  isReferenceMetric,
+  referenceCitation,
+  referenceLabel,
+  type ReferenceMetric,
+} from "../reference-ranges";
+
+describe("reference-ranges backbone", () => {
+  it("every band + conflict + headline resolves a real citation", () => {
+    for (const metric of REFERENCE_METRICS) {
+      const range = REFERENCE_RANGES[metric];
+      expect(CITATIONS[range.referenceId], `${metric} referenceId`).toBeTruthy();
+      expect(range.unit, `${metric} unit`).toBeTruthy();
+      expect(range.guidanceCaveat, `${metric} guidanceCaveat`).toBeTruthy();
+      for (const band of range.bands) {
+        expect(CITATIONS[band.citation], `${metric} band ${band.label}`).toBeTruthy();
+        // A band must pin at least one bound.
+        expect(band.low != null || band.high != null, `${metric} ${band.label}`).toBe(true);
+      }
+      for (const conflict of range.conflicts ?? []) {
+        expect(CITATIONS[conflict.citation], `${metric} conflict`).toBeTruthy();
+        expect(conflict.note).toBeTruthy();
+      }
+    }
+  });
+
+  it("keeps ESH 2023 as the BP headline anchor and surfaces US/EU context", () => {
+    const bp = REFERENCE_RANGES.BLOOD_PRESSURE;
+    expect(bp.referenceId).toBe("ESH_2023_HYPERTENSION");
+    expect(referenceLabel("BLOOD_PRESSURE")).toContain("ESH 2023");
+    // ACC/AHA + ESC 2024 ride only as context, never the headline.
+    const conflictCitations = (bp.conflicts ?? []).map((c) => c.citation);
+    expect(conflictCitations).toContain("ACC_AHA_2017_BP");
+    expect(conflictCitations).toContain("ESC_2024_BP");
+  });
+
+  it("classifies values into the four-state contract", () => {
+    // Within the normal band.
+    expect(classifyReference("RESTING_HEART_RATE", 70)).toBe("within");
+    expect(classifyReference("BLOOD_GLUCOSE", 90)).toBe("within");
+    // Adjacent watch band.
+    expect(classifyReference("BLOOD_GLUCOSE", 110)).toBe("slightly-outside");
+    // Attention band beyond the watch tier.
+    expect(classifyReference("BLOOD_GLUCOSE", 150)).toBe("outside");
+    // SpO2 below the healthy floor is attention.
+    expect(classifyReference("OXYGEN_SATURATION", 88)).toBe("outside");
+    expect(classifyReference("OXYGEN_SATURATION", 98)).toBe("within");
+  });
+
+  it("returns insufficient for absent values and band-less metrics", () => {
+    expect(classifyReference("RESTING_HEART_RATE", null)).toBe("insufficient");
+    expect(classifyReference("RESTING_HEART_RATE", Number.NaN)).toBe("insufficient");
+    // HRV carries no fixed population band — baseline-only.
+    expect(REFERENCE_RANGES.HEART_RATE_VARIABILITY.bands).toHaveLength(0);
+    expect(classifyReference("HEART_RATE_VARIABILITY", 42)).toBe("insufficient");
+  });
+
+  it("steps backbone uses the canonical 8,000 green floor", () => {
+    const steps = REFERENCE_RANGES.STEPS;
+    expect(steps.bands[0].low).toBe(8000);
+    expect(steps.referenceId).toBe("STEPS_SAINT_MAURICE_2020");
+  });
+
+  it("guards + resolvers narrow correctly", () => {
+    expect(isReferenceMetric("BLOOD_PRESSURE")).toBe(true);
+    expect(isReferenceMetric("NOT_A_METRIC")).toBe(false);
+    expect(getReferenceRange("NOT_A_METRIC")).toBeNull();
+    expect(getReferenceRange("HBA1C")).toBe(REFERENCE_RANGES.HBA1C);
+    expect(referenceCitation("BLOOD_PRESSURE")).toBe(
+      CITATIONS.ESH_2023_HYPERTENSION,
+    );
+  });
+
+  it("no commercial brand appears in any band label or caveat", () => {
+    const banned = /apple|withings|oura|whoop|garmin|fitbit|polar|samsung/i;
+    for (const metric of REFERENCE_METRICS) {
+      const range = REFERENCE_RANGES[metric];
+      expect(range.guidanceCaveat).not.toMatch(banned);
+      for (const band of range.bands) expect(band.label).not.toMatch(banned);
+      for (const conflict of range.conflicts ?? []) {
+        expect(conflict.note).not.toMatch(banned);
+      }
+    }
+  });
+
+  it("metric ids stay a closed, non-empty set", () => {
+    expect(REFERENCE_METRICS.length).toBeGreaterThan(10);
+    const ids = new Set<ReferenceMetric>(REFERENCE_METRICS);
+    expect(ids.size).toBe(REFERENCE_METRICS.length);
+  });
+});
diff --git a/src/lib/insights/metric-status-registry.ts b/src/lib/insights/metric-status-registry.ts
index bb0ea17a5..f45e7c4dc 100644
--- a/src/lib/insights/metric-status-registry.ts
+++ b/src/lib/insights/metric-status-registry.ts
@@ -155,6 +155,11 @@ const REGISTRY: Record<MetricStatusMetricId, MetricStatusMeta> = {
     normalRange: { low: 50, high: 100 },
     archetype: "physiological-vital",
   },
+  // HRV — no universal "normal" band (ESC/NASPE 1996): only the personal
+  // trend is meaningful and overnight wearable RMSSD is not interchangeable
+  // with the clinical 24-h SDNN norms. No `normalRange` by design; the user's
+  // own baseline leads and single-night swings of ~±10% are routine noise
+  // (see `reference-ranges.ts HEART_RATE_VARIABILITY.guidanceCaveat`).
   HEART_RATE_VARIABILITY: {
     id: "HEART_RATE_VARIABILITY",
     measurementType: "HEART_RATE_VARIABILITY",
@@ -163,6 +168,13 @@ const REGISTRY: Record<MetricStatusMetricId, MetricStatusMeta> = {
     direction: "higher-better",
     archetype: "physiological-vital",
   },
+  // SpO₂ — healthy room-air 95–100% (StatPearls/NIH 2023). C4 equity note:
+  // optical pulse oximeters can OVER-READ true saturation in people with
+  // darker skin pigmentation (~3× more often than in lighter skin per the
+  // US FDA 2024 review), so a single near-normal reading is not a clearance.
+  // The band is unchanged; the caveat lives in the explainer copy +
+  // `reference-ranges.ts OXYGEN_SATURATION.guidanceCaveat`. Do NOT set a
+  // "higher is always better" goal — above ~98% adds no benefit.
   OXYGEN_SATURATION: {
     id: "OXYGEN_SATURATION",
     measurementType: "OXYGEN_SATURATION",
@@ -181,13 +193,18 @@ const REGISTRY: Record<MetricStatusMetricId, MetricStatusMeta> = {
     normalRange: { low: 12, high: 20 },
     archetype: "physiological-vital",
   },
+  // Body temperature — the population oral-equivalent mean is ~36.6 °C, not
+  // 37.0 °C, with a normal band ~35.7–37.4 °C and fever ≥38.0 °C (J Gen
+  // Intern Med systematic review, 2019). C6: the high anchor tightens
+  // 37.5 → 37.2 so the band sits below the fever line; sites differ by up
+  // to ~1 °C, so the read is a coarse placement only.
   BODY_TEMPERATURE: {
     id: "BODY_TEMPERATURE",
     measurementType: "BODY_TEMPERATURE",
     displayName: "Body temperature",
     unit: "°C",
     direction: "target-band",
-    normalRange: { low: 36.1, high: 37.5 },
+    normalRange: { low: 36.1, high: 37.2 },
     archetype: "physiological-vital",
   },
   SKIN_TEMPERATURE: {
@@ -215,12 +232,17 @@ const REGISTRY: Record<MetricStatusMetricId, MetricStatusMeta> = {
     direction: "lower-better",
     archetype: "physiological-vital",
   },
+  // Pulse-wave velocity — the cf-PWV >10 m/s organ-damage marker is the
+  // European clinical reference (ESC/ESH 2018). A consumer estimate is a
+  // PROXY, not interchangeable with clinical cf-PWV tonometry; the band is
+  // a coarse "below 10 is the reference side" placement only.
   PULSE_WAVE_VELOCITY: {
     id: "PULSE_WAVE_VELOCITY",
     measurementType: "PULSE_WAVE_VELOCITY",
     displayName: "Pulse-wave velocity",
     unit: "m/s",
     direction: "lower-better",
+    normalRange: { low: 0, high: 10 },
     archetype: "physiological-vital",
   },
   VASCULAR_AGE: {
@@ -232,13 +254,18 @@ const REGISTRY: Record<MetricStatusMetricId, MetricStatusMeta> = {
     archetype: "physiological-vital",
   },
   // ── activity-fitness ──
+  // Steps — C2/D4 reconcile: the canonical "green" floor is 8,000/day
+  // (Saint-Maurice JAMA 2020: mortality risk falls steeply toward ~8k with
+  // continued benefit through ~12k), aligning this display band with the
+  // resolver + classifier so the cross-surface number stops contradicting.
+  // The "10,000" target is a marketing slogan, not research.
   STEPS: {
     id: "STEPS",
     measurementType: "ACTIVITY_STEPS",
     displayName: "Steps",
     unit: "steps/day",
     direction: "higher-better",
-    normalRange: { low: 7000, high: 10000 },
+    normalRange: { low: 8000, high: 15000 },
     archetype: "activity-fitness",
   },
   ACTIVE_ENERGY: {
diff --git a/src/lib/medical-citations.ts b/src/lib/medical-citations.ts
index f7808766e..3372a3b96 100644
--- a/src/lib/medical-citations.ts
+++ b/src/lib/medical-citations.ts
@@ -189,6 +189,293 @@ export const CITATIONS = {
     caveat:
       "Reference values for an idealised adult; individual variation broad.",
   },
+
+  // ── v1.18.6 — reference-range backbone sources ──
+
+  /**
+   * AHA — All About Heart Rate (resting + target heart rates), 2024.
+   * Normal adult resting 60–100 bpm; endurance athletes benignly 40–60.
+   * Consumer-facing orientation; symptomatic concern is the trigger for
+   * care, not the number alone.
+   */
+  AHA_2024_RHR: {
+    id: "aha-2024-rhr",
+    name: "AHA 2024 Heart Rate",
+    year: 2024,
+    url: "https://www.heart.org/en/health-topics/high-blood-pressure/the-facts-about-high-blood-pressure/all-about-heart-rate-pulse",
+    caveat:
+      "General adult band; a trained heart can sit 40–60, and a new low with dizziness/fainting is the concern, not the number alone.",
+  },
+
+  /**
+   * StatPearls/NIH — Pulse Oximetry (2023). Healthy adult room-air SpO₂
+   * 95–100% (bulk 96–99%); mild hypoxaemia 91–94%; clinically significant
+   * <90%. Consumer wrist/finger optical readers are wellness-grade
+   * (±2–4%) and a single low reading is often artefact.
+   */
+  STATPEARLS_PULSE_OX: {
+    id: "statpearls-pulse-ox",
+    name: "StatPearls Pulse Oximetry",
+    year: 2023,
+    url: "https://www.ncbi.nlm.nih.gov/books/NBK470348/",
+    caveat:
+      "Healthy room-air band; consumer optical SpO₂ is ±2–4% and a single low reading is often artefact — sustained runs are the signal.",
+  },
+
+  /**
+   * 2017 ACC/AHA Guideline for the Prevention, Detection, Evaluation and
+   * Management of High Blood Pressure in Adults. Lowers the US disease
+   * line: Normal <120/<80; Elevated 120–129/<80; Stage 1 130–139 or
+   * 80–89; Stage 2 ≥140 or ≥90. Surfaced only as the stricter COMPARISON
+   * anchor next to the shipped ESH default — never the labelled band.
+   */
+  ACC_AHA_2017_BP: {
+    id: "acc-aha-2017-bp",
+    name: "ACC/AHA 2017",
+    year: 2017,
+    url: "https://www.ahajournals.org/doi/10.1161/HYP.0000000000000065",
+    caveat:
+      "US guideline; labels 130–139/80–89 as Stage 1 — a stricter line than the ESH default, shown for placement only.",
+  },
+
+  /**
+   * 2024 ESC Guidelines for the management of elevated blood pressure and
+   * hypertension. Adds an "Elevated" diagnostic band (120–139/70–89) and a
+   * treated SBP target of 120–129. Disease line stays ≥140/90 office.
+   * Displayed as context alongside the ESH 2023 default.
+   */
+  ESC_2024_BP: {
+    id: "esc-2024-bp",
+    name: "ESC 2024",
+    year: 2024,
+    url: "https://academic.oup.com/eurheartj/article/45/38/3912/7741010",
+    caveat:
+      "European; introduces an 'Elevated' 120–139/70–89 band and a treated 120–129 target — context, not the shipped classification.",
+  },
+
+  /**
+   * StatPearls/NCBI — Physiology, Pulse Pressure (NBK482408). PP = SBP −
+   * DBP; ~40 mmHg typical at rest, wide ≳60 mmHg marks large-artery
+   * stiffening, narrow ≲25 mmHg can accompany low stroke volume. A
+   * "discuss with a clinician" signal, not a diagnosis.
+   */
+  STATPEARLS_PULSE_PRESSURE: {
+    id: "statpearls-pulse-pressure",
+    name: "StatPearls Pulse Pressure",
+    year: 2023,
+    url: "https://www.ncbi.nlm.nih.gov/books/NBK482408/",
+    caveat:
+      "Educational physiology reference; PP is a discussion prompt, never a standalone diagnosis.",
+  },
+
+  /**
+   * StatPearls/NCBI — Physiology, Mean Arterial Pressure (NBK538226).
+   * MAP ≈ (SBP + 2·DBP)/3; resting band ~70–100 mmHg, ~60 mmHg the
+   * conventional organ-perfusion floor — an acute-care concept, NOT a
+   * consumer self-alarm threshold.
+   */
+  STATPEARLS_MAP: {
+    id: "statpearls-map",
+    name: "StatPearls Mean Arterial Pressure",
+    year: 2023,
+    url: "https://www.ncbi.nlm.nih.gov/books/NBK538226/",
+    caveat:
+      "The ~60 mmHg floor is an acute-care perfusion concept, not a consumer alarm threshold.",
+  },
+
+  /**
+   * 2018 ESC/ESH Guidelines for the management of arterial hypertension.
+   * Source of the carotid-femoral PWV >10 m/s organ-damage cut-off and
+   * the BP grade bands still widely cited. The PWV number is European;
+   * AHA/ACC do not enshrine an equivalent consumer PWV threshold.
+   */
+  ESC_ESH_2018_PWV: {
+    id: "esc-esh-2018-pwv",
+    name: "ESC/ESH 2018",
+    year: 2018,
+    url: "https://academic.oup.com/eurheartj/article/39/33/3021/5079119",
+    caveat:
+      "cf-PWV >10 m/s is the European clinical reference; consumer PWV / vascular-age estimates are proxies, not clinical cf-PWV.",
+  },
+
+  /**
+   * US FDA — pulse-oximeter accuracy and limitations (Feb 2024 advisory
+   * committee review + safety communication). Oximeters can overestimate
+   * true saturation in people with darker skin, roughly 3× more often
+   * than in lighter-skinned patients (occult hypoxaemia).
+   */
+  FDA_2024_PULSE_OX: {
+    id: "fda-2024-pulse-ox",
+    name: "FDA 2024 Pulse Oximeter Review",
+    year: 2024,
+    url: "https://www.fda.gov/medical-devices/safety-communications/pulse-oximeter-accuracy-and-limitations-fda-safety-communication",
+    caveat:
+      "Documents over-reading in darker skin; a single near-normal reading is not a clearance — confirm when concerned.",
+  },
+
+  /**
+   * "Normal Body Temperature: A Systematic Review" — J Gen Intern Med,
+   * 2019. Population oral-equivalent mean ~36.6 °C (normal ~35.7–37.4 °C),
+   * superseding the conventional 37.0 °C set point. Fever ≥38.0 °C oral.
+   */
+  JGIM_2019_TEMPERATURE: {
+    id: "jgim-2019-temperature",
+    name: "J Gen Intern Med 2019",
+    year: 2019,
+    url: "https://link.springer.com/article/10.1007/s11606-019-05148-7",
+    caveat:
+      "Oral-equivalent mean; sites differ by up to ~1 °C — tag the measurement site before comparing.",
+  },
+
+  /**
+   * Royal College of Physicians — National Early Warning Score 2 (NEWS2),
+   * 2017. Respiratory-rate scoring: highest-risk ≤8 and ≥25/min. A
+   * hospital deterioration tool, not a consumer alarm.
+   */
+  RCP_2017_NEWS2: {
+    id: "rcp-2017-news2",
+    name: "RCP NEWS2 2017",
+    year: 2017,
+    url: "https://www.rcp.ac.uk/improving-care/resources/national-early-warning-score-news-2/",
+    caveat:
+      "Hospital deterioration score; the ≥25/min cutoff is clinical context, not a self-monitoring alarm.",
+  },
+
+  /**
+   * American Lung Association — resting respiratory rate reference
+   * (12–20 breaths/min for healthy adults). Consumer-facing vital-sign
+   * orientation.
+   */
+  ALA_RESPIRATORY_RATE: {
+    id: "ala-respiratory-rate",
+    name: "American Lung Association",
+    year: 2024,
+    url: "https://www.lung.org/lung-health-diseases/how-lungs-work/breathing-rate",
+    caveat:
+      "General adult resting band; rates run higher in children and shift with activity, fever and emotion.",
+  },
+
+  /**
+   * Peer-reviewed visceral-adipose-tissue imaging literature (2014–2025):
+   * CT/MRI/DXA VAT area >~100 cm² increased-risk, >~160 cm² high-risk.
+   * Ethnicity-dependent; the consumer scale "rating" is NOT a cm² value.
+   */
+  VAT_IMAGING_THRESHOLD: {
+    id: "vat-imaging-threshold",
+    name: "VAT imaging literature",
+    year: 2025,
+    url: "https://pubmed.ncbi.nlm.nih.gov/24008002/",
+    caveat:
+      "Imaging cm² thresholds; the consumer scale 'visceral fat rating' is a separate unitless scale, not interchangeable.",
+  },
+
+  /**
+   * Wilcox AJ, Dunson D, Baird DD. "The timing of the 'fertile window' in
+   * the menstrual cycle." BMJ, 2000. The 6-day fertile window ends on
+   * ovulation day; ovulation timing is highly variable even in regular
+   * cyclers.
+   */
+  WILCOX_2000_FERTILE_WINDOW: {
+    id: "wilcox-2000-fertile-window",
+    name: "Wilcox BMJ 2000",
+    year: 2000,
+    url: "https://www.bmj.com/content/321/7271/1259",
+    caveat:
+      "Fertile-window timing is highly variable; calendar estimates approximate and are not a contraceptive method.",
+  },
+
+  /**
+   * ACOG Committee Opinion 651 (2015) — "Menstruation in Girls and
+   * Adolescents: Using the Menstrual Cycle as a Vital Sign." Adult cycle
+   * 24–38 days, bleeding ~5 days (up to ~7).
+   *
+   * NEEDS-VERIFY ACOG — the cycle-length / bleeding-duration figures cited
+   * in the `insights.subPage.explainer.cycleEducationBody` copy, and any
+   * "when to see a clinician" thresholds (cycle <21 / >35, amenorrhea ≥3
+   * months, heavy bleeding >7 days), must be confirmed against the live
+   * ACOG FAQ before shipping that copy to users (automated fetch was
+   * rate-limited during research).
+   */
+  ACOG_CO651_2015: {
+    id: "acog-co651-2015",
+    name: "ACOG CO 651 2015",
+    year: 2015,
+    url: "https://www.acog.org/clinical/clinical-guidance/committee-opinion/articles/2015/12/menstruation-in-girls-and-adolescents-using-the-menstrual-cycle-as-a-vital-sign",
+    caveat:
+      "Cycle as a vital sign; exact clinician-consultation thresholds should be confirmed against the live ACOG FAQ.",
+  },
+
+  /**
+   * Phillips AJK, et al. "Irregular sleep/wake patterns are associated
+   * with poorer academic performance and delayed circadian and sleep/wake
+   * timing." Sci Rep, 2017 — origin of the Sleep Regularity Index (SRI).
+   * UK Biobank (Windred 2023/24) tied higher regularity to lower mortality.
+   */
+  PHILLIPS_2017_SRI: {
+    id: "phillips-2017-sri",
+    name: "Phillips Sci Rep 2017",
+    year: 2017,
+    url: "https://www.nature.com/articles/s41598-017-03171-4",
+    caveat:
+      "Sleep-regularity construct; no universal good/bad threshold — present as a personal trend.",
+  },
+
+  /**
+   * US CDC — About Sleep / tips for better sleep (2024). Evidence-based
+   * sleep-hygiene behaviours (consistent schedule, morning light, dim
+   * evenings, caffeine timing, cool dark room).
+   */
+  CDC_2024_SLEEP: {
+    id: "cdc-2024-sleep",
+    name: "CDC 2024 Sleep",
+    year: 2024,
+    url: "https://www.cdc.gov/sleep/about/index.html",
+    caveat: "General sleep-hygiene guidance; individual needs vary.",
+  },
+
+  /**
+   * WHO — Obesity: preventing and managing the global epidemic (TRS 894),
+   * 2000. The BMI classification still in use: underweight <18.5, normal
+   * 18.5–24.9, overweight 25.0–29.9, obesity ≥30. Asian-population risk
+   * rises at lower cut-offs (WHO 2004).
+   */
+  WHO_2000_BMI: {
+    id: "who-2000-bmi",
+    name: "WHO 2000 BMI",
+    year: 2000,
+    url: "https://www.who.int/publications/i/item/WHO_TRS_894",
+    caveat:
+      "Population screen, not a diagnosis; Asian-population risk rises at lower cut-offs and BMI does not distinguish muscle from fat.",
+  },
+
+  /**
+   * WHO/IDF — Definition and Diagnosis of Diabetes Mellitus and
+   * Intermediate Hyperglycaemia, 2006. Impaired fasting glucose floor of
+   * 110 mg/dL (vs ADA's 100); the diabetes line (≥126) is shared.
+   */
+  WHO_IDF_2006_GLUCOSE: {
+    id: "who-idf-2006-glucose",
+    name: "WHO/IDF 2006",
+    year: 2006,
+    url: "https://www.who.int/publications/i/item/definition-and-diagnosis-of-diabetes-mellitus-and-intermediate-hyperglycaemia",
+    caveat:
+      "Sets the impaired-fasting-glucose floor at 110 mg/dL; the diabetes threshold (≥126) is shared with ADA.",
+  },
+
+  /**
+   * ESC/NASPE Task Force — Heart Rate Variability: Standards of
+   * Measurement, Physiological Interpretation and Clinical Use.
+   * Circulation / Eur Heart J, 1996. Defines SDNN/RMSSD norms and the
+   * prognostic 24-h SDNN bands; day-to-day swings of ~±10% are routine.
+   */
+  ESC_NASPE_1996_HRV: {
+    id: "esc-naspe-1996-hrv",
+    name: "ESC/NASPE HRV Standards 1996",
+    year: 1996,
+    url: "https://www.ahajournals.org/doi/10.1161/01.CIR.93.5.1043",
+    caveat:
+      "Clinical 24-h SDNN norms are NOT interchangeable with an overnight wearable RMSSD; only the personal trend is meaningful.",
+  },
 } as const satisfies Record<string, Citation>;
 
 export type CitationId = keyof typeof CITATIONS;
diff --git a/src/lib/reference-ranges.ts b/src/lib/reference-ranges.ts
new file mode 100644
index 000000000..88e8c0581
--- /dev/null
+++ b/src/lib/reference-ranges.ts
@@ -0,0 +1,377 @@
+/**
+ * v1.18.6 — citation-backed reference-range backbone.
+ *
+ * A single structured source of truth for the population reference bands
+ * the UI surfaces (explainer captions, metric tiles, the glossary, the
+ * "where your value sits" tooltip). Each metric carries:
+ *   - the canonical display unit,
+ *   - one or more named `bands` (low/high half-open, with the body + year
+ *     that publishes them via a `CitationId`),
+ *   - the primary `referenceId` (the body the headline band is sourced to),
+ *   - an optional `conflicts[]` of alternative-guideline context (e.g. the
+ *     BP US/EU disagreement — shown as placement context, never the
+ *     shipped classification),
+ *   - a `guidanceCaveat` that frames the band as general guidance.
+ *
+ * This module is intentionally read-only data + pure helpers — no DB, no
+ * LLM, no per-user state. The metric-status registry fills its coarse
+ * `normalRange` from these bands; the BP detail surface reads the PP / MAP
+ * anchors; the explainers read `referenceLabel()` for the cited sentence.
+ *
+ * Every band traces to `src/lib/medical-citations.ts`. No commercial brand
+ * is named anywhere. Ranges are population anchors that shift with age,
+ * sex and condition — the user's own baseline always leads the read; these
+ * are a placement aid, not a diagnosis. Where authoritative bodies
+ * disagree the disagreement is surfaced (`conflicts`), never silently
+ * resolved.
+ */
+import { CITATIONS, type CitationId, citationLabel } from "./medical-citations";
+
+/**
+ * A single named reference band. `low`/`high` are inclusive display
+ * anchors in the metric's unit; either bound may be omitted for an
+ * open-ended band (e.g. "≥7 h", "<100 mg/dL").
+ */
+export interface ReferenceBand {
+  /** Stable, human-readable band label ("Normal", "Elevated", "Fever"). */
+  readonly label: string;
+  readonly low?: number;
+  readonly high?: number;
+  /** The body + year that publishes this band. */
+  readonly citation: CitationId;
+}
+
+/**
+ * An alternative-guideline framing shown as CONTEXT next to the default
+ * band — never the shipped classification. The BP US/EU split is the
+ * canonical use.
+ */
+export interface ReferenceConflict {
+  /** Short note describing the alternative framing (general education). */
+  readonly note: string;
+  readonly citation: CitationId;
+}
+
+export interface ReferenceRange {
+  /** Canonical display unit (matches the metric tile + registry). */
+  readonly unit: string;
+  /** Ordered population bands; the first is the "good"/normal placement. */
+  readonly bands: readonly ReferenceBand[];
+  /** The body the headline band is sourced to (drives the cited sentence). */
+  readonly referenceId: CitationId;
+  /** Alternative-guideline context, shown for placement only. */
+  readonly conflicts?: readonly ReferenceConflict[];
+  /** One-sentence general-guidance frame surfaced under the band. */
+  readonly guidanceCaveat: string;
+}
+
+/**
+ * The reference-metric slugs the backbone covers. Stable string keys (not
+ * the DB enum) so the UI, the registry and the explainer can all read one
+ * vocabulary. A superset of the universal metrics + the cardiovascular
+ * derivations the explainers cite.
+ */
+export type ReferenceMetric =
+  | "BLOOD_PRESSURE"
+  | "PULSE_PRESSURE"
+  | "MEAN_ARTERIAL_PRESSURE"
+  | "PULSE_WAVE_VELOCITY"
+  | "RESTING_HEART_RATE"
+  | "HEART_RATE_VARIABILITY"
+  | "OXYGEN_SATURATION"
+  | "RESPIRATORY_RATE"
+  | "BODY_TEMPERATURE"
+  | "BLOOD_GLUCOSE"
+  | "HBA1C"
+  | "BMI"
+  | "STEPS"
+  | "VISCERAL_FAT"
+  | "SLEEP_DURATION";
+
+export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
+  // ── Blood pressure — ESH 2023 is the SHIPPED default (do not flip). ──
+  // ACC/AHA 2017 + ESC 2024 are surfaced only as placement CONTEXT.
+  BLOOD_PRESSURE: {
+    unit: "mmHg",
+    bands: [
+      // ESH grade bands (office, mmHg, systolic anchors shown).
+      { label: "Optimal", high: 120, citation: "ESH_2023_HYPERTENSION" },
+      { label: "Normal", low: 120, high: 129, citation: "ESH_2023_HYPERTENSION" },
+      { label: "High-normal", low: 130, high: 139, citation: "ESH_2023_HYPERTENSION" },
+      { label: "Hypertension", low: 140, citation: "ESH_2023_HYPERTENSION" },
+    ],
+    referenceId: "ESH_2023_HYPERTENSION",
+    conflicts: [
+      {
+        note: "ACC/AHA (US) labels 130–139/80–89 as Stage 1 hypertension — a stricter line than the European disease threshold of 140/90.",
+        citation: "ACC_AHA_2017_BP",
+      },
+      {
+        note: "ESC 2024 adds an 'Elevated' band at 120–139/70–89 and a treated target of 120–129.",
+        citation: "ESC_2024_BP",
+      },
+    ],
+    guidanceCaveat:
+      "Categorised from a standardised seated reading or a validated home average — never a single reading. Targets individualise by age and condition.",
+  },
+
+  // Pulse pressure = SBP − DBP. Pure derivation of stored BP.
+  PULSE_PRESSURE: {
+    unit: "mmHg",
+    bands: [
+      { label: "Narrow", high: 25, citation: "STATPEARLS_PULSE_PRESSURE" },
+      { label: "Typical at rest", low: 25, high: 60, citation: "STATPEARLS_PULSE_PRESSURE" },
+      { label: "Wide", low: 60, citation: "STATPEARLS_PULSE_PRESSURE" },
+    ],
+    referenceId: "STATPEARLS_PULSE_PRESSURE",
+    guidanceCaveat:
+      "A wide gap (≳60) in middle age can reflect arterial stiffening; a narrow gap (≲25) can accompany low stroke volume. A discussion prompt, not a diagnosis.",
+  },
+
+  // Mean arterial pressure ≈ (SBP + 2·DBP)/3.
+  MEAN_ARTERIAL_PRESSURE: {
+    unit: "mmHg",
+    bands: [
+      { label: "Resting band", low: 70, high: 100, citation: "STATPEARLS_MAP" },
+    ],
+    referenceId: "STATPEARLS_MAP",
+    guidanceCaveat:
+      "The average pressure your organs see across a heartbeat. The ~60 mmHg floor is an acute-care concept, not a consumer self-alarm.",
+  },
+
+  PULSE_WAVE_VELOCITY: {
+    unit: "m/s",
+    bands: [
+      { label: "Reference", high: 10, citation: "ESC_ESH_2018_PWV" },
+      { label: "Elevated stiffness", low: 10, citation: "ESC_ESH_2018_PWV" },
+    ],
+    referenceId: "ESC_ESH_2018_PWV",
+    guidanceCaveat:
+      "The cf-PWV >10 m/s organ-damage marker is a European clinical reference measured by tonometry; a consumer estimate is a proxy, not interchangeable.",
+  },
+
+  // ── Resting heart rate — uses RESTING_HEART_RATE, never workout pulse. ──
+  // Bands are authored normal-first so `classifyReference` treats the
+  // population-normal band as the "within" placement. The athletic band
+  // (40–60) is benign for a trained heart but sits below the standard
+  // normal range — the caveat copy carries that nuance.
+  RESTING_HEART_RATE: {
+    unit: "bpm",
+    bands: [
+      { label: "Normal adult resting", low: 60, high: 100, citation: "AHA_2024_RHR" },
+      { label: "Athletic (benign)", low: 40, high: 60, citation: "AHA_2024_RHR" },
+    ],
+    referenceId: "AHA_2024_RHR",
+    guidanceCaveat:
+      "Measured at rest, ideally on waking. A trained heart can sit 40–60 bpm; the trend over weeks beats any single reading. Caffeine, stress, fever and medication all shift it.",
+  },
+
+  HEART_RATE_VARIABILITY: {
+    unit: "ms",
+    bands: [],
+    referenceId: "ESC_NASPE_1996_HRV",
+    guidanceCaveat:
+      "There is no universal 'normal' — only your own trend is meaningful. Single-night swings of about ±10% are routine; track a 7-day rolling average and read changes smaller than that as noise.",
+  },
+
+  // ── SpO2 — healthy room-air band + darker-skin over-read caveat (C4). ──
+  OXYGEN_SATURATION: {
+    unit: "%",
+    bands: [
+      { label: "Healthy room air", low: 95, high: 100, citation: "STATPEARLS_PULSE_OX" },
+      { label: "Mild hypoxaemia", low: 91, high: 94, citation: "STATPEARLS_PULSE_OX" },
+    ],
+    referenceId: "STATPEARLS_PULSE_OX",
+    guidanceCaveat:
+      "95–100% is normal at rest; above ~98% adds no benefit. Optical readers can over-read true saturation in people with darker skin, so a single near-normal reading is not a clearance — confirm when warm, still and concerned.",
+  },
+
+  RESPIRATORY_RATE: {
+    unit: "breaths/min",
+    bands: [
+      { label: "Normal resting adult", low: 12, high: 20, citation: "ALA_RESPIRATORY_RATE" },
+      { label: "Worth attention", low: 22, citation: "RCP_2017_NEWS2" },
+    ],
+    referenceId: "ALA_RESPIRATORY_RATE",
+    guidanceCaveat:
+      "Meaningful only truly at rest or asleep. A sustained rise of about +3 above your own nightly baseline can be an early illness signal; clinical escalation cutoffs are hospital tools, not self-alarms.",
+  },
+
+  // ── Body temperature — evidence-based 36.6 °C mean, fever ≥38 (C6). ──
+  BODY_TEMPERATURE: {
+    unit: "°C",
+    bands: [
+      { label: "Normal oral range", low: 35.7, high: 37.4, citation: "JGIM_2019_TEMPERATURE" },
+      { label: "Fever", low: 38.0, citation: "JGIM_2019_TEMPERATURE" },
+    ],
+    referenceId: "JGIM_2019_TEMPERATURE",
+    guidanceCaveat:
+      "The population mean is ~36.6 °C, not 37.0 °C, and swings ~0.5 °C across the day. Sites differ by up to ~1 °C, so tag the measurement site. Wearable wrist readings track relative change, not a fever value.",
+  },
+
+  // ── Glucose — GENERAL non-diabetic bands only (diabetes opt-in = W6). ──
+  BLOOD_GLUCOSE: {
+    unit: "mg/dL",
+    bands: [
+      { label: "Normal fasting", high: 100, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Prediabetes (fasting)", low: 100, high: 125, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Diabetes range (fasting)", low: 126, citation: "ADA_2024_GLYCEMIC" },
+    ],
+    referenceId: "ADA_2024_GLYCEMIC",
+    conflicts: [
+      {
+        note: "WHO/IDF set the prediabetes fasting floor at 110 mg/dL rather than 100; the diabetes line (≥126) is shared.",
+        citation: "WHO_IDF_2006_GLUCOSE",
+      },
+    ],
+    guidanceCaveat:
+      "Fasting bands for adults without diabetes. A single high reading does not diagnose — a clinician confirms with a repeat test. People managing diabetes use different, clinician-set targets.",
+  },
+
+  HBA1C: {
+    unit: "%",
+    bands: [
+      { label: "Normal", high: 5.7, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Prediabetes", low: 5.7, high: 6.4, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Diabetes", low: 6.5, citation: "ADA_2024_GLYCEMIC" },
+    ],
+    referenceId: "ADA_2024_GLYCEMIC",
+    guidanceCaveat:
+      "Reflects the average glucose over ~2–3 months. Unreliable with altered red-cell turnover; when discordant with glucose, glucose takes precedence.",
+  },
+
+  BMI: {
+    unit: "kg/m²",
+    bands: [
+      { label: "Underweight", high: 18.5, citation: "WHO_2020_PA" },
+      { label: "Normal", low: 18.5, high: 24.9, citation: "WHO_2020_PA" },
+      { label: "Overweight", low: 25.0, high: 29.9, citation: "WHO_2020_PA" },
+      { label: "Obesity", low: 30.0, citation: "WHO_2020_PA" },
+    ],
+    referenceId: "WHO_2000_BMI",
+    guidanceCaveat:
+      "A population-level screen, not a diagnosis — it does not distinguish muscle from fat or where fat sits. Asian-population risk rises at lower cut-offs.",
+  },
+
+  // ── Steps — canonical green floor = 8,000 (C2/D4 reconcile). ──
+  STEPS: {
+    unit: "steps/day",
+    bands: [
+      { label: "Higher mortality benefit", low: 8000, citation: "STEPS_SAINT_MAURICE_2020" },
+    ],
+    referenceId: "STEPS_SAINT_MAURICE_2020",
+    guidanceCaveat:
+      "Mortality risk falls steeply toward ~8,000 steps/day with continued benefit through ~12,000; the optimal count is lower for older adults. The '10,000' figure is a marketing slogan, not research.",
+  },
+
+  VISCERAL_FAT: {
+    unit: "rating",
+    bands: [
+      { label: "Healthy rating", low: 1, high: 12, citation: "VAT_IMAGING_THRESHOLD" },
+      { label: "Elevated rating", low: 13, citation: "VAT_IMAGING_THRESHOLD" },
+    ],
+    referenceId: "VAT_IMAGING_THRESHOLD",
+    guidanceCaveat:
+      "The consumer scale 'rating' (≈1–12 healthy) is a unitless scale, not the imaging cm² value (>100 cm² increased risk). High visceral fat is closely tied to heart disease and type 2 diabetes.",
+  },
+
+  // ── Sleep — adult 7–9 h; total sleep time beats the stage split. ──
+  SLEEP_DURATION: {
+    unit: "h",
+    bands: [
+      { label: "Adult 18–64", low: 7, high: 9, citation: "AASM_2015_SLEEP" },
+      { label: "Older adult 65+", low: 7, high: 8, citation: "AASM_2015_SLEEP" },
+    ],
+    referenceId: "AASM_2015_SLEEP",
+    guidanceCaveat:
+      "Both short and long habitual sleep carry risk. Regularity predicts health at least as strongly as duration, and a wearable's total sleep time is far more trustworthy than its deep/REM split.",
+  },
+};
+
+/** All reference-metric slugs the backbone covers. */
+export const REFERENCE_METRICS = Object.keys(
+  REFERENCE_RANGES,
+) as ReferenceMetric[];
+
+/** Type guard narrowing an arbitrary string to a covered reference metric. */
+export function isReferenceMetric(value: string): value is ReferenceMetric {
+  return Object.prototype.hasOwnProperty.call(REFERENCE_RANGES, value);
+}
+
+/** Resolve the reference range for a metric, or null when uncovered. */
+export function getReferenceRange(metric: string): ReferenceRange | null {
+  return isReferenceMetric(metric) ? REFERENCE_RANGES[metric] : null;
+}
+
+/**
+ * Localised "ESH 2023 (2023)"-style label for the headline band's source.
+ * The citation name is canonical and not translated (locale-agnostic).
+ */
+export function referenceLabel(metric: ReferenceMetric): string {
+  return citationLabel(REFERENCE_RANGES[metric].referenceId);
+}
+
+/**
+ * The four-state "where your value sits" phrasing contract (UI-1). A
+ * deterministic placement of a value against the metric's population
+ * bands, ALWAYS framed as general guidance. Consumers map each state to a
+ * cited i18n string; the state itself never asserts a diagnosis.
+ *
+ * - `within`          — inside the normal/good band.
+ * - `slightly-outside`— in an adjacent watch band (e.g. high-normal,
+ *                       prediabetes, mild hypoxaemia).
+ * - `outside`         — in a band the guideline flags for attention.
+ * - `insufficient`    — no value, or the metric carries no population band
+ *                       (device-derived / baseline-only signals).
+ */
+export type ReferencePlacement =
+  | "within"
+  | "slightly-outside"
+  | "outside"
+  | "insufficient";
+
+/**
+ * Place a value against a metric's population bands. Returns
+ * `insufficient` when the value is absent or the metric has no fixed band
+ * (HRV and other device-derived signals defer wholly to the personal
+ * baseline). Pure + side-effect free; the user's own baseline still leads
+ * the read — this is only a coarse placement aid.
+ */
+export function classifyReference(
+  metric: ReferenceMetric,
+  value: number | null | undefined,
+): ReferencePlacement {
+  const range = REFERENCE_RANGES[metric];
+  if (value == null || !Number.isFinite(value) || range.bands.length === 0) {
+    return "insufficient";
+  }
+  // Find the first band whose half-open interval contains the value.
+  // Bands are authored in ascending order; the FIRST band is the
+  // normal/good placement, so its membership maps to `within`.
+  for (let i = 0; i < range.bands.length; i++) {
+    const band = range.bands[i];
+    const aboveLow = band.low == null || value >= band.low;
+    const belowHigh = band.high == null || value <= band.high;
+    if (aboveLow && belowHigh) {
+      if (i === 0) return "within";
+      // The band immediately adjacent to normal is the watch tier; any
+      // band beyond it is the attention tier.
+      return i === 1 ? "slightly-outside" : "outside";
+    }
+  }
+  // Value sits beyond every authored band (e.g. below an open-low normal,
+  // or above the top band's open-high). Treat an under-shoot of the first
+  // band's low as within when the first band is open-low; otherwise the
+  // value is outside the covered range → attention.
+  const first = range.bands[0];
+  if (first.low != null && value < first.low) return "outside";
+  return "outside";
+}
+
+/**
+ * Convenience: the citation entry backing a metric's headline band, for
+ * surfaces that want the url + caveat rather than the formatted label.
+ */
+export function referenceCitation(metric: ReferenceMetric) {
+  return CITATIONS[REFERENCE_RANGES[metric].referenceId];
+}

From 2c87a93827a404e2b130835a8c0d44a3bda93566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:11:52 +0200
Subject: [PATCH 37/71] feat(glucose): add a diabetes opt-in preference

Introduce an explicit, user-declared "I have diabetes / clinician glucose
targets" preference (`User.hasDiabetes`, migration 0174, defaulted false) plus
its GET/PATCH endpoint at `/api/auth/me/diabetes`. The flag selects which
glucose target band a reading is judged against; it is never inferred from a
value and never asserts a diagnosis. Mirrors the existing per-user-scalar
preference pattern: 60/min rate limit, Zod validation, audit-logged,
field-by-field write. OpenAPI regenerated for the new route.
---
 docs/api/openapi.yaml                         |  99 +++++++++++++++
 .../0174_v1186_diabetes_opt_in/migration.sql  |  15 +++
 prisma/schema.prisma                          |   7 ++
 src/app/api/auth/me/diabetes/route.ts         | 118 ++++++++++++++++++
 src/lib/openapi/routes/profile.ts             |  55 ++++++++
 5 files changed, 294 insertions(+)
 create mode 100644 prisma/migrations/0174_v1186_diabetes_opt_in/migration.sql
 create mode 100644 src/app/api/auth/me/diabetes/route.ts

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index b55ba0e06..3b6ddd195 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -1837,6 +1837,8 @@ paths:
                       minLength: 1
                       maxLength: 32
                     - type: "null"
+                symptomsPresent:
+                  type: boolean
               required:
                 - type
                 - value
@@ -3170,6 +3172,48 @@ paths:
         "401": *a1
         "422": *a3
         "429": *a4
+  /api/auth/me/diabetes:
+    get:
+      tags:
+        - Auth
+      summary: Read per-user diabetes opt-in flag
+      description: Returns the user's per-account diabetes opt-in flag. Default `false`. When `true`, the glucose target
+        resolver applies the tighter ADA glycemic GOAL bands (fasting 80–130, postprandial < 180) instead of the general
+        non-diabetic bands. Powers the Settings "I have diabetes / clinician glucose targets" toggle. Never inferred
+        from a reading; asserts no diagnosis.
+      responses:
+        "200":
+          description: Resolved flag.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/GetDiabetesResponse"
+        "401": *a1
+        "422": *a3
+        "429": *a4
+    patch:
+      tags:
+        - Auth
+      summary: Toggle per-user diabetes opt-in flag
+      description: Sets the per-account diabetes opt-in flag. Idempotent — the DB write fires even when the value matches so
+        the audit-log row mirrors the API call. Always returns the resolved next-state. `userId` is never accepted from
+        the body. Rate-limit 60/min per user.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/DiabetesFlag"
+      responses:
+        "200":
+          description: Resolved next-state echoed back for optimistic-update consumers.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/PatchDiabetesResponse"
+        "401": *a1
+        "422": *a3
+        "429": *a4
   /api/auth/me/modules:
     get:
       tags:
@@ -7668,6 +7712,16 @@ components:
       required:
         - disableCoach
       description: Per-account Coach opt-out toggle (v1.4.47 W3). `true` hides the Coach FAB and short-circuits its API gates.
+    DiabetesFlag:
+      type: object
+      properties:
+        hasDiabetes:
+          type: boolean
+      required:
+        - hasDiabetes
+      description: Per-account diabetes opt-in (v1.18.6). `true` selects the ADA glycemic GOAL bands (fasting 80–130,
+        postprandial < 180) for glucose targets instead of the general non-diabetic bands. A user-declared preference
+        only — never inferred from a value, never a diagnosis.
     ModulePrefsPatchRequest:
       type: object
       properties:
@@ -13611,6 +13665,40 @@ components:
         - data
         - error
       additionalProperties: false
+    GetDiabetesResponse:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/DiabetesFlagOutput"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    PatchDiabetesResponse:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/DiabetesFlagOutput"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
     GetModulesResponse:
       type: object
       properties:
@@ -19607,6 +19695,17 @@ components:
         - disableCoach
       additionalProperties: false
       description: Per-account Coach opt-out toggle (v1.4.47 W3). `true` hides the Coach FAB and short-circuits its API gates.
+    DiabetesFlagOutput:
+      type: object
+      properties:
+        hasDiabetes:
+          type: boolean
+      required:
+        - hasDiabetes
+      additionalProperties: false
+      description: Per-account diabetes opt-in (v1.18.6). `true` selects the ADA glycemic GOAL bands (fasting 80–130,
+        postprandial < 180) for glucose targets instead of the general non-diabetic bands. A user-declared preference
+        only — never inferred from a value, never a diagnosis.
     InsightsLayoutBodyOutput:
       type: object
       properties:
diff --git a/prisma/migrations/0174_v1186_diabetes_opt_in/migration.sql b/prisma/migrations/0174_v1186_diabetes_opt_in/migration.sql
new file mode 100644
index 000000000..eaaa0fce8
--- /dev/null
+++ b/prisma/migrations/0174_v1186_diabetes_opt_in/migration.sql
@@ -0,0 +1,15 @@
+-- v1.18.6 — diabetes opt-in for clinician glucose targets.
+--
+-- One additive, defaulted column on `users` so a user can declare "I have
+-- diabetes / clinician glucose targets". When `true`, the glucose target
+-- resolver applies the tighter ADA glycemic GOAL bands (fasting 80–130,
+-- postprandial < 180) instead of the general non-diabetic normal bands.
+--
+-- This is NEVER auto-inferred from a reading and is NEVER a diagnosis — it is
+-- a user-declared preference that only selects which target band the user is
+-- judged against. The default `false` backfills every existing row onto the
+-- general bands (the current behaviour), so the migration is a no-op for
+-- anyone who never opts in.
+
+ALTER TABLE "users"
+  ADD COLUMN "has_diabetes" BOOLEAN NOT NULL DEFAULT false;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 948d0db58..f87097c6e 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -193,6 +193,13 @@ model User {
   moodTagLayoutJson       Json?   @map("mood_tag_layout_json")
   // Blood-glucose display unit preference. Canonical storage is mg/dL.
   glucoseUnit             String? @map("glucose_unit") // "mg/dL" | "mmol/L" | null = default "mg/dL"
+  // v1.18.6 — explicit "I have diabetes / clinician glucose targets" opt-in.
+  // When `true`, the glucose target resolver applies the tighter ADA glycemic
+  // GOAL bands (fasting 80–130, postprandial < 180) instead of the general
+  // non-diabetic normal bands. NEVER auto-inferred from values, NEVER a
+  // diagnosis — purely a user-declared preference that selects which target
+  // band the user is judged against. Default `false`.
+  hasDiabetes             Boolean @default(false) @map("has_diabetes")
   // v1.7.0 unit pref — global metric/imperial display preference.
   // Canonical storage stays SI; this only selects the display-time
   // transform branch (km/h vs mph, km vs mi). Null = default "metric".
diff --git a/src/app/api/auth/me/diabetes/route.ts b/src/app/api/auth/me/diabetes/route.ts
new file mode 100644
index 000000000..56d72da64
--- /dev/null
+++ b/src/app/api/auth/me/diabetes/route.ts
@@ -0,0 +1,118 @@
+/**
+ * v1.18.6 — per-user diabetes opt-in endpoint.
+ *
+ *  GET    /api/auth/me/diabetes  — current flag.
+ *  PATCH  /api/auth/me/diabetes  — body `{ hasDiabetes: boolean }`.
+ *
+ * The flag is an explicit, user-declared preference ("I have diabetes /
+ * clinician glucose targets"). When `true`, the glucose target resolver
+ * applies the tighter ADA glycemic GOAL bands (fasting 80–130, postprandial
+ * < 180) instead of the general non-diabetic normal bands. It is NEVER
+ * inferred from a reading and asserts NO diagnosis — it only selects which
+ * target band a glucose reading is judged against.
+ *
+ * Mirrors the `disable-coach` / `unit-preference` per-user-scalar pattern:
+ * 60/min rate limit, Zod safeParse → 422 via `returnAllZodIssues`, audit-log
+ * row, field-by-field write (no mass assignment). Idempotent — the endpoint
+ * always returns the resolved next state so the client can hard-set the
+ * optimistic update without an extra round-trip.
+ */
+import { z } from "zod";
+
+import { apiHandler, requireAuth, HttpError } from "@/lib/api-handler";
+import {
+  apiError,
+  apiSuccess,
+  getClientIp,
+  returnAllZodIssues,
+} from "@/lib/api-response";
+import { annotate } from "@/lib/logging/context";
+import { auditLog } from "@/lib/auth/audit";
+import { prisma } from "@/lib/db";
+import { checkRateLimit, rateLimitHeaders } from "@/lib/rate-limit";
+
+const patchBodySchema = z.object({
+  hasDiabetes: z.boolean(),
+});
+
+export const dynamic = "force-dynamic";
+
+const PATCH_RATE_LIMIT = 60;
+const PATCH_WINDOW_MS = 60_000;
+
+type DiabetesResponse = {
+  hasDiabetes: boolean;
+};
+
+export const GET = apiHandler(async () => {
+  const { user } = await requireAuth();
+  annotate({ action: { name: "auth.me.diabetes.get" } });
+
+  const row = await prisma.user.findUnique({
+    where: { id: user.id },
+    select: { hasDiabetes: true },
+  });
+  const payload: DiabetesResponse = {
+    hasDiabetes: row?.hasDiabetes ?? false,
+  };
+  return apiSuccess(payload);
+});
+
+export const PATCH = apiHandler(async (req: Request) => {
+  const { user } = await requireAuth();
+
+  const rl = await checkRateLimit(
+    `diabetes:patch:${user.id}`,
+    PATCH_RATE_LIMIT,
+    PATCH_WINDOW_MS,
+  );
+  if (!rl.allowed) {
+    const response = apiError("Too many requests", 429);
+    for (const [k, v] of Object.entries(rateLimitHeaders(rl))) {
+      response.headers.set(k, v);
+    }
+    return response;
+  }
+
+  let body: unknown;
+  try {
+    body = await req.json();
+  } catch {
+    throw new HttpError(422, "diabetes.body.invalid_json");
+  }
+
+  const parsed = patchBodySchema.safeParse(body);
+  if (!parsed.success) {
+    annotate({ action: { name: "auth.me.diabetes.patch.invalid_shape" } });
+    return returnAllZodIssues(parsed.error, 422);
+  }
+
+  const next = parsed.data.hasDiabetes;
+
+  const previous = await prisma.user.findUnique({
+    where: { id: user.id },
+    select: { hasDiabetes: true },
+  });
+
+  await prisma.user.update({
+    where: { id: user.id },
+    data: { hasDiabetes: next },
+  });
+
+  await auditLog("user.diabetes.update", {
+    userId: user.id,
+    ipAddress: getClientIp(req),
+    details: {
+      previous: previous?.hasDiabetes ?? false,
+      next,
+    },
+  });
+
+  annotate({
+    action: { name: "auth.me.diabetes.patch" },
+    meta: { hasDiabetes: next },
+  });
+
+  const payload: DiabetesResponse = { hasDiabetes: next };
+  return apiSuccess(payload);
+});
diff --git a/src/lib/openapi/routes/profile.ts b/src/lib/openapi/routes/profile.ts
index 2a5654939..cd329e1ea 100644
--- a/src/lib/openapi/routes/profile.ts
+++ b/src/lib/openapi/routes/profile.ts
@@ -67,6 +67,20 @@ const disableCoachFlag = z
       "Per-account Coach opt-out toggle (v1.4.47 W3). `true` hides the Coach FAB and short-circuits its API gates.",
   });
 
+// v1.18.6 — explicit diabetes opt-in. Shared by GET (current) and PATCH
+// (request body + resolved response). `true` switches the glucose target
+// resolver to the tighter ADA glycemic GOAL bands (fasting 80–130,
+// postprandial < 180). Never inferred from a reading; asserts no diagnosis.
+const diabetesFlag = z
+  .object({
+    hasDiabetes: z.boolean(),
+  })
+  .meta({
+    id: "DiabetesFlag",
+    description:
+      "Per-account diabetes opt-in (v1.18.6). `true` selects the ADA glycemic GOAL bands (fasting 80–130, postprandial < 180) for glucose targets instead of the general non-diabetic bands. A user-declared preference only — never inferred from a value, never a diagnosis.",
+  });
+
 // v1.16.11 — per-user notification preferences. The PATCH request body
 // is the REAL runtime validator (`notificationPrefsSchema` — every
 // category and field optional, deep-merged server-side); the response
@@ -415,6 +429,47 @@ export const profilePaths: NonNullable<ZodOpenApiObject["paths"]> = {
       },
     },
   },
+  "/api/auth/me/diabetes": {
+    get: {
+      tags: ["Auth"],
+      summary: "Read per-user diabetes opt-in flag",
+      description:
+        'Returns the user\'s per-account diabetes opt-in flag. Default `false`. When `true`, the glucose target resolver applies the tighter ADA glycemic GOAL bands (fasting 80–130, postprandial < 180) instead of the general non-diabetic bands. Powers the Settings "I have diabetes / clinician glucose targets" toggle. Never inferred from a reading; asserts no diagnosis.',
+      responses: {
+        "200": {
+          description: "Resolved flag.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(diabetesFlag, "GetDiabetesResponse"),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+    patch: {
+      tags: ["Auth"],
+      summary: "Toggle per-user diabetes opt-in flag",
+      description:
+        "Sets the per-account diabetes opt-in flag. Idempotent — the DB write fires even when the value matches so the audit-log row mirrors the API call. Always returns the resolved next-state. `userId` is never accepted from the body. Rate-limit 60/min per user.",
+      requestBody: {
+        required: true,
+        content: { "application/json": { schema: diabetesFlag } },
+      },
+      responses: {
+        "200": {
+          description:
+            "Resolved next-state echoed back for optimistic-update consumers.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(diabetesFlag, "PatchDiabetesResponse"),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
   "/api/auth/me/modules": {
     get: {
       tags: ["Auth"],

From cf620de3153fae5472d94db7fd45721f565da842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:11:59 +0200
Subject: [PATCH 38/71] feat(glucose): resolve tighter ADA goal targets when
 diabetes is on
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a diabetes-aware glucose target resolver: when the user has opted in, the
fasting/post-prandial targets switch to the tighter ADA glycemic GOAL bands
(fasting 80–130, post-meal under 180 mg/dL) instead of the general
non-diabetic normal bands. A user threshold override always wins over both, so
a clinician-pinned individualised goal is never replaced by the population
band. The targets surface now reads through the resolver and labels the source
accordingly. The general band display is untouched.
---
 .../targets/__tests__/glucose-targets.test.ts |  98 ++++++++++++
 src/lib/targets/build-response.ts             |  46 ++++--
 src/lib/targets/glucose-targets.ts            | 147 ++++++++++++++++++
 3 files changed, 275 insertions(+), 16 deletions(-)
 create mode 100644 src/lib/targets/__tests__/glucose-targets.test.ts
 create mode 100644 src/lib/targets/glucose-targets.ts

diff --git a/src/lib/targets/__tests__/glucose-targets.test.ts b/src/lib/targets/__tests__/glucose-targets.test.ts
new file mode 100644
index 000000000..1b2c10d1b
--- /dev/null
+++ b/src/lib/targets/__tests__/glucose-targets.test.ts
@@ -0,0 +1,98 @@
+/**
+ * v1.18.6 — diabetes-aware glucose target resolver.
+ *
+ * Pins: flag OFF → general non-diabetic band; flag ON → tighter ADA goal band;
+ * a user override always wins over BOTH; the flag is consumed verbatim (never
+ * derived from a value).
+ */
+import { describe, expect, it } from "vitest";
+import {
+  resolveGlucoseTarget,
+  DIABETIC_GOAL_BANDS,
+} from "../glucose-targets";
+import type { UserProfileForRange } from "@/lib/analytics/effective-range";
+
+const profile: UserProfileForRange = {
+  heightCm: 178,
+  dateOfBirth: "1985-01-01",
+  gender: "MALE",
+};
+
+describe("resolveGlucoseTarget", () => {
+  it("uses the general non-diabetic band when the flag is OFF", () => {
+    const r = resolveGlucoseTarget({
+      context: "FASTING",
+      hasDiabetes: false,
+      profile,
+      overrides: null,
+    });
+    expect(r.source).toBe("default");
+    expect(r.isOverride).toBe(false);
+    // General fasting normal band is 70–99 (non-diabetic).
+    expect(r.range?.greenMin).toBe(70);
+    expect(r.range?.greenMax).toBe(99);
+  });
+
+  it("uses the tighter ADA goal band when the flag is ON (fasting 80-130)", () => {
+    const r = resolveGlucoseTarget({
+      context: "FASTING",
+      hasDiabetes: true,
+      profile,
+      overrides: null,
+    });
+    expect(r.source).toBe("ADA goal (diabetes)");
+    expect(r.range?.greenMin).toBe(DIABETIC_GOAL_BANDS.FASTING.min);
+    expect(r.range?.greenMax).toBe(DIABETIC_GOAL_BANDS.FASTING.max);
+    expect(r.range?.greenMin).toBe(80);
+    expect(r.range?.greenMax).toBe(130);
+  });
+
+  it("uses the ADA postprandial goal band (< 180) when the flag is ON", () => {
+    const r = resolveGlucoseTarget({
+      context: "POSTPRANDIAL",
+      hasDiabetes: true,
+      profile,
+      overrides: null,
+    });
+    expect(r.range?.greenMin).toBe(80);
+    expect(r.range?.greenMax).toBe(180);
+  });
+
+  it("lets a user override win over the diabetic goal band", () => {
+    const r = resolveGlucoseTarget({
+      context: "FASTING",
+      hasDiabetes: true,
+      profile,
+      overrides: { BLOOD_GLUCOSE_FASTING: { min: 90, max: 120 } },
+    });
+    expect(r.source).toBe("custom");
+    expect(r.isOverride).toBe(true);
+    expect(r.range?.greenMin).toBe(90);
+    expect(r.range?.greenMax).toBe(120);
+  });
+
+  it("lets a user override win over the general band (flag OFF)", () => {
+    const r = resolveGlucoseTarget({
+      context: "FASTING",
+      hasDiabetes: false,
+      profile,
+      overrides: { BLOOD_GLUCOSE_FASTING: { min: 75, max: 105 } },
+    });
+    expect(r.source).toBe("custom");
+    expect(r.range?.greenMin).toBe(75);
+    expect(r.range?.greenMax).toBe(105);
+  });
+
+  it("resolves the diabetic goal band identically for every context", () => {
+    for (const ctx of ["FASTING", "POSTPRANDIAL", "RANDOM", "BEDTIME"] as const) {
+      const r = resolveGlucoseTarget({
+        context: ctx,
+        hasDiabetes: true,
+        profile,
+        overrides: null,
+      });
+      expect(r.range?.greenMin).toBe(DIABETIC_GOAL_BANDS[ctx].min);
+      expect(r.range?.greenMax).toBe(DIABETIC_GOAL_BANDS[ctx].max);
+    }
+  });
+});
diff --git a/src/lib/targets/build-response.ts b/src/lib/targets/build-response.ts
index 7bae2df9d..1c2489df0 100644
--- a/src/lib/targets/build-response.ts
+++ b/src/lib/targets/build-response.ts
@@ -46,12 +46,10 @@ import type {
   MeasurementType,
   GlucoseContext,
 } from "@/generated/prisma/client";
-import {
-  getEffectiveRange,
-  type ThresholdOverridesJson,
-} from "@/lib/analytics/effective-range";
+import type { ThresholdOverridesJson } from "@/lib/analytics/effective-range";
 import { getBodyFatTargetRange } from "@/lib/analytics/value-bands";
-import { thresholdMetricForContext, resolveGlucoseUnit } from "@/lib/glucose";
+import { resolveGlucoseUnit } from "@/lib/glucose";
+import { resolveGlucoseTarget } from "@/lib/targets/glucose-targets";
 import {
   ensureUserMoodRollupsFresh,
   readMoodDayRollups,
@@ -219,6 +217,9 @@ export async function buildTargetsResponse(user: AuthedUser) {
           dateOfBirth: true,
           gender: true,
           glucoseUnit: true,
+          // v1.18.6 — diabetes opt-in selects the tighter ADA glycemic goal
+          // band for glucose targets (resolved below via resolveGlucoseTarget).
+          hasDiabetes: true,
           thresholdsJson: true,
           // v1.11.5 — needed to collapse a dual-source sleep night to one
           // canonical source before reconstructing per-night asleep totals.
@@ -1456,20 +1457,28 @@ export async function buildTargetsResponse(user: AuthedUser) {
           ) / 10
         : null;
 
-    const metric = thresholdMetricForContext(ctx);
-    const eff = getEffectiveRange(metric, profileForRange, overrides);
-    const range = eff.range
-      ? { min: eff.range.greenMin, max: eff.range.greenMax }
+    // v1.18.6 — diabetes-aware target band. When the user has declared
+    // diabetes (and has NOT pinned a custom override) the tighter ADA glycemic
+    // GOAL band wins; otherwise the general non-diabetic band (or the override)
+    // is used exactly as before. The flag is never inferred from a value.
+    const resolved = resolveGlucoseTarget({
+      context: ctx,
+      hasDiabetes: dbUser?.hasDiabetes ?? false,
+      profile: profileForRange,
+      overrides,
+    });
+    const effRange = resolved.range;
+    const range = effRange
+      ? { min: effRange.greenMin, max: effRange.greenMax }
       : null;
 
     let classification: { category: string; color: string } | null = null;
-    if (range) {
+    if (range && effRange) {
       if (latest >= range.min && latest <= range.max) {
         classification = { category: "Optimal", color: "#50fa7b" };
       } else if (
-        eff.range &&
-        latest >= eff.range.orangeMin &&
-        latest <= eff.range.orangeMax
+        latest >= effRange.orangeMin &&
+        latest <= effRange.orangeMax
       ) {
         classification = { category: "Elevated", color: "#f1fa8c" };
       } else {
@@ -1481,8 +1490,8 @@ export async function buildTargetsResponse(user: AuthedUser) {
       recent.map((r) => ({ measuredAt: r.measuredAt, value: r.value })),
       makeRangeClassifier(
         range,
-        eff.range
-          ? { orangeMin: eff.range.orangeMin, orangeMax: eff.range.orangeMax }
+        effRange
+          ? { orangeMin: effRange.orangeMin, orangeMax: effRange.orangeMax }
           : undefined,
       ),
     );
@@ -1495,7 +1504,12 @@ export async function buildTargetsResponse(user: AuthedUser) {
       unit: glucoseUnit,
       range,
       classification,
-      source: eff.isOverride ? "Custom" : "ADA 2024 / DDG",
+      source:
+        resolved.source === "custom"
+          ? "Custom"
+          : resolved.source === "ADA goal (diabetes)"
+            ? "ADA goal (diabetes)"
+            : "ADA 2024 / DDG",
       ...consistency,
     });
   }
diff --git a/src/lib/targets/glucose-targets.ts b/src/lib/targets/glucose-targets.ts
new file mode 100644
index 000000000..a52b6dfaa
--- /dev/null
+++ b/src/lib/targets/glucose-targets.ts
@@ -0,0 +1,147 @@
+/**
+ * Diabetes-aware blood-glucose TARGET resolver (v1.18.6).
+ *
+ * One question: "what glucose band should THIS user be judged against on this
+ * context, right now?" The answer depends on a single explicit, user-declared
+ * preference — `User.hasDiabetes` — and NEVER on any reading. The flag is set
+ * through Settings (`PATCH /api/auth/me/diabetes`); it is never inferred from
+ * a value and never asserts a diagnosis.
+ *
+ *   - Flag OFF (default): the general non-diabetic normal bands — the existing
+ *     behaviour, resolved by the shared reference-range resolver
+ *     (`getEffectiveRange`, which owns the band display) so a user-override
+ *     still wins and nothing about the calm-state UI changes.
+ *   - Flag ON: the tighter ADA glycemic GOAL bands for people living with
+ *     diabetes — fasting / pre-prandial 80–130 mg/dL, peak post-prandial
+ *     < 180 mg/dL (ADA Standards of Care §6, stable 2024–2026). A user
+ *     override still wins (a clinician may pin an individualised goal), but
+ *     absent an override the diabetic goal band — not the normal band — is the
+ *     target.
+ *
+ * The diabetic goal targets are GOALS, not screening thresholds: a fasting 80
+ * is "in goal" for someone managing diabetes, where the non-diabetic 70–99
+ * normal band would call the same reading low-normal. This is exactly why we
+ * keep the two resolvers distinct rather than widening the general band.
+ *
+ * Pure given its inputs. The route resolves the flag + overrides and passes
+ * them in. mg/dL throughout (HealthLog canonical store unit); display-time
+ * conversion to mmol/L is the caller's job (`src/lib/glucose.ts`).
+ *
+ * Citation: American Diabetes Association, Standards of Care in Diabetes
+ * §6 "Glycemic Goals and Hypoglycemia", Diabetes Care 2024 47(Suppl. 1):S111.
+ * Pre-prandial plasma glucose goal 80–130 mg/dL; peak post-prandial < 180
+ * mg/dL. https://diabetesjournals.org/care/article/47/Supplement_1/S111/153957
+ */
+
+import {
+  getEffectiveRange,
+  type ThresholdMetric,
+  type ThresholdOverridesJson,
+  type UserProfileForRange,
+} from "@/lib/analytics/effective-range";
+import type { TrafficRange } from "@/lib/analytics/value-bands";
+import { thresholdMetricForContext } from "@/lib/glucose";
+
+export type GlucoseContextKey =
+  | "FASTING"
+  | "POSTPRANDIAL"
+  | "RANDOM"
+  | "BEDTIME";
+
+/**
+ * ADA glycemic GOAL bands for people living with diabetes (mg/dL).
+ *
+ * FASTING / pre-prandial: 80–130 (ADA pre-prandial plasma glucose goal).
+ * POSTPRANDIAL: floor 80 (avoid hypoglycemia), ceiling 180 (ADA peak
+ *   post-prandial goal `< 180`; the inclusive 180 is the band edge).
+ * RANDOM: a random spot reading is not a defined ADA goal context; the
+ *   post-prandial goal is the most clinically defensible comparator (a random
+ *   reading is most often post-meal). Use the same 80–180 band.
+ * BEDTIME: ADA publishes no separate bedtime goal for adults; the ISPAD
+ *   pediatric bedtime band (90–150) is the closest comparator and the slightly
+ *   higher floor guards against nocturnal hypoglycemia. Kept identical to the
+ *   non-diabetic bedtime band on purpose — the diabetic delta lives in the
+ *   fasting/post-prandial goals, where ADA is explicit.
+ */
+const DIABETIC_GOAL_BANDS: Record<
+  GlucoseContextKey,
+  { min: number; max: number }
+> = {
+  FASTING: { min: 80, max: 130 },
+  POSTPRANDIAL: { min: 80, max: 180 },
+  RANDOM: { min: 80, max: 180 },
+  BEDTIME: { min: 90, max: 150 },
+};
+
+/** Source label surfaced on the resolved range for the targets surface. */
+export type GlucoseTargetSource = "ADA goal (diabetes)" | "default" | "custom";
+
+export interface ResolvedGlucoseTarget {
+  /** The green band the reading is judged against (mg/dL). */
+  range: TrafficRange | null;
+  /** True when a user threshold override is in play (override always wins). */
+  isOverride: boolean;
+  /**
+   * Which band family produced the range: the diabetic ADA goal, the general
+   * default, or a user custom override. Drives the targets-card source label.
+   */
+  source: GlucoseTargetSource;
+}
+
+/**
+ * Build the diabetic-goal `TrafficRange`. The orange wings mirror the general
+ * resolver's glucose convention (floor − 10 below, a modest ceiling above) so
+ * a reading just outside goal reads "elevated", not "high".
+ */
+function diabeticGoalRange(ctx: GlucoseContextKey): TrafficRange {
+  const band = DIABETIC_GOAL_BANDS[ctx];
+  return {
+    greenMin: band.min,
+    greenMax: band.max,
+    orangeMin: band.min - 10,
+    // Above the goal ceiling stays "elevated" up to a modest margin before
+    // the red "high" band; matches the general resolver's wing width posture.
+    orangeMax: band.max + 30,
+  };
+}
+
+/**
+ * Resolve the glucose target band for one context.
+ *
+ * `hasDiabetes` is the user's explicit, declared preference. When `true` AND
+ * the user has NOT overridden the metric, the ADA diabetic goal band wins.
+ * Otherwise we defer entirely to the shared reference-range resolver so the
+ * general non-diabetic band (and any user override) behaves exactly as before.
+ *
+ * The flag is NEVER derived from a reading and asserts no diagnosis — it only
+ * selects the band the user is measured against.
+ */
+export function resolveGlucoseTarget(input: {
+  context: GlucoseContextKey;
+  hasDiabetes: boolean;
+  profile: UserProfileForRange;
+  overrides: ThresholdOverridesJson | null | undefined;
+}): ResolvedGlucoseTarget {
+  const { context, hasDiabetes, profile, overrides } = input;
+  const metric = thresholdMetricForContext(context) as ThresholdMetric;
+  const eff = getEffectiveRange(metric, profile, overrides);
+
+  // A user override always wins — a clinician-pinned individualised goal must
+  // not be silently replaced by the population ADA goal band.
+  if (eff.isOverride) {
+    return { range: eff.range, isOverride: true, source: "custom" };
+  }
+
+  if (hasDiabetes) {
+    return {
+      range: diabeticGoalRange(context),
+      isOverride: false,
+      source: "ADA goal (diabetes)",
+    };
+  }
+
+  return { range: eff.range, isOverride: false, source: "default" };
+}
+
+/** The ADA diabetic goal bands, exported for tests + documentation. */
+export { DIABETIC_GOAL_BANDS };

From f20be2918958410d97f206c782f1ee055a683d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:12:11 +0200
Subject: [PATCH 39/71] feat(illness): escalate confirmed clinical safety
 floors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add absolute, guideline-backed safety floors that escalate a freshly logged
reading — but only after a second, confirming reading inside a one-hour
re-test window, so a single oscillometric spike or a one-off finger-stick can
never raise a false alarm:

  - blood pressure 180/120 or higher (re-check, contact your doctor; symptom-
    coupled lifts to emergency copy) and a symmetric low-systolic-under-90
    cautionary tier;
  - glucose under 70 (low) and under 54 (very low), and a sustained very-high
    250-or-higher tier. The 200 DKA criterion deliberately never shows an
    all-clear and never urgently escalates on its own, since a value alone
    cannot rule euglycemic DKA in or out.

The escalation reuses the urgent SYSTEM_ALERT path with a 24h per-reason
dedup, never names a condition, and gates glucose behind the glucose module.
An optional transient `symptomsPresent` flag on the measurement write lifts a
confirmed breach from the contact-your-doctor copy to the emergency copy. The
measurement POST runs the check fire-and-forget so a notification failure
never fails the user's write.
---
 src/app/api/measurements/route.ts             |  51 +++-
 .../__tests__/safety-floor-notify.test.ts     | 107 ++++++++
 .../illness/__tests__/safety-floors.test.ts   | 227 ++++++++++++++++
 src/lib/illness/safety-floor-check.ts         | 173 +++++++++++++
 src/lib/illness/safety-floor-notify.ts        | 123 +++++++++
 src/lib/illness/safety-floors.ts              | 242 ++++++++++++++++++
 src/lib/validations/measurement.ts            |   6 +
 7 files changed, 927 insertions(+), 2 deletions(-)
 create mode 100644 src/lib/illness/__tests__/safety-floor-notify.test.ts
 create mode 100644 src/lib/illness/__tests__/safety-floors.test.ts
 create mode 100644 src/lib/illness/safety-floor-check.ts
 create mode 100644 src/lib/illness/safety-floor-notify.ts
 create mode 100644 src/lib/illness/safety-floors.ts

diff --git a/src/app/api/measurements/route.ts b/src/app/api/measurements/route.ts
index 77c23833a..0aac4a53c 100644
--- a/src/app/api/measurements/route.ts
+++ b/src/app/api/measurements/route.ts
@@ -30,6 +30,7 @@ import { withIdempotency } from "@/lib/idempotency";
 import { invalidateUserMeasurements } from "@/lib/cache/invalidate";
 import { invalidateStatusInsightsForTypes } from "@/lib/insights/comprehensive-generate";
 import { enqueueReminderSatisfy } from "@/lib/jobs/reminder-satisfy";
+import { runSafetyFloorCheck } from "@/lib/illness/safety-floor-check";
 import {
   recomputeBucketsForMeasurement,
   collapseToTypeDayKeys,
@@ -776,6 +777,25 @@ async function postMeasurement(request: NextRequest) {
     // reminders against the just-landed readings now. Fire-and-forget.
     void enqueueReminderSatisfy(user.id).catch(() => {});
 
+    // v1.18.6 — absolute clinical safety-floor check on the just-written
+    // readings (confirm-gated, module-gated, never diagnoses). The combined
+    // BP form lands both arms here, so the BP floor sees a whole reading.
+    // The transient per-entry `symptomsPresent` flag (ORed across the batch)
+    // lifts a confirmed breach to the symptom-coupled emergency copy.
+    // Fire-and-forget — a notification failure never fails the write.
+    void runSafetyFloorCheck({
+      userId: user.id,
+      written: results.map((r) => ({
+        type: r.type,
+        value: r.value,
+        measuredAt: r.measuredAt,
+        glucoseContext: r.glucoseContext,
+      })),
+      symptomsPresent: parsed.data.measurements.some(
+        (m) => m.symptomsPresent === true,
+      ),
+    }).catch(() => {});
+
     // v1.5.0 — refresh the persistent rollup table for every distinct
     // (type, day) the batch touched so the next analytics / coach read
     // hits the cache rather than falling through to live aggregation.
@@ -836,8 +856,16 @@ async function postMeasurement(request: NextRequest) {
     return returnAllZodIssues(parsed.error, 422);
   }
 
-  const { type, value, measuredAt, notes, source, glucoseContext, deviceType } =
-    parsed.data;
+  const {
+    type,
+    value,
+    measuredAt,
+    notes,
+    source,
+    glucoseContext,
+    deviceType,
+    symptomsPresent,
+  } = parsed.data;
 
   // Handle unique constraint violation
   let measurement;
@@ -893,6 +921,25 @@ async function postMeasurement(request: NextRequest) {
   // against the just-landed reading now. Fire-and-forget.
   void enqueueReminderSatisfy(user.id).catch(() => {});
 
+  // v1.18.6 — absolute clinical safety-floor check (confirm-gated,
+  // module-gated, never diagnoses). A single-entry POST carries only one arm
+  // of a BP reading, so the BP floor only fires through the combined-form /
+  // batch path; a lone glucose reading is evaluated here. The transient
+  // `symptomsPresent` flag lifts a confirmed breach to the emergency copy.
+  // Fire-and-forget — a notification failure never fails the write.
+  void runSafetyFloorCheck({
+    userId: user.id,
+    written: [
+      {
+        type: measurement.type,
+        value: measurement.value,
+        measuredAt: measurement.measuredAt,
+        glucoseContext: measurement.glucoseContext,
+      },
+    ],
+    symptomsPresent,
+  }).catch(() => {});
+
   // v1.5.0 — refresh the persistent rollup row for the affected
   // (type, day) tuple. Runs inline so the next read of the
   // comprehensive / analytics surface is correct without waiting on
diff --git a/src/lib/illness/__tests__/safety-floor-notify.test.ts b/src/lib/illness/__tests__/safety-floor-notify.test.ts
new file mode 100644
index 000000000..b16aaa123
--- /dev/null
+++ b/src/lib/illness/__tests__/safety-floor-notify.test.ts
@@ -0,0 +1,107 @@
+/**
+ * v1.18.6 — safety-floor escalation push.
+ *
+ * Pins: null decision = no-op; a confirmed breach dispatches an URGENT
+ * SYSTEM_ALERT; asymptomatic → Doctor copy, symptom-coupled → Emergency copy;
+ * a recent ledger row de-dupes by reason; failures never throw; the ledger
+ * anchor is stamped before dispatch.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const findFirstMock = vi.fn();
+const createMock = vi.fn();
+const dispatchMock = vi.fn();
+
+vi.mock("@/lib/db", () => ({
+  prisma: {
+    pushAttempt: {
+      findFirst: (...a: unknown[]) => findFirstMock(...a),
+      create: (...a: unknown[]) => createMock(...a),
+    },
+  },
+}));
+
+vi.mock("@/lib/logging/context", () => ({
+  getEvent: () => ({ addMeta: vi.fn(), addWarning: vi.fn() }),
+}));
+
+vi.mock("@/lib/notifications/dispatch-localised", () => ({
+  dispatchLocalisedNotification: (...a: unknown[]) => dispatchMock(...a),
+}));
+
+import { notifySafetyFloor } from "../safety-floor-notify";
+import type { SafetyFloorDecision } from "../safety-floors";
+
+const bpHigh: SafetyFloorDecision = {
+  kind: "BLOOD_PRESSURE",
+  reason: "bp_hypertensive",
+  tier: "severe",
+  symptomCoupled: false,
+  value: 188,
+  diastolic: 122,
+};
+const glucoseLowSymptomatic: SafetyFloorDecision = {
+  kind: "GLUCOSE",
+  reason: "glucose_hypo_severe",
+  tier: "severe",
+  symptomCoupled: true,
+  value: 48,
+  diastolic: null,
+};
+
+beforeEach(() => {
+  findFirstMock.mockReset().mockResolvedValue(null);
+  createMock.mockReset().mockResolvedValue({});
+  dispatchMock.mockReset().mockResolvedValue(undefined);
+});
+
+afterEach(() => vi.clearAllMocks());
+
+describe("notifySafetyFloor", () => {
+  it("no-op when the decision is null", async () => {
+    await notifySafetyFloor({ userId: "u1", decision: null });
+    expect(dispatchMock).not.toHaveBeenCalled();
+    expect(findFirstMock).not.toHaveBeenCalled();
+  });
+
+  it("dispatches an URGENT SYSTEM_ALERT with the asymptomatic Doctor copy", async () => {
+    await notifySafetyFloor({ userId: "u1", decision: bpHigh });
+    expect(dispatchMock).toHaveBeenCalledTimes(1);
+    const opts = dispatchMock.mock.calls[0][0];
+    expect(opts.urgent).toBe(true);
+    expect(opts.eventType).toBe("SYSTEM_ALERT");
+    expect(opts.userId).toBe("u1");
+    expect(opts.titleKey).toBe("safety.floor.bpHighTitle");
+    expect(opts.messageKey).toBe("safety.floor.bpHighDoctor");
+    expect(opts.params).toEqual({ systolic: 188, diastolic: 122 });
+  });
+
+  it("uses the Emergency copy variant when symptom-coupled", async () => {
+    await notifySafetyFloor({ userId: "u1", decision: glucoseLowSymptomatic });
+    const opts = dispatchMock.mock.calls[0][0];
+    expect(opts.messageKey).toBe("safety.floor.glucoseLowSevereEmergency");
+    expect(opts.titleKey).toBe("safety.floor.glucoseLowSevereTitle");
+    expect(opts.params).toEqual({ value: 48 });
+  });
+
+  it("de-dupes by reason when a recent ledger row exists", async () => {
+    findFirstMock.mockResolvedValueOnce({ id: "prior" });
+    await notifySafetyFloor({ userId: "u1", decision: bpHigh });
+    expect(dispatchMock).not.toHaveBeenCalled();
+    expect(createMock).not.toHaveBeenCalled();
+  });
+
+  it("stamps the ledger anchor (keyed by reason) before dispatching", async () => {
+    await notifySafetyFloor({ userId: "u9", decision: bpHigh });
+    expect(createMock).toHaveBeenCalledTimes(1);
+    expect(createMock.mock.calls[0][0].data.reason).toContain("bp_hypertensive");
+    expect(createMock.mock.calls[0][0].data.eventType).toBe("SYSTEM_ALERT");
+  });
+
+  it("never throws when dispatch fails", async () => {
+    dispatchMock.mockRejectedValueOnce(new Error("boom"));
+    await expect(
+      notifySafetyFloor({ userId: "u1", decision: bpHigh }),
+    ).resolves.toBeUndefined();
+  });
+});
diff --git a/src/lib/illness/__tests__/safety-floors.test.ts b/src/lib/illness/__tests__/safety-floors.test.ts
new file mode 100644
index 000000000..4af788946
--- /dev/null
+++ b/src/lib/illness/__tests__/safety-floors.test.ts
@@ -0,0 +1,227 @@
+/**
+ * v1.18.6 — absolute clinical safety-floor engine.
+ *
+ * Pins each threshold + the confirm-before-alarm gate. The engine must NEVER
+ * escalate on a single breach reading — a prior same-floor reading inside the
+ * confirm window is required. Severe tiers keep the confirm gate; symptom
+ * coupling only lifts the copy tier, never the gate.
+ */
+import { describe, expect, it } from "vitest";
+import {
+  evaluateBloodPressure,
+  evaluateGlucose,
+  CONFIRM_WINDOW_MS,
+  BP_SYS_HYPERTENSIVE,
+  BP_DIA_HYPERTENSIVE,
+  BP_SYS_HYPOTENSIVE,
+  GLUCOSE_HYPO,
+  GLUCOSE_HYPO_SEVERE,
+  GLUCOSE_HYPER,
+  type BpSample,
+  type GlucoseSample,
+} from "../safety-floors";
+
+const T0 = new Date("2026-06-18T09:00:00Z");
+/** A confirming prior reading 10 minutes before the candidate (in window). */
+const T_PRIOR = new Date(T0.getTime() - 10 * 60 * 1000);
+/** A prior reading just outside the confirm window. */
+const T_STALE = new Date(T0.getTime() - CONFIRM_WINDOW_MS - 60 * 1000);
+
+function bp(measuredAt: Date, systolic: number, diastolic: number): BpSample {
+  return { measuredAt, systolic, diastolic };
+}
+function gl(measuredAt: Date, mgdl: number): GlucoseSample {
+  return { measuredAt, mgdl };
+}
+
+describe("safety-floors — blood pressure", () => {
+  it("does not escalate on a single hypertensive reading (no confirm)", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 185, 110),
+      recent: [],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("escalates a confirmed hypertensive breach (>=180 systolic) at severe tier", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, BP_SYS_HYPERTENSIVE, 100),
+      recent: [bp(T_PRIOR, 182, 98)],
+      symptomCoupled: false,
+    });
+    expect(d).not.toBeNull();
+    expect(d!.reason).toBe("bp_hypertensive");
+    expect(d!.tier).toBe("severe");
+    expect(d!.symptomCoupled).toBe(false);
+    expect(d!.value).toBe(BP_SYS_HYPERTENSIVE);
+    expect(d!.diastolic).toBe(100);
+  });
+
+  it("escalates when only the diastolic crosses the floor (>=120)", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 150, BP_DIA_HYPERTENSIVE),
+      recent: [bp(T_PRIOR, 150, 122)],
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("bp_hypertensive");
+  });
+
+  it("does not confirm with a reading outside the window", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 190, 115),
+      recent: [bp(T_STALE, 190, 115)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("does not confirm with a prior reading of a DIFFERENT floor family", () => {
+    // candidate hypertensive, prior hypotensive — not the same floor.
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 185, 110),
+      recent: [bp(T_PRIOR, 85, 55)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("treats low BP (<90 systolic) as caution when asymptomatic", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, BP_SYS_HYPOTENSIVE - 1, 55),
+      recent: [bp(T_PRIOR, 86, 54)],
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("bp_hypotensive");
+    expect(d?.tier).toBe("caution");
+  });
+
+  it("lifts low BP to severe when symptom-coupled", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 85, 55),
+      recent: [bp(T_PRIOR, 86, 54)],
+      symptomCoupled: true,
+    });
+    expect(d?.reason).toBe("bp_hypotensive");
+    expect(d?.tier).toBe("severe");
+    expect(d?.symptomCoupled).toBe(true);
+  });
+
+  it("does not escalate a normal reading", () => {
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 120, 78),
+      recent: [bp(T_PRIOR, 122, 80)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("ignores a future-dated prior reading (after the candidate)", () => {
+    const future = new Date(T0.getTime() + 5 * 60 * 1000);
+    const d = evaluateBloodPressure({
+      candidate: bp(T0, 185, 110),
+      recent: [bp(future, 185, 110)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+});
+
+describe("safety-floors — glucose", () => {
+  it("does not escalate a single low reading (no confirm)", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 65),
+      recent: [],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("escalates a confirmed hypo (<70) at caution tier", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, GLUCOSE_HYPO - 1),
+      recent: [gl(T_PRIOR, 66)],
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("glucose_hypo");
+    expect(d?.tier).toBe("caution");
+    expect(d?.value).toBe(GLUCOSE_HYPO - 1);
+  });
+
+  it("escalates a confirmed severe-hypo (<54) at severe tier", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, GLUCOSE_HYPO_SEVERE - 4),
+      recent: [gl(T_PRIOR, 52)],
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("glucose_hypo_severe");
+    expect(d?.tier).toBe("severe");
+  });
+
+  it("confirms a severe-hypo candidate with any low (<70) re-test (same floor family)", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 50),
+      recent: [gl(T_PRIOR, 68)], // 68 is hypo but not severe — still confirms LOW family
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("glucose_hypo_severe");
+    expect(d?.tier).toBe("severe");
+  });
+
+  it("escalates a confirmed hyper (>=250) at severe tier", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, GLUCOSE_HYPER),
+      recent: [gl(T_PRIOR, 270)],
+      symptomCoupled: false,
+    });
+    expect(d?.reason).toBe("glucose_hyper");
+    expect(d?.tier).toBe("severe");
+  });
+
+  it("does NOT escalate the 200 DKA criterion (euglycemic-DKA conservatism)", () => {
+    // ADA-2026 lowered the DKA criterion to >=200, but a value alone cannot
+    // rule DKA in or out, so we never URGENTLY escalate at 200 — only at 250.
+    const d = evaluateGlucose({
+      candidate: gl(T0, 210),
+      recent: [gl(T_PRIOR, 220)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("does not confirm a low candidate with a high re-test (different family)", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 60),
+      recent: [gl(T_PRIOR, 260)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("does not confirm outside the window", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 50),
+      recent: [gl(T_STALE, 50)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+
+  it("carries the symptom flag through to the decision", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 300),
+      recent: [gl(T_PRIOR, 280)],
+      symptomCoupled: true,
+    });
+    expect(d?.symptomCoupled).toBe(true);
+  });
+
+  it("does not escalate an in-range reading", () => {
+    const d = evaluateGlucose({
+      candidate: gl(T0, 110),
+      recent: [gl(T_PRIOR, 105)],
+      symptomCoupled: false,
+    });
+    expect(d).toBeNull();
+  });
+});
diff --git a/src/lib/illness/safety-floor-check.ts b/src/lib/illness/safety-floor-check.ts
new file mode 100644
index 000000000..1b25e1520
--- /dev/null
+++ b/src/lib/illness/safety-floor-check.ts
@@ -0,0 +1,173 @@
+/**
+ * Safety-floor write-hook orchestrator (v1.18.6).
+ *
+ * Runs AFTER a measurement write lands. Resolves the recent same-kind readings
+ * the confirm gate needs, runs the absolute-floor engine (`safety-floors.ts`),
+ * and dispatches an urgent escalation (`safety-floor-notify.ts`) when — and
+ * only when — a fresh reading breaches a clinical floor AND a prior reading
+ * inside the confirm window held the same floor.
+ *
+ * Module-gated: glucose checks only run when the `glucose` module is enabled;
+ * BP is a CORE domain (always on) but the BP check is still cheap and only
+ * fires on an extreme reading. Owner-scoped, fire-and-forget, never throws —
+ * a notification failure must never fail the user's measurement write.
+ *
+ * The caller (the measurement POST route) passes the just-written rows plus
+ * the transient `symptomsPresent` flag; this helper does the bounded reads.
+ */
+import { prisma } from "@/lib/db";
+import { getEvent } from "@/lib/logging/context";
+import { isModuleEnabled } from "@/lib/modules/gate";
+import {
+  evaluateBloodPressure,
+  evaluateGlucose,
+  CONFIRM_WINDOW_MS,
+  type BpSample,
+  type GlucoseSample,
+} from "@/lib/illness/safety-floors";
+import { notifySafetyFloor } from "@/lib/illness/safety-floor-notify";
+
+/** A row the write hook just persisted (the subset the check needs). */
+export interface WrittenReading {
+  type: string;
+  value: number;
+  measuredAt: Date;
+  glucoseContext?: string | null;
+}
+
+/**
+ * Evaluate the just-written readings against the absolute safety floors and
+ * dispatch any confirmed escalation. Best-effort.
+ *
+ * `symptomsPresent` is the transient per-write flag — true lifts a confirmed
+ * breach to the symptom-coupled emergency copy. Defaults to false.
+ */
+export async function runSafetyFloorCheck(input: {
+  userId: string;
+  written: WrittenReading[];
+  symptomsPresent?: boolean;
+}): Promise<void> {
+  const { userId, written } = input;
+  const symptomCoupled = input.symptomsPresent === true;
+
+  try {
+    await Promise.all([
+      checkBloodPressure(userId, written, symptomCoupled),
+      checkGlucose(userId, written, symptomCoupled),
+    ]);
+  } catch (err) {
+    getEvent()?.addWarning(
+      `safety-floor check failed: ${
+        err instanceof Error ? err.message : String(err)
+      }`,
+    );
+  }
+}
+
+/* ── blood pressure ───────────────────────────────────────────────────── */
+
+async function checkBloodPressure(
+  userId: string,
+  written: WrittenReading[],
+  symptomCoupled: boolean,
+): Promise<void> {
+  // BP is stored as two rows (SYS + DIA). We only evaluate when BOTH arms of
+  // the candidate reading are present in this write (the normal combined-form
+  // and iOS batch path) so we never reason about half a reading.
+  const sys = written.find((r) => r.type === "BLOOD_PRESSURE_SYS");
+  const dia = written.find((r) => r.type === "BLOOD_PRESSURE_DIA");
+  if (!sys || !dia) return;
+
+  const candidate: BpSample = {
+    measuredAt: sys.measuredAt,
+    systolic: sys.value,
+    diastolic: dia.value,
+  };
+
+  // Pull the recent SYS + DIA rows inside the confirm window and pair them by
+  // timestamp so the engine sees prior whole readings, not loose arms. The
+  // candidate's own rows are excluded by the strict `lt: measuredAt` bound.
+  const windowStart = new Date(
+    candidate.measuredAt.getTime() - CONFIRM_WINDOW_MS,
+  );
+  const rows = await prisma.measurement.findMany({
+    where: {
+      userId,
+      type: { in: ["BLOOD_PRESSURE_SYS", "BLOOD_PRESSURE_DIA"] },
+      deletedAt: null,
+      measuredAt: { gte: windowStart, lt: candidate.measuredAt },
+    },
+    orderBy: { measuredAt: "desc" },
+    take: 50,
+    select: { type: true, value: true, measuredAt: true },
+  });
+
+  const recent = pairBp(rows);
+  const decision = evaluateBloodPressure({ candidate, recent, symptomCoupled });
+  await notifySafetyFloor({ userId, decision });
+}
+
+/**
+ * Pair loose SYS/DIA rows into whole BP samples by exact timestamp. A combined
+ * BP form writes both arms at the same instant, so an exact-instant join is
+ * the right grain here (the confirm gate only needs prior WHOLE readings).
+ */
+function pairBp(
+  rows: ReadonlyArray<{ type: string; value: number; measuredAt: Date }>,
+): BpSample[] {
+  const sysByTs = new Map<number, number>();
+  const diaByTs = new Map<number, number>();
+  for (const r of rows) {
+    const ts = r.measuredAt.getTime();
+    if (r.type === "BLOOD_PRESSURE_SYS") sysByTs.set(ts, r.value);
+    else if (r.type === "BLOOD_PRESSURE_DIA") diaByTs.set(ts, r.value);
+  }
+  const out: BpSample[] = [];
+  for (const [ts, systolic] of sysByTs) {
+    const diastolic = diaByTs.get(ts);
+    if (diastolic === undefined) continue;
+    out.push({ measuredAt: new Date(ts), systolic, diastolic });
+  }
+  return out;
+}
+
+/* ── glucose ──────────────────────────────────────────────────────────── */
+
+async function checkGlucose(
+  userId: string,
+  written: WrittenReading[],
+  symptomCoupled: boolean,
+): Promise<void> {
+  const glucose = written.find((r) => r.type === "BLOOD_GLUCOSE");
+  if (!glucose) return;
+
+  // Module gate: only run when the glucose module is enabled for this account.
+  if (!(await isModuleEnabled(userId, "glucose"))) return;
+
+  const candidate: GlucoseSample = {
+    measuredAt: glucose.measuredAt,
+    mgdl: glucose.value,
+  };
+
+  const windowStart = new Date(
+    candidate.measuredAt.getTime() - CONFIRM_WINDOW_MS,
+  );
+  const rows = await prisma.measurement.findMany({
+    where: {
+      userId,
+      type: "BLOOD_GLUCOSE",
+      deletedAt: null,
+      measuredAt: { gte: windowStart, lt: candidate.measuredAt },
+    },
+    orderBy: { measuredAt: "desc" },
+    take: 50,
+    select: { value: true, measuredAt: true },
+  });
+
+  const recent: GlucoseSample[] = rows.map((r) => ({
+    measuredAt: r.measuredAt,
+    mgdl: r.value,
+  }));
+  const decision = evaluateGlucose({ candidate, recent, symptomCoupled });
+  await notifySafetyFloor({ userId, decision });
+}
diff --git a/src/lib/illness/safety-floor-notify.ts b/src/lib/illness/safety-floor-notify.ts
new file mode 100644
index 000000000..5e206088b
--- /dev/null
+++ b/src/lib/illness/safety-floor-notify.ts
@@ -0,0 +1,123 @@
+/**
+ * Absolute safety-floor escalation push (v1.18.6).
+ *
+ * Bridges a {@link SafetyFloorDecision} (from `safety-floors.ts`, already
+ * confirm-gated) to the notification dispatcher at the URGENT level, reusing
+ * the same urgent SYSTEM_ALERT + 24h-dedup mechanics as the illness red-flag
+ * push (`red-flag-notify.ts`).
+ *
+ * Copy framing (firm, safety-reviewed):
+ *   - NEVER diagnoses (no "hypertensive emergency", no "DKA").
+ *   - ASYMPTOMATIC breach → "re-check and contact your doctor" copy.
+ *   - SYMPTOM-COUPLED breach → emergency copy ("call emergency services").
+ *   - The body always echoes the (already re-confirmed) reading value.
+ *
+ * Dedup: at most one push per (user, reason) per rolling 24h window, anchored
+ * on a synthetic `pushAttempt` row keyed by reason — so a user re-checking a
+ * stubbornly-high reading repeatedly doesn't get spammed. Owner-scoped, never
+ * throws (a notification failure must not break the measurement write).
+ */
+import { prisma } from "@/lib/db";
+import { getEvent } from "@/lib/logging/context";
+import { dispatchLocalisedNotification } from "@/lib/notifications/dispatch-localised";
+import type {
+  SafetyFloorDecision,
+  SafetyFloorReason,
+} from "@/lib/illness/safety-floors";
+
+/** One escalation per (user, reason) per this window. */
+const DEDUPE_WINDOW_MS = 24 * 60 * 60 * 1000;
+
+/** Stable ledger reason prefix so the dedupe lookup is exact-matchable. */
+const LEDGER_REASON_PREFIX = "safety_floor:";
+
+/**
+ * The i18n title/body keys for a decision. Two body variants per reason: the
+ * asymptomatic "contact your doctor" copy and the symptom-coupled emergency
+ * copy. Every key below resolves in all six locale bundles (i18n integrity
+ * guarantee enforced by the locale-integrity test).
+ */
+function copyKeysFor(decision: SafetyFloorDecision): {
+  titleKey: string;
+  messageKey: string;
+} {
+  const variant = decision.symptomCoupled ? "Emergency" : "Doctor";
+  const reasonKey: Record<SafetyFloorReason, string> = {
+    bp_hypertensive: "bpHigh",
+    bp_hypotensive: "bpLow",
+    glucose_hypo: "glucoseLow",
+    glucose_hypo_severe: "glucoseLowSevere",
+    glucose_hyper: "glucoseHigh",
+  };
+  return {
+    titleKey: `safety.floor.${reasonKey[decision.reason]}Title`,
+    messageKey: `safety.floor.${reasonKey[decision.reason]}${variant}`,
+  };
+}
+
+/** Body params — the re-confirmed reading value(s) echoed into the copy. */
+function paramsFor(
+  decision: SafetyFloorDecision,
+): Record<string, string | number> {
+  if (decision.kind === "BLOOD_PRESSURE") {
+    return {
+      systolic: decision.value,
+      diastolic: decision.diastolic ?? 0,
+    };
+  }
+  return { value: decision.value };
+}
+
+/**
+ * Emit an urgent escalation push for a confirmed safety-floor breach, at most
+ * once per (user, reason) per `DEDUPE_WINDOW_MS`. No-op when `decision` is
+ * null. Never throws.
+ */
+export async function notifySafetyFloor(input: {
+  userId: string;
+  decision: SafetyFloorDecision | null;
+}): Promise<void> {
+  const { userId, decision } = input;
+  if (!decision) return;
+
+  try {
+    const reason = `${LEDGER_REASON_PREFIX}${decision.reason}`;
+    const since = new Date(Date.now() - DEDUPE_WINDOW_MS);
+    const prior = await prisma.pushAttempt.findFirst({
+      where: { userId, reason, createdAt: { gte: since } },
+      select: { id: true },
+    });
+    if (prior) return;
+
+    // Stamp the ledger BEFORE dispatching so a concurrent confirm can't
+    // double-fire. The senders write their own per-channel rows; this
+    // synthetic row is purely the dedupe anchor.
+    await prisma.pushAttempt.create({
+      data: {
+        userId,
+        channel: "WEB_PUSH",
+        eventType: "SYSTEM_ALERT",
+        result: "skipped",
+        reason,
+      },
+    });
+
+    const { titleKey, messageKey } = copyKeysFor(decision);
+    await dispatchLocalisedNotification({
+      userId,
+      titleKey,
+      messageKey,
+      params: paramsFor(decision),
+      eventType: "SYSTEM_ALERT",
+      urgent: true,
+    });
+
+    getEvent()?.addMeta("safety_floor_notified", decision.reason);
+  } catch (err) {
+    getEvent()?.addWarning(
+      `safety-floor notify failed (${decision.reason}): ${
+        err instanceof Error ? err.message : String(err)
+      }`,
+    );
+  }
+}
diff --git a/src/lib/illness/safety-floors.ts b/src/lib/illness/safety-floors.ts
new file mode 100644
index 000000000..609e9c38e
--- /dev/null
+++ b/src/lib/illness/safety-floors.ts
@@ -0,0 +1,242 @@
+/**
+ * Absolute clinical safety floors (v1.18.6) — confirm-before-alarm engine.
+ *
+ * The illness *correlation* engine (`correlation.ts`) is retrospective: it
+ * flags a SUSTAINED multi-day adverse run against a user's OWN baseline. This
+ * module is its safety-critical complement: it evaluates a SINGLE freshly
+ * logged reading against ABSOLUTE, guideline-backed clinical floors and, when
+ * a reading breaches one, decides whether to escalate — but ONLY after a
+ * second, confirming reading (the AHA "wait and re-measure" discipline), so a
+ * single oscillometric spike or a one-off finger-stick can never raise a
+ * false alarm.
+ *
+ * Hard design rules (this is health-safety code — conservative by construction):
+ *
+ *   1. CONFIRM BEFORE ALARM. A breach reading alone is NEVER enough. We
+ *      require a PRIOR reading of the same kind inside a short re-test window
+ *      that ALSO breached the same floor. One reading → "watch", two → alarm.
+ *      (Severe-tier floors keep the same confirm gate — the differentiator
+ *      between tiers is the copy, not whether we wait.)
+ *   2. NEVER DIAGNOSE. The copy says "this reading is very high/low — re-check
+ *      and, if it holds, contact your doctor / call emergency services". It
+ *      never names a condition (no "hypertensive emergency", no "DKA").
+ *   3. SYMPTOM-COUPLED → emergency copy; ASYMPTOMATIC → contact-doctor copy.
+ *      The caller passes whether the user flagged symptoms with the reading.
+ *   4. MODULE-GATED. The caller only runs the relevant check when the module
+ *      is enabled (glucose module for glucose, the always-on BP core for BP).
+ *
+ * Pure given its inputs — no Prisma, no I/O. The caller resolves the recent
+ * same-kind readings + the symptom flag and passes them in; the dispatch +
+ * 24h dedup lives in `safety-floor-notify.ts`. mg/dL + mmHg throughout
+ * (HealthLog canonical store units).
+ *
+ * Citations (general guidance, not medical advice; wide individual variation):
+ *   - BP ≥180/120: ACC/AHA 2017; AHA "Management of Elevated BP in the Acute
+ *     Care Setting" 2024. The number is identical for emergency vs non-
+ *     emergency — symptoms are the differentiator, not the value. Protocol:
+ *     re-measure before acting.
+ *   - Low BP (SBP < 90): NHLBI low-blood-pressure guidance; Hypotension —
+ *     StatPearls/NIH 2024. Cautionary by default; emergency only with self-
+ *     reported shock-type symptoms.
+ *   - Hypoglycemia: ADA Standards of Care §6 — Level 1 alert < 70 mg/dL,
+ *     Level 2 (clinically significant) < 54 mg/dL. Stable 2024–2026.
+ *   - Hyperglycemia / DKA: ADA Standards of Care 2026 — DKA hyperglycemia
+ *     criterion lowered to ≥ 200 mg/dL; ~10% of DKA is euglycemic, so a
+ *     glucose value alone cannot rule it out — we NEVER show "all clear" below
+ *     200 and reserve the urgent escalation for a sustained very-high band
+ *     (≥ 250 mg/dL) per the practical seek-care trigger.
+ */
+
+/** Reading kinds the absolute-floor engine evaluates. */
+export type SafetyFloorKind = "BLOOD_PRESSURE" | "GLUCOSE";
+
+/** Why a reading breached a floor — a stable key the i18n layer renders. */
+export type SafetyFloorReason =
+  | "bp_hypertensive" // SBP ≥ 180 OR DBP ≥ 120
+  | "bp_hypotensive" // SBP < 90
+  | "glucose_hypo" // < 70 mg/dL
+  | "glucose_hypo_severe" // < 54 mg/dL
+  | "glucose_hyper"; // ≥ 250 mg/dL (sustained-very-high seek-care trigger)
+
+/** Severity tier — drives copy, never the confirm gate. */
+export type SafetyFloorTier = "caution" | "severe";
+
+/* ── absolute floors (documented clinical constants) ─────────────────── */
+
+/** Hypertensive-urgency floor: systolic ≥ this OR diastolic ≥ DIA floor. */
+export const BP_SYS_HYPERTENSIVE = 180;
+export const BP_DIA_HYPERTENSIVE = 120;
+/** Symmetric low-BP cautionary floor: systolic < this. */
+export const BP_SYS_HYPOTENSIVE = 90;
+
+/** Hypoglycemia Level-1 alert: glucose < this (mg/dL). */
+export const GLUCOSE_HYPO = 70;
+/** Hypoglycemia Level-2 (clinically significant): glucose < this (mg/dL). */
+export const GLUCOSE_HYPO_SEVERE = 54;
+/**
+ * Hyperglycemia urgent escalation floor (mg/dL). ADA 2026 lowered the DKA
+ * hyperglycemia CRITERION to ≥ 200, but a value alone cannot rule DKA in OR
+ * out (euglycemic DKA exists), so we do NOT urgently escalate at 200. We
+ * reserve the escalation for the practical "sustained very-high" seek-care
+ * trigger (≥ 250) and the copy NEVER reads "all clear" below 200.
+ */
+export const GLUCOSE_HYPER = 250;
+
+/**
+ * Confirm window: a breach reading only escalates when a PRIOR same-kind
+ * reading inside this window ALSO breached the SAME floor. Long enough that a
+ * deliberate "wait a minute and re-measure" is captured, short enough that two
+ * unrelated readings days apart don't spuriously confirm each other.
+ */
+export const CONFIRM_WINDOW_MS = 60 * 60 * 1000; // 1 hour
+
+/* ── inputs (the caller resolves these and passes them in) ───────────── */
+
+/** A blood-pressure reading (systolic + diastolic, mmHg) at an instant. */
+export interface BpSample {
+  measuredAt: Date;
+  systolic: number;
+  diastolic: number;
+}
+
+/** A spot glucose reading (mg/dL canonical) at an instant. */
+export interface GlucoseSample {
+  measuredAt: Date;
+  mgdl: number;
+}
+
+/** The escalation decision the engine returns (or null = nothing to do). */
+export interface SafetyFloorDecision {
+  kind: SafetyFloorKind;
+  reason: SafetyFloorReason;
+  tier: SafetyFloorTier;
+  /** True when the user flagged symptoms → emergency-tier copy. */
+  symptomCoupled: boolean;
+  /** The breaching value(s), for the localised body params. */
+  value: number;
+  /** The diastolic value when `kind === "BLOOD_PRESSURE"` (else null). */
+  diastolic: number | null;
+}
+
+/* ── BP evaluation ────────────────────────────────────────────────────── */
+
+/** Classify a single BP reading against the absolute floors. */
+function classifyBp(
+  sys: number,
+  dia: number,
+): { reason: SafetyFloorReason; tier: SafetyFloorTier } | null {
+  if (sys >= BP_SYS_HYPERTENSIVE || dia >= BP_DIA_HYPERTENSIVE) {
+    return { reason: "bp_hypertensive", tier: "severe" };
+  }
+  if (sys < BP_SYS_HYPOTENSIVE) {
+    // Symmetric low-BP is cautionary by default — most hypotension is benign;
+    // it only becomes urgent when symptom-coupled (handled by the caller's
+    // symptom flag, which lifts the copy to emergency tier).
+    return { reason: "bp_hypotensive", tier: "caution" };
+  }
+  return null;
+}
+
+/**
+ * Evaluate a fresh BP reading against the absolute floors with the confirm
+ * gate. Returns a decision ONLY when the candidate breaches AND a prior
+ * reading inside the confirm window breached the SAME reason. `recent` is the
+ * user's other same-kind readings (excluding the candidate); order-independent.
+ */
+export function evaluateBloodPressure(input: {
+  candidate: BpSample;
+  recent: BpSample[];
+  symptomCoupled: boolean;
+}): SafetyFloorDecision | null {
+  const { candidate, recent, symptomCoupled } = input;
+  const candClass = classifyBp(candidate.systolic, candidate.diastolic);
+  if (!candClass) return null;
+
+  const windowStart = candidate.measuredAt.getTime() - CONFIRM_WINDOW_MS;
+  const confirmed = recent.some((r) => {
+    const t = r.measuredAt.getTime();
+    if (t < windowStart || t > candidate.measuredAt.getTime()) return false;
+    const c = classifyBp(r.systolic, r.diastolic);
+    return c?.reason === candClass.reason;
+  });
+  if (!confirmed) return null;
+
+  return {
+    kind: "BLOOD_PRESSURE",
+    reason: candClass.reason,
+    // A symptom-coupled hypotensive breach escalates to severe-tier copy
+    // (shock signs → emergency); asymptomatic stays cautionary.
+    tier:
+      candClass.reason === "bp_hypotensive" && symptomCoupled
+        ? "severe"
+        : candClass.tier,
+    symptomCoupled,
+    value: candidate.systolic,
+    diastolic: candidate.diastolic,
+  };
+}
+
+/* ── glucose evaluation ───────────────────────────────────────────────── */
+
+/** Classify a single glucose reading (mg/dL) against the absolute floors. */
+function classifyGlucose(
+  mgdl: number,
+): { reason: SafetyFloorReason; tier: SafetyFloorTier } | null {
+  if (mgdl < GLUCOSE_HYPO_SEVERE) {
+    return { reason: "glucose_hypo_severe", tier: "severe" };
+  }
+  if (mgdl < GLUCOSE_HYPO) {
+    return { reason: "glucose_hypo", tier: "caution" };
+  }
+  if (mgdl >= GLUCOSE_HYPER) {
+    return { reason: "glucose_hyper", tier: "severe" };
+  }
+  return null;
+}
+
+/**
+ * Evaluate a fresh glucose reading against the absolute floors with the
+ * confirm gate. The confirm match is by FLOOR FAMILY, not exact reason: a
+ * follow-up reading that is hypo (< 70) confirms a candidate that is
+ * severe-hypo (< 54) and vice versa — both are "the low floor held on
+ * re-test". The same applies to the high floor. Hypoglycemia is acutely
+ * dangerous, so a severe-hypo candidate confirmed by ANY low re-test still
+ * escalates at the severe tier (the candidate's own tier wins).
+ */
+export function evaluateGlucose(input: {
+  candidate: GlucoseSample;
+  recent: GlucoseSample[];
+  symptomCoupled: boolean;
+}): SafetyFloorDecision | null {
+  const { candidate, recent, symptomCoupled } = input;
+  const candClass = classifyGlucose(candidate.mgdl);
+  if (!candClass) return null;
+
+  const family = floorFamily(candClass.reason);
+  const windowStart = candidate.measuredAt.getTime() - CONFIRM_WINDOW_MS;
+  const confirmed = recent.some((r) => {
+    const t = r.measuredAt.getTime();
+    if (t < windowStart || t > candidate.measuredAt.getTime()) return false;
+    const c = classifyGlucose(r.mgdl);
+    return c != null && floorFamily(c.reason) === family;
+  });
+  if (!confirmed) return null;
+
+  return {
+    kind: "GLUCOSE",
+    reason: candClass.reason,
+    tier: candClass.tier,
+    symptomCoupled,
+    value: Math.round(candidate.mgdl),
+    diastolic: null,
+  };
+}
+
+/** Group a glucose reason into its directional floor family for confirm-matching. */
+function floorFamily(reason: SafetyFloorReason): "low" | "high" | "other" {
+  if (reason === "glucose_hypo" || reason === "glucose_hypo_severe") {
+    return "low";
+  }
+  if (reason === "glucose_hyper") return "high";
+  return "other";
+}
diff --git a/src/lib/validations/measurement.ts b/src/lib/validations/measurement.ts
index a2b48acbf..1e39e7cd5 100644
--- a/src/lib/validations/measurement.ts
+++ b/src/lib/validations/measurement.ts
@@ -575,6 +575,12 @@ export const createMeasurementSchema = z
     // metadata) now persist the tag instead of seeing it disappear.
     // Accepts `null` so a client can explicitly clear the column.
     deviceType: z.string().min(1).max(32).nullable().optional(),
+    // v1.18.6 — optional "I feel unwell with this reading" flag. Transient
+    // (NOT persisted on the measurement row): it only lifts a confirmed
+    // safety-floor escalation from the asymptomatic "contact your doctor"
+    // copy to the symptom-coupled emergency copy. Defaults to false/absent —
+    // every existing client keeps the asymptomatic posture. Never a diagnosis.
+    symptomsPresent: z.boolean().optional(),
   })
   .refine((data) => validateMeasurementRange(data.type, data.value) === null, {
     message: "Value out of plausible range",

From 961257fffdbd87c3b82f2a28c8866680aefa831d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:12:16 +0200
Subject: [PATCH 40/71] i18n: add safety-floor alert and diabetes-target
 strings

Add the safety-floor escalation copy (per-reason title plus a contact-your-
doctor and an emergency body variant) and the diabetes opt-in setting strings
across all six locales. The alert copy frames as general guidance, never names
a condition, and routes symptom-coupled breaches to the emergency wording.
---
 messages/de.json | 24 +++++++++++++++++++++++-
 messages/en.json | 24 +++++++++++++++++++++++-
 messages/es.json | 24 +++++++++++++++++++++++-
 messages/fr.json | 24 +++++++++++++++++++++++-
 messages/it.json | 24 +++++++++++++++++++++++-
 messages/pl.json | 24 +++++++++++++++++++++++-
 6 files changed, 138 insertions(+), 6 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index d9fab76e8..0401f087a 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach ist ausgeblendet.",
         "saveError": "Speichern fehlgeschlagen. Bitte erneut versuchen."
       }
-    }
+    },
+    "diabetes": "Ich habe Diabetes",
+    "diabetesDescription": "Nutze ärztliche Glukose-Zielwerte (nüchtern 80–130, nach dem Essen unter 180 mg/dL) statt der allgemeinen Bänder. Das ändert nur den Zielbereich, an dem du gemessen wirst — es ist keine Diagnose.",
+    "diabetesSaved": "Glukose-Zielwert-Einstellung gespeichert"
   },
   "admin": {
     "title": "Administration",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Kadenz-Vorschläge",
       "reminderSuggestionsDescription": "Lass den Coach gelegentlich eine evidenzbasierte Erinnerung anbieten, eine Metrik regelmäßiger zu messen."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Sehr hoher Blutdruck",
+      "bpHighDoctor": "Zwei aktuelle Messungen lagen bei {systolic}/{diastolic} mmHg oder höher. Ruhe dich aus, miss in einigen Minuten erneut und kontaktiere möglichst bald deine Ärztin oder deinen Arzt, wenn es so hoch bleibt.",
+      "bpHighEmergency": "Zwei aktuelle Messungen lagen bei {systolic}/{diastolic} mmHg oder höher und du hast Beschwerden angegeben. Bei Brustschmerz, Atemnot, Schwäche oder Seh- oder Sprachstörungen sofort den Notruf wählen.",
+      "bpLowTitle": "Niedriger Blutdruck",
+      "bpLowDoctor": "Zwei aktuelle Messungen hatten einen systolischen Wert unter {systolic} mmHg. Wenn dir schwindelig oder schummrig ist, setz oder leg dich hin und kontaktiere deine Ärztin oder deinen Arzt, wenn es anhält.",
+      "bpLowEmergency": "Zwei aktuelle Messungen hatten einen systolischen Wert unter {systolic} mmHg und du hast Beschwerden angegeben. Bei Ohnmachtsgefühl, Verwirrtheit oder kalter, feuchter Haut sofort den Notruf wählen.",
+      "glucoseLowTitle": "Niedriger Blutzucker",
+      "glucoseLowDoctor": "Zwei aktuelle Messungen lagen unter 70 mg/dL ({value} mg/dL). Nimm schnell wirkende Kohlenhydrate, miss in 15 Minuten erneut und kontaktiere deine Ärztin oder deinen Arzt, wenn die Tiefs anhalten.",
+      "glucoseLowEmergency": "Zwei aktuelle Messungen lagen unter 70 mg/dL ({value} mg/dL) und du hast Beschwerden angegeben. Behandle jetzt mit schnellem Zucker; wenn das nicht geht oder dir sehr unwohl ist, wähle den Notruf.",
+      "glucoseLowSevereTitle": "Sehr niedriger Blutzucker",
+      "glucoseLowSevereDoctor": "Zwei aktuelle Messungen lagen unter 54 mg/dL ({value} mg/dL). Behandle sofort mit schnell wirkenden Kohlenhydraten, miss in 15 Minuten erneut und kontaktiere deine Ärztin oder deinen Arzt.",
+      "glucoseLowSevereEmergency": "Zwei aktuelle Messungen lagen unter 54 mg/dL ({value} mg/dL) und du hast Beschwerden angegeben. Behandle jetzt; wenn du nichts bei dir behalten kannst oder dir sehr unwohl ist, wähle den Notruf.",
+      "glucoseHighTitle": "Sehr hoher Blutzucker",
+      "glucoseHighDoctor": "Zwei aktuelle Messungen lagen bei {value} mg/dL oder höher. Miss erneut, trink ausreichend und kontaktiere möglichst bald deine Ärztin oder deinen Arzt, wenn es so hoch bleibt.",
+      "glucoseHighEmergency": "Zwei aktuelle Messungen lagen bei {value} mg/dL oder höher und du hast Beschwerden angegeben. Bei Erbrechen, schneller Atmung oder Verwirrtheit sofort den Notruf wählen."
+    }
   }
 }
diff --git a/messages/en.json b/messages/en.json
index eed712aac..6057b30dc 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach hidden.",
         "saveError": "Could not save the change. Please try again."
       }
-    }
+    },
+    "diabetes": "I have diabetes",
+    "diabetesDescription": "Use clinician glucose targets (fasting 80–130, post-meal under 180 mg/dL) instead of the general bands. This only changes the target you are measured against — it is never a diagnosis.",
+    "diabetesSaved": "Glucose target preference saved"
   },
   "admin": {
     "title": "Administration",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Cadence suggestions",
       "reminderSuggestionsDescription": "Let the Coach offer an occasional, evidence-based reminder to measure a metric more regularly."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Very high blood pressure",
+      "bpHighDoctor": "Two recent readings were {systolic}/{diastolic} mmHg or higher. Rest, re-check in a few minutes, and contact your doctor as soon as possible if it stays this high.",
+      "bpHighEmergency": "Two recent readings were {systolic}/{diastolic} mmHg or higher and you noted symptoms. If you have chest pain, breathlessness, weakness, or vision or speech changes, call emergency services now.",
+      "bpLowTitle": "Low blood pressure",
+      "bpLowDoctor": "Two recent readings had a systolic below {systolic} mmHg. If you feel dizzy or faint, sit or lie down, and contact your doctor if it continues.",
+      "bpLowEmergency": "Two recent readings had a systolic below {systolic} mmHg and you noted symptoms. If you feel faint, confused, or have cold clammy skin, call emergency services now.",
+      "glucoseLowTitle": "Low blood sugar",
+      "glucoseLowDoctor": "Two recent readings were below 70 mg/dL ({value} mg/dL). Take fast-acting carbohydrate, re-check in 15 minutes, and contact your doctor if lows continue.",
+      "glucoseLowEmergency": "Two recent readings were below 70 mg/dL ({value} mg/dL) and you noted symptoms. Treat now with fast-acting sugar; if you cannot, or you feel very unwell, call emergency services.",
+      "glucoseLowSevereTitle": "Very low blood sugar",
+      "glucoseLowSevereDoctor": "Two recent readings were below 54 mg/dL ({value} mg/dL). Treat immediately with fast-acting carbohydrate, re-check in 15 minutes, and contact your doctor.",
+      "glucoseLowSevereEmergency": "Two recent readings were below 54 mg/dL ({value} mg/dL) and you noted symptoms. Treat now; if you cannot keep food down or feel very unwell, call emergency services.",
+      "glucoseHighTitle": "Very high blood sugar",
+      "glucoseHighDoctor": "Two recent readings were {value} mg/dL or higher. Re-check, hydrate, and contact your doctor as soon as possible if it stays this high.",
+      "glucoseHighEmergency": "Two recent readings were {value} mg/dL or higher and you noted symptoms. If you have vomiting, fast breathing, or confusion, call emergency services now."
+    }
   }
 }
diff --git a/messages/es.json b/messages/es.json
index 2bafb2f5c..3370b034e 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach oculto.",
         "saveError": "No se pudo guardar el cambio. Inténtalo de nuevo."
       }
-    }
+    },
+    "diabetes": "Tengo diabetes",
+    "diabetesDescription": "Usa objetivos de glucosa clínicos (en ayunas 80–130, tras la comida menos de 180 mg/dL) en lugar de las bandas generales. Esto solo cambia el objetivo con el que te comparas; nunca es un diagnóstico.",
+    "diabetesSaved": "Preferencia de objetivo de glucosa guardada"
   },
   "admin": {
     "title": "Administration",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Sugerencias de frecuencia",
       "reminderSuggestionsDescription": "Permite que el Coach ofrezca de vez en cuando un recordatorio basado en evidencia para medir una métrica con más regularidad."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Presión arterial muy alta",
+      "bpHighDoctor": "Dos lecturas recientes fueron de {systolic}/{diastolic} mmHg o más. Descansa, vuelve a medir en unos minutos y contacta a tu médico cuanto antes si sigue así de alta.",
+      "bpHighEmergency": "Dos lecturas recientes fueron de {systolic}/{diastolic} mmHg o más e indicaste síntomas. Si tienes dolor en el pecho, falta de aire, debilidad o cambios en la visión o el habla, llama a emergencias ya.",
+      "bpLowTitle": "Presión arterial baja",
+      "bpLowDoctor": "Dos lecturas recientes tuvieron una sistólica por debajo de {systolic} mmHg. Si te mareas o te sientes débil, siéntate o recuéstate y contacta a tu médico si continúa.",
+      "bpLowEmergency": "Dos lecturas recientes tuvieron una sistólica por debajo de {systolic} mmHg e indicaste síntomas. Si te sientes a punto de desmayar, confuso o con piel fría y húmeda, llama a emergencias ya.",
+      "glucoseLowTitle": "Glucosa baja",
+      "glucoseLowDoctor": "Dos lecturas recientes estuvieron por debajo de 70 mg/dL ({value} mg/dL). Toma carbohidratos de acción rápida, vuelve a medir en 15 minutos y contacta a tu médico si los bajones continúan.",
+      "glucoseLowEmergency": "Dos lecturas recientes estuvieron por debajo de 70 mg/dL ({value} mg/dL) e indicaste síntomas. Trátalo ahora con azúcar rápida; si no puedes o te sientes muy mal, llama a emergencias.",
+      "glucoseLowSevereTitle": "Glucosa muy baja",
+      "glucoseLowSevereDoctor": "Dos lecturas recientes estuvieron por debajo de 54 mg/dL ({value} mg/dL). Trátalo de inmediato con carbohidratos de acción rápida, vuelve a medir en 15 minutos y contacta a tu médico.",
+      "glucoseLowSevereEmergency": "Dos lecturas recientes estuvieron por debajo de 54 mg/dL ({value} mg/dL) e indicaste síntomas. Trátalo ahora; si no retienes alimentos o te sientes muy mal, llama a emergencias.",
+      "glucoseHighTitle": "Glucosa muy alta",
+      "glucoseHighDoctor": "Dos lecturas recientes fueron de {value} mg/dL o más. Vuelve a medir, hidrátate y contacta a tu médico cuanto antes si sigue así de alta.",
+      "glucoseHighEmergency": "Dos lecturas recientes fueron de {value} mg/dL o más e indicaste síntomas. Si tienes vómitos, respiración rápida o confusión, llama a emergencias ya."
+    }
   }
 }
diff --git a/messages/fr.json b/messages/fr.json
index 591813a41..310006f4b 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach masqué.",
         "saveError": "Impossible d enregistrer la modification. Veuillez réessayer."
       }
-    }
+    },
+    "diabetes": "Je suis diabétique",
+    "diabetesDescription": "Utilise des objectifs glycémiques cliniques (à jeun 80–130, après le repas moins de 180 mg/dL) au lieu des plages générales. Cela ne change que l'objectif auquel tu es comparé — ce n'est jamais un diagnostic.",
+    "diabetesSaved": "Préférence d'objectif glycémique enregistrée"
   },
   "admin": {
     "title": "Administration",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Suggestions de fréquence",
       "reminderSuggestionsDescription": "Laissez le Coach proposer de temps en temps un rappel fondé sur des preuves pour mesurer une donnée plus régulièrement."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Tension artérielle très élevée",
+      "bpHighDoctor": "Deux mesures récentes étaient à {systolic}/{diastolic} mmHg ou plus. Repose-toi, remesure dans quelques minutes et contacte ton médecin dès que possible si cela reste aussi élevé.",
+      "bpHighEmergency": "Deux mesures récentes étaient à {systolic}/{diastolic} mmHg ou plus et tu as signalé des symptômes. En cas de douleur thoracique, d'essoufflement, de faiblesse ou de troubles de la vision ou de la parole, appelle les secours immédiatement.",
+      "bpLowTitle": "Tension artérielle basse",
+      "bpLowDoctor": "Deux mesures récentes avaient une systolique inférieure à {systolic} mmHg. Si tu te sens étourdi ou faible, assieds-toi ou allonge-toi et contacte ton médecin si cela persiste.",
+      "bpLowEmergency": "Deux mesures récentes avaient une systolique inférieure à {systolic} mmHg et tu as signalé des symptômes. Si tu te sens près de t'évanouir, confus ou as la peau froide et moite, appelle les secours immédiatement.",
+      "glucoseLowTitle": "Glycémie basse",
+      "glucoseLowDoctor": "Deux mesures récentes étaient en dessous de 70 mg/dL ({value} mg/dL). Prends des glucides à action rapide, remesure dans 15 minutes et contacte ton médecin si les baisses persistent.",
+      "glucoseLowEmergency": "Deux mesures récentes étaient en dessous de 70 mg/dL ({value} mg/dL) et tu as signalé des symptômes. Traite maintenant avec du sucre rapide ; si tu ne peux pas ou te sens très mal, appelle les secours.",
+      "glucoseLowSevereTitle": "Glycémie très basse",
+      "glucoseLowSevereDoctor": "Deux mesures récentes étaient en dessous de 54 mg/dL ({value} mg/dL). Traite immédiatement avec des glucides à action rapide, remesure dans 15 minutes et contacte ton médecin.",
+      "glucoseLowSevereEmergency": "Deux mesures récentes étaient en dessous de 54 mg/dL ({value} mg/dL) et tu as signalé des symptômes. Traite maintenant ; si tu ne gardes pas la nourriture ou te sens très mal, appelle les secours.",
+      "glucoseHighTitle": "Glycémie très élevée",
+      "glucoseHighDoctor": "Deux mesures récentes étaient à {value} mg/dL ou plus. Remesure, hydrate-toi et contacte ton médecin dès que possible si cela reste aussi élevé.",
+      "glucoseHighEmergency": "Deux mesures récentes étaient à {value} mg/dL ou plus et tu as signalé des symptômes. En cas de vomissements, de respiration rapide ou de confusion, appelle les secours immédiatement."
+    }
   }
 }
diff --git a/messages/it.json b/messages/it.json
index 2a850296e..b881a4956 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach nascosto.",
         "saveError": "Impossibile salvare la modifica. Riprova."
       }
-    }
+    },
+    "diabetes": "Ho il diabete",
+    "diabetesDescription": "Usa obiettivi glicemici clinici (a digiuno 80–130, dopo i pasti sotto 180 mg/dL) invece delle bande generali. Questo cambia solo l'obiettivo con cui ti confronti — non è mai una diagnosi.",
+    "diabetesSaved": "Preferenza dell'obiettivo glicemico salvata"
   },
   "admin": {
     "title": "Administration",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Suggerimenti di cadenza",
       "reminderSuggestionsDescription": "Lascia che il Coach proponga ogni tanto un promemoria basato sull'evidenza per misurare una metrica più regolarmente."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Pressione molto alta",
+      "bpHighDoctor": "Due misurazioni recenti erano di {systolic}/{diastolic} mmHg o superiori. Riposa, rimisura tra qualche minuto e contatta il medico al più presto se resta così alta.",
+      "bpHighEmergency": "Due misurazioni recenti erano di {systolic}/{diastolic} mmHg o superiori e hai segnalato sintomi. In caso di dolore al petto, affanno, debolezza o disturbi della vista o del linguaggio, chiama subito i soccorsi.",
+      "bpLowTitle": "Pressione bassa",
+      "bpLowDoctor": "Due misurazioni recenti avevano una sistolica sotto {systolic} mmHg. Se ti senti stordito o debole, siediti o sdraiati e contatta il medico se continua.",
+      "bpLowEmergency": "Due misurazioni recenti avevano una sistolica sotto {systolic} mmHg e hai segnalato sintomi. Se senti che stai per svenire, sei confuso o hai la pelle fredda e sudata, chiama subito i soccorsi.",
+      "glucoseLowTitle": "Glicemia bassa",
+      "glucoseLowDoctor": "Due misurazioni recenti erano sotto 70 mg/dL ({value} mg/dL). Assumi carboidrati ad azione rapida, rimisura tra 15 minuti e contatta il medico se i cali continuano.",
+      "glucoseLowEmergency": "Due misurazioni recenti erano sotto 70 mg/dL ({value} mg/dL) e hai segnalato sintomi. Tratta subito con zucchero rapido; se non puoi o ti senti molto male, chiama i soccorsi.",
+      "glucoseLowSevereTitle": "Glicemia molto bassa",
+      "glucoseLowSevereDoctor": "Due misurazioni recenti erano sotto 54 mg/dL ({value} mg/dL). Tratta subito con carboidrati ad azione rapida, rimisura tra 15 minuti e contatta il medico.",
+      "glucoseLowSevereEmergency": "Due misurazioni recenti erano sotto 54 mg/dL ({value} mg/dL) e hai segnalato sintomi. Tratta subito; se non trattieni il cibo o ti senti molto male, chiama i soccorsi.",
+      "glucoseHighTitle": "Glicemia molto alta",
+      "glucoseHighDoctor": "Due misurazioni recenti erano di {value} mg/dL o superiori. Rimisura, idratati e contatta il medico al più presto se resta così alta.",
+      "glucoseHighEmergency": "Due misurazioni recenti erano di {value} mg/dL o superiori e hai segnalato sintomi. In caso di vomito, respiro affannoso o confusione, chiama subito i soccorsi."
+    }
   }
 }
diff --git a/messages/pl.json b/messages/pl.json
index 345078605..82756d8fd 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -4725,7 +4725,10 @@
         "savedOff": "Coach ukryty.",
         "saveError": "Nie udało się zapisać zmiany. Spróbuj ponownie."
       }
-    }
+    },
+    "diabetes": "Mam cukrzycę",
+    "diabetesDescription": "Użyj klinicznych celów glukozy (na czczo 80–130, po posiłku poniżej 180 mg/dL) zamiast ogólnych zakresów. Zmienia to tylko cel, względem którego jesteś oceniany — to nigdy nie jest diagnoza.",
+    "diabetesSaved": "Zapisano preferencję celu glukozy"
   },
   "admin": {
     "title": "Administracja",
@@ -6760,5 +6763,24 @@
       "reminderSuggestionsLabel": "Sugestie częstotliwości",
       "reminderSuggestionsDescription": "Pozwól Coachowi od czasu do czasu zaproponować oparte na dowodach przypomnienie, aby mierzyć daną wartość bardziej regularnie."
     }
+  },
+  "safety": {
+    "floor": {
+      "bpHighTitle": "Bardzo wysokie ciśnienie",
+      "bpHighDoctor": "Dwa ostatnie pomiary wyniosły {systolic}/{diastolic} mmHg lub więcej. Odpocznij, zmierz ponownie za kilka minut i jak najszybciej skontaktuj się z lekarzem, jeśli pozostaje tak wysokie.",
+      "bpHighEmergency": "Dwa ostatnie pomiary wyniosły {systolic}/{diastolic} mmHg lub więcej i zgłosiłeś objawy. W razie bólu w klatce piersiowej, duszności, osłabienia lub zaburzeń widzenia czy mowy natychmiast zadzwoń po pomoc.",
+      "bpLowTitle": "Niskie ciśnienie",
+      "bpLowDoctor": "Dwa ostatnie pomiary miały ciśnienie skurczowe poniżej {systolic} mmHg. Jeśli kręci ci się w głowie lub czujesz osłabienie, usiądź lub połóż się i skontaktuj się z lekarzem, jeśli to się utrzymuje.",
+      "bpLowEmergency": "Dwa ostatnie pomiary miały ciśnienie skurczowe poniżej {systolic} mmHg i zgłosiłeś objawy. Jeśli czujesz, że możesz zemdleć, jesteś zdezorientowany lub masz zimną, lepką skórę, natychmiast zadzwoń po pomoc.",
+      "glucoseLowTitle": "Niski poziom cukru",
+      "glucoseLowDoctor": "Dwa ostatnie pomiary były poniżej 70 mg/dL ({value} mg/dL). Przyjmij szybko działające węglowodany, zmierz ponownie za 15 minut i skontaktuj się z lekarzem, jeśli spadki się utrzymują.",
+      "glucoseLowEmergency": "Dwa ostatnie pomiary były poniżej 70 mg/dL ({value} mg/dL) i zgłosiłeś objawy. Lecz to teraz szybkim cukrem; jeśli nie możesz lub czujesz się bardzo źle, zadzwoń po pomoc.",
+      "glucoseLowSevereTitle": "Bardzo niski poziom cukru",
+      "glucoseLowSevereDoctor": "Dwa ostatnie pomiary były poniżej 54 mg/dL ({value} mg/dL). Lecz natychmiast szybko działającymi węglowodanami, zmierz ponownie za 15 minut i skontaktuj się z lekarzem.",
+      "glucoseLowSevereEmergency": "Dwa ostatnie pomiary były poniżej 54 mg/dL ({value} mg/dL) i zgłosiłeś objawy. Lecz to teraz; jeśli nie utrzymujesz pokarmu lub czujesz się bardzo źle, zadzwoń po pomoc.",
+      "glucoseHighTitle": "Bardzo wysoki poziom cukru",
+      "glucoseHighDoctor": "Dwa ostatnie pomiary wyniosły {value} mg/dL lub więcej. Zmierz ponownie, nawodnij się i jak najszybciej skontaktuj się z lekarzem, jeśli pozostaje tak wysoki.",
+      "glucoseHighEmergency": "Dwa ostatnie pomiary wyniosły {value} mg/dL lub więcej i zgłosiłeś objawy. W razie wymiotów, przyspieszonego oddechu lub dezorientacji natychmiast zadzwoń po pomoc."
+    }
   }
 }

From 22ffb19fa5dca5f6bba8de00d8ae583ff636c4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:32:45 +0200
Subject: [PATCH 41/71] feat(coach): ground replies in cited reference ranges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Surface the population reference bands behind the metrics a Coach turn
carries as a compact, citation-aware grounding block appended after the
SNAPSHOT. For each present metric the block states the headline band, its
source (blood pressure on the ESH 2023 line, US/ESC framings as context
only), and where the user's value sits via the shared four-state
placement contract.

Framed strictly as general guidance: the block opens and closes with a
not-a-diagnosis caveat, never overrides the existing refusal/dose/drug-
level safety discipline, and carries no commercial brand name. Glucose
respects the diabetes opt-in — the tighter ADA management goal only when
the user has declared it, otherwise the general non-diabetic band.

The block is deterministic and inspectable: built purely from the
reference-range backbone over the same scalars the snapshot already
surfaces, so it can never cite a value or band the snapshot does not
carry.
---
 src/app/api/insights/chat/route.ts            |  11 +-
 .../__tests__/reference-grounding.test.ts     | 202 ++++++++++++++
 src/lib/ai/coach/__tests__/snapshot.test.ts   |  93 +++++++
 src/lib/ai/coach/reference-grounding.ts       | 252 ++++++++++++++++++
 src/lib/ai/coach/snapshot.ts                  | 122 +++++++++
 src/lib/ai/coach/system-prompt.ts             |  35 +++
 6 files changed, 714 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/ai/coach/__tests__/reference-grounding.test.ts
 create mode 100644 src/lib/ai/coach/reference-grounding.ts

diff --git a/src/app/api/insights/chat/route.ts b/src/app/api/insights/chat/route.ts
index 812c38b80..93311440c 100644
--- a/src/app/api/insights/chat/route.ts
+++ b/src/app/api/insights/chat/route.ts
@@ -393,9 +393,18 @@ The user's message answers this clarifying question from their self-context ques
 React briefly and personally to the answer; do not repeat the question and do not ask it again.
 `
     : "";
+  // v1.18.6 (W7) — citation-aware reference-range grounding for the metrics
+  // present in this snapshot. Deterministic + brand-free; framed as general
+  // guidance, never a diagnosis. Appended after the SNAPSHOT so it is fully
+  // inspectable and the model reads the published population bands + the
+  // user's placement. Omitted entirely when no present metric is covered by
+  // the reference backbone (the builder returns null).
+  const groundingBlock = snapshot.referenceGrounding
+    ? `\n${snapshot.referenceGrounding}\n`
+    : "";
   const userPrompt = `SNAPSHOT
 ${snapshot.snapshotJson || "(no metric data in this user's log yet)"}
-${guidedBlock}
+${groundingBlock}${guidedBlock}
 CONVERSATION
 ${transcript}
 
diff --git a/src/lib/ai/coach/__tests__/reference-grounding.test.ts b/src/lib/ai/coach/__tests__/reference-grounding.test.ts
new file mode 100644
index 000000000..c04540a83
--- /dev/null
+++ b/src/lib/ai/coach/__tests__/reference-grounding.test.ts
@@ -0,0 +1,202 @@
+import { describe, expect, it } from "vitest";
+
+import { buildReferenceGroundingBlock } from "../reference-grounding";
+import { CITATIONS } from "@/lib/medical-citations";
+
+/**
+ * W7 — the Coach reference-grounding block. These tests pin the
+ * deterministic shape the hallucination-QA pass audits: the right band per
+ * metric, the right four-state placement, the general-guidance caveat, the
+ * ESH-2023 blood-pressure label, the diabetes opt-in gating, and the hard
+ * no-commercial-brand rule.
+ */
+
+/**
+ * Every commercial brand the Coach prompt already names elsewhere (the
+ * GLP-1 block / dose-deferral rule). The grounding block must contain NONE
+ * of them — it is brand-free by construction, and this list is the guard.
+ */
+const BRAND_TOKENS = [
+  "Mounjaro",
+  "Ozempic",
+  "Wegovy",
+  "Zepbound",
+  "Trulicity",
+  "Saxenda",
+  "Rybelsus",
+  "Eli Lilly",
+  "Novo Nordisk",
+  "Withings",
+  "WHOOP",
+  "Oura",
+  "Fitbit",
+  "Garmin",
+  "Apple",
+  "Polar",
+  "Nightscout",
+  "Dexcom",
+  "Libre",
+];
+
+describe("buildReferenceGroundingBlock", () => {
+  it("returns null when no metric is covered by the backbone", () => {
+    expect(buildReferenceGroundingBlock({ metrics: [], hasDiabetes: false })).toBeNull();
+  });
+
+  it("cites the ESH 2023 source for blood pressure and never the US/ESC line", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BLOOD_PRESSURE", value: 118 }],
+      hasDiabetes: false,
+    });
+    expect(block).not.toBeNull();
+    expect(block).toContain("ESH 2023");
+    // The headline normal band edge (≤120 mmHg) is surfaced.
+    expect(block).toContain("120 mmHg");
+    // The conflicting US/ESC framings stay out of the per-line copy; only
+    // the preamble's neutral "(ACC/AHA)" context mentions them.
+    expect(block).not.toContain("Stage 1");
+    // 118 sits inside the optimal band → "within" placement phrasing.
+    expect(block).toContain("sits inside the general reference band");
+  });
+
+  it("places an out-of-band value as outside", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BLOOD_PRESSURE", value: 165 }],
+      hasDiabetes: false,
+    });
+    expect(block).toContain("sits outside the general reference band");
+  });
+
+  it("opens and closes with a general-guidance, not-a-diagnosis caveat", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BMI", value: 22 }],
+      hasDiabetes: false,
+    })!;
+    expect(block).toContain("general guidance");
+    expect(block).toContain("not a diagnosis");
+    expect(block.toLowerCase()).toContain(
+      "not personal medical advice",
+    );
+    // The closing reminder line is present.
+    expect(block).toMatch(/general guidance, not personal medical advice\.$/);
+  });
+
+  it("grounds glucose against the general non-diabetic band when the opt-in is off", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BLOOD_GLUCOSE", value: 92 }],
+      hasDiabetes: false,
+    })!;
+    expect(block).toContain("general non-diabetic normal");
+    // The non-diabetic fasting normal ceiling is 100 mg/dL.
+    expect(block).toContain("100 mg/dL");
+    expect(block).not.toContain("80–130");
+    expect(block).toContain("sits inside the general reference band");
+  });
+
+  it("grounds glucose against the tighter ADA goal band when diabetes is opted in", () => {
+    const inGoal = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BLOOD_GLUCOSE", value: 110 }],
+      hasDiabetes: true,
+    })!;
+    // The ADA diabetic fasting goal band, framed as a clinician-set goal.
+    expect(inGoal).toContain("80–130 mg/dL");
+    expect(inGoal).toContain("management goal");
+    expect(inGoal).toContain("clinician-set goal");
+    // The line explicitly frames the band as a goal, NOT a screening line.
+    expect(inGoal).toContain("not a screening line");
+    expect(inGoal).toContain("inside the typical diabetes management goal");
+
+    const outOfGoal = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BLOOD_GLUCOSE", value: 200 }],
+      hasDiabetes: true,
+    })!;
+    expect(outOfGoal).toContain("outside the typical diabetes management goal");
+  });
+
+  it("treats a band-less metric (HRV) as baseline-led, never out-of-band", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "HEART_RATE_VARIABILITY", value: 45 }],
+      hasDiabetes: false,
+    })!;
+    expect(block).toContain("no fixed population band");
+    expect(block).not.toContain("sits outside");
+  });
+
+  it("is deterministic — identical inputs produce byte-identical output", () => {
+    const input = {
+      metrics: [
+        { metric: "BLOOD_PRESSURE" as const, value: 134 },
+        { metric: "BLOOD_GLUCOSE" as const, value: 105 },
+        { metric: "SLEEP_DURATION" as const, value: 7.5 },
+      ],
+      hasDiabetes: false,
+    };
+    expect(buildReferenceGroundingBlock(input)).toEqual(
+      buildReferenceGroundingBlock(input),
+    );
+  });
+
+  it("caps the number of grounded lines and de-dupes metrics", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [
+        { metric: "BMI", value: 22 },
+        { metric: "BMI", value: 23 },
+      ],
+      hasDiabetes: false,
+    })!;
+    // De-duped: only one BMI line.
+    const bmiLines = block.split("\n").filter((l) => l.startsWith("- BMI:"));
+    expect(bmiLines).toHaveLength(1);
+  });
+
+  it("contains NO commercial brand token in any branch", () => {
+    // Exercise both the non-diabetic and diabetic glucose branches plus a
+    // broad metric spread so every code path's text is scanned.
+    const blocks = [
+      buildReferenceGroundingBlock({
+        metrics: [
+          { metric: "BLOOD_PRESSURE", value: 130 },
+          { metric: "BLOOD_GLUCOSE", value: 95 },
+          { metric: "RESTING_HEART_RATE", value: 58 },
+          { metric: "OXYGEN_SATURATION", value: 97 },
+          { metric: "RESPIRATORY_RATE", value: 16 },
+          { metric: "BODY_TEMPERATURE", value: 36.8 },
+          { metric: "BMI", value: 27 },
+          { metric: "STEPS", value: 9000 },
+          { metric: "VISCERAL_FAT", value: 8 },
+          { metric: "SLEEP_DURATION", value: 8 },
+          { metric: "HEART_RATE_VARIABILITY", value: 40 },
+        ],
+        hasDiabetes: false,
+      }),
+      buildReferenceGroundingBlock({
+        metrics: [{ metric: "BLOOD_GLUCOSE", value: 140 }],
+        hasDiabetes: true,
+      }),
+    ];
+    for (const block of blocks) {
+      expect(block).not.toBeNull();
+      for (const brand of BRAND_TOKENS) {
+        expect(block!.toLowerCase()).not.toContain(brand.toLowerCase());
+      }
+    }
+  });
+
+  it("only cites real entries from the medical-citations registry", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [
+        { metric: "BLOOD_PRESSURE", value: 120 },
+        { metric: "STEPS", value: 9000 },
+        { metric: "SLEEP_DURATION", value: 8 },
+      ],
+      hasDiabetes: false,
+    })!;
+    // Each cited source label ("NAME (YEAR)") corresponds to a real
+    // registry entry — no fabricated guideline names.
+    const citationNames = Object.values(CITATIONS).map((c) => c.name);
+    // The BP / steps / sleep headline sources must all appear by name.
+    expect(citationNames.some((n) => block.includes(n))).toBe(true);
+    expect(block).toContain("ESH 2023");
+    expect(block).toContain("AASM");
+  });
+});
diff --git a/src/lib/ai/coach/__tests__/snapshot.test.ts b/src/lib/ai/coach/__tests__/snapshot.test.ts
index 4000f8ca9..c94c65bb6 100644
--- a/src/lib/ai/coach/__tests__/snapshot.test.ts
+++ b/src/lib/ai/coach/__tests__/snapshot.test.ts
@@ -897,3 +897,96 @@ describe("Coach snapshot — free-text fields wrap through sanitizeForPrompt (L-
     expect(hit).toBe(true);
   });
 });
+
+// v1.18.6 (W7) — the citation-aware reference-range grounding rides through
+// buildCoachSnapshot for the metrics present, gated on the W6 diabetes opt-in.
+describe("buildCoachSnapshot — reference grounding (W7)", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    __resetCoachSnapshotCacheForTests();
+    prismaMock.measurement.findMany.mockResolvedValue([]);
+    prismaMock.moodEntry.findMany.mockResolvedValue([]);
+    prismaMock.medicationIntakeEvent.findMany.mockResolvedValue([]);
+    prismaMock.medication.findMany.mockResolvedValue([]);
+    prismaMock.user.findUnique.mockResolvedValue({ coachPrefsJson: null });
+    resolveModuleMapMock.mockResolvedValue(allModulesEnabled());
+    featuresMock.mockResolvedValue({});
+  });
+
+  it("attaches an ESH-2023-cited grounding block when blood pressure is present", async () => {
+    featuresMock.mockResolvedValue({
+      bloodPressure: { avgSys30: 138, avgDia30: 85, coverage: { count: 4 } },
+    });
+    prismaMock.measurement.findMany.mockResolvedValue([
+      daysAgo(2, 138, "BLOOD_PRESSURE_SYS"),
+      daysAgo(2, 85, "BLOOD_PRESSURE_DIA"),
+    ]);
+
+    const out = await buildCoachSnapshot("user-1", { sources: ["bp"] });
+    expect(out.referenceGrounding).not.toBeNull();
+    expect(out.referenceGrounding).toContain("REFERENCE GROUNDING");
+    expect(out.referenceGrounding).toContain("ESH 2023");
+    // 138 sits in the high-normal band (130–139), two tiers past optimal →
+    // the four-state contract reads that as "outside".
+    expect(out.referenceGrounding).toContain(
+      "sits outside the general reference band",
+    );
+    expect(out.referenceGrounding).toContain("not a diagnosis");
+  });
+
+  it("returns null grounding when no present metric is covered", async () => {
+    const out = await buildCoachSnapshot("user-1");
+    // Empty snapshot — no reference-covered scalar collected.
+    expect(out.referenceGrounding).toBeNull();
+  });
+
+  it("uses the general non-diabetic glucose band when hasDiabetes is unset", async () => {
+    featuresMock.mockResolvedValue({});
+    prismaMock.measurement.findMany.mockResolvedValue([
+      { ...daysAgo(2, 95, "BLOOD_GLUCOSE"), glucoseContext: "FASTING" },
+    ]);
+    prismaMock.user.findUnique.mockResolvedValue({
+      coachPrefsJson: null,
+      hasDiabetes: false,
+    });
+
+    const out = await buildCoachSnapshot("user-1", { sources: ["glucose"] });
+    expect(out.referenceGrounding).toContain("general non-diabetic normal");
+    expect(out.referenceGrounding).not.toContain("management goal");
+  });
+
+  it("uses the tighter ADA goal band when hasDiabetes is opted in", async () => {
+    featuresMock.mockResolvedValue({});
+    prismaMock.measurement.findMany.mockResolvedValue([
+      { ...daysAgo(2, 150, "BLOOD_GLUCOSE"), glucoseContext: "FASTING" },
+    ]);
+    prismaMock.user.findUnique.mockResolvedValue({
+      coachPrefsJson: null,
+      hasDiabetes: true,
+    });
+
+    const out = await buildCoachSnapshot("user-1", { sources: ["glucose"] });
+    expect(out.referenceGrounding).toContain("80–130 mg/dL");
+    expect(out.referenceGrounding).toContain("management goal");
+    // 150 fasting is outside the diabetic goal band.
+    expect(out.referenceGrounding).toContain(
+      "outside the typical diabetes management goal",
+    );
+  });
+
+  it("never emits a commercial brand token in the grounding block", async () => {
+    featuresMock.mockResolvedValue({
+      bloodPressure: { avgSys30: 120, coverage: { count: 4 } },
+    });
+    prismaMock.measurement.findMany.mockResolvedValue([
+      daysAgo(2, 120, "BLOOD_PRESSURE_SYS"),
+      daysAgo(2, 78, "BLOOD_PRESSURE_DIA"),
+    ]);
+    const out = await buildCoachSnapshot("user-1", { sources: ["bp"] });
+    for (const brand of ["Mounjaro", "Withings", "WHOOP", "Oura", "Dexcom"]) {
+      expect(out.referenceGrounding!.toLowerCase()).not.toContain(
+        brand.toLowerCase(),
+      );
+    }
+  });
+});
diff --git a/src/lib/ai/coach/reference-grounding.ts b/src/lib/ai/coach/reference-grounding.ts
new file mode 100644
index 000000000..7c1ff6a94
--- /dev/null
+++ b/src/lib/ai/coach/reference-grounding.ts
@@ -0,0 +1,252 @@
+/**
+ * v1.18.6 — Coach reference-range grounding (W7).
+ *
+ * Turns the population reference bands W5 landed in
+ * `src/lib/reference-ranges.ts` into a compact, citation-aware text block
+ * the Coach prompt can read so a reply is GROUNDED in published guidance
+ * rather than the model's parametric memory of "what's normal". For each
+ * metric the snapshot actually carries, the block states:
+ *   - the metric's headline reference band(s), cited to the publishing
+ *     body + year (via `referenceLabel` → `medical-citations`), and
+ *   - where the user's current value sits against those bands, using the
+ *     SAME deterministic `classifyReference()` four-state contract the UI
+ *     tiles use — never a recomputed placement.
+ *
+ * GUARDRAILS (firm — a hallucination-QA pass audits this exact text):
+ *   - GENERAL guidance only. The block opens AND closes with a caveat that
+ *     these are population anchors, not personal medical advice or a
+ *     diagnosis. The Coach safety discipline (refusal rules, dose-deferral)
+ *     is unchanged — this is read-only context, never an instruction.
+ *   - NO commercial brand names. Every string is sourced from
+ *     `reference-ranges.ts` (brand-free by construction) + the metric's
+ *     natural-language label here. The unit test asserts the rendered
+ *     block contains no brand token.
+ *   - Blood pressure is labelled to ESH 2023 (the SHIPPED European
+ *     default); the ACC/AHA + ESC framings ride only as `conflicts`
+ *     CONTEXT, exactly as the band data authored them — never as the
+ *     placement.
+ *   - GLUCOSE respects the W6 `hasDiabetes` opt-in. When the user has NOT
+ *     opted in, glucose is grounded against the GENERAL non-diabetic
+ *     fasting bands. When they HAVE, the block states the tighter ADA
+ *     glycemic GOAL band (fasting 80–130 mg/dL) as a clinician-set target,
+ *     never a screening threshold and never a diagnosis.
+ *
+ * Deterministic + pure: same inputs → byte-identical block, no DB, no LLM,
+ * no per-call randomness. The block is surfaced verbatim in the Coach
+ * user-prompt after the SNAPSHOT so it is fully inspectable.
+ *
+ * Token budget: the block is bounded by the number of metrics present
+ * (one short line each) and a hard `MAX_GROUNDING_METRICS` cap, so even a
+ * 15-metric snapshot stays a few hundred tokens.
+ */
+import {
+  classifyReference,
+  getReferenceRange,
+  referenceLabel,
+  type ReferenceMetric,
+  type ReferencePlacement,
+} from "@/lib/reference-ranges";
+
+/**
+ * One metric the snapshot carries, paired with the user's current
+ * representative value in the metric's reference unit. The caller
+ * (`snapshot.ts`) resolves the value from the same aggregates it already
+ * built, so the grounding reads the SAME number the rest of the snapshot
+ * does.
+ */
+export interface GroundingMetricInput {
+  readonly metric: ReferenceMetric;
+  /**
+   * Current representative value in the metric's reference unit (e.g. the
+   * 30-day mean systolic in mmHg, the fasting-glucose mean in mg/dL). Null
+   * when the snapshot has the metric block but no usable scalar — the line
+   * still cites the band, with an `insufficient` placement.
+   */
+  readonly value: number | null;
+}
+
+export interface ReferenceGroundingInput {
+  readonly metrics: readonly GroundingMetricInput[];
+  /**
+   * The user's explicit, declared diabetes opt-in (`User.hasDiabetes`,
+   * resolved by the W6 path). Selects the tighter ADA glucose GOAL band
+   * for the glucose line ONLY. Never inferred from a reading.
+   */
+  readonly hasDiabetes: boolean;
+}
+
+/**
+ * Hard cap on grounding lines so a maxed-out cluster set cannot balloon
+ * the block. Metrics beyond the cap are dropped silently (the snapshot
+ * still carries their data; only the extra grounding line is shed). The
+ * cap sits above the universal-metric count so a normal account is never
+ * trimmed.
+ */
+const MAX_GROUNDING_METRICS = 14;
+
+/**
+ * Natural-language label for each grounded metric. Deliberately the
+ * user-facing phrasing the Coach prompt already mandates (GROUND RULE 8 —
+ * never the DB enum). No brand names by construction.
+ */
+const METRIC_LABEL: Record<ReferenceMetric, string> = {
+  BLOOD_PRESSURE: "blood pressure (systolic)",
+  PULSE_PRESSURE: "pulse pressure",
+  MEAN_ARTERIAL_PRESSURE: "mean arterial pressure",
+  PULSE_WAVE_VELOCITY: "pulse-wave velocity",
+  RESTING_HEART_RATE: "resting heart rate",
+  HEART_RATE_VARIABILITY: "heart-rate variability",
+  OXYGEN_SATURATION: "oxygen saturation",
+  RESPIRATORY_RATE: "respiratory rate",
+  BODY_TEMPERATURE: "body temperature",
+  BLOOD_GLUCOSE: "fasting glucose",
+  HBA1C: "HbA1c",
+  BMI: "BMI",
+  STEPS: "daily steps",
+  VISCERAL_FAT: "visceral-fat rating",
+  SLEEP_DURATION: "sleep duration",
+};
+
+/**
+ * The ADA diabetic glycemic GOAL fasting band (mg/dL), kept in lock-step
+ * with `src/lib/targets/glucose-targets.ts` `DIABETIC_GOAL_BANDS.FASTING`.
+ * Only used to phrase the glucose grounding line when `hasDiabetes` is set;
+ * the placement still defers to the user's clinician, never to a band edge.
+ */
+const ADA_DIABETIC_FASTING_GOAL = { low: 80, high: 130 } as const;
+
+/** Map a four-state placement to a short, general-guidance phrase. */
+function placementPhrase(placement: ReferencePlacement): string {
+  switch (placement) {
+    case "within":
+      return "sits inside the general reference band";
+    case "slightly-outside":
+      return "sits just outside the general reference band";
+    case "outside":
+      return "sits outside the general reference band";
+    case "insufficient":
+      // No scalar, or a metric with no fixed population band (e.g. HRV) —
+      // the band is cited for education, the placement is left to the
+      // user's own baseline.
+      return "has no fixed population band — your own trend leads";
+  }
+}
+
+/**
+ * Render the half-open band as a compact "low–high unit" descriptor for the
+ * metric's headline (first/normal) band. Open-ended bounds render with a
+ * leading/trailing ≤ / ≥.
+ */
+function headlineBandText(metric: ReferenceMetric): string | null {
+  const range = getReferenceRange(metric);
+  if (!range || range.bands.length === 0) return null;
+  const band = range.bands[0];
+  const unit = range.unit;
+  if (band.low != null && band.high != null) {
+    return `${band.low}–${band.high} ${unit}`;
+  }
+  if (band.high != null) return `≤${band.high} ${unit}`;
+  if (band.low != null) return `≥${band.low} ${unit}`;
+  return null;
+}
+
+/**
+ * Build the glucose grounding line. Branches on the W6 diabetes opt-in:
+ * general non-diabetic fasting band by default, the tighter ADA glycemic
+ * GOAL band when the user declared diabetes. The diabetic branch frames the
+ * band as a clinician-set GOAL, never a screening threshold.
+ */
+function glucoseLine(value: number | null, hasDiabetes: boolean): string {
+  const label = METRIC_LABEL.BLOOD_GLUCOSE;
+  if (hasDiabetes) {
+    const { low, high } = ADA_DIABETIC_FASTING_GOAL;
+    // Placement against the diabetic GOAL band, framed as a target the
+    // user's clinician individualises — never a diagnostic call.
+    let where: string;
+    if (value == null || !Number.isFinite(value)) {
+      where = "no usable value this window";
+    } else if (value >= low && value <= high) {
+      where = "is inside the typical diabetes management goal";
+    } else {
+      where = "is outside the typical diabetes management goal";
+    }
+    return `- ${label}: a common diabetes management goal is ${low}–${high} mg/dL fasting (${referenceLabel(
+      "BLOOD_GLUCOSE",
+    )} — clinician-set goal, individualised, not a screening line). Yours ${where}.`;
+  }
+  const band = headlineBandText("BLOOD_GLUCOSE");
+  const placement = classifyReference("BLOOD_GLUCOSE", value);
+  return `- ${label}: general non-diabetic normal is ${band} (${referenceLabel(
+    "BLOOD_GLUCOSE",
+  )}). Yours ${placementPhrase(placement)}.`;
+}
+
+/** Build one standard (non-glucose) grounding line for a metric. */
+function standardLine(metric: ReferenceMetric, value: number | null): string {
+  const label = METRIC_LABEL[metric];
+  const band = headlineBandText(metric);
+  const placement = classifyReference(metric, value);
+  const cite = referenceLabel(metric);
+  // Blood pressure cites ESH 2023 by construction (the reference-range
+  // headline band is sourced to ESH_2023_HYPERTENSION); the conflicts
+  // (ACC/AHA, ESC) stay out of the per-line copy and live in the block
+  // preamble's "guidelines disagree" note so the Coach never mislabels the
+  // shipped European line.
+  if (band) {
+    return `- ${label}: general reference ${band} (${cite}). Yours ${placementPhrase(
+      placement,
+    )}.`;
+  }
+  // No fixed band (HRV) — cite the source, defer wholly to the baseline.
+  return `- ${label}: ${placementPhrase(placement)} (${cite}).`;
+}
+
+/**
+ * Build the Coach reference-grounding block, or null when no metric in the
+ * input is covered by the reference backbone (so the prompt carries no
+ * empty section). The returned string is plain text with a stable shape:
+ * a header, a general-guidance preamble, one line per metric, and a
+ * closing caveat. The route appends it verbatim after the SNAPSHOT.
+ */
+export function buildReferenceGroundingBlock(
+  input: ReferenceGroundingInput,
+): string | null {
+  // De-dupe + keep input order; only metrics the backbone covers.
+  const seen = new Set<ReferenceMetric>();
+  const ordered: GroundingMetricInput[] = [];
+  for (const m of input.metrics) {
+    if (seen.has(m.metric)) continue;
+    if (!getReferenceRange(m.metric)) continue;
+    seen.add(m.metric);
+    ordered.push(m);
+    if (ordered.length >= MAX_GROUNDING_METRICS) break;
+  }
+  if (ordered.length === 0) return null;
+
+  const lines = ordered.map((m) =>
+    m.metric === "BLOOD_GLUCOSE"
+      ? glucoseLine(m.value, input.hasDiabetes)
+      : standardLine(m.metric, m.value),
+  );
+
+  // The preamble + closing caveat carry the firm general-guidance framing.
+  // Blood-pressure guideline disagreement is surfaced once here (context),
+  // never as a per-line placement, so the Coach reads ESH 2023 as the
+  // shipped line.
+  const header = "REFERENCE GROUNDING (general guidance — not a diagnosis)";
+  const preamble = [
+    "These are published POPULATION reference bands for context only — they",
+    "are not personal medical advice, not a diagnosis, and not a target set",
+    "for this user. The user's own baseline always leads the read. Cite a",
+    "band only to orient a reply (\"the general reference range is …\"); never",
+    "tell the user they \"have\" or \"don't have\" a condition from a band.",
+    "Blood pressure follows the European ESH 2023 line; US (ACC/AHA) and",
+    "ESC framings differ and are context, not the call. This block does not",
+    "change any safety rule above — keep deferring dose / diagnosis / drug-",
+    "level questions to the user's clinician exactly as instructed.",
+  ].join("\n");
+  const closing =
+    "Reminder: ranges are general guidance, not personal medical advice.";
+
+  return `${header}\n${preamble}\n\n${lines.join("\n")}\n\n${closing}`;
+}
diff --git a/src/lib/ai/coach/snapshot.ts b/src/lib/ai/coach/snapshot.ts
index f8e82811a..339482f58 100644
--- a/src/lib/ai/coach/snapshot.ts
+++ b/src/lib/ai/coach/snapshot.ts
@@ -49,6 +49,11 @@ import { buildCoachMemoryBlock } from "./memory-snapshot";
 import { buildTrajectorySnapshotBlock } from "./trajectory-snapshot";
 import { buildCycleSnapshotBlock } from "./cycle-snapshot";
 import { buildIllnessSnapshotBlock } from "./illness-snapshot";
+import {
+  buildReferenceGroundingBlock,
+  type GroundingMetricInput,
+} from "./reference-grounding";
+import type { ReferenceMetric } from "@/lib/reference-ranges";
 import { isCycleAvailableForUser } from "@/lib/cycle/gate";
 import { resolveModuleMap, type ModuleKey } from "@/lib/modules/gate";
 import {
@@ -81,6 +86,15 @@ export interface CoachSnapshotResult {
    * the model could see.
    */
   provenance: CoachProvenance;
+  /**
+   * v1.18.6 (W7) — citation-aware reference-range grounding for the
+   * metrics present in this snapshot, or null when none is covered by the
+   * reference backbone. The Coach route appends it verbatim after the
+   * SNAPSHOT so the model reads published population bands + the user's
+   * placement (general guidance, never a diagnosis). Built deterministically
+   * from `src/lib/reference-ranges.ts`; carries no commercial brand name.
+   */
+  referenceGrounding: string | null;
 }
 
 /**
@@ -565,6 +579,11 @@ async function buildCoachSnapshotImpl(
       // display unit so the Coach reads the same number every other surface
       // shows. Read it on this existing prefs hop (no extra round-trip).
       glucoseUnit: true,
+      // v1.18.6 (W7) — the explicit, user-declared diabetes opt-in. Selects
+      // the tighter ADA glycemic GOAL band for the glucose reference-grounding
+      // line only; never inferred from a reading, never a diagnosis. Read on
+      // this existing prefs hop (no extra round-trip).
+      hasDiabetes: true,
     },
   });
   const prefs = parseCoachPrefs(prefsRow?.coachPrefsJson);
@@ -652,6 +671,37 @@ async function buildCoachSnapshotImpl(
   const metrics = new Set<CoachProvenance["metrics"][number]>();
   const counts: NonNullable<CoachProvenance["counts"]> = {};
 
+  // v1.18.6 (W7) — representative scalar per reference-covered metric, in the
+  // metric's reference unit, collected as the blocks below build. Feeds the
+  // citation-aware grounding block (population band + the user's placement).
+  // Each entry reads the SAME number the snapshot already surfaces — no
+  // independent recompute — so the grounding can never cite a value the
+  // snapshot doesn't carry. A metric with a block but no clean scalar is left
+  // unset (the grounding line still cites its band with an insufficient
+  // placement only if it is added with a null value; we omit such metrics).
+  const groundingValues = new Map<ReferenceMetric, number>();
+  // Additive `MeasurementType` → reference metric, for the value-block loop.
+  const TYPE_TO_REFERENCE_METRIC: Record<string, ReferenceMetric> = {
+    RESTING_HEART_RATE: "RESTING_HEART_RATE",
+    OXYGEN_SATURATION: "OXYGEN_SATURATION",
+    RESPIRATORY_RATE: "RESPIRATORY_RATE",
+    PULSE_WAVE_VELOCITY: "PULSE_WAVE_VELOCITY",
+    BODY_TEMPERATURE: "BODY_TEMPERATURE",
+    BODY_MASS_INDEX: "BMI",
+    VISCERAL_FAT: "VISCERAL_FAT",
+    ACTIVITY_STEPS: "STEPS",
+  };
+  /** Mean of the most recent N daily-value rows (already user-tz day means). */
+  const recentRowsMean = (
+    rows: DailyValueRow[],
+    take = DAILY_TIMELINE_DAYS,
+  ): number | null => {
+    if (rows.length === 0) return null;
+    const slice = rows.slice(-take);
+    const sum = slice.reduce((s, r) => s + r.value, 0);
+    return sum / slice.length;
+  };
+
   // v1.7.0 — block registry. Maps each emitted snapshot top-level key
   // to the cluster it belongs to so the soft-cap degradation pass
   // (below) can walk blocks in reverse cluster-priority order and shed
@@ -1119,6 +1169,10 @@ async function buildCoachSnapshotImpl(
     windows.add("last90days");
     counts.bp = features.bloodPressure.coverage?.count ?? undefined;
     registerBlock("bloodPressure", "bp");
+    // W7 grounding: systolic 30-day mean against the ESH 2023 office bands.
+    const sys30 =
+      features.bloodPressure.avgSys30 ?? features.bloodPressure.allTimeAvgSys;
+    if (sys30 != null) groundingValues.set("BLOOD_PRESSURE", sys30);
   }
   if (wantsWeight && features.weight) {
     const rows = byType("WEIGHT");
@@ -1137,6 +1191,13 @@ async function buildCoachSnapshotImpl(
     windows.add("last30days");
     counts.weight = features.weight.coverage?.count ?? undefined;
     registerBlock("weight", "weight");
+    // W7 grounding: weight has no population band, but the derived BMI does.
+    // Use the features-computed BMI (same value the weight tile shows) so the
+    // grounding reads the WHO band. A dedicated BODY_MASS_INDEX block (below)
+    // wins if the user also syncs a measured BMI series.
+    if (features.weight.bmi != null) {
+      groundingValues.set("BMI", features.weight.bmi);
+    }
   }
   if (wantsPulse && features.pulse) {
     const rows = byType("PULSE");
@@ -1412,6 +1473,14 @@ async function buildCoachSnapshotImpl(
     metrics.add(block.metric);
     counts[block.metric] = rows.length;
     registerBlock(block.snapshotKey, block.source);
+    // W7 grounding: when this additive series maps to a reference metric,
+    // record the recent daily mean (same per-day means the timeline shows).
+    const refMetric = TYPE_TO_REFERENCE_METRIC[block.type];
+    if (refMetric) {
+      const recentRows = buildDailyValueRows(rows, recentCutoff, userTz);
+      const mean = recentRowsMean(recentRows);
+      if (mean != null) groundingValues.set(refMetric, mean);
+    }
   }
 
   // ── v1.7.0 sleep block (with optional per-stage enrichment) ───────
@@ -1480,6 +1549,19 @@ async function buildCoachSnapshotImpl(
       metrics.add("sleep");
       counts.sleep = sleepRows.length;
       registerBlock("sleep", "sleep");
+      // W7 grounding: recent nightly asleep duration in HOURS against the
+      // AASM 7–9 h band (the reference unit is hours; the snapshot stores
+      // minutes). Mean over the recent nights the block already reconstructed.
+      if (recentNights.length > 0) {
+        const meanMin =
+          recentNights.reduce(
+            (s, n) => s + (typeof n.minutes === "number" ? n.minutes : 0),
+            0,
+          ) / recentNights.length;
+        if (meanMin > 0) {
+          groundingValues.set("SLEEP_DURATION", meanMin / 60);
+        }
+      }
     }
   }
 
@@ -1653,6 +1735,22 @@ async function buildCoachSnapshotImpl(
       metrics.add("glucose");
       counts.glucose = glucoseRows.length;
       registerBlock("glucose", "glucose");
+      // W7 grounding: fasting glucose mean in RAW mg/dL (the reference band's
+      // unit), independent of the user's mmol/L display preference. The
+      // grounding line's band selection respects the W6 `hasDiabetes` opt-in;
+      // here we only feed the representative fasting value. Fall back to the
+      // overall mean when no row is tagged FASTING so the band is still cited.
+      const fastingRows = glucoseRows.filter(
+        (r) => String(r.glucoseContext).toUpperCase() === "FASTING",
+      );
+      const glucoseScalarRows =
+        fastingRows.length > 0 ? fastingRows : glucoseRows;
+      const glucoseMeanMgdl =
+        glucoseScalarRows.reduce((s, r) => s + r.value, 0) /
+        glucoseScalarRows.length;
+      if (Number.isFinite(glucoseMeanMgdl)) {
+        groundingValues.set("BLOOD_GLUCOSE", glucoseMeanMgdl);
+      }
     }
   }
 
@@ -1894,6 +1992,29 @@ async function buildCoachSnapshotImpl(
   // `coach.snapshot.truncated` annotation when it sheds anything.
   degradeToBudget(compactSnapshot, blockClusters);
 
+  // v1.18.6 (W7) — build the citation-aware reference-grounding block from the
+  // representative scalars collected above. Deterministic + pure; the route
+  // appends it verbatim after the SNAPSHOT. Null when no present metric is
+  // covered by the reference backbone. Insertion order follows the block-build
+  // order (BP first), giving a stable, inspectable block for the
+  // hallucination-QA pass.
+  const groundingMetrics: GroundingMetricInput[] = Array.from(
+    groundingValues.entries(),
+  ).map(([metric, value]) => ({ metric, value }));
+  const referenceGrounding = buildReferenceGroundingBlock({
+    metrics: groundingMetrics,
+    hasDiabetes: prefsRow?.hasDiabetes ?? false,
+  });
+  if (referenceGrounding) {
+    annotate({
+      action: { name: "coach.grounding.attached" },
+      meta: {
+        metrics: groundingMetrics.map((m) => m.metric).sort(),
+        hasDiabetes: prefsRow?.hasDiabetes ?? false,
+      },
+    });
+  }
+
   return {
     snapshotJson: JSON.stringify(compactSnapshot, null, 2),
     provenance: {
@@ -1901,6 +2022,7 @@ async function buildCoachSnapshotImpl(
       metrics: Array.from(metrics),
       counts: Object.keys(counts).length > 0 ? counts : undefined,
     },
+    referenceGrounding,
   };
 }
 
diff --git a/src/lib/ai/coach/system-prompt.ts b/src/lib/ai/coach/system-prompt.ts
index 608aaf262..0c94d276b 100644
--- a/src/lib/ai/coach/system-prompt.ts
+++ b/src/lib/ai/coach/system-prompt.ts
@@ -189,6 +189,22 @@ GROUND RULES
     day, decline and say the forecast is a descriptive estimate, not
     a contraceptive method. When NO "cycle" block is present, do not
     infer or guess a phase.
+13. The user prompt MAY carry a "REFERENCE GROUNDING" block after the
+    SNAPSHOT. It lists published POPULATION reference bands for the
+    metrics present plus where the user's value sits, each cited to its
+    source (e.g. ESH 2023 for blood pressure). Use it ONLY as general
+    orientation — "the general reference range is …", "that sits a little
+    above the usual band". It is NOT personal medical advice, NOT a
+    diagnosis, and NOT a target for this user; the user's own baseline
+    still leads. Never tell the user they "have" or "don't have" a
+    condition from a band, never convert a band into a risk score, and
+    never let the grounding soften the safety rules above — keep deferring
+    dose / diagnosis / drug-level questions to their clinician. Blood
+    pressure reads on the European ESH 2023 line; the US (ACC/AHA) and
+    ESC framings differ and are context only. If the user has declared
+    diabetes, the glucose line states a clinician-set management GOAL, not
+    a screening threshold. When no REFERENCE GROUNDING block is present,
+    do not invent a band — pivot to the user's own trend.
 
 DAY-LEVEL READINGS — USE THE TIMELINE
 
@@ -580,6 +596,25 @@ GRUNDREGELN
     dass die Prognose eine beschreibende Schätzung ist, keine
     Verhütungsmethode. Wenn KEIN "cycle"-Block vorhanden ist, leite
     oder rate keine Phase ab.
+13. Der User-Prompt kann nach dem SNAPSHOT einen "REFERENCE
+    GROUNDING"-Block mitbringen. Er nennt publizierte POPULATIONS-
+    Referenzbereiche für die vorhandenen Metriken plus die Einordnung des
+    Nutzerwerts, jeweils mit Quelle zitiert (z. B. ESH 2023 für den
+    Blutdruck). Nutze ihn AUSSCHLIESSLICH zur groben Orientierung — "der
+    allgemeine Referenzbereich liegt bei …", "das liegt etwas über dem
+    üblichen Bereich". Er ist KEINE persönliche medizinische Beratung,
+    KEINE Diagnose und KEIN Zielwert für diesen Nutzer; die eigene
+    Ausgangslage des Nutzers führt weiterhin. Sag dem Nutzer nie, er
+    "habe" oder "habe nicht" eine Erkrankung aus einem Bereich, mach aus
+    einem Bereich nie einen Risiko-Score, und lass das Grounding nie die
+    Sicherheitsregeln oben aufweichen — verweise Dosis-/Diagnose-/
+    Wirkstoffspiegel-Fragen weiter an die behandelnde Ärztin. Der
+    Blutdruck liest sich auf der europäischen ESH-2023-Linie; die US-
+    (ACC/AHA) und ESC-Einordnungen weichen ab und sind nur Kontext. Hat
+    der Nutzer Diabetes angegeben, nennt die Glukose-Zeile ein
+    klinisch gesetztes Management-ZIEL, keinen Screening-Schwellwert.
+    Ist kein REFERENCE-GROUNDING-Block vorhanden, erfinde keinen Bereich
+    — wechsle zum eigenen Trend des Nutzers.
 
 TAGES-LEVEL-MESSWERTE — NUTZE DIE TIMELINE
 

From 9265ab89c630f9a59c281db69aac20869e640e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 20:41:29 +0200
Subject: [PATCH 42/71] fix(reference): resolve the normal band by marker, not
 index 0

The reference-range classifier assumed bands[0] was always the
normal/target band, so any metric whose first band is abnormal was
placed wrong: a healthy BMI 22 read as just outside the reference and
an underweight BMI 17 read as inside; pulse pressure had the same flaw
(Narrow is its first band). The same classifier drives the in-app
four-state explainer, so both surfaces were affected.

Mark the population-normal band explicitly with a `normal: true` flag
on every metric, add `normalBandIndex`, and place values by distance
from the marked band rather than from index 0. `headlineBandText` now
renders the marked band, so BMI grounds against 18.5-24.9 kg/m2.

Exclude daily steps from the Coach grounding: it is fed the intra-day
mean of the step rows, which averages a multi-row day down and can
misplace it below the 8,000 floor. Grounding it on a per-day sum is the
correct fix and is left as a follow-up; until then drop the line rather
than ship a wrong placement.

Extend the classifier and grounding tests for BMI 17/22/27, a pulse
pressure case, the normal-band-not-at-index-0 contract, and that steps
is not grounded.
---
 src/lib/__tests__/reference-ranges.test.ts    | 37 ++++++++
 .../__tests__/reference-grounding.test.ts     | 65 ++++++++++++++
 src/lib/ai/coach/reference-grounding.ts       | 17 +++-
 src/lib/reference-ranges.ts                   | 89 ++++++++++++-------
 4 files changed, 175 insertions(+), 33 deletions(-)

diff --git a/src/lib/__tests__/reference-ranges.test.ts b/src/lib/__tests__/reference-ranges.test.ts
index 910e80e05..730739d9c 100644
--- a/src/lib/__tests__/reference-ranges.test.ts
+++ b/src/lib/__tests__/reference-ranges.test.ts
@@ -7,6 +7,7 @@ import {
   classifyReference,
   getReferenceRange,
   isReferenceMetric,
+  normalBandIndex,
   referenceCitation,
   referenceLabel,
   type ReferenceMetric,
@@ -54,6 +55,42 @@ describe("reference-ranges backbone", () => {
     expect(classifyReference("OXYGEN_SATURATION", 98)).toBe("within");
   });
 
+  it("every banded metric marks exactly one normal band", () => {
+    for (const metric of REFERENCE_METRICS) {
+      const bands = REFERENCE_RANGES[metric].bands;
+      if (bands.length === 0) continue;
+      const marked = bands.filter((b) => b.normal === true);
+      expect(marked, `${metric} normal-band count`).toHaveLength(1);
+      // `normalBandIndex` points at that marked band.
+      expect(bands[normalBandIndex(metric)].normal, `${metric} index`).toBe(true);
+    }
+  });
+
+  it("resolves the normal band by marker, not by index 0", () => {
+    // BMI authors Underweight FIRST; the normal band is the 18.5–24.9 entry.
+    expect(REFERENCE_RANGES.BMI.bands[0].label).toBe("Underweight");
+    expect(REFERENCE_RANGES.BMI.bands[normalBandIndex("BMI")].label).toBe("Normal");
+    // BMI 22 is healthy → within (the index-0 bug reported it slightly-outside).
+    expect(classifyReference("BMI", 22)).toBe("within");
+    // BMI 17 is underweight → one band below normal → slightly-outside
+    // (the index-0 bug reported it as within).
+    expect(classifyReference("BMI", 17)).toBe("slightly-outside");
+    // BMI 27 overweight (one above) → slightly-outside; 35 obesity (two
+    // above) → outside.
+    expect(classifyReference("BMI", 27)).toBe("slightly-outside");
+    expect(classifyReference("BMI", 35)).toBe("outside");
+  });
+
+  it("classifies pulse pressure around its interior normal band", () => {
+    // Narrow is the FIRST band; the normal band is "Typical at rest".
+    expect(REFERENCE_RANGES.PULSE_PRESSURE.bands[0].label).toBe("Narrow");
+    expect(classifyReference("PULSE_PRESSURE", 40)).toBe("within");
+    // Narrow (≤25) is one band below normal → slightly-outside.
+    expect(classifyReference("PULSE_PRESSURE", 20)).toBe("slightly-outside");
+    // Wide (≥60) is one band above normal → slightly-outside.
+    expect(classifyReference("PULSE_PRESSURE", 75)).toBe("slightly-outside");
+  });
+
   it("returns insufficient for absent values and band-less metrics", () => {
     expect(classifyReference("RESTING_HEART_RATE", null)).toBe("insufficient");
     expect(classifyReference("RESTING_HEART_RATE", Number.NaN)).toBe("insufficient");
diff --git a/src/lib/ai/coach/__tests__/reference-grounding.test.ts b/src/lib/ai/coach/__tests__/reference-grounding.test.ts
index c04540a83..d010e8b37 100644
--- a/src/lib/ai/coach/__tests__/reference-grounding.test.ts
+++ b/src/lib/ai/coach/__tests__/reference-grounding.test.ts
@@ -113,6 +113,71 @@ describe("buildReferenceGroundingBlock", () => {
     expect(outOfGoal).toContain("outside the typical diabetes management goal");
   });
 
+  it("grounds BMI against the WHO normal band, not the first (Underweight) band", () => {
+    // The headline band rendered must be the 18.5–24.9 normal range — the
+    // index-0 bug surfaced the Underweight "≤18.5" ceiling instead.
+    const normal = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BMI", value: 22 }],
+      hasDiabetes: false,
+    })!;
+    const bmiLine = normal.split("\n").find((l) => l.startsWith("- BMI:"))!;
+    expect(bmiLine).toContain("18.5–24.9 kg/m²");
+    expect(bmiLine).not.toContain("≤18.5");
+    // A healthy 22 sits INSIDE the band (was wrongly "just outside").
+    expect(bmiLine).toContain("sits inside the general reference band");
+
+    // Underweight 17 sits just outside (was wrongly "inside").
+    const under = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BMI", value: 17 }],
+      hasDiabetes: false,
+    })!;
+    expect(under.split("\n").find((l) => l.startsWith("- BMI:"))).toContain(
+      "sits just outside the general reference band",
+    );
+
+    // Overweight 27 sits just outside.
+    const over = buildReferenceGroundingBlock({
+      metrics: [{ metric: "BMI", value: 27 }],
+      hasDiabetes: false,
+    })!;
+    expect(over.split("\n").find((l) => l.startsWith("- BMI:"))).toContain(
+      "sits just outside the general reference band",
+    );
+  });
+
+  it("grounds pulse pressure against its interior normal band", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [{ metric: "PULSE_PRESSURE", value: 40 }],
+      hasDiabetes: false,
+    })!;
+    const line = block.split("\n").find((l) => l.startsWith("- pulse pressure:"))!;
+    // The normal "Typical at rest" band (25–60), not the first "Narrow" band.
+    expect(line).toContain("25–60 mmHg");
+    expect(line).toContain("sits inside the general reference band");
+  });
+
+  it("does not ground steps (mean-aggregation misplacement; follow-up)", () => {
+    const block = buildReferenceGroundingBlock({
+      metrics: [
+        { metric: "STEPS", value: 9000 },
+        { metric: "BMI", value: 22 },
+      ],
+      hasDiabetes: false,
+    })!;
+    // STEPS is dropped; the BMI line still renders.
+    expect(block).not.toContain("daily steps");
+    expect(block.split("\n").some((l) => l.startsWith("- BMI:"))).toBe(true);
+  });
+
+  it("returns null when steps is the only metric (it is not grounded)", () => {
+    expect(
+      buildReferenceGroundingBlock({
+        metrics: [{ metric: "STEPS", value: 9000 }],
+        hasDiabetes: false,
+      }),
+    ).toBeNull();
+  });
+
   it("treats a band-less metric (HRV) as baseline-led, never out-of-band", () => {
     const block = buildReferenceGroundingBlock({
       metrics: [{ metric: "HEART_RATE_VARIABILITY", value: 45 }],
diff --git a/src/lib/ai/coach/reference-grounding.ts b/src/lib/ai/coach/reference-grounding.ts
index 7c1ff6a94..9263fa7b6 100644
--- a/src/lib/ai/coach/reference-grounding.ts
+++ b/src/lib/ai/coach/reference-grounding.ts
@@ -42,6 +42,7 @@
 import {
   classifyReference,
   getReferenceRange,
+  normalBandIndex,
   referenceLabel,
   type ReferenceMetric,
   type ReferencePlacement,
@@ -134,13 +135,16 @@ function placementPhrase(placement: ReferencePlacement): string {
 
 /**
  * Render the half-open band as a compact "low–high unit" descriptor for the
- * metric's headline (first/normal) band. Open-ended bounds render with a
- * leading/trailing ≤ / ≥.
+ * metric's NORMAL band — resolved by the `normal` marker, NOT by index 0
+ * (some metrics author an abnormal band first, e.g. BMI Underweight or
+ * pulse-pressure Narrow). Open-ended bounds render with a leading/trailing
+ * ≤ / ≥.
  */
 function headlineBandText(metric: ReferenceMetric): string | null {
   const range = getReferenceRange(metric);
   if (!range || range.bands.length === 0) return null;
-  const band = range.bands[0];
+  const idx = normalBandIndex(metric);
+  const band = range.bands[idx];
   const unit = range.unit;
   if (band.low != null && band.high != null) {
     return `${band.low}–${band.high} ${unit}`;
@@ -217,6 +221,13 @@ export function buildReferenceGroundingBlock(
   for (const m of input.metrics) {
     if (seen.has(m.metric)) continue;
     if (!getReferenceRange(m.metric)) continue;
+    // STEPS is excluded from grounding for now: the caller feeds the
+    // intra-day MEAN of the ACTIVITY_STEPS rows, so a day logged across
+    // several rows is averaged DOWN and can be misclassified below the
+    // 8,000-step floor. Grounding it on a sum-per-day aggregate is the
+    // correct fix and is tracked as a follow-up; until then we drop the
+    // line rather than ship a wrong placement.
+    if (m.metric === "STEPS") continue;
     seen.add(m.metric);
     ordered.push(m);
     if (ordered.length >= MAX_GROUNDING_METRICS) break;
diff --git a/src/lib/reference-ranges.ts b/src/lib/reference-ranges.ts
index 88e8c0581..288507a45 100644
--- a/src/lib/reference-ranges.ts
+++ b/src/lib/reference-ranges.ts
@@ -39,6 +39,16 @@ export interface ReferenceBand {
   readonly high?: number;
   /** The body + year that publishes this band. */
   readonly citation: CitationId;
+  /**
+   * Marks THE population-normal / target band — the placement
+   * `classifyReference` treats as "within" and `headlineBandText` renders
+   * as the headline. Exactly one band per metric (with at least one band)
+   * carries this. Bands are NOT assumed normal by index: a metric whose
+   * first band is abnormal (BMI → Underweight first; pulse pressure →
+   * Narrow first) marks the correct interior band instead. A test asserts
+   * the one-marker-per-banded-metric invariant.
+   */
+  readonly normal?: boolean;
 }
 
 /**
@@ -55,7 +65,12 @@ export interface ReferenceConflict {
 export interface ReferenceRange {
   /** Canonical display unit (matches the metric tile + registry). */
   readonly unit: string;
-  /** Ordered population bands; the first is the "good"/normal placement. */
+  /**
+   * Ordered population bands. The "good"/normal placement is the band
+   * flagged `normal: true` — NOT necessarily the first entry. Some metrics
+   * (BMI, pulse pressure) author an abnormal band first, so consumers must
+   * resolve the normal band by the marker, never by index.
+   */
   readonly bands: readonly ReferenceBand[];
   /** The body the headline band is sourced to (drives the cited sentence). */
   readonly referenceId: CitationId;
@@ -95,7 +110,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
     unit: "mmHg",
     bands: [
       // ESH grade bands (office, mmHg, systolic anchors shown).
-      { label: "Optimal", high: 120, citation: "ESH_2023_HYPERTENSION" },
+      { label: "Optimal", high: 120, citation: "ESH_2023_HYPERTENSION", normal: true },
       { label: "Normal", low: 120, high: 129, citation: "ESH_2023_HYPERTENSION" },
       { label: "High-normal", low: 130, high: 139, citation: "ESH_2023_HYPERTENSION" },
       { label: "Hypertension", low: 140, citation: "ESH_2023_HYPERTENSION" },
@@ -120,7 +135,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
     unit: "mmHg",
     bands: [
       { label: "Narrow", high: 25, citation: "STATPEARLS_PULSE_PRESSURE" },
-      { label: "Typical at rest", low: 25, high: 60, citation: "STATPEARLS_PULSE_PRESSURE" },
+      { label: "Typical at rest", low: 25, high: 60, citation: "STATPEARLS_PULSE_PRESSURE", normal: true },
       { label: "Wide", low: 60, citation: "STATPEARLS_PULSE_PRESSURE" },
     ],
     referenceId: "STATPEARLS_PULSE_PRESSURE",
@@ -132,7 +147,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   MEAN_ARTERIAL_PRESSURE: {
     unit: "mmHg",
     bands: [
-      { label: "Resting band", low: 70, high: 100, citation: "STATPEARLS_MAP" },
+      { label: "Resting band", low: 70, high: 100, citation: "STATPEARLS_MAP", normal: true },
     ],
     referenceId: "STATPEARLS_MAP",
     guidanceCaveat:
@@ -142,7 +157,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   PULSE_WAVE_VELOCITY: {
     unit: "m/s",
     bands: [
-      { label: "Reference", high: 10, citation: "ESC_ESH_2018_PWV" },
+      { label: "Reference", high: 10, citation: "ESC_ESH_2018_PWV", normal: true },
       { label: "Elevated stiffness", low: 10, citation: "ESC_ESH_2018_PWV" },
     ],
     referenceId: "ESC_ESH_2018_PWV",
@@ -151,14 +166,14 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   },
 
   // ── Resting heart rate — uses RESTING_HEART_RATE, never workout pulse. ──
-  // Bands are authored normal-first so `classifyReference` treats the
-  // population-normal band as the "within" placement. The athletic band
+  // The 60–100 band carries `normal: true`, so `classifyReference` treats it
+  // as the "within" placement regardless of band order. The athletic band
   // (40–60) is benign for a trained heart but sits below the standard
   // normal range — the caveat copy carries that nuance.
   RESTING_HEART_RATE: {
     unit: "bpm",
     bands: [
-      { label: "Normal adult resting", low: 60, high: 100, citation: "AHA_2024_RHR" },
+      { label: "Normal adult resting", low: 60, high: 100, citation: "AHA_2024_RHR", normal: true },
       { label: "Athletic (benign)", low: 40, high: 60, citation: "AHA_2024_RHR" },
     ],
     referenceId: "AHA_2024_RHR",
@@ -178,7 +193,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   OXYGEN_SATURATION: {
     unit: "%",
     bands: [
-      { label: "Healthy room air", low: 95, high: 100, citation: "STATPEARLS_PULSE_OX" },
+      { label: "Healthy room air", low: 95, high: 100, citation: "STATPEARLS_PULSE_OX", normal: true },
       { label: "Mild hypoxaemia", low: 91, high: 94, citation: "STATPEARLS_PULSE_OX" },
     ],
     referenceId: "STATPEARLS_PULSE_OX",
@@ -189,7 +204,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   RESPIRATORY_RATE: {
     unit: "breaths/min",
     bands: [
-      { label: "Normal resting adult", low: 12, high: 20, citation: "ALA_RESPIRATORY_RATE" },
+      { label: "Normal resting adult", low: 12, high: 20, citation: "ALA_RESPIRATORY_RATE", normal: true },
       { label: "Worth attention", low: 22, citation: "RCP_2017_NEWS2" },
     ],
     referenceId: "ALA_RESPIRATORY_RATE",
@@ -201,7 +216,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   BODY_TEMPERATURE: {
     unit: "°C",
     bands: [
-      { label: "Normal oral range", low: 35.7, high: 37.4, citation: "JGIM_2019_TEMPERATURE" },
+      { label: "Normal oral range", low: 35.7, high: 37.4, citation: "JGIM_2019_TEMPERATURE", normal: true },
       { label: "Fever", low: 38.0, citation: "JGIM_2019_TEMPERATURE" },
     ],
     referenceId: "JGIM_2019_TEMPERATURE",
@@ -213,7 +228,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   BLOOD_GLUCOSE: {
     unit: "mg/dL",
     bands: [
-      { label: "Normal fasting", high: 100, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Normal fasting", high: 100, citation: "ADA_2024_GLYCEMIC", normal: true },
       { label: "Prediabetes (fasting)", low: 100, high: 125, citation: "ADA_2024_GLYCEMIC" },
       { label: "Diabetes range (fasting)", low: 126, citation: "ADA_2024_GLYCEMIC" },
     ],
@@ -231,7 +246,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   HBA1C: {
     unit: "%",
     bands: [
-      { label: "Normal", high: 5.7, citation: "ADA_2024_GLYCEMIC" },
+      { label: "Normal", high: 5.7, citation: "ADA_2024_GLYCEMIC", normal: true },
       { label: "Prediabetes", low: 5.7, high: 6.4, citation: "ADA_2024_GLYCEMIC" },
       { label: "Diabetes", low: 6.5, citation: "ADA_2024_GLYCEMIC" },
     ],
@@ -244,7 +259,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
     unit: "kg/m²",
     bands: [
       { label: "Underweight", high: 18.5, citation: "WHO_2020_PA" },
-      { label: "Normal", low: 18.5, high: 24.9, citation: "WHO_2020_PA" },
+      { label: "Normal", low: 18.5, high: 24.9, citation: "WHO_2020_PA", normal: true },
       { label: "Overweight", low: 25.0, high: 29.9, citation: "WHO_2020_PA" },
       { label: "Obesity", low: 30.0, citation: "WHO_2020_PA" },
     ],
@@ -257,7 +272,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   STEPS: {
     unit: "steps/day",
     bands: [
-      { label: "Higher mortality benefit", low: 8000, citation: "STEPS_SAINT_MAURICE_2020" },
+      { label: "Higher mortality benefit", low: 8000, citation: "STEPS_SAINT_MAURICE_2020", normal: true },
     ],
     referenceId: "STEPS_SAINT_MAURICE_2020",
     guidanceCaveat:
@@ -267,7 +282,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   VISCERAL_FAT: {
     unit: "rating",
     bands: [
-      { label: "Healthy rating", low: 1, high: 12, citation: "VAT_IMAGING_THRESHOLD" },
+      { label: "Healthy rating", low: 1, high: 12, citation: "VAT_IMAGING_THRESHOLD", normal: true },
       { label: "Elevated rating", low: 13, citation: "VAT_IMAGING_THRESHOLD" },
     ],
     referenceId: "VAT_IMAGING_THRESHOLD",
@@ -279,7 +294,7 @@ export const REFERENCE_RANGES: Record<ReferenceMetric, ReferenceRange> = {
   SLEEP_DURATION: {
     unit: "h",
     bands: [
-      { label: "Adult 18–64", low: 7, high: 9, citation: "AASM_2015_SLEEP" },
+      { label: "Adult 18–64", low: 7, high: 9, citation: "AASM_2015_SLEEP", normal: true },
       { label: "Older adult 65+", low: 7, high: 8, citation: "AASM_2015_SLEEP" },
     ],
     referenceId: "AASM_2015_SLEEP",
@@ -337,6 +352,20 @@ export type ReferencePlacement =
  * baseline). Pure + side-effect free; the user's own baseline still leads
  * the read — this is only a coarse placement aid.
  */
+/**
+ * Resolve the index of a metric's population-normal band — the band the
+ * placement contract treats as "within". Returns the index of the band
+ * flagged `normal: true`; falls back to band 0 only for the legacy
+ * (untagged) shape so an unmarked metric degrades to the old normal-first
+ * assumption rather than throwing. A metric with no bands returns -1.
+ */
+export function normalBandIndex(metric: ReferenceMetric): number {
+  const bands = REFERENCE_RANGES[metric].bands;
+  if (bands.length === 0) return -1;
+  const marked = bands.findIndex((b) => b.normal === true);
+  return marked === -1 ? 0 : marked;
+}
+
 export function classifyReference(
   metric: ReferenceMetric,
   value: number | null | undefined,
@@ -345,26 +374,26 @@ export function classifyReference(
   if (value == null || !Number.isFinite(value) || range.bands.length === 0) {
     return "insufficient";
   }
-  // Find the first band whose half-open interval contains the value.
-  // Bands are authored in ascending order; the FIRST band is the
-  // normal/good placement, so its membership maps to `within`.
+  const normalIdx = normalBandIndex(metric);
+  // Find the band whose half-open interval contains the value. Bands are
+  // authored in ascending order; the placement is the band's DISTANCE from
+  // the normal band (resolved by the `normal` marker, NOT by index 0 —
+  // some metrics author an abnormal band first, e.g. BMI Underweight,
+  // pulse-pressure Narrow). One step from normal = watch tier; two or more
+  // = attention tier.
   for (let i = 0; i < range.bands.length; i++) {
     const band = range.bands[i];
     const aboveLow = band.low == null || value >= band.low;
     const belowHigh = band.high == null || value <= band.high;
     if (aboveLow && belowHigh) {
-      if (i === 0) return "within";
-      // The band immediately adjacent to normal is the watch tier; any
-      // band beyond it is the attention tier.
-      return i === 1 ? "slightly-outside" : "outside";
+      const distance = Math.abs(i - normalIdx);
+      if (distance === 0) return "within";
+      return distance === 1 ? "slightly-outside" : "outside";
     }
   }
-  // Value sits beyond every authored band (e.g. below an open-low normal,
-  // or above the top band's open-high). Treat an under-shoot of the first
-  // band's low as within when the first band is open-low; otherwise the
-  // value is outside the covered range → attention.
-  const first = range.bands[0];
-  if (first.low != null && value < first.low) return "outside";
+  // Value sits beyond every authored band (below an open-low first band, or
+  // above an open-high last band). Either way it is outside the covered
+  // bands → attention.
   return "outside";
 }
 

From c69e6deb6778d0a0efd2581b258574087692def6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:11:18 +0200
Subject: [PATCH 43/71] fix(sleep): drop the misleading last-night timeline for
 estimated stages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The last-night card drew a stepped stage timeline for every source. For a
source that reports per-stage totals without measured onsets (WHOOP / Polar),
the server lays the segments out in a fixed physiological order, so the bar
invents a phase progression that was never recorded — it reads as one Core
block then one Deep block, not a real hypnogram.

Suppress the timeline when the night is reconstructed and keep the per-stage
breakdown + totals, which are real. A calm note explains that stage timing is
estimated for that source. Real-series nights (Apple Health, Withings, Fitbit)
keep the measured timeline unchanged.
---
 messages/de.json                              |  3 +-
 messages/en.json                              |  3 +-
 messages/es.json                              |  3 +-
 messages/fr.json                              |  3 +-
 messages/it.json                              |  3 +-
 messages/pl.json                              |  3 +-
 .../__tests__/sleep-hypnogram.test.tsx        | 24 ++++++++++++++
 src/components/insights/sleep-hypnogram.tsx   | 33 +++++++++++++++++--
 8 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 3dcc80763..4e8cd7244 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Geschlafen {value}",
         "inBedTotal": "Im Bett {value}",
         "awakenings": "{count} Wachphasen",
-        "source": "Quelle: {source}"
+        "source": "Quelle: {source}",
+        "estimateNote": "Die Phasen-Zeiten sind geschätzt — diese Quelle liefert Summen je Phase, keinen gemessenen Verlauf."
       },
       "stages": {
         "deep": "Tief",
diff --git a/messages/en.json b/messages/en.json
index a87949920..5c4c0206d 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Asleep {value}",
         "inBedTotal": "In bed {value}",
         "awakenings": "{count} awakenings",
-        "source": "Source: {source}"
+        "source": "Source: {source}",
+        "estimateNote": "Stage timing is estimated — this source reports totals per stage, not a measured timeline."
       },
       "stages": {
         "deep": "Deep",
diff --git a/messages/es.json b/messages/es.json
index 99b6d7782..a69ad908c 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Dormido {value}",
         "inBedTotal": "En la cama {value}",
         "awakenings": "{count} despertares",
-        "source": "Fuente: {source}"
+        "source": "Fuente: {source}",
+        "estimateNote": "Los tiempos de cada fase son estimados: esta fuente informa totales por fase, no una cronología medida."
       },
       "stages": {
         "deep": "Profundo",
diff --git a/messages/fr.json b/messages/fr.json
index 85cb525e9..8ca52cec5 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Sommeil {value}",
         "inBedTotal": "Au lit {value}",
         "awakenings": "{count} réveils",
-        "source": "Source : {source}"
+        "source": "Source : {source}",
+        "estimateNote": "Les durées des phases sont estimées : cette source indique des totaux par phase, pas une chronologie mesurée."
       },
       "stages": {
         "deep": "Profond",
diff --git a/messages/it.json b/messages/it.json
index 48507ed1d..7608d2186 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Sonno {value}",
         "inBedTotal": "A letto {value}",
         "awakenings": "{count} risvegli",
-        "source": "Fonte: {source}"
+        "source": "Fonte: {source}",
+        "estimateNote": "I tempi delle fasi sono stimati: questa sorgente riporta i totali per fase, non una cronologia misurata."
       },
       "stages": {
         "deep": "Profondo",
diff --git a/messages/pl.json b/messages/pl.json
index c60c651f4..32e690173 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2547,7 +2547,8 @@
         "asleepTotal": "Sen {value}",
         "inBedTotal": "W łóżku {value}",
         "awakenings": "{count} przebudzeń",
-        "source": "Źródło: {source}"
+        "source": "Źródło: {source}",
+        "estimateNote": "Czasy faz są szacowane — to źródło podaje sumy dla każdej fazy, a nie zmierzony przebieg."
       },
       "stages": {
         "deep": "Głęboki",
diff --git a/src/components/insights/__tests__/sleep-hypnogram.test.tsx b/src/components/insights/__tests__/sleep-hypnogram.test.tsx
index a04a0ea17..6452cd205 100644
--- a/src/components/insights/__tests__/sleep-hypnogram.test.tsx
+++ b/src/components/insights/__tests__/sleep-hypnogram.test.tsx
@@ -127,6 +127,30 @@ describe("<SleepHypnogram> — timeline bar visibility", () => {
     expect(render(session)).toContain('role="img"');
   });
 
+  it("suppresses the timeline bar for a SYNTHESISED (reconstructed) night", () => {
+    // WHOOP / Polar report per-stage TOTALS and the server lays the segments
+    // out in a fixed physiological order — the timeline would invent a phase
+    // progression that was never measured. So even with distinct, well-timed
+    // spans, a `reconstructed` night drops the bar and keeps the breakdown.
+    const session: SleepHypnogramSession = {
+      ...baseSession,
+      source: "WHOOP",
+      reconstructed: true,
+    };
+    const html = render(session);
+    expect(html).not.toContain('role="img"');
+    expect(html).toContain('data-slot="sleep-hypnogram-breakdown"');
+    expect(html).toContain('data-slot="sleep-hypnogram-estimate-note"');
+  });
+
+  it("keeps the timeline bar for a measured (non-reconstructed) night", () => {
+    // An Apple Health night carries real per-stage onsets, so the stepped bar
+    // is genuine and stays. The estimate note never appears.
+    const html = render({ ...baseSession, reconstructed: false });
+    expect(html).toContain('role="img"');
+    expect(html).not.toContain('data-slot="sleep-hypnogram-estimate-note"');
+  });
+
   it("collapses to the breakdown footer for a degenerate single-instant session", () => {
     // Every segment stamped on ONE instant — no real timeline, so only the
     // breakdown footer, no bar.
diff --git a/src/components/insights/sleep-hypnogram.tsx b/src/components/insights/sleep-hypnogram.tsx
index 27b341252..7e6797140 100644
--- a/src/components/insights/sleep-hypnogram.tsx
+++ b/src/components/insights/sleep-hypnogram.tsx
@@ -58,6 +58,17 @@ export interface SleepHypnogramSession {
   awakenings: number;
   stages: Record<string, number>;
   segments: SleepHypnogramSegment[];
+  /**
+   * `true` when the winning source has no measured per-stage onset
+   * timestamps and the server synthesised a contiguous timeline in a fixed
+   * physiological order (WHOOP / Polar). The "timeline" of such a night is
+   * not a real hypnogram — it would read as one long Core block followed by
+   * one Deep block, never the phase-to-phase progression a measured night
+   * shows — so we never draw the misleading stepped bar for it and fall back
+   * to the per-stage breakdown alone. A real-series source (Apple Health,
+   * Withings, Fitbit) is `false` and keeps the timeline.
+   */
+  reconstructed?: boolean;
 }
 
 export interface SleepHypnogramProps {
@@ -216,10 +227,16 @@ export function SleepHypnogram({ session }: SleepHypnogramProps) {
   // breakdown footer. (Gating on the END instant instead hid the bar for an
   // ordinary multi-stage night whose segments happened to share a right
   // edge — the regression this restores.)
+  // A SYNTHESISED night (WHOOP / Polar) has no measured stage onsets — the
+  // server laid its segments out in a fixed physiological order, so drawing
+  // the stepped bar would invent a phase progression that was never recorded
+  // (the "Core block then Deep block, no real breakdown" the bar reads as).
+  // For those we keep the per-stage breakdown + totals, which ARE real, and
+  // drop the misleading timeline entirely. Real-series sources keep the bar.
   const hasTrack =
+    session.reconstructed !== true &&
     spans.length > 0 &&
-    (spans.length === 1 ||
-      new Set(spans.map((s) => s.x1)).size > 1);
+    (spans.length === 1 || new Set(spans.map((s) => s.x1)).size > 1);
   const hasBreakdown = breakdown.length > 0;
 
   return (
@@ -251,6 +268,18 @@ export function SleepHypnogram({ session }: SleepHypnogramProps) {
               })}
             </span>
           ) : null}
+          {/* When the source reports stage TOTALS but no measured onsets
+              (WHOOP / Polar) the stepped timeline is suppressed — drawing one
+              would invent a phase order that was never recorded. Surface a calm
+              note so the breakdown below doesn't read as a missing chart. */}
+          {session.reconstructed === true && hasBreakdown ? (
+            <span
+              data-slot="sleep-hypnogram-estimate-note"
+              className="text-muted-foreground/70 text-xs"
+            >
+              {t("insights.sleep.hypnogram.estimateNote")}
+            </span>
+          ) : null}
         </div>
       </CardHeader>
       <CardContent className="space-y-3">

From d8c139698c8b49655979904fdbddf56651989e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:16:43 +0200
Subject: [PATCH 44/71] feat(sleep): surface the chronotype as a labelled
 corner readout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the chronotype band out of a body badge into a labelled top-right corner
of the card — a small "Chronotype" label over the value — so the resolved
type is the first thing the eye lands on. Tighten the mid-sleep copy to name
it as the body's natural sleep midpoint on free days.
---
 messages/de.json                              | 28 +++++++++--
 messages/en.json                              | 28 +++++++++--
 messages/es.json                              | 28 +++++++++--
 messages/fr.json                              | 28 +++++++++--
 messages/it.json                              | 28 +++++++++--
 messages/pl.json                              | 28 +++++++++--
 .../__tests__/sleep-rhythm-cards.test.tsx     |  8 ++++
 .../insights/sleep/chronotype-card.tsx        | 47 ++++++++++++-------
 8 files changed, 187 insertions(+), 36 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 4e8cd7244..8f654ac76 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Chronotyp",
         "learning": "Dein Rhythmus wird noch erfasst — {counted} von {total} freien Nächten. Ein Chronotyp braucht ein paar weckerfreie Morgen, um aussagekräftig zu sein.",
-        "midSleepCaption": "Schlafmitte an freien Tagen gegen {clock}",
+        "midSleepCaption": "Deine natürliche Schlafmitte an freien Tagen liegt etwa um {clock}.",
         "advancedToggle": "Mehr Details",
         "socialJetlagValue": "{hours} Std. {minutes} Min. sozialer Jetlag",
         "socialJetlagCaption": "Der Unterschied zwischen deinem Schlaf an Arbeits- und freien Tagen — wie eine kleine wöchentliche Zeitzonenverschiebung.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Mischtyp",
           "late": "Abendtyp",
           "extreme_late": "Ausgeprägter Abendtyp"
-        }
+        },
+        "cornerLabel": "Chronotyp"
       },
       "rhythm": {
         "loadError": "Dein Schlafrhythmus konnte gerade nicht geladen werden. Er erscheint wieder, sobald die Verbindung steht."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Schlafqualität",
-      "subtitle": "Nächtliche Werte deines Wearables"
+      "subtitle": "Nächtliche Werte deines Wearables",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "dein Gesamt-Schlafscore",
+          "SLEEP_EFFICIENCY": "die Schlafeffizienz",
+          "SLEEP_PERFORMANCE": "die Schlafleistung",
+          "SLEEP_CONSISTENCY": "die Schlafkonstanz"
+        },
+        "grade": {
+          "excellent": "ausgezeichnet",
+          "good": "solide",
+          "fair": "durchschnittlich",
+          "low": "eher niedrig"
+        },
+        "clause": "Über die letzten 30 Nächte ist {metric} mit {value} {grade}.",
+        "closing": {
+          "excellent": "Behalte die Routine bei, die dich hierher bringt.",
+          "good": "Konstantere Zubett- und Aufstehzeiten sind meist der nächste Gewinn.",
+          "fair": "Ein konstantes Schlaffenster hebt diesen Wert erfahrungsgemäß am stärksten.",
+          "low": "Ein festes Herunterfahren am Abend und eine feste Aufstehzeit sind die ersten Hebel."
+        }
+      }
     },
     "recovery": {
       "title": "Erholung",
diff --git a/messages/en.json b/messages/en.json
index 5c4c0206d..accbf337f 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Chronotype",
         "learning": "Still learning your rhythm — {counted} of {total} free nights. A chronotype needs a few alarm-free mornings before it means anything.",
-        "midSleepCaption": "Mid-sleep on free days around {clock}",
+        "midSleepCaption": "Your natural sleep midpoint on free days lands around {clock}.",
         "advancedToggle": "Advanced",
         "socialJetlagValue": "{hours}h {minutes}m social jetlag",
         "socialJetlagCaption": "The gap between your work-day and free-day sleep timing — like a small weekly time-zone shift.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Intermediate type",
           "late": "Evening type",
           "extreme_late": "Strong evening type"
-        }
+        },
+        "cornerLabel": "Chronotype"
       },
       "rhythm": {
         "loadError": "Your sleep rhythm couldn't load just now. It'll reappear once the connection settles."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Sleep quality",
-      "subtitle": "Nightly scores from your wearable"
+      "subtitle": "Nightly scores from your wearable",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "your overall sleep score",
+          "SLEEP_EFFICIENCY": "sleep efficiency",
+          "SLEEP_PERFORMANCE": "sleep performance",
+          "SLEEP_CONSISTENCY": "sleep consistency"
+        },
+        "grade": {
+          "excellent": "excellent",
+          "good": "solid",
+          "fair": "fair",
+          "low": "on the low side"
+        },
+        "clause": "Over the last 30 nights {metric} is {grade} at {value}.",
+        "closing": {
+          "excellent": "Keep the routine that is getting you here.",
+          "good": "A steadier bed and wake time is the usual next gain.",
+          "fair": "Protecting a consistent sleep window tends to lift this most.",
+          "low": "A regular wind-down and a fixed wake time are the first levers to pull."
+        }
+      }
     },
     "recovery": {
       "title": "Recovery",
diff --git a/messages/es.json b/messages/es.json
index a69ad908c..9fa3e2b1e 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Cronotipo",
         "learning": "Aún estamos aprendiendo tu ritmo — {counted} de {total} noches libres. Un cronotipo necesita varias mañanas sin despertador para tener sentido.",
-        "midSleepCaption": "Punto medio del sueño en días libres en torno a las {clock}",
+        "midSleepCaption": "El punto medio natural de tu sueño en días libres ronda las {clock}.",
         "advancedToggle": "Avanzado",
         "socialJetlagValue": "{hours} h {minutes} min de jet lag social",
         "socialJetlagCaption": "La diferencia entre el horario de sueño laboral y el de los días libres — como un pequeño cambio de huso horario semanal.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Intermedio",
           "late": "Vespertino",
           "extreme_late": "Vespertino marcado"
-        }
+        },
+        "cornerLabel": "Cronotipo"
       },
       "rhythm": {
         "loadError": "Tu ritmo de sueño no pudo cargarse ahora mismo. Reaparecerá en cuanto se estabilice la conexión."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Calidad del sueño",
-      "subtitle": "Puntuaciones nocturnas de tu wearable"
+      "subtitle": "Puntuaciones nocturnas de tu wearable",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "tu puntuación global de sueño",
+          "SLEEP_EFFICIENCY": "la eficiencia del sueño",
+          "SLEEP_PERFORMANCE": "el rendimiento del sueño",
+          "SLEEP_CONSISTENCY": "la regularidad del sueño"
+        },
+        "grade": {
+          "excellent": "excelente",
+          "good": "sólida",
+          "fair": "aceptable",
+          "low": "más bien baja"
+        },
+        "clause": "En las últimas 30 noches {metric} es {grade}, en {value}.",
+        "closing": {
+          "excellent": "Mantén la rutina que te trae hasta aquí.",
+          "good": "Acostarte y levantarte a horas más estables suele ser la siguiente mejora.",
+          "fair": "Proteger una franja de sueño constante es lo que más suele subir esto.",
+          "low": "Una rutina de relajación regular y una hora fija para despertar son las primeras palancas."
+        }
+      }
     },
     "recovery": {
       "title": "Recuperación",
diff --git a/messages/fr.json b/messages/fr.json
index 8ca52cec5..9c1a433c0 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Chronotype",
         "learning": "Votre rythme est encore en cours d'analyse — {counted} sur {total} nuits libres. Un chronotype a besoin de quelques matins sans réveil pour avoir du sens.",
-        "midSleepCaption": "Milieu de sommeil les jours libres vers {clock}",
+        "midSleepCaption": "Le milieu naturel de votre sommeil les jours de repos se situe vers {clock}.",
         "advancedToggle": "Avancé",
         "socialJetlagValue": "{hours} h {minutes} min de jet lag social",
         "socialJetlagCaption": "L'écart entre vos horaires de sommeil les jours travaillés et les jours libres — comme un petit décalage horaire hebdomadaire.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Type intermédiaire",
           "late": "Type du soir",
           "extreme_late": "Type du soir marqué"
-        }
+        },
+        "cornerLabel": "Chronotype"
       },
       "rhythm": {
         "loadError": "Votre rythme de sommeil n'a pas pu se charger pour l'instant. Il réapparaîtra dès que la connexion sera rétablie."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Qualité du sommeil",
-      "subtitle": "Scores nocturnes de votre wearable"
+      "subtitle": "Scores nocturnes de votre wearable",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "votre score de sommeil global",
+          "SLEEP_EFFICIENCY": "l’efficacité du sommeil",
+          "SLEEP_PERFORMANCE": "la performance de sommeil",
+          "SLEEP_CONSISTENCY": "la régularité du sommeil"
+        },
+        "grade": {
+          "excellent": "excellente",
+          "good": "solide",
+          "fair": "correcte",
+          "low": "plutôt faible"
+        },
+        "clause": "Sur les 30 dernières nuits, {metric} est {grade}, à {value}.",
+        "closing": {
+          "excellent": "Gardez la routine qui vous mène jusque-là.",
+          "good": "Des heures de coucher et de lever plus stables sont souvent le prochain gain.",
+          "fair": "Protéger une fenêtre de sommeil constante est ce qui fait le plus progresser ce point.",
+          "low": "Un rituel d’endormissement régulier et une heure de réveil fixe sont les premiers leviers."
+        }
+      }
     },
     "recovery": {
       "title": "Récupération",
diff --git a/messages/it.json b/messages/it.json
index 7608d2186..77ba27740 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Cronotipo",
         "learning": "Stiamo ancora imparando il tuo ritmo — {counted} di {total} notti libere. Un cronotipo richiede alcune mattine senza sveglia per avere significato.",
-        "midSleepCaption": "Metà del sonno nei giorni liberi intorno alle {clock}",
+        "midSleepCaption": "Il punto medio naturale del tuo sonno nei giorni liberi è intorno alle {clock}.",
         "advancedToggle": "Avanzate",
         "socialJetlagValue": "{hours} h {minutes} min di jet lag sociale",
         "socialJetlagCaption": "La differenza tra gli orari del sonno nei giorni lavorativi e in quelli liberi — come un piccolo cambio di fuso orario settimanale.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Tipo intermedio",
           "late": "Tipo serale",
           "extreme_late": "Tipo serale marcato"
-        }
+        },
+        "cornerLabel": "Cronotipo"
       },
       "rhythm": {
         "loadError": "Non è stato possibile caricare il tuo ritmo del sonno in questo momento. Riapparirà non appena la connessione sarà stabile."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Qualità del sonno",
-      "subtitle": "Punteggi notturni del tuo wearable"
+      "subtitle": "Punteggi notturni del tuo wearable",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "il tuo punteggio di sonno complessivo",
+          "SLEEP_EFFICIENCY": "l’efficienza del sonno",
+          "SLEEP_PERFORMANCE": "la prestazione del sonno",
+          "SLEEP_CONSISTENCY": "la regolarità del sonno"
+        },
+        "grade": {
+          "excellent": "eccellente",
+          "good": "solida",
+          "fair": "discreta",
+          "low": "piuttosto bassa"
+        },
+        "clause": "Nelle ultime 30 notti {metric} è {grade}, a {value}.",
+        "closing": {
+          "excellent": "Mantieni la routine che ti porta fin qui.",
+          "good": "Orari di sonno e risveglio più stabili sono di solito il prossimo guadagno.",
+          "fair": "Proteggere una finestra di sonno costante è ciò che alza di più questo valore.",
+          "low": "Una routine serale regolare e un orario di sveglia fisso sono le prime leve."
+        }
+      }
     },
     "recovery": {
       "title": "Recupero",
diff --git a/messages/pl.json b/messages/pl.json
index 32e690173..6bd2a8336 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2575,7 +2575,7 @@
       "chronotype": {
         "title": "Chronotyp",
         "learning": "Wciąż poznajemy Twój rytm — {counted} z {total} wolnych nocy. Chronotyp wymaga kilku poranków bez budzika, aby coś znaczył.",
-        "midSleepCaption": "Środek snu w dni wolne około {clock}",
+        "midSleepCaption": "Naturalny środek Twojego snu w dni wolne przypada około {clock}.",
         "advancedToggle": "Zaawansowane",
         "socialJetlagValue": "{hours} godz. {minutes} min jet lagu społecznego",
         "socialJetlagCaption": "Różnica między porą snu w dni robocze i wolne — jak niewielka cotygodniowa zmiana strefy czasowej.",
@@ -2588,7 +2588,8 @@
           "intermediate": "Typ pośredni",
           "late": "Typ wieczorny",
           "extreme_late": "Wyraźny typ wieczorny"
-        }
+        },
+        "cornerLabel": "Chronotyp"
       },
       "rhythm": {
         "loadError": "Nie udało się teraz wczytać Twojego rytmu snu. Pojawi się ponownie, gdy połączenie się ustabilizuje."
@@ -3480,7 +3481,28 @@
     },
     "sleepQuality": {
       "title": "Jakość snu",
-      "subtitle": "Nocne wyniki z Twojego urządzenia"
+      "subtitle": "Nocne wyniki z Twojego urządzenia",
+      "assessment": {
+        "metric": {
+          "SLEEP_SCORE": "Twój ogólny wynik snu",
+          "SLEEP_EFFICIENCY": "efektywność snu",
+          "SLEEP_PERFORMANCE": "wydajność snu",
+          "SLEEP_CONSISTENCY": "regularność snu"
+        },
+        "grade": {
+          "excellent": "doskonała",
+          "good": "solidna",
+          "fair": "przeciętna",
+          "low": "raczej niska"
+        },
+        "clause": "W ciągu ostatnich 30 nocy {metric} jest {grade} i wynosi {value}.",
+        "closing": {
+          "excellent": "Trzymaj się rutyny, która Cię tu doprowadziła.",
+          "good": "Bardziej stałe pory zasypiania i wstawania to zwykle następny zysk.",
+          "fair": "Utrzymanie stałego okna snu zwykle podnosi ten wynik najbardziej.",
+          "low": "Regularne wyciszenie wieczorem i stała pora pobudki to pierwsze dźwignie."
+        }
+      }
     },
     "recovery": {
       "title": "Regeneracja",
diff --git a/src/components/insights/sleep/__tests__/sleep-rhythm-cards.test.tsx b/src/components/insights/sleep/__tests__/sleep-rhythm-cards.test.tsx
index 7e1dc23ae..ffa8e2572 100644
--- a/src/components/insights/sleep/__tests__/sleep-rhythm-cards.test.tsx
+++ b/src/components/insights/sleep/__tests__/sleep-rhythm-cards.test.tsx
@@ -110,6 +110,14 @@ describe("<ChronotypeCard>", () => {
     expect(html).toContain("04:30");
   });
 
+  it("renders the band as a labelled top-right corner readout, not a badge", () => {
+    const html = render(<ChronotypeCard chronotype={READY_CHRONO} />);
+    // The labelled corner carries both the "Chronotype" label and the value.
+    expect(html).toContain('data-slot="chronotype-corner"');
+    expect(html).toContain("Chronotype");
+    expect(html).toContain("Intermediate type");
+  });
+
   it("inherits the standard Card rhythm (no compact override)", () => {
     const learning = render(<ChronotypeCard chronotype={LEARNING_CHRONO} />);
     const ready = render(<ChronotypeCard chronotype={READY_CHRONO} />);
diff --git a/src/components/insights/sleep/chronotype-card.tsx b/src/components/insights/sleep/chronotype-card.tsx
index 1932e7b92..9b7ebfb4c 100644
--- a/src/components/insights/sleep/chronotype-card.tsx
+++ b/src/components/insights/sleep/chronotype-card.tsx
@@ -5,7 +5,6 @@ import { Clock, ChevronDown, ChevronUp } from "lucide-react";
 
 import { useTranslations } from "@/lib/i18n/context";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Badge } from "@/components/ui/badge";
 import { LearningGate } from "@/components/ui/learning-gate";
 import type { ChronotypeDto } from "./use-sleep-rhythm";
 
@@ -67,26 +66,38 @@ export function ChronotypeCard({ chronotype }: { chronotype: ChronotypeDto }) {
   return (
     <Card>
       <CardHeader className="pb-0">
-        <div className="flex items-center gap-2">
-          <Clock className="text-info h-4 w-4" />
-          <CardTitle className="text-base font-semibold">
-            {t("insights.sleep.chronotype.title")}
-          </CardTitle>
+        {/* The resolved chronotype rides the top-right corner as a labelled
+            readout — a small "Chronotyp" label over the band value — rather
+            than a badge buried in the body. The title stays left; the value
+            is the thing the eye should land on first. */}
+        <div className="flex items-start justify-between gap-3">
+          <div className="flex items-center gap-2">
+            <Clock className="text-info h-4 w-4" />
+            <CardTitle className="text-base font-semibold">
+              {t("insights.sleep.chronotype.title")}
+            </CardTitle>
+          </div>
+          <div
+            className="flex flex-col items-end text-right"
+            data-slot="chronotype-corner"
+          >
+            <span className="text-muted-foreground text-[0.625rem] font-medium tracking-wide uppercase">
+              {t("insights.sleep.chronotype.cornerLabel")}
+            </span>
+            <span className="text-foreground text-sm font-semibold">
+              {bandLabel}
+            </span>
+          </div>
         </div>
       </CardHeader>
       <CardContent className="space-y-3">
-        <div className="space-y-1">
-          <Badge variant="secondary" className="text-sm">
-            {bandLabel}
-          </Badge>
-          {msfClock && (
-            <p className="text-muted-foreground text-xs">
-              {t("insights.sleep.chronotype.midSleepCaption", {
-                clock: msfClock,
-              })}
-            </p>
-          )}
-        </div>
+        {msfClock && (
+          <p className="text-muted-foreground text-xs">
+            {t("insights.sleep.chronotype.midSleepCaption", {
+              clock: msfClock,
+            })}
+          </p>
+        )}
 
         <button
           type="button"

From aa9b713a669de313377dda1e4c02842ac36d88d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:17:00 +0200
Subject: [PATCH 45/71] feat(sleep): ground the sleep-quality assessment in the
 user's own scores
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The sleep-quality "Einschätzung" read "no assessment yet" until an AI provider
had run, and stayed blank on an account with no provider configured. Fill that
slot with a deterministic note built from the user's own quality averages —
efficiency, performance, consistency and the headline score graded against
recognised reference bands — so the assessment is always substantive. The
richer AI narrative still wins when present; the grounded note only steps in
once the assessment query settles with no narrative, so the two never stack.
---
 .../sleep-quality-assessment.test.ts          |  68 +++++++++
 .../sleep-quality-grounded-note.test.tsx      |  67 +++++++++
 .../sleep/sleep-quality-assessment.ts         | 136 ++++++++++++++++++
 .../sleep/sleep-quality-grounded-note.tsx     | 112 +++++++++++++++
 .../insights/sleep/sleep-quality-section.tsx  |  67 +++++++--
 5 files changed, 438 insertions(+), 12 deletions(-)
 create mode 100644 src/components/insights/sleep/__tests__/sleep-quality-assessment.test.ts
 create mode 100644 src/components/insights/sleep/__tests__/sleep-quality-grounded-note.test.tsx
 create mode 100644 src/components/insights/sleep/sleep-quality-assessment.ts
 create mode 100644 src/components/insights/sleep/sleep-quality-grounded-note.tsx

diff --git a/src/components/insights/sleep/__tests__/sleep-quality-assessment.test.ts b/src/components/insights/sleep/__tests__/sleep-quality-assessment.test.ts
new file mode 100644
index 000000000..ec27b8be4
--- /dev/null
+++ b/src/components/insights/sleep/__tests__/sleep-quality-assessment.test.ts
@@ -0,0 +1,68 @@
+import { describe, it, expect } from "vitest";
+
+import { buildSleepQualityAssessment } from "../sleep-quality-assessment";
+
+/**
+ * v1.18.6 — the deterministic sleep-quality grading that backs the grounded
+ * "Einschätzung" when no AI narrative exists. Pins the band thresholds and the
+ * worst-grade-wins overall, and the "skip ungradable metrics" contract.
+ */
+describe("buildSleepQualityAssessment", () => {
+  it("grades efficiency on the clinical 90 / 85 / 75 floors", () => {
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_EFFICIENCY", value: 92 }])
+        ?.lead.grade,
+    ).toBe("excellent");
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_EFFICIENCY", value: 86 }])
+        ?.lead.grade,
+    ).toBe("good");
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_EFFICIENCY", value: 78 }])
+        ?.lead.grade,
+    ).toBe("fair");
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_EFFICIENCY", value: 60 }])
+        ?.lead.grade,
+    ).toBe("low");
+  });
+
+  it("grades 0–100 scores on the 90 / 85 / 70 split", () => {
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_SCORE", value: 95 }])?.lead
+        .grade,
+    ).toBe("excellent");
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_SCORE", value: 72 }])?.lead
+        .grade,
+    ).toBe("fair");
+  });
+
+  it("opens on the headline score and keeps worst-grade-wins overall", () => {
+    const a = buildSleepQualityAssessment([
+      { type: "SLEEP_CONSISTENCY", value: 60 },
+      { type: "SLEEP_SCORE", value: 95 },
+      { type: "SLEEP_EFFICIENCY", value: 92 },
+    ]);
+    expect(a?.lead.type).toBe("SLEEP_SCORE");
+    // The low consistency pulls the overall down even though the score is high.
+    expect(a?.overall).toBe("low");
+    expect(a?.rest.length).toBe(2);
+  });
+
+  it("skips metrics it has no recognised band for, and returns null on none", () => {
+    // SLEEP_NEED (minutes) + disturbance count are not gradable here.
+    expect(
+      buildSleepQualityAssessment([
+        { type: "SLEEP_NEED", value: 480 },
+        { type: "SLEEP_DISTURBANCE_COUNT", value: 3 },
+      ]),
+    ).toBeNull();
+  });
+
+  it("ignores non-finite values", () => {
+    expect(
+      buildSleepQualityAssessment([{ type: "SLEEP_SCORE", value: Number.NaN }]),
+    ).toBeNull();
+  });
+});
diff --git a/src/components/insights/sleep/__tests__/sleep-quality-grounded-note.test.tsx b/src/components/insights/sleep/__tests__/sleep-quality-grounded-note.test.tsx
new file mode 100644
index 000000000..f02cfc52d
--- /dev/null
+++ b/src/components/insights/sleep/__tests__/sleep-quality-grounded-note.test.tsx
@@ -0,0 +1,67 @@
+import { describe, it, expect } from "vitest";
+import { renderToStaticMarkup } from "react-dom/server";
+
+import { I18nProvider } from "@/lib/i18n/context";
+import { SleepQualityGroundedNote } from "../sleep-quality-grounded-note";
+import type { DataSummary } from "@/lib/analytics/trends";
+
+/**
+ * v1.18.6 — the grounded sleep-quality note that fills the assessment slot
+ * when no AI narrative is available. Pins that it builds substantive copy from
+ * the user's own averages and that it self-suppresses when the AI is present.
+ */
+function summary(avg30: number): DataSummary {
+  return {
+    count: 30,
+    latest: avg30,
+    avg7: avg30,
+    avg30,
+  } as unknown as DataSummary;
+}
+
+function render(node: React.ReactNode, locale: "en" | "de" = "en") {
+  return renderToStaticMarkup(
+    <I18nProvider initialLocale={locale}>{node}</I18nProvider>,
+  );
+}
+
+describe("<SleepQualityGroundedNote>", () => {
+  const summaries = {
+    SLEEP_SCORE: summary(82),
+    SLEEP_EFFICIENCY: summary(88),
+  };
+
+  it("renders a substantive, grounded assessment when the AI is absent", () => {
+    const html = render(
+      <SleepQualityGroundedNote
+        summaries={summaries}
+        showWhenAiAbsent={true}
+      />,
+    );
+    expect(html).toContain('data-slot="sleep-quality-grounded-note"');
+    // The headline score (82 → fair on the 90/85/70 split) leads the read.
+    expect(html).toContain("overall sleep score");
+    expect(html).toContain("fair");
+    expect(html).toContain("82");
+  });
+
+  it("renders nothing when the AI assessment is present", () => {
+    const html = render(
+      <SleepQualityGroundedNote
+        summaries={summaries}
+        showWhenAiAbsent={false}
+      />,
+    );
+    expect(html).toBe("");
+  });
+
+  it("renders nothing when no quality metric is gradable", () => {
+    const html = render(
+      <SleepQualityGroundedNote
+        summaries={{ SLEEP_NEED: summary(480) }}
+        showWhenAiAbsent={true}
+      />,
+    );
+    expect(html).toBe("");
+  });
+});
diff --git a/src/components/insights/sleep/sleep-quality-assessment.ts b/src/components/insights/sleep/sleep-quality-assessment.ts
new file mode 100644
index 000000000..b2799a3d3
--- /dev/null
+++ b/src/components/insights/sleep/sleep-quality-assessment.ts
@@ -0,0 +1,136 @@
+/**
+ * v1.18.6 — deterministic, data-grounded sleep-quality assessment.
+ *
+ * The AI "Einschätzung" under the sleep-quality block reads "no assessment
+ * yet / unavailable" until a provider has run (and never at all on an account
+ * with no AI provider). That left the most universally useful read — the one
+ * the user's OWN numbers already support — blank. This pure helper turns the
+ * sleep-quality summaries that the section already has in hand into a short,
+ * grounded sentence: it names the night-over-night averages and grades them
+ * against recognised reference ranges, with NO provider call and NO recompute
+ * of a stored value (it only reads the server-authoritative averages).
+ *
+ * Grading thresholds are the conventional consumer-sleep-platform bands:
+ *   - Sleep efficiency: ≥ 85 % is the textbook "good sleeper" floor (AASM);
+ *     ≥ 90 % is excellent, < 75 % is poor.
+ *   - Performance / consistency / headline score: 0–100, graded on the
+ *     standard 85 / 70 split most rings use (good / fair / low).
+ * The copy is intentionally cautious — it describes, it never diagnoses.
+ *
+ * Kept free of React + i18n so the grading is unit-testable in isolation; the
+ * component maps the returned shape onto localised strings.
+ */
+
+export type QualityGrade = "excellent" | "good" | "fair" | "low";
+
+export interface SleepQualityMetricRead {
+  /** Registry/measurement type, e.g. `SLEEP_EFFICIENCY`. */
+  type: string;
+  /** The averaged value the section already holds (avg30 ?? avg7 ?? latest). */
+  value: number;
+}
+
+export interface SleepQualityFinding {
+  type: string;
+  value: number;
+  grade: QualityGrade;
+}
+
+export interface SleepQualityAssessment {
+  /** The lead metric the assessment opens on (best-known quality signal). */
+  lead: SleepQualityFinding;
+  /** The remaining graded metrics, most-informative first. */
+  rest: SleepQualityFinding[];
+  /** Worst grade across the present metrics — drives the closing nudge. */
+  overall: QualityGrade;
+}
+
+/** Percent-scaled 0–100 metrics graded on the 90 / 85 / 70 ring split. */
+const PERCENT_METRICS = new Set<string>([
+  "SLEEP_SCORE",
+  "SLEEP_PERFORMANCE",
+  "SLEEP_CONSISTENCY",
+]);
+
+/** Efficiency uses the clinical 90 / 85 / 75 floors rather than the ring split. */
+function gradeEfficiency(pct: number): QualityGrade {
+  if (pct >= 90) return "excellent";
+  if (pct >= 85) return "good";
+  if (pct >= 75) return "fair";
+  return "low";
+}
+
+function gradeScore(value: number): QualityGrade {
+  if (value >= 90) return "excellent";
+  if (value >= 85) return "good";
+  if (value >= 70) return "fair";
+  return "low";
+}
+
+/**
+ * Grade one quality metric. Returns null for a metric the helper has no
+ * recognised band for (e.g. raw disturbance counts or sleep-need minutes),
+ * so the assessment never grades a value against a scale it does not fit.
+ */
+function gradeMetric(type: string, value: number): QualityGrade | null {
+  if (type === "SLEEP_EFFICIENCY") return gradeEfficiency(value);
+  if (PERCENT_METRICS.has(type)) return gradeScore(value);
+  return null;
+}
+
+/** Worst grade wins — a single low signal pulls the overall read down. */
+const GRADE_RANK: Record<QualityGrade, number> = {
+  excellent: 3,
+  good: 2,
+  fair: 1,
+  low: 0,
+};
+
+/**
+ * Lead-metric preference: the headline score reads first when present, then
+ * efficiency, then performance, then consistency. Keeps the opening sentence
+ * anchored on the most holistic signal the night carries.
+ */
+const LEAD_ORDER = [
+  "SLEEP_SCORE",
+  "SLEEP_EFFICIENCY",
+  "SLEEP_PERFORMANCE",
+  "SLEEP_CONSISTENCY",
+] as const;
+
+/**
+ * Build a deterministic assessment from the present quality metrics. Returns
+ * null when none of the supplied metrics is gradable, so the caller falls back
+ * to its existing copy rather than printing an empty read.
+ */
+export function buildSleepQualityAssessment(
+  reads: readonly SleepQualityMetricRead[],
+): SleepQualityAssessment | null {
+  const findings: SleepQualityFinding[] = [];
+  for (const r of reads) {
+    if (!Number.isFinite(r.value)) continue;
+    const grade = gradeMetric(r.type, r.value);
+    if (grade == null) continue;
+    findings.push({ type: r.type, value: r.value, grade });
+  }
+  if (findings.length === 0) return null;
+
+  const leadIndex = (type: string): number => {
+    const i = LEAD_ORDER.indexOf(type as (typeof LEAD_ORDER)[number]);
+    return i === -1 ? Number.MAX_SAFE_INTEGER : i;
+  };
+  const sorted = [...findings].sort(
+    (a, b) => leadIndex(a.type) - leadIndex(b.type),
+  );
+
+  const overall = sorted.reduce<QualityGrade>(
+    (worst, f) => (GRADE_RANK[f.grade] < GRADE_RANK[worst] ? f.grade : worst),
+    "excellent",
+  );
+
+  return {
+    lead: sorted[0],
+    rest: sorted.slice(1),
+    overall,
+  };
+}
diff --git a/src/components/insights/sleep/sleep-quality-grounded-note.tsx b/src/components/insights/sleep/sleep-quality-grounded-note.tsx
new file mode 100644
index 000000000..11a1000a3
--- /dev/null
+++ b/src/components/insights/sleep/sleep-quality-grounded-note.tsx
@@ -0,0 +1,112 @@
+"use client";
+
+import { Moon } from "lucide-react";
+
+import { useTranslations } from "@/lib/i18n/context";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { TileHeader } from "@/components/insights/tile-header";
+import type { DataSummary } from "@/lib/analytics/trends";
+import {
+  buildSleepQualityAssessment,
+  type QualityGrade,
+  type SleepQualityFinding,
+} from "./sleep-quality-assessment";
+
+/**
+ * v1.18.6 — the grounded sleep-quality "Einschätzung".
+ *
+ * The AI assessment under the sleep-quality block reads "no assessment yet"
+ * until a provider has run, and stays blank forever on an account with no AI
+ * provider. This card fills that gap with a substantive read built ENTIRELY
+ * from the user's own quality averages (efficiency / performance / consistency
+ * / headline score) graded against recognised reference bands — no provider,
+ * no recompute of a stored value. It describes; it does not diagnose.
+ *
+ * Mounted only when the AI assessment is NOT present (`showWhenAiAbsent`), so
+ * the richer AI narrative still wins when it exists and the user never sees
+ * two assessments stacked.
+ */
+
+const QUALITY_TYPES = [
+  "SLEEP_SCORE",
+  "SLEEP_EFFICIENCY",
+  "SLEEP_PERFORMANCE",
+  "SLEEP_CONSISTENCY",
+] as const;
+
+/** Map a finding to its localised "{metric} is {grade} at {value}" clause. */
+function clauseFor(
+  finding: SleepQualityFinding,
+  t: (key: string, vars?: Record<string, string | number>) => string,
+): string {
+  const metricLabel = t(`insights.sleepQuality.assessment.metric.${finding.type}`);
+  const gradeLabel = t(`insights.sleepQuality.assessment.grade.${finding.grade}`);
+  // Efficiency / performance / consistency are percentages; the headline score
+  // is a 0–100 index. Both read naturally as a rounded integer.
+  const value = Math.round(finding.value);
+  return t("insights.sleepQuality.assessment.clause", {
+    metric: metricLabel,
+    grade: gradeLabel,
+    value,
+  });
+}
+
+export interface SleepQualityGroundedNoteProps {
+  /** The analytics summaries the section already holds (no extra fetch). */
+  summaries: Record<string, DataSummary | undefined> | undefined;
+  /**
+   * Whether the AI assessment is absent. The grounded note only renders when
+   * the AI narrative is not there, so the two never stack.
+   */
+  showWhenAiAbsent: boolean;
+}
+
+export function SleepQualityGroundedNote({
+  summaries,
+  showWhenAiAbsent,
+}: SleepQualityGroundedNoteProps) {
+  const { t } = useTranslations();
+
+  if (!showWhenAiAbsent || !summaries) return null;
+
+  const reads = QUALITY_TYPES.map((type) => {
+    const s = summaries[type];
+    const value = s?.avg30 ?? s?.avg7 ?? s?.latest ?? null;
+    return value == null
+      ? null
+      : ({ type, value } as { type: string; value: number });
+  }).filter((r): r is { type: string; value: number } => r !== null);
+
+  const assessment = buildSleepQualityAssessment(reads);
+  if (!assessment) return null;
+
+  const clauses = [assessment.lead, ...assessment.rest].map((f) =>
+    clauseFor(f, t),
+  );
+  const closing = t(
+    `insights.sleepQuality.assessment.closing.${assessment.overall as QualityGrade}`,
+  );
+
+  return (
+    <Card
+      data-slot="sleep-quality-grounded-note"
+      className="gap-1.5 py-4 md:py-5"
+    >
+      <CardHeader className="pb-1">
+        <TileHeader
+          icon={QualityNoteIcon}
+          title={t("insights.assessmentTitle")}
+        />
+      </CardHeader>
+      <CardContent className="space-y-2">
+        <p className="text-muted-foreground text-sm leading-relaxed">
+          {clauses.join(" ")} {closing}
+        </p>
+      </CardContent>
+    </Card>
+  );
+}
+
+function QualityNoteIcon({ className }: { className?: string }) {
+  return <Moon className={className} aria-hidden="true" />;
+}
diff --git a/src/components/insights/sleep/sleep-quality-section.tsx b/src/components/insights/sleep/sleep-quality-section.tsx
index f791f4862..51363ba9a 100644
--- a/src/components/insights/sleep/sleep-quality-section.tsx
+++ b/src/components/insights/sleep/sleep-quality-section.tsx
@@ -3,11 +3,14 @@
 import { Activity, Gauge, Moon, Repeat, Target, Waves } from "lucide-react";
 
 import { useInsightsAnalytics } from "@/hooks/use-insights-analytics";
+import { useInsightMetricStatus } from "@/hooks/use-insight-status";
 import { useTranslations } from "@/lib/i18n/context";
+import type { DataSummary } from "@/lib/analytics/trends";
 import { SectionHeading } from "@/components/insights/section-heading";
 import { DeviceScoreTile } from "@/components/insights/device-score-tile";
 import { DeviceScoreGridSkeleton } from "@/components/insights/device-score-tile-skeleton";
 import { MetricStatusCard } from "@/components/insights/metric-status-card";
+import { SleepQualityGroundedNote } from "@/components/insights/sleep/sleep-quality-grounded-note";
 
 /**
  * v1.17.1 — "Sleep quality" block on `/insights/sleep`.
@@ -101,13 +104,6 @@ export function SleepQualitySection({ enabled }: { enabled: boolean }) {
   );
   if (present.length === 0) return null;
 
-  // v1.18.1 — the quality block is a distinct chart group, so it carries its
-  // OWN assessment (matching the canonical "multiple charts ⇒ multiple texts"
-  // rule the recovery page meets). Gated on the nightly headline sleep score
-  // having data so the generic assessment route only fires when there is a
-  // quality series to read.
-  const hasSleepScore = (summaries.SLEEP_SCORE?.count ?? 0) > 0;
-
   return (
     <section data-slot="sleep-quality-section" className="space-y-3">
       <SectionHeading
@@ -132,11 +128,58 @@ export function SleepQualitySection({ enabled }: { enabled: boolean }) {
           />
         ))}
       </div>
-      <MetricStatusCard
-        metric="SLEEP_SCORE"
-        icon={<Moon className="h-5 w-5" />}
-        enabled={hasSleepScore}
-      />
+      <SleepQualityAssessmentBlock summaries={summaries} />
     </section>
   );
 }
+
+/**
+ * The quality block's "Einschätzung". The richer AI narrative wins when it
+ * exists; until then (or forever, on an account with no AI provider) a
+ * deterministic note grounded in the user's own quality averages fills the
+ * slot, so the assessment is never the bare "no analysis yet" line.
+ *
+ * Both reads are gated on the headline sleep score having data — the same gate
+ * the AI route used — so the assessment only surfaces with a quality series to
+ * describe. The grounded note reads the SLEEP_SCORE status query (already
+ * warmed by `<MetricStatusCard>`) to know whether the AI text is absent, so it
+ * adds no second round-trip and the two never stack.
+ */
+function SleepQualityAssessmentBlock({
+  summaries,
+}: {
+  summaries: Record<string, DataSummary | undefined>;
+}) {
+  const hasSleepScore = (summaries.SLEEP_SCORE?.count ?? 0) > 0;
+  const { data: status, isLoading: statusLoading } = useInsightMetricStatus(
+    "SLEEP_SCORE",
+    hasSleepScore,
+  );
+
+  // The AI narrative is "present" when there is text OR the worker is actively
+  // assembling one (preparing / revalidating). In those cases the AI card owns
+  // the slot. The grounded note only steps in once the status query has SETTLED
+  // with no narrative — so it never flashes ahead of a warm AI assessment.
+  const aiAbsent =
+    !statusLoading &&
+    !status?.text &&
+    status?.preparing !== true &&
+    status?.revalidating !== true;
+
+  return (
+    <>
+      <MetricStatusCard
+        metric="SLEEP_SCORE"
+        icon={<Moon className="h-5 w-5" />}
+        // Suppress the AI card's static "no analysis yet" / "no provider"
+        // empty states — the grounded note covers that ground with real
+        // content. The AI card still renders its text / preparing states.
+        enabled={hasSleepScore && !aiAbsent}
+      />
+      <SleepQualityGroundedNote
+        summaries={summaries}
+        showWhenAiAbsent={hasSleepScore && aiAbsent}
+      />
+    </>
+  );
+}

From f453f8a758cb204d2873e9a603c831956a3cea9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:19:17 +0200
Subject: [PATCH 46/71] fix(coach): surface the proactive nudge in the
 conversation rail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The proactive Coach nudge dispatched a notification only — it never
wrote a CoachMessage, so it was invisible under the conversation list
and entirely silent for a user with no push channel configured.

Record the nudge as a real conversation before dispatching: create a
conversation and write the nudge body as the initial assistant message
(encrypted at rest like every other Coach reply), then fire the existing
notification + /coach deep link unchanged. A persistence failure is
caught locally so it can never swallow the notification, and the tick
summary tracks a separate persisted count alongside dispatched.
---
 .../ai/coach/__tests__/persistence.test.ts    | 74 ++++++++++++++++++-
 src/lib/ai/coach/persistence.ts               | 54 ++++++++++++++
 src/lib/jobs/__tests__/coach-nudge.test.ts    | 63 ++++++++++++++++
 src/lib/jobs/coach-nudge.ts                   | 35 +++++++++
 src/lib/jobs/reminder/register-status.ts      |  1 +
 5 files changed, 225 insertions(+), 2 deletions(-)

diff --git a/src/lib/ai/coach/__tests__/persistence.test.ts b/src/lib/ai/coach/__tests__/persistence.test.ts
index f506f5865..dbe6a1afc 100644
--- a/src/lib/ai/coach/__tests__/persistence.test.ts
+++ b/src/lib/ai/coach/__tests__/persistence.test.ts
@@ -1,6 +1,28 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
-import { summariseTitle } from "../persistence";
+// Mock the db + crypto boundaries so `recordProactiveNudge` can be
+// exercised without a real Postgres / encryption key. The transaction
+// runner simply invokes the callback with the stubbed `tx`.
+const txCreate = {
+  coachConversation: { create: vi.fn() },
+  coachMessage: { create: vi.fn() },
+};
+vi.mock("@/lib/db", () => ({
+  prisma: {
+    $transaction: vi.fn(
+      async (cb: (tx: typeof txCreate) => Promise<unknown>) => cb(txCreate),
+    ),
+  },
+}));
+vi.mock("../bytes-codec", () => ({
+  encryptToBytes: vi.fn((text: string) =>
+    new TextEncoder().encode(`enc:${text}`),
+  ),
+  decryptFromBytes: vi.fn(),
+}));
+
+import { recordProactiveNudge, summariseTitle } from "../persistence";
+import { encryptToBytes } from "../bytes-codec";
 
 describe("summariseTitle", () => {
   it("returns the input unchanged when below 80 chars", () => {
@@ -41,3 +63,51 @@ describe("summariseTitle", () => {
     expect(summariseTitle("    ")).toBe("New conversation");
   });
 });
+
+describe("recordProactiveNudge", () => {
+  it("creates a conversation + an encrypted ASSISTANT message in one transaction", async () => {
+    const now = new Date("2026-06-18T05:15:00.000Z");
+    txCreate.coachConversation.create.mockResolvedValue({
+      id: "conv_1",
+      userId: "user_1",
+      title: "Time to weigh in",
+      createdAt: now,
+      updatedAt: now,
+    });
+    txCreate.coachMessage.create.mockResolvedValue({
+      id: "msg_1",
+      createdAt: now,
+    });
+
+    const out = await recordProactiveNudge({
+      userId: "user_1",
+      title: "Time to weigh in",
+      body: "It has been a week — a quick weigh-in keeps the trend honest.",
+    });
+
+    expect(out).toEqual({
+      conversationId: "conv_1",
+      messageId: "msg_1",
+      createdAt: now,
+    });
+
+    // Conversation owned by the user, title summarised.
+    expect(txCreate.coachConversation.create).toHaveBeenCalledWith({
+      data: { userId: "user_1", title: "Time to weigh in" },
+    });
+
+    // The body is encrypted at rest (Bytes), role is assistant, and the
+    // message hangs off the new conversation. No raw plaintext column.
+    const msgArg = txCreate.coachMessage.create.mock.calls[0][0];
+    expect(msgArg.data.conversationId).toBe("conv_1");
+    expect(msgArg.data.role).toBe("assistant");
+    expect(msgArg.data.providerType).toBe("nudge");
+    expect(encryptToBytes).toHaveBeenCalledWith(
+      "It has been a week — a quick weigh-in keeps the trend honest.",
+    );
+    // The stored column is the ciphertext, never the plaintext body.
+    expect(new TextDecoder().decode(msgArg.data.encryptedContent)).toContain(
+      "enc:",
+    );
+  });
+});
diff --git a/src/lib/ai/coach/persistence.ts b/src/lib/ai/coach/persistence.ts
index 9d0c0440c..7e318ee93 100644
--- a/src/lib/ai/coach/persistence.ts
+++ b/src/lib/ai/coach/persistence.ts
@@ -188,6 +188,60 @@ export async function appendMessage(
   };
 }
 
+export interface RecordProactiveNudgeParams {
+  userId: string;
+  /** Conversation title (the nudge headline) — summarised to ≤80 chars. */
+  title: string;
+  /** The nudge body, persisted as the initial ASSISTANT message. */
+  body: string;
+  /** Trigger tag for the wide-event annotation on the caller side. */
+  providerType?: string | null;
+}
+
+/**
+ * v1.18.6 (CCH-02) — record a proactive Coach nudge as a real
+ * conversation so it shows up in the conversation rail regardless of
+ * which push channel (if any) the user configured. The proactive cron
+ * used to dispatch a notification ONLY; with no push channel the nudge
+ * was entirely invisible.
+ *
+ * Creates a fresh conversation and writes the nudge as the initial
+ * ASSISTANT message in one transaction so a partial write never leaves
+ * an empty thread in the rail. The body crosses the same
+ * `encryptToBytes` boundary as every other Coach message, so the nudge
+ * text is encrypted at rest like a normal reply. Returns the new
+ * conversation + message ids for the caller's annotation.
+ */
+export async function recordProactiveNudge(
+  params: RecordProactiveNudgeParams,
+): Promise<{ conversationId: string; messageId: string; createdAt: Date }> {
+  return prisma.$transaction(async (tx) => {
+    const conversation = await tx.coachConversation.create({
+      data: {
+        userId: params.userId,
+        title: summariseTitle(params.title),
+      },
+    });
+    const message = await tx.coachMessage.create({
+      data: {
+        conversationId: conversation.id,
+        role: "assistant",
+        encryptedContent: encryptToBytes(params.body),
+        metricSourceJson: null,
+        providerType: params.providerType ?? "nudge",
+        promptVersion: null,
+      },
+    });
+    // The conversation's `createdAt` == `updatedAt` on creation, so the
+    // rail already orders it to the top; no extra `update` needed.
+    return {
+      conversationId: conversation.id,
+      messageId: message.id,
+      createdAt: message.createdAt,
+    };
+  });
+}
+
 /**
  * Fetch one conversation + every message, decrypting each body on
  * read. Returns null when the conversation does not exist OR when the
diff --git a/src/lib/jobs/__tests__/coach-nudge.test.ts b/src/lib/jobs/__tests__/coach-nudge.test.ts
index a417e359b..dfa3a5a23 100644
--- a/src/lib/jobs/__tests__/coach-nudge.test.ts
+++ b/src/lib/jobs/__tests__/coach-nudge.test.ts
@@ -714,4 +714,67 @@ describe("runCoachNudgeTick — gates and prefs", () => {
       "You wanted to keep an eye on: morning blood pressure.",
     );
   });
+
+  it("persists the nudge as a conversation before dispatching (CCH-02)", async () => {
+    const order: string[] = [];
+    const recordNudge = vi.fn(
+      async (args: { userId: string; title: string; body: string }) => {
+        void args;
+        order.push("persist");
+        return {
+          conversationId: "conv_1",
+          messageId: "msg_1",
+          createdAt: now,
+        };
+      },
+    );
+    const dispatch = vi.fn(async () => {
+      order.push("dispatch");
+      return { dispatched: true };
+    });
+    const prisma = prismaMock({
+      users: [userRow(null)],
+      intakeRows: failingIntakes,
+    });
+    const summary = await runCoachNudgeTick(
+      prisma as unknown as PrismaClient,
+      now,
+      { dispatch: dispatch as never, recordNudge: recordNudge as never },
+    );
+    expect(summary.dispatched).toBe(1);
+    expect(summary.persisted).toBe(1);
+    // The conversation must be written BEFORE the notification fires so
+    // the rail always carries the nudge even if the push channel is gone.
+    expect(order).toEqual(["persist", "dispatch"]);
+    const persistArg = recordNudge.mock.calls[0]?.[0] as unknown as {
+      userId: string;
+      title: string;
+      body: string;
+    };
+    expect(persistArg.userId).toBe("user-1");
+    // The persisted body is the same compliance nudge copy the
+    // notification carries — it lands as the initial assistant message.
+    expect(persistArg.body).toContain("Your intakes were patchy this week");
+    expect(persistArg.title.length).toBeGreaterThan(0);
+  });
+
+  it("still dispatches + counts the nudge when persistence throws", async () => {
+    const recordNudge = vi.fn(async () => {
+      throw new Error("db down");
+    });
+    const dispatch = vi.fn(async () => ({ dispatched: true }));
+    const prisma = prismaMock({
+      users: [userRow(null)],
+      intakeRows: failingIntakes,
+    });
+    const summary = await runCoachNudgeTick(
+      prisma as unknown as PrismaClient,
+      now,
+      { dispatch: dispatch as never, recordNudge: recordNudge as never },
+    );
+    // A persistence failure must not swallow the notification.
+    expect(dispatch).toHaveBeenCalledTimes(1);
+    expect(summary.dispatched).toBe(1);
+    expect(summary.persisted).toBe(0);
+  });
 });
diff --git a/src/lib/jobs/coach-nudge.ts b/src/lib/jobs/coach-nudge.ts
index 8c5ecb03f..d1fe2724e 100644
--- a/src/lib/jobs/coach-nudge.ts
+++ b/src/lib/jobs/coach-nudge.ts
@@ -73,6 +73,7 @@ import {
 import { dispatchNotification } from "@/lib/notifications/dispatcher";
 import { resolveCoachNudgePrefs } from "@/lib/validations/notification-prefs";
 import { decryptFromBytes } from "@/lib/ai/coach/bytes-codec";
+import { recordProactiveNudge } from "@/lib/ai/coach/persistence";
 import { getServerTranslator } from "@/lib/i18n/server-translator";
 import type { Locale } from "@/lib/i18n/config";
 import { defaultLocale, locales } from "@/lib/i18n/config";
@@ -167,6 +168,13 @@ export const COACH_NUDGE_TRIGGER_GROUPS: Record<
 export interface CoachNudgeSummary {
   candidatesScanned: number;
   dispatched: number;
+  /**
+   * v1.18.6 (CCH-02) — nudges written into the conversation rail as an
+   * initial ASSISTANT message. Counted independently of `dispatched`:
+   * the conversation lands even when no push channel is configured, so
+   * `persisted` can exceed `dispatched`.
+   */
+  persisted: number;
   skippedOptedOut: number;
   skippedNoProvider: number;
   skippedRecentNudge: number;
@@ -695,13 +703,16 @@ export async function runCoachNudgeTick(
   now: Date,
   options: {
     dispatch?: typeof dispatchNotification;
+    recordNudge?: typeof recordProactiveNudge;
   } = {},
 ): Promise<CoachNudgeSummary> {
   const dispatchImpl = options.dispatch ?? dispatchNotification;
+  const recordNudgeImpl = options.recordNudge ?? recordProactiveNudge;
 
   const summary: CoachNudgeSummary = {
     candidatesScanned: 0,
     dispatched: 0,
+    persisted: 0,
     skippedOptedOut: 0,
     skippedNoProvider: 0,
     skippedRecentNudge: 0,
@@ -839,6 +850,30 @@ export async function runCoachNudgeTick(
         user.locale,
         coachFocus,
       );
+
+      // v1.18.6 (CCH-02) — persist the nudge as a real conversation
+      // BEFORE dispatching the notification. The proactive nudge used to
+      // be notification-only, so a user with no push channel never saw
+      // it anywhere; writing it as the initial ASSISTANT message means it
+      // always lands in the conversation rail (and clears the FAB unread
+      // dot once the user opens the Coach). A persistence failure must
+      // not swallow the notification, so it is caught locally and the
+      // dispatch still fires.
+      try {
+        await recordNudgeImpl({
+          userId: user.id,
+          title,
+          body,
+        });
+        summary.persisted += 1;
+      } catch (persistErr: unknown) {
+        const message =
+          persistErr instanceof Error ? persistErr.message : String(persistErr);
+        getEvent()?.addWarning(
+          `coach-nudge conversation persist failed for ${user.id}: ${message}`,
+        );
+      }
+
       const outcome = await dispatchImpl({
         eventType: "COACH_NUDGE",
         userId: user.id,
diff --git a/src/lib/jobs/reminder/register-status.ts b/src/lib/jobs/reminder/register-status.ts
index ee7d1b900..0d5a7ab67 100644
--- a/src/lib/jobs/reminder/register-status.ts
+++ b/src/lib/jobs/reminder/register-status.ts
@@ -306,6 +306,7 @@ export async function registerStatusQueues(
           result: {
             candidates_scanned: summary.candidatesScanned,
             dispatched: summary.dispatched,
+            persisted: summary.persisted,
             skipped_opted_out: summary.skippedOptedOut,
             skipped_no_provider: summary.skippedNoProvider,
             skipped_recent_nudge: summary.skippedRecentNudge,

From 3a3f88a80c6df0cea948821ca2ab79bab7005789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:19:27 +0200
Subject: [PATCH 47/71] feat(coach): mark an unread proactive nudge on the
 Coach launcher
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a discreet unread dot to the Coach FAB when the Coach has something
the user has not opened yet, and clear it when they open the Coach.

The signal is server-authoritative: a new coach_last_seen_at column on
users records the last time the Coach was opened, and the launcher's
status endpoint reports unread when the newest assistant message is
newer than that stamp — so the dot works even with no push channel and
clears across every device, web and iOS. Opening the Coach (FAB or the
/coach page) stamps the column via a new /api/insights/coach/seen
endpoint; the launcher keeps a local stamp only for an instant paint.

The dot is a calm cyan, not an alarming red, per the card-status rule.
---
 .../0175_v1186_coach_last_seen/migration.sql  | 15 ++++
 prisma/schema.prisma                          | 12 +++
 .../api/insights/coach/nudge-status/route.ts  | 55 +++++++-----
 src/app/api/insights/coach/seen/route.ts      | 33 +++++++
 src/components/insights/layout-coach-fab.tsx  | 89 +++++++++++++++----
 src/lib/query-keys/coach.ts                   |  2 +
 6 files changed, 165 insertions(+), 41 deletions(-)
 create mode 100644 prisma/migrations/0175_v1186_coach_last_seen/migration.sql
 create mode 100644 src/app/api/insights/coach/seen/route.ts

diff --git a/prisma/migrations/0175_v1186_coach_last_seen/migration.sql b/prisma/migrations/0175_v1186_coach_last_seen/migration.sql
new file mode 100644
index 000000000..c784fd21b
--- /dev/null
+++ b/prisma/migrations/0175_v1186_coach_last_seen/migration.sql
@@ -0,0 +1,15 @@
+-- v1.18.6 (CCH-03) — Coach "last seen" stamp for the FAB unread dot.
+--
+-- A single nullable timestamp on `users`. The proactive Coach nudge now
+-- lands as an ASSISTANT message in the conversation rail (CCH-02); the
+-- Coach FAB shows a discreet unread dot when the newest Coach message is
+-- newer than this stamp, and clears it once the user opens the Coach
+-- (the open writes the current time here via POST
+-- /api/insights/coach/seen).
+--
+-- NULL backfills every existing row to "never opened" — harmless: the
+-- dot only paints when an actual newer Coach message exists, so a user
+-- with no proactive nudge yet sees nothing. No data migration needed.
+
+ALTER TABLE "users"
+  ADD COLUMN "coach_last_seen_at" TIMESTAMP(3);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index f87097c6e..bb3b65d1d 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -453,6 +453,18 @@ model User {
   // `GET /api/auth/me` as a `modules: { <key>: boolean }` map.
   modulePreferencesJson Json? @map("module_preferences_json")
 
+  // v1.18.6 (CCH-03) — "Coach last seen" stamp powering the unread dot
+  // on the Coach FAB. The proactive nudge now lands as an ASSISTANT
+  // message in the conversation rail (CCH-02); the FAB shows a discreet
+  // unread dot when the newest Coach message is newer than this stamp,
+  // and clears it when the user opens the Coach (drawer or page, which
+  // writes the current time here via `POST /api/insights/coach/seen`).
+  // Null = never opened the Coach, so any existing message reads as
+  // unread once. Server-authoritative so the signal is consistent across
+  // web + iOS; the FAB keeps a local mirror only as an instant-paint
+  // optimisation.
+  coachLastSeenAt DateTime? @map("coach_last_seen_at")
+
   // v1.5.5 — self-hosted avatar storage.
   //
   // Replaces the Gravatar third-party leak (the old `getGravatarUrl`
diff --git a/src/app/api/insights/coach/nudge-status/route.ts b/src/app/api/insights/coach/nudge-status/route.ts
index a4aad8dd6..48d9d58c6 100644
--- a/src/app/api/insights/coach/nudge-status/route.ts
+++ b/src/app/api/insights/coach/nudge-status/route.ts
@@ -1,18 +1,26 @@
 /**
- * GET /api/insights/coach/nudge-status — has the proactive Coach nudge
- * something the caller has not engaged with yet?
+ * GET /api/insights/coach/nudge-status — is there an unread Coach
+ * message the caller has not opened yet?
  *
- * v1.16.1 — feeds the floating Coach bubble: the bubble renders only
- * while an unseen Coach-initiated nudge exists, instead of being a
- * permanent FAB. "Unseen" is derived, not stored: the latest successful
- * `COACH_NUDGE` dispatch (the `push_attempts` ledger the nudge cron
- * already anchors its frequency cap on) counts as read once the user
- * has sent a Coach message after it. The client additionally remembers
- * a local "seen" stamp so opening the chat without sending also clears
- * the bubble on that device.
+ * v1.18.6 (CCH-03) — the proactive Coach nudge now lands as a real
+ * ASSISTANT message in the conversation rail (CCH-02), not as a
+ * notification-only dispatch. The unread signal moved with it: instead
+ * of anchoring on the `push_attempts` ledger (which is empty when no
+ * push channel is configured, so the nudge was invisible), the status
+ * compares the newest Coach assistant message against the
+ * server-authoritative `User.coachLastSeenAt` stamp.
  *
- * No new table, no migration: both timestamps come from existing rows,
- * scoped to the caller.
+ * `unread` is true when an assistant message exists that is newer than
+ * the last time the user opened the Coach (drawer or page, which writes
+ * `coachLastSeenAt` via `POST /api/insights/coach/seen`). A user who has
+ * never opened the Coach reads any existing nudge as unread exactly
+ * once. Server-authoritative so the signal is consistent across web +
+ * iOS; the FAB keeps a local mirror only as an instant-paint
+ * optimisation.
+ *
+ * `nudgedAt` carries the newest assistant-message timestamp so the FAB's
+ * local seen-stamp keys on a stable value (kept for the existing client
+ * contract).
  */
 import { apiHandler, requireAuth } from "@/lib/api-handler";
 import { apiSuccess } from "@/lib/api-response";
@@ -23,23 +31,26 @@ export const GET = apiHandler(async () => {
   const { user } = await requireAuth();
   await requireAssistantSurface("coach");
 
-  const [lastNudge, lastUserMessage] = await Promise.all([
-    prisma.pushAttempt.findFirst({
-      where: { userId: user.id, eventType: "COACH_NUDGE", result: "ok" },
+  // The newest assistant message across the caller's conversations — the
+  // proactive nudge writes one, and so does every normal Coach reply. We
+  // intentionally key on assistant (not user) messages: the unread dot
+  // means "the Coach said something", and the open-stamp clears it.
+  const [lastAssistant, seen] = await Promise.all([
+    prisma.coachMessage.findFirst({
+      where: { role: "assistant", conversation: { userId: user.id } },
       orderBy: { createdAt: "desc" },
       select: { createdAt: true },
     }),
-    prisma.coachMessage.findFirst({
-      where: { role: "user", conversation: { userId: user.id } },
-      orderBy: { createdAt: "desc" },
-      select: { createdAt: true },
+    prisma.user.findUnique({
+      where: { id: user.id },
+      select: { coachLastSeenAt: true },
     }),
   ]);
 
-  const nudgedAt = lastNudge?.createdAt ?? null;
+  const nudgedAt = lastAssistant?.createdAt ?? null;
+  const lastSeenAt = seen?.coachLastSeenAt ?? null;
   const unread =
-    nudgedAt !== null &&
-    (lastUserMessage === null || lastUserMessage.createdAt < nudgedAt);
+    nudgedAt !== null && (lastSeenAt === null || lastSeenAt < nudgedAt);
 
   return apiSuccess({
     nudgedAt: nudgedAt ? nudgedAt.toISOString() : null,
diff --git a/src/app/api/insights/coach/seen/route.ts b/src/app/api/insights/coach/seen/route.ts
new file mode 100644
index 000000000..603edafb7
--- /dev/null
+++ b/src/app/api/insights/coach/seen/route.ts
@@ -0,0 +1,33 @@
+/**
+ * POST /api/insights/coach/seen — mark every Coach message as read.
+ *
+ * v1.18.6 (CCH-03) — opening the Coach (drawer or full page) clears the
+ * unread dot on the FAB. The open stamps `User.coachLastSeenAt = now`;
+ * the FAB's `GET /api/insights/coach/nudge-status` then reads no
+ * assistant message newer than the stamp and drops the dot. Server-
+ * authoritative so the cleared state follows the user across web + iOS,
+ * not just the device that opened the Coach.
+ *
+ * No request body — the timestamp is server-minted from `now()` so a
+ * client can never backdate the stamp to suppress a future nudge.
+ */
+import { apiHandler, requireAuth } from "@/lib/api-handler";
+import { apiSuccess } from "@/lib/api-response";
+import { prisma } from "@/lib/db";
+import { requireAssistantSurface } from "@/lib/feature-flags";
+
+export const POST = apiHandler(async () => {
+  const { user } = await requireAuth();
+  await requireAssistantSurface("coach");
+
+  const seenAt = new Date();
+  await prisma.user.update({
+    where: { id: user.id },
+    data: { coachLastSeenAt: seenAt },
+  });
+
+  return apiSuccess({ seenAt: seenAt.toISOString() });
+});
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
diff --git a/src/components/insights/layout-coach-fab.tsx b/src/components/insights/layout-coach-fab.tsx
index 0be23a4c4..ac0c877e6 100644
--- a/src/components/insights/layout-coach-fab.tsx
+++ b/src/components/insights/layout-coach-fab.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useRef, useState } from "react";
 import { usePathname } from "next/navigation";
-import { useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { Sparkles } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
@@ -13,18 +13,26 @@ import { useFeatureFlags } from "@/hooks/use-feature-flags";
 import { useDisableCoach } from "@/hooks/use-disable-coach";
 import { queryKeys } from "@/lib/query-keys";
 
-import { apiGet } from "@/lib/api/api-fetch";
+import { apiGet, apiPost } from "@/lib/api/api-fetch";
 
 /**
  * v1.16.8 — the Coach FAB is a permanent launcher again, now on EVERY
  * authenticated page (mounted once in `<AuthShell>`, no longer scoped
  * to `/insights/**`). The v1.16.1 nudge-only bubble folded into it: the
- * FAB always renders, and an unseen proactive `COACH_NUDGE` (surfaced
+ * FAB always renders, and an unread proactive Coach message (surfaced
  * by `/api/insights/coach/nudge-status`) paints a small unread dot on
- * its corner instead of toggling the whole button. The dot clears once
- * the nudge counts as read — the user sent a Coach message after the
- * nudge (server-derived), or opened the Coach on this device (local
- * seen stamp keyed by the nudge timestamp).
+ * its corner instead of toggling the whole button.
+ *
+ * v1.18.6 (CCH-02/CCH-03) — the proactive nudge now lands as a real
+ * ASSISTANT message in the conversation rail, not a notification-only
+ * dispatch, so the unread signal moved onto the server-authoritative
+ * `User.coachLastSeenAt` stamp: `status.unread` is true while a Coach
+ * message is newer than the last time the user opened the Coach. Opening
+ * the Coach (this FAB, or the `/coach` page) fires
+ * `POST /api/insights/coach/seen`, which stamps the server and clears
+ * the dot everywhere (web + iOS). A local "seen" stamp is kept only as
+ * an instant-paint optimisation so the dot disappears the moment the
+ * user taps, before the mutation round-trips.
  *
  * The FAB hides inside the Coach view itself (`/coach`) — a
  * launcher pointing at the page the user is already on is noise.
@@ -44,9 +52,12 @@ export interface CoachNudgeStatus {
 }
 
 /**
- * Pure unread derivation — server signal AND-ed with the local
- * seen-stamp. Exported so the unit test pins the contract without a
- * QueryClient round-trip.
+ * Pure unread derivation — the server signal is authoritative
+ * (`status.unread` already compares the newest Coach message against the
+ * persisted `coachLastSeenAt`). The local seen-stamp only suppresses the
+ * dot for an instant after the user taps, before the mark-seen mutation
+ * + status refetch land. Exported so the unit test pins the contract
+ * without a QueryClient round-trip.
  */
 export function isNudgeUnread(
   status: CoachNudgeStatus | undefined,
@@ -77,6 +88,7 @@ export function LayoutCoachFab() {
 
   const coachAvailable = !!launch && flags.coach && !disableCoach;
   const onCoachPage = pathname?.startsWith("/coach") ?? false;
+  const queryClient = useQueryClient();
 
   const { data: status } = useQuery({
     queryKey: queryKeys.coachNudgeStatus(),
@@ -87,6 +99,22 @@ export function LayoutCoachFab() {
     staleTime: 5 * 60 * 1000,
   });
 
+  // v1.18.6 (CCH-03) — stamp `coachLastSeenAt` server-side when the user
+  // opens the Coach so the dot clears across every device. Fire-and-
+  // forget from the UI's perspective (the local seen-stamp already
+  // suppressed the dot); on success the status query refetches so the
+  // server-authoritative `unread` re-resolves to false.
+  const markSeen = useMutation({
+    mutationKey: queryKeys.coachMarkSeen(),
+    mutationFn: async () =>
+      apiPost<{ seenAt: string }>("/api/insights/coach/seen", {}),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: queryKeys.coachNudgeStatus(),
+      });
+    },
+  });
+
   const nudgedAt = status?.nudgedAt ?? null;
   const unread = isNudgeUnread(status, seenStamp);
 
@@ -107,16 +135,30 @@ export function LayoutCoachFab() {
     prevUnreadRef.current = unread;
   }, [unread, t]);
 
-  // Visiting the Coach page itself counts as reading the nudge on this
-  // device — persist the stamp so the dot stays gone after leaving.
+  // Visiting the Coach page itself counts as reading the nudge — persist
+  // the local instant-paint stamp AND stamp the server so the dot stays
+  // gone after leaving, on every device. Fired once per page entry: the
+  // ref guards against the effect re-running on unrelated re-renders.
+  const seenStampedRef = useRef(false);
   useEffect(() => {
-    if (!onCoachPage || nudgedAt === null) return;
-    try {
-      window.localStorage.setItem(NUDGE_SEEN_STORAGE_KEY, nudgedAt);
-    } catch {
-      // Storage unavailable (private mode) — the server-side read
-      // signal still clears the dot once the user sends a message.
+    if (!onCoachPage) {
+      seenStampedRef.current = false;
+      return;
     }
+    if (seenStampedRef.current) return;
+    seenStampedRef.current = true;
+    if (nudgedAt !== null) {
+      try {
+        window.localStorage.setItem(NUDGE_SEEN_STORAGE_KEY, nudgedAt);
+      } catch {
+        // Storage unavailable (private mode) — the server stamp below
+        // still clears the dot once it round-trips.
+      }
+    }
+    markSeen.mutate();
+    // `markSeen` is a stable mutation object; excluding it keeps the
+    // effect from re-firing on its internal state changes.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [onCoachPage, nudgedAt]);
 
   if (!coachAvailable) return null;
@@ -136,6 +178,10 @@ export function LayoutCoachFab() {
         // Best effort — see above.
       }
     }
+    // v1.18.6 (CCH-03) — stamp the server so the dot clears on every
+    // device, not just this one. The local stamp above already hid the
+    // dot for an instant paint; the mutation makes it durable.
+    if (unread) markSeen.mutate();
     // v1.16.11 — open the side drawer in place (the launch context the
     // layout mount consumes) instead of navigating to the chat page;
     // the conversation arrives without losing the page underneath.
@@ -194,10 +240,15 @@ export function LayoutCoachFab() {
       >
         <Sparkles className="size-6" aria-hidden="true" />
         {unread ? (
+          // v1.18.6 (CCH-03) — discreet "the Coach said something" dot.
+          // Deliberately NOT an alarming red (the medication-card rule:
+          // status via calm signal, never an alarm tint): a small cyan
+          // dot ringed against the FAB background reads as informative,
+          // not urgent.
           <span
             data-slot="coach-fab-unread"
             aria-hidden="true"
-            className="border-background bg-dracula-red absolute top-0.5 right-0.5 size-3 rounded-full border-2"
+            className="border-background bg-dracula-cyan absolute top-0.5 right-0.5 size-3 rounded-full border-2"
           />
         ) : null}
       </Button>
diff --git a/src/lib/query-keys/coach.ts b/src/lib/query-keys/coach.ts
index e759d3342..61ffa23a2 100644
--- a/src/lib/query-keys/coach.ts
+++ b/src/lib/query-keys/coach.ts
@@ -11,4 +11,6 @@ export const coachKeys = {
   coachAboutMeQuestions: () => ["coach-about-me", "questions"] as const,
   /** v1.16.1 — unseen proactive-nudge state for the floating Coach bubble. */
   coachNudgeStatus: () => ["coach-nudge-status"] as const,
+  /** v1.18.6 (CCH-03) — mark-Coach-seen mutation (clears the FAB unread dot). */
+  coachMarkSeen: () => ["coach-mark-seen"] as const,
 };

From 96c564178718ad434f822bad519dc85bfd810453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:19:36 +0200
Subject: [PATCH 48/71] fix(coach): give the chat page more width and fix the
 rail scrollbar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Coach page read as cut off against other pages and the left
conversation scrollbar looked broken.

Width: the page sat inside the shared max-w-screen-xl content frame with
a tall pb-20 FAB gutter that does nothing on /coach (the FAB hides
there). Break out of the frame so the chat claims the full content width
and viewport height, edge-to-edge on small screens and a contained card
from sm up, and centre the thread on a comfortable reading measure.

Scrollbar: the page-surface history rail was wrapped in an overflow-auto
container while the rail itself is a flex column with its own
overflow-auto list — two nested scroll regions. The inner list's height
never resolved, so its scrollbar rendered against an indeterminate track
and the search field scrolled away. Drop the outer scroll: the rail
keeps a fixed search header and one internal list-scroll.
---
 src/app/coach/page.tsx                        | 39 ++++++++++++++-----
 .../coach-panel/coach-drawer-body.tsx         | 13 ++++++-
 .../insights/coach-panel/message-thread.tsx   |  7 ++++
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/app/coach/page.tsx b/src/app/coach/page.tsx
index d8c0d5402..9ffb5a694 100644
--- a/src/app/coach/page.tsx
+++ b/src/app/coach/page.tsx
@@ -63,15 +63,35 @@ export default function CoachPage() {
     <div
       data-slot="coach-page"
       data-tour-id="coach-hero"
-      // v1.18.1 (W-COACH-UI C1/C3) — the card was capped at
-      // `100dvh-13rem`, leaving a band of wasted space below it on a
-      // standalone route that no longer carries the Insights tab strip.
-      // Claim the page height down to a comfortable bottom gutter so the
-      // thread + rail fill the viewport, and lift the card with a soft
-      // shadow so it reads as one contained surface rather than a thin
-      // outline.
-      className="bg-card flex h-[calc(100dvh-8rem)] min-h-[32rem] flex-col overflow-hidden rounded-2xl border shadow-sm"
+      // v1.18.6 (CCH-01) — Marc: the Coach read "cut off" vs other pages
+      // and wanted more width / a focused Claude-like surface. The page
+      // sits inside `<AuthShell>`'s shared `mx-auto max-w-screen-xl px-4
+      // pt-6 pb-20 md:px-6` content frame, which boxed the chat into the
+      // same narrow column every dashboard card uses and left a tall dead
+      // band below the card (the `pb-20` FAB gutter, pointless here since
+      // the FAB hides on `/coach`). Break out of that frame: negative
+      // margins cancel the container's horizontal + top/bottom padding so
+      // the chat claims the full content width and the viewport height,
+      // then a light inner padding keeps it off the window edge. The card
+      // itself drops its rounded border on small screens (edge-to-edge,
+      // app-like) and keeps the contained card look from `sm+`.
+      //
+      // v1.18.1 (W-COACH-UI C1/C3) — the card formerly capped at
+      // `100dvh-13rem`, leaving wasted space below it; we now fill the
+      // reclaimed height.
+      className={
+        // Cancel the AuthShell container's padding (`-mt-6` top,
+        // `-mb-20` bottom, `-mx-4 md:-mx-6` sides) so the surface is
+        // full-bleed, then re-pad lightly. The height is the full
+        // viewport minus the top bar (`4rem`) and the small gutters.
+        "-mx-4 -mt-6 -mb-20 flex h-[calc(100dvh-4rem)] min-h-[32rem] flex-col md:-mx-6 " +
+        "px-2 pt-2 pb-3 sm:px-4 sm:pt-4 sm:pb-4"
+      }
     >
+      <div
+        data-slot="coach-page-card"
+        className="bg-card flex min-h-0 flex-1 flex-col overflow-hidden rounded-none border-y shadow-sm sm:rounded-2xl sm:border"
+      >
       <CoachConversation
         surface="page"
         autoFocusComposer
@@ -95,7 +115,8 @@ export default function CoachPage() {
             </Button>
           </>
         }
-      />
+        />
+      </div>
     </div>
   );
 }
diff --git a/src/components/insights/coach-panel/coach-drawer-body.tsx b/src/components/insights/coach-panel/coach-drawer-body.tsx
index f59461b02..1c677b86f 100644
--- a/src/components/insights/coach-panel/coach-drawer-body.tsx
+++ b/src/components/insights/coach-panel/coach-drawer-body.tsx
@@ -78,7 +78,18 @@ export function CoachDrawerBody({
           <h2 className="border-border/70 text-muted-foreground flex h-14 shrink-0 items-center border-b px-4 text-xs font-medium tracking-wide uppercase">
             {t("insights.coach.historyTitle")}
           </h2>
-          <div className="min-h-0 flex-1 overflow-y-auto">{historyRail}</div>
+          {/* v1.18.6 (CCH-01) — the wrapping `overflow-y-auto` div here
+              was the broken left scrollbar: `<HistoryRail>` is itself a
+              `flex h-full flex-col` with its OWN `overflow-y-auto` list,
+              so this nested it inside a second scroll container. The
+              outer container scrolled the whole rail (search field
+              included) against an `h-full` child whose height resolved to
+              its content, leaving the inner list's `flex-1 min-h-0`
+              without a bounded track — the scrollbar rendered against an
+              indeterminate height and read as half-broken. Drop the outer
+              scroll: the rail keeps a fixed search header and its single
+              internal list-scroll is the only scroll region. */}
+          <div className="flex min-h-0 flex-1 flex-col">{historyRail}</div>
         </aside>
       )}
 
diff --git a/src/components/insights/coach-panel/message-thread.tsx b/src/components/insights/coach-panel/message-thread.tsx
index 75a632f59..6dae240d0 100644
--- a/src/components/insights/coach-panel/message-thread.tsx
+++ b/src/components/insights/coach-panel/message-thread.tsx
@@ -363,6 +363,13 @@ export function MessageThread({
       data-slot="coach-message-thread"
       className={cn(
         "flex h-full flex-col gap-4 overflow-y-auto px-4 py-4 sm:px-6",
+        // v1.18.6 (CCH-01) — on the now full-width page surface a thread
+        // stretched edge-to-edge sprawled the prose to an unreadable
+        // measure. Centre the content on a comfortable max width (Claude-
+        // like) via an `mx-auto` inner gutter; the scrollbar still rides
+        // the surface edge. The drawer surface is already narrow, so the
+        // cap only bites on the wide page surface.
+        "[&>*]:mx-auto [&>*]:w-full [&>*]:max-w-3xl",
         "scroll-smooth",
       )}
     >

From 2535d45fc76f2049feeacd8b01e63dfa8c6c7e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:19:42 +0200
Subject: [PATCH 49/71] refactor(insights): drop the redundant per-metric Coach
 launcher

Every metric sub-page header carried a Coach launch icon. With the Coach
FAB anchored bottom-right on every authenticated page, that header icon
was a second entry point to the same surface. Remove it from the shared
sub-page shell so the FAB is the single Coach launcher app-wide. The
coachLaunch prop stays accepted on the shell (the metric pages still pass
it) but no longer renders a control, so no per-page churn is needed.
---
 src/components/insights/sub-page-shell.tsx | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/insights/sub-page-shell.tsx b/src/components/insights/sub-page-shell.tsx
index ba30ea838..d658f3de9 100644
--- a/src/components/insights/sub-page-shell.tsx
+++ b/src/components/insights/sub-page-shell.tsx
@@ -13,7 +13,6 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { CoachLaunchButton } from "@/components/insights/coach-launch-button";
 import { TargetAdjustButton } from "@/components/insights/target-adjust-button";
 import { TargetAdjustProvider } from "@/lib/insights/target-adjust-context";
 import { useScrollResetOnRoute } from "@/hooks/use-scroll-reset-on-route";
@@ -108,13 +107,12 @@ export interface SubPageShellProps {
   /**
    * v1.8.6 — opt-in Coach launch in the page header.
    *
-   * When true, the shell mounts an icon-only `<CoachLaunchButton>` at
-   * the top-right of the header, vertically aligned with the heading, so
-   * "Coach fragen" reads as a header action rather than a foot-of-page
-   * button. Every routed category page passes it; the mother page and
-   * empty-state branches omit it. The button self-gates on the Coach
-   * feature flag + per-user opt-out, so a disabled-Coach tenant shows
-   * nothing.
+   * v1.18.6 (CCH-04) — RETIRED as a rendered control. With the Coach FAB
+   * anchored bottom-right on every authenticated page, the per-metric
+   * Coach icon was a redundant second entry point, so the shell no longer
+   * paints anything for it. The prop stays on the signature (every routed
+   * category page still passes it) to avoid a churny rename across ~14
+   * call sites; it is intentionally inert.
    */
   coachLaunch?: boolean;
   /**
@@ -139,7 +137,10 @@ export function SubPageShell({
   focusOnMount = false,
   statStrip,
   diversityNudge,
-  coachLaunch = false,
+  // v1.18.6 (CCH-04) — `coachLaunch` is intentionally not destructured:
+  // the prop is still accepted on the type (call sites pass it) but the
+  // shell no longer renders a Coach control. The FAB is the single Coach
+  // entry point app-wide.
   showAllValuesType,
   children,
 }: SubPageShellProps) {
@@ -270,7 +271,12 @@ export function SubPageShell({
                 </Button>
               ) : null}
               <TargetAdjustButton />
-              {coachLaunch ? <CoachLaunchButton variant="icon" /> : null}
+              {/* v1.18.6 (CCH-04) — the per-metric Coach launch icon is
+                gone. With the Coach FAB anchored bottom-right on every
+                authenticated page, a second Coach affordance in each
+                metric header was redundant. The `coachLaunch` prop is
+                still accepted (every metric page passes it) but no longer
+                paints a control — the FAB is the single Coach entry. */}
               {/* v1.16.8 — the v1.16.4 customise cog is gone: the sticky
                 tab strip above already carries the same control on every
                 insights surface, so the header copy was a duplicate. */}

From 71b29f5b6f2fb18ba33040e261978aeb4a29a6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:20:19 +0200
Subject: [PATCH 50/71] refactor(recovery): drop the per-group sub-headings on
 the recovery page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Read next to the page's "Erholung" heading, the "Recharge" / "Strain & load" /
"Daily heart & energy" sub-headings were redundant chrome. Remove them and
render the present signal blocks as one flat, evenly-spaced stack — each block
already carries its own title + explainer, so nothing loses context. The group
structure stays internally to drive block order and the data gate. Promote the
block title to an h2 so the page heading outline stays nested (h1 then h2) with
no skipped level, and drop the now-orphaned group i18n keys.
---
 messages/de.json                              | 12 ---
 messages/en.json                              | 12 ---
 messages/es.json                              | 12 ---
 messages/fr.json                              | 12 ---
 messages/it.json                              | 12 ---
 messages/pl.json                              | 12 ---
 .../__tests__/device-score-surfaces.test.tsx  | 13 ++-
 .../recovery/recovery-metric-block.tsx        | 12 +--
 .../insights/recovery/recovery-section.tsx    | 82 ++++++-------------
 9 files changed, 40 insertions(+), 139 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 8f654ac76..6e9a48271 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -3509,18 +3509,6 @@
       "description": "Wie gut sich dein Körper erholt hat – die Erholungs-, Belastungs- und Load-Signale, die dein Wearable über Nacht aufzeichnet.",
       "emptyTitle": "Noch keine Erholungsdaten",
       "empty": "Noch keine Erholungsdaten. Verbinde ein WHOOP-, Polar- oder Oura-Konto, dann füllen sich diese Werte, sobald dein Gerät synchronisiert.",
-      "recharge": {
-        "title": "Recharge",
-        "subtitle": "Ladung des autonomen Nervensystems"
-      },
-      "strain": {
-        "title": "Belastung & Load",
-        "subtitle": "Tägliche kardiovaskuläre Belastung"
-      },
-      "cardio": {
-        "title": "Herz & Energie pro Tag",
-        "subtitle": "Herz- und Energiewerte des ganzen Tages"
-      },
       "block": {
         "ansChargeExplainer": "Wie aufgeladen dein autonomes Nervensystem in den Tag startet – ein Recharge-Wert aus deinen nächtlichen Herz- und Atemsignalen.",
         "dayStrainExplainer": "Die kardiovaskuläre Tagesbelastung auf der Belastungsskala deines Geräts. Lies sie im Verhältnis zu deiner Erholung, nicht als Ziel für sich.",
diff --git a/messages/en.json b/messages/en.json
index accbf337f..c33810296 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3509,18 +3509,6 @@
       "description": "How well your body has bounced back — the recovery, strain and load signals your wearable records overnight.",
       "emptyTitle": "No recovery data yet",
       "empty": "No recovery data yet. Connect a WHOOP, Polar or Oura account and these scores fill in once your device syncs.",
-      "recharge": {
-        "title": "Recharge",
-        "subtitle": "Autonomic-nervous-system charge"
-      },
-      "strain": {
-        "title": "Strain & load",
-        "subtitle": "Daily cardiovascular load"
-      },
-      "cardio": {
-        "title": "Daily heart & energy",
-        "subtitle": "Whole-day cardiac and energy totals"
-      },
       "block": {
         "ansChargeExplainer": "How charged your autonomic nervous system is for the day ahead — a recharge reading drawn from your overnight heart and breathing signals.",
         "dayStrainExplainer": "The day's whole-body cardiovascular load on your device's strain scale. Read it against your recovery, not as a goal on its own.",
diff --git a/messages/es.json b/messages/es.json
index 9fa3e2b1e..0a1b03839 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -3509,18 +3509,6 @@
       "description": "Cómo se ha recuperado tu cuerpo: las señales de recuperación, esfuerzo y carga que tu wearable registra durante la noche.",
       "emptyTitle": "Aún no hay datos de recuperación",
       "empty": "Aún no hay datos de recuperación. Conecta una cuenta de WHOOP, Polar u Oura y estas puntuaciones se completarán cuando tu dispositivo sincronice.",
-      "recharge": {
-        "title": "Recarga",
-        "subtitle": "Carga del sistema nervioso autónomo"
-      },
-      "strain": {
-        "title": "Esfuerzo y carga",
-        "subtitle": "Carga cardiovascular diaria"
-      },
-      "cardio": {
-        "title": "Corazón y energía del día",
-        "subtitle": "Totales cardiacos y de energía de todo el día"
-      },
       "block": {
         "ansChargeExplainer": "Cuán cargado está tu sistema nervioso autónomo para el día — una lectura de recarga obtenida de tus señales nocturnas de corazón y respiración.",
         "dayStrainExplainer": "La carga cardiovascular del día en la escala de esfuerzo de tu dispositivo. Léela en relación con tu recuperación, no como una meta en sí.",
diff --git a/messages/fr.json b/messages/fr.json
index 9c1a433c0..38a840ea8 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -3509,18 +3509,6 @@
       "description": "À quel point votre corps a récupéré : les signaux de récupération, de charge et d'effort que votre wearable enregistre la nuit.",
       "emptyTitle": "Pas encore de données de récupération",
       "empty": "Pas encore de données de récupération. Connectez un compte WHOOP, Polar ou Oura et ces scores se rempliront dès que votre appareil se synchronise.",
-      "recharge": {
-        "title": "Recharge",
-        "subtitle": "Charge du système nerveux autonome"
-      },
-      "strain": {
-        "title": "Effort et charge",
-        "subtitle": "Charge cardiovasculaire quotidienne"
-      },
-      "cardio": {
-        "title": "Cœur et énergie du jour",
-        "subtitle": "Totaux cardiaques et énergétiques de la journée"
-      },
       "block": {
         "ansChargeExplainer": "À quel point votre système nerveux autonome est rechargé pour la journée — une mesure de recharge issue de vos signaux nocturnes de cœur et de respiration.",
         "dayStrainExplainer": "La charge cardiovasculaire de la journée sur l'échelle d'effort de votre appareil. Lisez-la au regard de votre récupération, pas comme un objectif en soi.",
diff --git a/messages/it.json b/messages/it.json
index 77ba27740..489c26670 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -3509,18 +3509,6 @@
       "description": "Quanto bene il tuo corpo si è ripreso: i segnali di recupero, sforzo e carico che il tuo wearable registra durante la notte.",
       "emptyTitle": "Ancora nessun dato di recupero",
       "empty": "Ancora nessun dato di recupero. Collega un account WHOOP, Polar o Oura e questi punteggi si popoleranno appena il dispositivo si sincronizza.",
-      "recharge": {
-        "title": "Ricarica",
-        "subtitle": "Carica del sistema nervoso autonomo"
-      },
-      "strain": {
-        "title": "Sforzo e carico",
-        "subtitle": "Carico cardiovascolare giornaliero"
-      },
-      "cardio": {
-        "title": "Cuore ed energia del giorno",
-        "subtitle": "Totali cardiaci ed energetici dell'intera giornata"
-      },
       "block": {
         "ansChargeExplainer": "Quanto è carico il tuo sistema nervoso autonomo per la giornata — una lettura di ricarica ricavata dai segnali notturni di cuore e respiro.",
         "dayStrainExplainer": "Il carico cardiovascolare della giornata sulla scala di sforzo del tuo dispositivo. Leggilo in rapporto al tuo recupero, non come obiettivo a sé.",
diff --git a/messages/pl.json b/messages/pl.json
index 6bd2a8336..9b66dda9e 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -3509,18 +3509,6 @@
       "description": "Jak dobrze Twój organizm się zregenerował – sygnały regeneracji, obciążenia i load, które Twoje urządzenie rejestruje w nocy.",
       "emptyTitle": "Brak danych o regeneracji",
       "empty": "Brak danych o regeneracji. Połącz konto WHOOP, Polar lub Oura, a te wyniki uzupełnią się po synchronizacji urządzenia.",
-      "recharge": {
-        "title": "Recharge",
-        "subtitle": "Ładowanie autonomicznego układu nerwowego"
-      },
-      "strain": {
-        "title": "Obciążenie i load",
-        "subtitle": "Dzienne obciążenie sercowo-naczyniowe"
-      },
-      "cardio": {
-        "title": "Serce i energia w ciągu dnia",
-        "subtitle": "Całodobowe sumy sercowe i energetyczne"
-      },
       "block": {
         "ansChargeExplainer": "Jak naładowany jest Twój autonomiczny układ nerwowy na dany dzień — odczyt regeneracji oparty na nocnych sygnałach serca i oddechu.",
         "dayStrainExplainer": "Dzienne obciążenie sercowo-naczyniowe na skali wysiłku Twojego urządzenia. Odczytuj je w odniesieniu do regeneracji, nie jako cel sam w sobie.",
diff --git a/src/components/insights/__tests__/device-score-surfaces.test.tsx b/src/components/insights/__tests__/device-score-surfaces.test.tsx
index 73ae8e968..0018b2cab 100644
--- a/src/components/insights/__tests__/device-score-surfaces.test.tsx
+++ b/src/components/insights/__tests__/device-score-surfaces.test.tsx
@@ -206,7 +206,7 @@ describe("<RecoverySection> data-gating", () => {
     // Routed through the shared <EmptyState> (dashed bordered card), not the
     // old hand-rolled div — the empty title comes from the unified primitive.
     expect(html).toContain("border-dashed");
-    expect(html).not.toContain('data-slot="recovery-group-strain"');
+    expect(html).not.toContain('data-slot="recovery-block-DAY_STRAIN"');
   });
 
   it("renders a canonical chart block for the present signal", () => {
@@ -218,13 +218,18 @@ describe("<RecoverySection> data-gating", () => {
       }),
     );
     const html = render(<RecoverySection />);
-    expect(html).toContain('data-slot="recovery-group-strain"');
+    // v1.18.6 — the per-group sub-headings are gone; present blocks render as
+    // one flat stack. The data gate now reads at the block level.
     expect(html).toContain('data-slot="recovery-block-DAY_STRAIN"');
     // B3 — the redundant "Recovery score" cross-link block is gone; this
     // surface is reached from the overview already.
     expect(html).not.toContain('data-slot="recovery-score-link"');
-    // The recharge group (ANS charge only) has no data → hidden.
-    expect(html).not.toContain('data-slot="recovery-group-recharge"');
+    // The recharge group's only signal (ANS charge) has no data → its block
+    // is dropped.
+    expect(html).not.toContain('data-slot="recovery-block-ANS_CHARGE"');
+    // The removed sub-headings must not reappear.
+    expect(html).not.toContain('data-slot="recovery-group-strain"');
+    expect(html).not.toContain("Strain &amp; load");
     // Empty note must not show when at least one signal is present.
     expect(html).not.toContain('data-slot="recovery-empty"');
   });
diff --git a/src/components/insights/recovery/recovery-metric-block.tsx b/src/components/insights/recovery/recovery-metric-block.tsx
index 09265d492..88527e76e 100644
--- a/src/components/insights/recovery/recovery-metric-block.tsx
+++ b/src/components/insights/recovery/recovery-metric-block.tsx
@@ -77,12 +77,12 @@ export function RecoveryMetricBlock({
             className="text-muted-foreground size-4 shrink-0"
             aria-hidden="true"
           />
-          {/* v1.18.1 — block title is an `<h3>` (kept at `text-base`): it
-              nests under the group `SectionHeading` `<h2>`, which itself
-              sits under the page `<h1>` from `SubPageShell`. Demoting it
-              keeps the recovery page's heading outline strictly nested
-              (h1 → h2 → h3) instead of stacking two sibling `<h2>`s. */}
-          <h3 className="text-base font-semibold">{title}</h3>
+          {/* v1.18.6 — block title is an `<h2>` (at `text-base`): the per-group
+              sub-headings were removed, so each block now sits directly under
+              the page `<h1>` from `SubPageShell`. Promoting it from `<h3>` keeps
+              the recovery page's heading outline strictly nested (h1 → h2)
+              with no skipped level. */}
+          <h2 className="text-base font-semibold">{title}</h2>
         </div>
         <p className="text-muted-foreground text-sm leading-relaxed">
           {explainer}
diff --git a/src/components/insights/recovery/recovery-section.tsx b/src/components/insights/recovery/recovery-section.tsx
index 9fa4ba138..701442858 100644
--- a/src/components/insights/recovery/recovery-section.tsx
+++ b/src/components/insights/recovery/recovery-section.tsx
@@ -14,7 +14,6 @@ import { useInsightsAnalytics } from "@/hooks/use-insights-analytics";
 import { useAnalyticsQuery } from "@/lib/queries/use-analytics-query";
 import { useTranslations } from "@/lib/i18n/context";
 import { EmptyState } from "@/components/ui/empty-state";
-import { SectionHeading } from "@/components/insights/section-heading";
 import { ChartSkeleton } from "@/components/charts/chart-skeleton";
 import { RestModeBanner } from "@/components/insights/rest-mode-banner";
 import type { RestModeAnnotation } from "@/lib/analytics/health-score";
@@ -36,9 +35,6 @@ interface BlockSpec {
 
 interface BlockGroup {
   key: string;
-  headingIcon: typeof Activity;
-  title: string;
-  subtitle: string;
   blocks: BlockSpec[];
 }
 
@@ -84,9 +80,6 @@ export function RecoverySection() {
   const groups: BlockGroup[] = [
     {
       key: "recharge",
-      headingIcon: Battery,
-      title: t("insights.recovery.recharge.title"),
-      subtitle: t("insights.recovery.recharge.subtitle"),
       blocks: [
         {
           type: "ANS_CHARGE",
@@ -103,9 +96,6 @@ export function RecoverySection() {
     },
     {
       key: "strain",
-      headingIcon: Gauge,
-      title: t("insights.recovery.strain.title"),
-      subtitle: t("insights.recovery.strain.subtitle"),
       blocks: [
         {
           type: "DAY_STRAIN",
@@ -143,9 +133,6 @@ export function RecoverySection() {
     },
     {
       key: "cardio",
-      headingIcon: HeartPulse,
-      title: t("insights.recovery.cardio.title"),
-      subtitle: t("insights.recovery.cardio.subtitle"),
       blocks: [
         {
           type: "AVERAGE_HEART_RATE",
@@ -190,10 +177,6 @@ export function RecoverySection() {
   if (isLoading || summaries == null) {
     return (
       <div className="space-y-3" data-slot="recovery-loading">
-        <SectionHeading
-          icon={Battery}
-          title={t("insights.recovery.recharge.title")}
-        />
         <ChartSkeleton />
       </div>
     );
@@ -210,51 +193,36 @@ export function RecoverySection() {
     );
   }
 
+  // v1.18.6 — the per-group sub-headings ("Recharge" / "Strain & load" /
+  // "Daily heart & energy") are gone: read next to the page's "Erholung"
+  // heading they were redundant chrome. The groups still drive ORDER + the
+  // data gate (a group with no present block contributes nothing); their
+  // present blocks now render as one flat, evenly-spaced stack, each block
+  // carrying its own title + explainer so nothing loses context.
+  const presentBlocks = groups.flatMap((group) =>
+    group.blocks.filter((block) => (summaries[block.type]?.count ?? 0) > 0),
+  );
+
   return (
     <div className="space-y-8" data-slot="recovery-section">
       {/* v1.18.1 — calm Rest Mode cue at the head of the recovery surface.
           Self-gating: renders nothing unless an episode is active. */}
       <RestModeBanner annotation={restMode} />
-      {groups.map((group) => {
-        const present = group.blocks.filter(
-          (block) => (summaries[block.type]?.count ?? 0) > 0,
-        );
-        if (present.length === 0) return null;
-        return (
-          <section
-            key={group.key}
-            data-slot={`recovery-group-${group.key}`}
-            className="space-y-4"
-          >
-            <SectionHeading
-              icon={group.headingIcon}
-              title={group.title}
-              action={
-                <p className="text-muted-foreground text-xs">
-                  {group.subtitle}
-                </p>
-              }
-            />
-            <div className="space-y-8">
-              {present.map((block) => (
-                <RecoveryMetricBlock
-                  key={block.type}
-                  type={block.type}
-                  chartKey={block.chartKey}
-                  statusMetric={block.statusMetric}
-                  title={block.title}
-                  explainer={block.explainer}
-                  icon={block.icon}
-                  color={block.color}
-                  unit={block.unit}
-                  summary={summaries[block.type] ?? null}
-                  fractionDigits={block.fractionDigits}
-                />
-              ))}
-            </div>
-          </section>
-        );
-      })}
+      {presentBlocks.map((block) => (
+        <RecoveryMetricBlock
+          key={block.type}
+          type={block.type}
+          chartKey={block.chartKey}
+          statusMetric={block.statusMetric}
+          title={block.title}
+          explainer={block.explainer}
+          icon={block.icon}
+          color={block.color}
+          unit={block.unit}
+          summary={summaries[block.type] ?? null}
+          fractionDigits={block.fractionDigits}
+        />
+      ))}
     </div>
   );
 }

From 34fbfe1c67ff32a10edcd738a064bd543e963f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:24:02 +0200
Subject: [PATCH 51/71] feat(insights): link the overview Trends cards to their
 detail pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The overview charted each trend but never offered a way into the metric's
detail page — the steps page in particular exists and is used, yet Insights
never linked to it. Give every Trends-row chart a routed detail target and a
discreet "view details" link below the caption, so a metric the row surfaces
(steps included, when the briefing flags it) drills into /insights/<slug>.
---
 messages/de.json                              |  3 ++-
 messages/en.json                              |  3 ++-
 messages/es.json                              |  3 ++-
 messages/fr.json                              |  3 ++-
 messages/it.json                              |  3 ++-
 messages/pl.json                              |  3 ++-
 .../insights/__tests__/trends-row.test.tsx    | 18 +++++++++++++++
 src/components/insights/trends-row.tsx        | 19 +++++++++++++++-
 .../__tests__/trend-chart-select.test.ts      | 13 +++++++++++
 src/lib/insights/trend-chart-select.ts        | 22 +++++++++++++++++++
 10 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 6e9a48271..db398f369 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2029,7 +2029,8 @@
         "distance": "Geh- und Laufstrecke der letzten 30 Tage.",
         "vo2_max": "VO₂max der letzten 30 Tage.",
         "body_temp": "Körpertemperatur der letzten 30 Tage."
-      }
+      },
+      "viewDetail": "{metric} im Detail"
     },
     "vo2Max": {
       "statLatest": "Aktuell",
diff --git a/messages/en.json b/messages/en.json
index c33810296..d8373bc5f 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2029,7 +2029,8 @@
         "distance": "Walking and running distance over the last 30 days.",
         "vo2_max": "VO₂ max over the last 30 days.",
         "body_temp": "Body temperature over the last 30 days."
-      }
+      },
+      "viewDetail": "View {metric} details"
     },
     "vo2Max": {
       "statLatest": "Latest",
diff --git a/messages/es.json b/messages/es.json
index 0a1b03839..4c76e91d2 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2029,7 +2029,8 @@
         "distance": "Distancia caminando y corriendo de los últimos 30 días.",
         "vo2_max": "VO₂ máx de los últimos 30 días.",
         "body_temp": "Temperatura corporal de los últimos 30 días."
-      }
+      },
+      "viewDetail": "Ver detalles de {metric}"
     },
     "vo2Max": {
       "statLatest": "Actual",
diff --git a/messages/fr.json b/messages/fr.json
index 38a840ea8..52691bd65 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2029,7 +2029,8 @@
         "distance": "Distance de marche et de course des 30 derniers jours.",
         "vo2_max": "VO₂ max des 30 derniers jours.",
         "body_temp": "Température corporelle des 30 derniers jours."
-      }
+      },
+      "viewDetail": "Voir le détail de {metric}"
     },
     "vo2Max": {
       "statLatest": "Actuel",
diff --git a/messages/it.json b/messages/it.json
index 489c26670..d53d58a54 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2029,7 +2029,8 @@
         "distance": "Distanza a piedi e di corsa degli ultimi 30 giorni.",
         "vo2_max": "VO₂ max degli ultimi 30 giorni.",
         "body_temp": "Temperatura corporea degli ultimi 30 giorni."
-      }
+      },
+      "viewDetail": "Vedi i dettagli di {metric}"
     },
     "vo2Max": {
       "statLatest": "Attuale",
diff --git a/messages/pl.json b/messages/pl.json
index 9b66dda9e..a6e7821c5 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2029,7 +2029,8 @@
         "distance": "Dystans marszu i biegu z ostatnich 30 dni.",
         "vo2_max": "VO₂ max z ostatnich 30 dni.",
         "body_temp": "Temperatura ciała z ostatnich 30 dni."
-      }
+      },
+      "viewDetail": "Zobacz szczegóły: {metric}"
     },
     "vo2Max": {
       "statLatest": "Aktualne",
diff --git a/src/components/insights/__tests__/trends-row.test.tsx b/src/components/insights/__tests__/trends-row.test.tsx
index 05f33aaa0..34e1fe848 100644
--- a/src/components/insights/__tests__/trends-row.test.tsx
+++ b/src/components/insights/__tests__/trends-row.test.tsx
@@ -284,4 +284,22 @@ describe("<TrendsRow>", () => {
     expect(html).toContain("Moderate confidence");
     expect(html).toContain("Low confidence");
   });
+
+  // ── v1.18.6 — detail-page cross-links (the Insights→steps gap) ──────
+  it("links each metric card to its detail page", () => {
+    const html = render(<TrendsRow />);
+    // The default BP / weight / mood triple each link to their sub-page.
+    expect(html).toContain('data-slot="trends-row-detail-link"');
+    expect(html).toContain('href="/insights/blood-pressure"');
+    expect(html).toContain('href="/insights/weight"');
+    expect(html).toContain('href="/insights/mood"');
+  });
+
+  it("offers the steps detail link when the briefing flags steps", () => {
+    // Steps has a routed sub-page but the overview never linked to it; a
+    // briefing finding on steps now charts it AND drills into /insights/steps.
+    const html = render(<TrendsRow briefing={briefing(["steps"])} />);
+    expect(html).toMatch(/data-metric="steps"/);
+    expect(html).toContain('href="/insights/steps"');
+  });
 });
diff --git a/src/components/insights/trends-row.tsx b/src/components/insights/trends-row.tsx
index 5b9bcac4b..5bc1c51b3 100644
--- a/src/components/insights/trends-row.tsx
+++ b/src/components/insights/trends-row.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import dynamic from "next/dynamic";
-import { TrendingUp } from "lucide-react";
+import Link from "next/link";
+import { ArrowRight, TrendingUp } from "lucide-react";
 import { useTranslations } from "@/lib/i18n/context";
 import { useAuth } from "@/hooks/use-auth";
 import { ChartSkeleton } from "@/components/charts/chart-skeleton";
@@ -301,6 +302,22 @@ export function TrendsRow({
                   text={t(config.captionKey)}
                 />
               )}
+              {/* v1.18.6 — drill-in link to the metric's detail page. The
+                  overview charted these metrics but never offered a way INTO
+                  their detail pages — notably the steps page, which exists and
+                  is used but was unreachable from Insights. The link sits below
+                  the caption so the chart keeps its own interactions. */}
+              {config.detailHref ? (
+                <Link
+                  href={config.detailHref}
+                  data-slot="trends-row-detail-link"
+                  data-metric={config.metric}
+                  className="text-muted-foreground hover:text-foreground mt-auto inline-flex items-center gap-1 self-start text-xs font-medium transition-colors"
+                >
+                  {t("insights.trendsRow.viewDetail", { metric: title })}
+                  <ArrowRight className="h-3.5 w-3.5" aria-hidden="true" />
+                </Link>
+              ) : null}
             </div>
           );
         })}
diff --git a/src/lib/insights/__tests__/trend-chart-select.test.ts b/src/lib/insights/__tests__/trend-chart-select.test.ts
index 02a3317f4..fa1d12437 100644
--- a/src/lib/insights/__tests__/trend-chart-select.test.ts
+++ b/src/lib/insights/__tests__/trend-chart-select.test.ts
@@ -151,4 +151,17 @@ describe("selectTrendCharts", () => {
       }
     }
   });
+
+  it("every chart-bearing sourceMetric carries a routed detailHref", () => {
+    // v1.18.6 — the overview Trends row drills into the metric's detail page.
+    // Each chartable slot must resolve to a `/insights/<slug>` target so the
+    // cross-link never lands on a non-route — steps in particular.
+    for (const [metric, config] of Object.entries(TREND_CHART_CONFIG)) {
+      if (!config) continue;
+      expect(config.detailHref, `${metric} detailHref`).toMatch(
+        /^\/insights\//,
+      );
+    }
+    expect(TREND_CHART_CONFIG.steps?.detailHref).toBe("/insights/steps");
+  });
 });
diff --git a/src/lib/insights/trend-chart-select.ts b/src/lib/insights/trend-chart-select.ts
index 8bcb85dd2..73c7b63ff 100644
--- a/src/lib/insights/trend-chart-select.ts
+++ b/src/lib/insights/trend-chart-select.ts
@@ -74,6 +74,15 @@ export interface TrendChartConfig {
    * for additive metrics, which fall back to {@link captionKey}.
    */
   annotationKey?: TrendAnnotationKey;
+  /**
+   * Routed detail page for the metric (`/insights/<slug>`), when one exists.
+   * The Trends-row card links to it so the overview can drill into the metric
+   * — notably the one cross-link to `/insights/steps`, which the overview
+   * otherwise never offered despite the steps page existing and being used.
+   * Omitted for slots with no dedicated page (mood routes through its own
+   * surface; metabolic re-frames live on their composite pages).
+   */
+  detailHref?: string;
 }
 
 /**
@@ -100,6 +109,7 @@ export const TREND_CHART_CONFIG: Record<
     titleKey: "charts.bloodPressure",
     captionKey: "insights.trendsRow.caption.bp",
     annotationKey: "bp",
+    detailHref: "/insights/blood-pressure",
   },
   weight: {
     metric: "weight",
@@ -110,6 +120,7 @@ export const TREND_CHART_CONFIG: Record<
     titleKey: "charts.weight",
     captionKey: "insights.trendsRow.caption.weight",
     annotationKey: "weight",
+    detailHref: "/insights/weight",
   },
   pulse: {
     metric: "pulse",
@@ -120,6 +131,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "bpm",
     titleKey: "charts.pulse",
     captionKey: "insights.trendsRow.caption.pulse",
+    detailHref: "/insights/pulse",
   },
   mood: {
     metric: "mood",
@@ -129,6 +141,7 @@ export const TREND_CHART_CONFIG: Record<
     titleKey: "charts.mood",
     captionKey: "insights.trendsRow.caption.mood",
     annotationKey: "mood",
+    detailHref: "/insights/mood",
   },
   sleep: {
     metric: "sleep",
@@ -139,6 +152,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "h",
     titleKey: "charts.sleep",
     captionKey: "insights.trendsRow.caption.sleep",
+    detailHref: "/insights/sleep",
   },
   steps: {
     metric: "steps",
@@ -149,6 +163,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "steps",
     titleKey: "charts.steps",
     captionKey: "insights.trendsRow.caption.steps",
+    detailHref: "/insights/steps",
   },
   hrv: {
     metric: "hrv",
@@ -159,6 +174,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "ms",
     titleKey: "charts.hrv",
     captionKey: "insights.trendsRow.caption.hrv",
+    detailHref: "/insights/hrv",
   },
   resting_hr: {
     metric: "resting_hr",
@@ -169,6 +185,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "bpm",
     titleKey: "charts.restingHeartRate",
     captionKey: "insights.trendsRow.caption.resting_hr",
+    detailHref: "/insights/resting-pulse",
   },
   active_energy: {
     metric: "active_energy",
@@ -179,6 +196,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "kcal",
     titleKey: "charts.activeEnergy",
     captionKey: "insights.trendsRow.caption.active_energy",
+    detailHref: "/insights/active-energy",
   },
   flights: {
     metric: "flights",
@@ -189,6 +207,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "flights",
     titleKey: "charts.flights",
     captionKey: "insights.trendsRow.caption.flights",
+    detailHref: "/insights/flights-climbed",
   },
   distance: {
     metric: "distance",
@@ -199,6 +218,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "km",
     titleKey: "charts.distance",
     captionKey: "insights.trendsRow.caption.distance",
+    detailHref: "/insights/walking-distance",
   },
   vo2_max: {
     metric: "vo2_max",
@@ -209,6 +229,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "mL/kg·min",
     titleKey: "charts.vo2Max",
     captionKey: "insights.trendsRow.caption.vo2_max",
+    detailHref: "/insights/cardio-fitness",
   },
   body_temp: {
     metric: "body_temp",
@@ -219,6 +240,7 @@ export const TREND_CHART_CONFIG: Record<
     yAxisUnit: "°C",
     titleKey: "charts.bodyTemperature",
     captionKey: "insights.trendsRow.caption.body_temp",
+    detailHref: "/insights/body-temperature",
   },
   // Adherence-context findings — no single plottable trend series in
   // this row. A finding on one of these is skipped during selection so

From 33d7d103da764e7033371bdae55abf8355f145a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:28:33 +0200
Subject: [PATCH 52/71] feat(settings): standardize settings and admin section
 framing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce a shared SettingsSectionFrame (the settings twin of the admin
renderer's SectionFrame) that emits the canonical visible heading +
subheading, and route all 19 settings sections through it. Every settings
page now shows a real h1 + subtitle in the reference Übersicht style
instead of an invisible sr-only title; the section bodies drop their own
headings and off-style intro paragraphs (the explanatory copy folds into
the frame subtitle).

- Route the admin About page through SectionFrame so it carries the same
  visible heading as every other admin section.
- Rename the AI settings section from KI-Auswertung to KI-Anbieter across
  six locales: the page configures the provider and key, not an analysis.
- Add a heading-block spacer to the settings and admin sidebars so the
  first menu item lines up with the top of the first card.
- Remove the always-on core-domains card from Module: a tracking area that
  can't be turned off doesn't need listing.
- Move the proactive-coach control out of Benachrichtigungen into Coach.
- Move admin module availability out of the Coach section into its own
  page: it gates every module, not just the coach.
- Give the Layout Insights editor a proper Insights heading.

Adds settings.sections.<slug>.subtitle and the new admin keys across all
six locales; removes the now-unused module core-domain strings.
---
 messages/de.json                              |  87 +++++-----
 messages/en.json                              |  87 +++++-----
 messages/es.json                              |  87 +++++-----
 messages/fr.json                              |  87 +++++-----
 messages/it.json                              |  87 +++++-----
 messages/pl.json                              |  87 +++++-----
 src/app/admin/[section]/renderer.tsx          |  34 +++-
 src/app/settings/[section]/page.tsx           |  60 ++++++-
 src/components/admin/admin-shell.tsx          |  12 ++
 src/components/admin/section-slugs.ts         |  12 +-
 .../settings/__tests__/coach-section.test.tsx |  10 +-
 .../__tests__/export-section.test.tsx         |   9 +-
 .../gesundheitsakte-section.test.tsx          |  11 +-
 .../__tests__/medications-section.test.tsx    |   7 +-
 .../__tests__/modules-section.test.tsx        |  41 ++---
 .../settings/__tests__/mood-section.test.tsx  |   7 +-
 ...tifications-section-module-gating.test.tsx |  34 ++--
 .../__tests__/sections-i18n-parity.test.ts    |  32 ++--
 .../settings/__tests__/sections.test.tsx      |  67 +++++---
 .../__tests__/settings-shell.test.tsx         |   6 +-
 src/components/settings/about-section.tsx     |  17 +-
 src/components/settings/account-section.tsx   |  18 +-
 src/components/settings/advanced-section.tsx  |  18 +-
 src/components/settings/ai-section.tsx        |  21 +--
 src/components/settings/api-section.tsx       |  14 +-
 src/components/settings/channels-section.tsx  |  25 +--
 src/components/settings/coach-section.tsx     |  38 +++--
 src/components/settings/dashboard-section.tsx |  29 +---
 src/components/settings/export-section.tsx    |  16 +-
 .../settings/gesundheitsakte-section.tsx      |  30 +---
 src/components/settings/insights-section.tsx  |  26 +--
 .../settings/integrations-section.tsx         |  29 +---
 src/components/settings/layout-section.tsx    |  73 ++++----
 .../settings/medications-section.tsx          |  15 +-
 src/components/settings/modules-section.tsx   | 158 ++++++------------
 src/components/settings/mood-section.tsx      |  15 +-
 .../settings/notifications-section.tsx        |  42 ++---
 .../settings/section-nav-heading-spacer.tsx   |  25 +++
 .../settings/settings-section-frame.tsx       |  74 ++++++++
 src/components/settings/settings-shell.tsx    |   8 +-
 src/components/settings/sources-section.tsx   |  46 +++--
 .../settings/thresholds-section.tsx           |  23 +--
 42 files changed, 822 insertions(+), 802 deletions(-)
 create mode 100644 src/components/settings/section-nav-heading-spacer.tsx
 create mode 100644 src/components/settings/settings-section-frame.tsx

diff --git a/messages/de.json b/messages/de.json
index 3dcc80763..b9a9a1292 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Konto",
-        "description": "Profil, Passwort, Passkeys und deine Onboarding-Tour."
+        "description": "Profil, Passwort, Passkeys und deine Onboarding-Tour.",
+        "subtitle": "Dein Profil, deine Identität und deine Anmeldedaten."
       },
       "integrations": {
         "title": "Integrationen",
-        "description": "Verbundene Dienste, Zustellkanäle und die Quellen-Priorität an einem Ort."
+        "description": "Verbundene Dienste, Zustellkanäle und die Quellen-Priorität an einem Ort.",
+        "subtitle": "Datenquellen und Geräte verbinden und verwalten."
       },
       "notifications": {
         "title": "Benachrichtigungen",
         "description": "Alle Erinnerungen an einem Ort — was wann erinnert wird. Die Zustellkanäle liegen unter Integrationen.",
         "channelsHint": "Telegram, ntfy, Web-Push, Webhook und E-Mail richtest du jetzt unter",
         "channelsHintLink": "Integrationen → Kanäle",
-        "inboxLink": "Posteingang öffnen"
+        "inboxLink": "Posteingang öffnen",
+        "subtitle": "Wähle, welche Erinnerungen du erhältst."
       },
       "layout": {
         "title": "Layout",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Insights",
           "description": "Reihenfolge der Übersicht und der Navigations-Pills."
-        }
+        },
+        "subtitle": "Passe an, wie Dashboard und Insights angeordnet sind."
       },
       "dashboard": {
         "title": "Dashboard",
-        "description": "Kachel-Layout und Reihenfolge."
+        "description": "Kachel-Layout und Reihenfolge.",
+        "subtitle": "Ordne die Kacheln auf deinem Dashboard an."
       },
       "thresholds": {
         "title": "Zielwerte",
-        "description": "Pro Metrik dein eigener Zielbereich für gesunde Werte."
+        "description": "Pro Metrik dein eigener Zielbereich für gesunde Werte.",
+        "subtitle": "Lege deine persönlichen Zielbereiche je Messgröße fest."
       },
       "sources": {
         "title": "Quellen-Priorität",
@@ -3869,19 +3875,23 @@
           "scale": "Waage",
           "other": "Sonstige",
           "unknown": "Unbekannt"
-        }
+        },
+        "subtitle": "Lege fest, welche Quelle gewinnt, wenn zwei dieselbe Messgröße liefern."
       },
       "ai": {
-        "title": "KI-Auswertungen",
-        "description": "Provider, Modell und API-Key für die Auswertungen — dazu dein „Über mich“-Kontext."
+        "title": "KI-Anbieter",
+        "description": "Provider, Modell und API-Key für die Auswertungen — dazu dein „Über mich“-Kontext.",
+        "subtitle": "Wähle deinen KI-Anbieter und hinterlege deinen eigenen Schlüssel."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Bearer-Tokens für eigene Skripte und Apps — erfasse Messwerte oder Einnahmen von überall."
+        "description": "Bearer-Tokens für eigene Skripte und Apps — erfasse Messwerte oder Einnahmen von überall.",
+        "subtitle": "API-Endpunkte und Zugriffstoken verwalten."
       },
       "advanced": {
         "title": "Erweitert",
-        "description": "Opt-in-Schalter für den Forschungsmodus sowie der Notausgang zum unwiderruflichen Löschen aller Gesundheitsdaten."
+        "description": "Opt-in-Schalter für den Forschungsmodus sowie der Notausgang zum unwiderruflichen Löschen aller Gesundheitsdaten.",
+        "subtitle": "Research-Modus, Daten zurücksetzen und Konto löschen."
       },
       "export": {
         "title": "Export & Import",
@@ -3982,27 +3992,33 @@
             "resultSummary": "{inserted} neu importiert und {updated} aktualisiert, {skipped} übersprungen.",
             "rowError": "Zeile {line}: {reason}"
           }
-        }
+        },
+        "subtitle": "Exportiere deine Daten oder importiere aus einer Sicherung."
       },
       "about": {
         "title": "Über diese App",
-        "description": "Version, Lizenz, Links."
+        "description": "Version, Lizenz, Links.",
+        "subtitle": "Version, Lizenz und Projektlinks."
       },
       "sharing": {
         "title": "Freigabe",
-        "description": "Erstelle einen schreibgeschützten Link, um deine Gesundheitsakte mit einer Ärztin oder einem Arzt zu teilen."
+        "description": "Erstelle einen schreibgeschützten Link, um deine Gesundheitsakte mit einer Ärztin oder einem Arzt zu teilen.",
+        "subtitle": "Teile schreibgeschützten Zugriff auf deine Daten."
       },
       "insights": {
         "title": "Insights",
-        "description": "Reihenfolge der Übersicht und der Navigations-Pills."
+        "description": "Reihenfolge der Übersicht und der Navigations-Pills.",
+        "subtitle": "Ordne die Übersichts-Bereiche und die Reihenfolge der Pills an."
       },
       "medications": {
         "title": "Medikamente",
-        "description": "Listenansicht, Reihenfolge und Injektionsstellen deiner Medikamente."
+        "description": "Listenansicht, Reihenfolge und Injektionsstellen deiner Medikamente.",
+        "subtitle": "Verwalte Ansicht und Reihenfolge deiner Medikamentenliste."
       },
       "mood": {
         "title": "Stimmungs-Tags",
-        "description": "Gruppen, Tags und archivierte Tags der Stimmungs-Auswahl."
+        "description": "Gruppen, Tags und archivierte Tags der Stimmungs-Auswahl.",
+        "subtitle": "Organisiere deine Stimmungs-Tags, Gruppen und Auswahlreihenfolge."
       },
       "modules": {
         "title": "Module",
@@ -4012,26 +4028,24 @@
           "title": "Was du trackst",
           "description": "Optionale Bereiche. Deaktivierte Module verschwinden aus Navigation, Kacheln und Auswertungen — deine Daten bleiben erhalten."
         },
-        "core": {
-          "title": "Immer aktiv",
-          "description": "Die Grundlagen von HealthLog. Diese Bereiche lassen sich nicht abschalten.",
-          "note": "Kernbereich — immer aktiv"
-        },
-        "description": "Lege fest, was HealthLog für dich erfasst. Schalte einzelne Bereiche ein oder aus — die Navigation, Kacheln und Auswertungen passen sich sofort an.",
         "manageIn": "In {section} verwalten",
-        "operatorDisabled": "Serverweit deaktiviert"
+        "operatorDisabled": "Serverweit deaktiviert",
+        "subtitle": "Lege fest, welche Tracking-Bereiche HealthLog überall anzeigt."
       },
       "gesundheitsakte": {
         "title": "Gesundheitsakte",
-        "description": "Vollständige Gesundheitsakte als PDF, FHIR R4 oder kombiniertes ZIP-Paket exportieren."
+        "description": "Vollständige Gesundheitsakte als PDF, FHIR R4 oder kombiniertes ZIP-Paket exportieren.",
+        "subtitle": "Exportiere eine vollständige, arzttaugliche Gesundheitsakte."
       },
       "coach": {
         "title": "Coach",
-        "description": "Coach aktivieren, Ton und Umfang, gespeicherte Erinnerungen."
+        "description": "Coach aktivieren, Ton und Umfang, gespeicherte Erinnerungen.",
+        "subtitle": "Stelle den Coach, seine proaktiven Hinweise und sein Gedächtnis ein."
       },
       "channels": {
         "title": "Kanäle",
-        "description": "Zustellung über Telegram, ntfy, Web-Push, Webhook und E-Mail."
+        "description": "Zustellung über Telegram, ntfy, Web-Push, Webhook und E-Mail.",
+        "subtitle": "Wohin Erinnerungen und Hinweise zugestellt werden."
       }
     },
     "profile": "Profil",
@@ -5291,7 +5305,12 @@
         "subtitle": "Destruktive systemweite Operationen."
       },
       "about": {
-        "title": "Über"
+        "title": "Über",
+        "subtitle": "Version, Lizenz und Update-Status."
+      },
+      "module-availability": {
+        "title": "Modulverfügbarkeit",
+        "subtitle": "Module für jedes Konto auf diesem Server aktivieren oder deaktivieren."
       }
     },
     "carrier": "Anbieter",
@@ -6588,18 +6607,6 @@
       "label": "Arztbericht",
       "description": "PDF- und FHIR-Export für deine Praxis."
     },
-    "weight": {
-      "label": "Gewicht",
-      "description": "Gewicht und Körperzusammensetzung."
-    },
-    "bloodPressure": {
-      "label": "Blutdruck",
-      "description": "Systolisch und diastolisch."
-    },
-    "pulse": {
-      "label": "Puls",
-      "description": "Ruhepuls und Herzfrequenz."
-    },
     "medications": {
       "label": "Medikamente",
       "description": "Pläne, Einnahmen und Compliance."
diff --git a/messages/en.json b/messages/en.json
index a87949920..8b8f063d4 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Account",
-        "description": "Profile, password, passkeys, and your onboarding tour."
+        "description": "Profile, password, passkeys, and your onboarding tour.",
+        "subtitle": "Your profile, identity, and sign-in details."
       },
       "integrations": {
         "title": "Integrations",
-        "description": "Connected services, delivery channels, and source priority in one place."
+        "description": "Connected services, delivery channels, and source priority in one place.",
+        "subtitle": "Connect and manage your data sources and devices."
       },
       "notifications": {
         "title": "Notifications",
         "description": "Every reminder in one place — what gets reminded and when. The delivery channels live under Integrations.",
         "channelsHint": "Telegram, ntfy, Web Push, Webhook, and Email are now set up under",
         "channelsHintLink": "Integrations → Channels",
-        "inboxLink": "Open the inbox"
+        "inboxLink": "Open the inbox",
+        "subtitle": "Choose which reminders you receive."
       },
       "layout": {
         "title": "Layout",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Insights",
           "description": "Overview sections and navigation-pill order."
-        }
+        },
+        "subtitle": "Personalize how your dashboard and insights are arranged."
       },
       "dashboard": {
         "title": "Dashboard",
-        "description": "Tile layout and order."
+        "description": "Tile layout and order.",
+        "subtitle": "Arrange the tiles on your dashboard."
       },
       "thresholds": {
         "title": "Targets",
-        "description": "Per metric: your own target range for healthy values."
+        "description": "Per metric: your own target range for healthy values.",
+        "subtitle": "Set your personal target ranges per metric."
       },
       "sources": {
         "title": "Source priority",
@@ -3869,19 +3875,23 @@
           "scale": "Scale",
           "other": "Other",
           "unknown": "Unknown"
-        }
+        },
+        "subtitle": "Decide which source wins when two report the same metric."
       },
       "ai": {
-        "title": "AI Insights",
-        "description": "Provider, model, and API key for the insights — plus your “about me” context."
+        "title": "AI provider",
+        "description": "Provider, model, and API key for the insights — plus your “about me” context.",
+        "subtitle": "Choose your AI provider and bring your own key."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Bearer tokens for your own scripts and apps — log measurements or medication intake from anywhere."
+        "description": "Bearer tokens for your own scripts and apps — log measurements or medication intake from anywhere.",
+        "subtitle": "Manage API endpoints and access tokens."
       },
       "advanced": {
         "title": "Advanced",
-        "description": "Opt-in Research Mode toggle plus the account-wide danger zone for wiping every health record."
+        "description": "Opt-in Research Mode toggle plus the account-wide danger zone for wiping every health record.",
+        "subtitle": "Research mode, data reset, and account deletion."
       },
       "export": {
         "title": "Export & Import",
@@ -3982,27 +3992,33 @@
             "resultSummary": "Imported {inserted} new and updated {updated}, {skipped} skipped.",
             "rowError": "Line {line}: {reason}"
           }
-        }
+        },
+        "subtitle": "Export your data or import from a backup."
       },
       "about": {
         "title": "About this app",
-        "description": "Version, license, links."
+        "description": "Version, license, links.",
+        "subtitle": "Version, license, and project links."
       },
       "sharing": {
         "title": "Sharing",
-        "description": "Create a read-only link to share your health record with a clinician."
+        "description": "Create a read-only link to share your health record with a clinician.",
+        "subtitle": "Share read-only access to your data."
       },
       "insights": {
         "title": "Insights",
-        "description": "Overview and navigation-pill order."
+        "description": "Overview and navigation-pill order.",
+        "subtitle": "Arrange your overview sections and pill order."
       },
       "medications": {
         "title": "Medications",
-        "description": "List view, order, and injection sites for your medications."
+        "description": "List view, order, and injection sites for your medications.",
+        "subtitle": "Manage your medication list view and order."
       },
       "mood": {
         "title": "Mood tags",
-        "description": "Groups, tags, and archived tags for the mood picker."
+        "description": "Groups, tags, and archived tags for the mood picker.",
+        "subtitle": "Organize your mood tags, groups, and picker order."
       },
       "modules": {
         "title": "Modules",
@@ -4012,26 +4028,24 @@
           "title": "What you track",
           "description": "Optional areas. Disabled modules drop out of the navigation, tiles, and insights — your data stays untouched."
         },
-        "core": {
-          "title": "Always on",
-          "description": "HealthLog's foundations. These areas can't be turned off.",
-          "note": "Core area — always on"
-        },
-        "description": "Choose what HealthLog tracks for you. Turn individual areas on or off — the navigation, tiles, and insights adapt right away.",
         "manageIn": "Manage in {section}",
-        "operatorDisabled": "Disabled server-wide"
+        "operatorDisabled": "Disabled server-wide",
+        "subtitle": "Choose which tracking areas HealthLog shows across the app."
       },
       "gesundheitsakte": {
         "title": "Health record",
-        "description": "Export your full health record as PDF, FHIR R4, or a combined ZIP package."
+        "description": "Export your full health record as PDF, FHIR R4, or a combined ZIP package.",
+        "subtitle": "Export a complete, clinician-ready health record."
       },
       "coach": {
         "title": "Coach",
-        "description": "Enable the Coach, tone and scope, stored memories."
+        "description": "Enable the Coach, tone and scope, stored memories.",
+        "subtitle": "Tune the Coach, its proactive nudges, and its memory."
       },
       "channels": {
         "title": "Channels",
-        "description": "Telegram, ntfy, Web Push, Webhook, and Email delivery."
+        "description": "Telegram, ntfy, Web Push, Webhook, and Email delivery.",
+        "subtitle": "Where reminders and alerts are delivered."
       }
     },
     "profile": "Profile",
@@ -5291,7 +5305,12 @@
         "subtitle": "Destructive system-wide operations."
       },
       "about": {
-        "title": "About"
+        "title": "About",
+        "subtitle": "Version, license, and update status."
+      },
+      "module-availability": {
+        "title": "Module availability",
+        "subtitle": "Turn modules on or off for every account on this server."
       }
     },
     "carrier": "Carrier",
@@ -6588,18 +6607,6 @@
       "label": "Doctor report",
       "description": "PDF and FHIR export for your practice."
     },
-    "weight": {
-      "label": "Weight",
-      "description": "Weight and body composition."
-    },
-    "bloodPressure": {
-      "label": "Blood pressure",
-      "description": "Systolic and diastolic."
-    },
-    "pulse": {
-      "label": "Pulse",
-      "description": "Resting pulse and heart rate."
-    },
     "medications": {
       "label": "Medications",
       "description": "Schedules, intakes, and compliance."
diff --git a/messages/es.json b/messages/es.json
index 99b6d7782..ad87143c8 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Cuenta",
-        "description": "Perfil, contraseña, claves de acceso y tu recorrido de incorporación."
+        "description": "Perfil, contraseña, claves de acceso y tu recorrido de incorporación.",
+        "subtitle": "Tu perfil, identidad y datos de acceso."
       },
       "integrations": {
         "title": "Integraciones",
-        "description": "Servicios conectados, canales de entrega y prioridad de fuentes en un solo lugar."
+        "description": "Servicios conectados, canales de entrega y prioridad de fuentes en un solo lugar.",
+        "subtitle": "Conecta y gestiona tus fuentes de datos y dispositivos."
       },
       "notifications": {
         "title": "Notificaciones",
         "description": "Todos los recordatorios en un solo lugar: qué se recuerda y cuándo. Los canales de entrega están en Integraciones.",
         "channelsHint": "Telegram, ntfy, Web Push, Webhook y correo se configuran ahora en",
         "channelsHintLink": "Integraciones → Canales",
-        "inboxLink": "Abrir la bandeja de entrada"
+        "inboxLink": "Abrir la bandeja de entrada",
+        "subtitle": "Elige qué recordatorios recibes."
       },
       "layout": {
         "title": "Diseño",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Análisis",
           "description": "Orden de la vista general y de las pestañas de navegación."
-        }
+        },
+        "subtitle": "Personaliza cómo se organizan tu panel e insights."
       },
       "dashboard": {
         "title": "Panel",
-        "description": "Diseño y orden de los mosaicos."
+        "description": "Diseño y orden de los mosaicos.",
+        "subtitle": "Organiza los mosaicos de tu panel."
       },
       "thresholds": {
         "title": "Objetivos",
-        "description": "Por métrica: tu propio rango objetivo de valores saludables."
+        "description": "Por métrica: tu propio rango objetivo de valores saludables.",
+        "subtitle": "Define tus rangos objetivo personales por métrica."
       },
       "sources": {
         "title": "Prioridad de fuentes",
@@ -3869,19 +3875,23 @@
           "scale": "Báscula",
           "other": "Otro",
           "unknown": "Desconocido"
-        }
+        },
+        "subtitle": "Decide qué fuente prevalece cuando dos informan la misma métrica."
       },
       "ai": {
-        "title": "Análisis con IA",
-        "description": "Proveedor, modelo y clave API para los análisis, además de tu contexto «sobre mí»."
+        "title": "Proveedor de IA",
+        "description": "Proveedor, modelo y clave API para los análisis, además de tu contexto «sobre mí».",
+        "subtitle": "Elige tu proveedor de IA y usa tu propia clave."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Tokens Bearer para tus propios scripts y apps — registra mediciones o tomas de medicación desde cualquier lugar."
+        "description": "Tokens Bearer para tus propios scripts y apps — registra mediciones o tomas de medicación desde cualquier lugar.",
+        "subtitle": "Gestiona los endpoints de la API y los tokens de acceso."
       },
       "advanced": {
         "title": "Avanzado",
-        "description": "Activador opt-in del modo Investigación y zona de peligro para borrar irrevocablemente todos los registros de salud."
+        "description": "Activador opt-in del modo Investigación y zona de peligro para borrar irrevocablemente todos los registros de salud.",
+        "subtitle": "Modo investigación, restablecer datos y eliminar cuenta."
       },
       "export": {
         "title": "Exportar e importar",
@@ -3982,27 +3992,33 @@
             "resultSummary": "{inserted} nuevas importadas y {updated} actualizadas, {skipped} omitidas.",
             "rowError": "Línea {line}: {reason}"
           }
-        }
+        },
+        "subtitle": "Exporta tus datos o importa desde una copia de seguridad."
       },
       "about": {
         "title": "Acerca de esta app",
-        "description": "Versión, licencia, enlaces."
+        "description": "Versión, licencia, enlaces.",
+        "subtitle": "Versión, licencia y enlaces del proyecto."
       },
       "sharing": {
         "title": "Compartir",
-        "description": "Crea un enlace de solo lectura para compartir tu historial de salud con un profesional médico."
+        "description": "Crea un enlace de solo lectura para compartir tu historial de salud con un profesional médico.",
+        "subtitle": "Comparte acceso de solo lectura a tus datos."
       },
       "insights": {
         "title": "Análisis",
-        "description": "Orden de la vista general y de las pestañas de navegación."
+        "description": "Orden de la vista general y de las pestañas de navegación.",
+        "subtitle": "Organiza las secciones de tu resumen y el orden de las píldoras."
       },
       "medications": {
         "title": "Medicamentos",
-        "description": "Vista de lista, orden y zonas de inyección de tus medicamentos."
+        "description": "Vista de lista, orden y zonas de inyección de tus medicamentos.",
+        "subtitle": "Gestiona la vista y el orden de tu lista de medicamentos."
       },
       "mood": {
         "title": "Etiquetas de ánimo",
-        "description": "Grupos, etiquetas y etiquetas archivadas del selector de ánimo."
+        "description": "Grupos, etiquetas y etiquetas archivadas del selector de ánimo.",
+        "subtitle": "Organiza tus etiquetas de ánimo, grupos y orden del selector."
       },
       "modules": {
         "title": "Módulos",
@@ -4012,26 +4028,24 @@
           "title": "Qué registras",
           "description": "Áreas opcionales. Los módulos desactivados desaparecen de la navegación, los paneles y los análisis; tus datos se conservan."
         },
-        "core": {
-          "title": "Siempre activos",
-          "description": "Los pilares de HealthLog. Estas áreas no se pueden desactivar.",
-          "note": "Área esencial — siempre activa"
-        },
-        "description": "Elige qué registra HealthLog por ti. Activa o desactiva áreas concretas: la navegación, los paneles y los análisis se adaptan al instante.",
         "manageIn": "Gestionar en {section}",
-        "operatorDisabled": "Desactivado en todo el servidor"
+        "operatorDisabled": "Desactivado en todo el servidor",
+        "subtitle": "Elige qué áreas de seguimiento muestra HealthLog en la app."
       },
       "gesundheitsakte": {
         "title": "Historial médico",
-        "description": "Exporta tu historial médico completo como PDF, FHIR R4 o un paquete ZIP combinado."
+        "description": "Exporta tu historial médico completo como PDF, FHIR R4 o un paquete ZIP combinado.",
+        "subtitle": "Exporta un historial de salud completo, listo para el médico."
       },
       "coach": {
         "title": "Coach",
-        "description": "Activa el Coach, tono y alcance, recuerdos guardados."
+        "description": "Activa el Coach, tono y alcance, recuerdos guardados.",
+        "subtitle": "Ajusta el Coach, sus avisos proactivos y su memoria."
       },
       "channels": {
         "title": "Canales",
-        "description": "Envío por Telegram, ntfy, Web Push, Webhook y correo electrónico."
+        "description": "Envío por Telegram, ntfy, Web Push, Webhook y correo electrónico.",
+        "subtitle": "Dónde se entregan los recordatorios y avisos."
       }
     },
     "profile": "Perfil",
@@ -5291,7 +5305,12 @@
         "subtitle": "Operaciones destructivas en todo el sistema."
       },
       "about": {
-        "title": "Acerca de"
+        "title": "Acerca de",
+        "subtitle": "Versión, licencia y estado de actualizaciones."
+      },
+      "module-availability": {
+        "title": "Disponibilidad de módulos",
+        "subtitle": "Activa o desactiva módulos para todas las cuentas de este servidor."
       }
     },
     "carrier": "Operador",
@@ -6588,18 +6607,6 @@
       "label": "Informe médico",
       "description": "Exportación PDF y FHIR para tu consulta."
     },
-    "weight": {
-      "label": "Peso",
-      "description": "Peso y composición corporal."
-    },
-    "bloodPressure": {
-      "label": "Presión arterial",
-      "description": "Sistólica y diastólica."
-    },
-    "pulse": {
-      "label": "Pulso",
-      "description": "Pulso en reposo y frecuencia cardiaca."
-    },
     "medications": {
       "label": "Medicamentos",
       "description": "Pautas, tomas y cumplimiento."
diff --git a/messages/fr.json b/messages/fr.json
index 85cb525e9..1c74cf1bf 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Compte",
-        "description": "Profil, mot de passe, clés d’accès et votre visite guidée."
+        "description": "Profil, mot de passe, clés d’accès et votre visite guidée.",
+        "subtitle": "Votre profil, votre identité et vos identifiants."
       },
       "integrations": {
         "title": "Intégrations",
-        "description": "Services connectés, canaux de diffusion et priorité des sources au même endroit."
+        "description": "Services connectés, canaux de diffusion et priorité des sources au même endroit.",
+        "subtitle": "Connectez et gérez vos sources de données et appareils."
       },
       "notifications": {
         "title": "Notifications",
         "description": "Tous les rappels au même endroit — quoi et quand. Les canaux de diffusion se trouvent dans Intégrations.",
         "channelsHint": "Telegram, ntfy, Web Push, Webhook et e-mail se configurent désormais dans",
         "channelsHintLink": "Intégrations → Canaux",
-        "inboxLink": "Ouvrir la boîte de réception"
+        "inboxLink": "Ouvrir la boîte de réception",
+        "subtitle": "Choisissez les rappels que vous recevez."
       },
       "layout": {
         "title": "Disposition",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Analyses",
           "description": "Ordre de la vue d'ensemble et des onglets de navigation."
-        }
+        },
+        "subtitle": "Personnalisez l'agencement de votre tableau de bord et de vos insights."
       },
       "dashboard": {
         "title": "Tableau de bord",
-        "description": "Disposition et ordre des tuiles."
+        "description": "Disposition et ordre des tuiles.",
+        "subtitle": "Organisez les tuiles de votre tableau de bord."
       },
       "thresholds": {
         "title": "Objectifs",
-        "description": "Par métrique : votre propre plage cible pour des valeurs saines."
+        "description": "Par métrique : votre propre plage cible pour des valeurs saines.",
+        "subtitle": "Définissez vos plages cibles personnelles par mesure."
       },
       "sources": {
         "title": "Priorité des sources",
@@ -3869,19 +3875,23 @@
           "scale": "Balance",
           "other": "Autre",
           "unknown": "Inconnu"
-        }
+        },
+        "subtitle": "Choisissez la source prioritaire en cas de doublon de mesure."
       },
       "ai": {
-        "title": "Analyses IA",
-        "description": "Fournisseur, modèle et clé API pour les analyses, ainsi que votre contexte « à propos de moi »."
+        "title": "Fournisseur d'IA",
+        "description": "Fournisseur, modèle et clé API pour les analyses, ainsi que votre contexte « à propos de moi ».",
+        "subtitle": "Choisissez votre fournisseur d'IA et utilisez votre propre clé."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Jetons Bearer pour vos propres scripts et applis — enregistrez des mesures ou des prises de médicaments depuis n’importe où."
+        "description": "Jetons Bearer pour vos propres scripts et applis — enregistrez des mesures ou des prises de médicaments depuis n’importe où.",
+        "subtitle": "Gérez les points d'accès API et les jetons d'accès."
       },
       "advanced": {
         "title": "Avancé",
-        "description": "Bouton opt-in du mode Recherche et zone dangereuse pour effacer irrévocablement toutes les données de santé."
+        "description": "Bouton opt-in du mode Recherche et zone dangereuse pour effacer irrévocablement toutes les données de santé.",
+        "subtitle": "Mode recherche, réinitialisation des données et suppression du compte."
       },
       "export": {
         "title": "Export et import",
@@ -3982,27 +3992,33 @@
             "resultSummary": "{inserted} nouvelles importées et {updated} mises à jour, {skipped} ignorées.",
             "rowError": "Ligne {line} : {reason}"
           }
-        }
+        },
+        "subtitle": "Exportez vos données ou importez depuis une sauvegarde."
       },
       "about": {
         "title": "À propos de cette app",
-        "description": "Version, licence, liens."
+        "description": "Version, licence, liens.",
+        "subtitle": "Version, licence et liens du projet."
       },
       "sharing": {
         "title": "Partage",
-        "description": "Créez un lien en lecture seule pour partager votre dossier de santé avec un professionnel de santé."
+        "description": "Créez un lien en lecture seule pour partager votre dossier de santé avec un professionnel de santé.",
+        "subtitle": "Partagez un accès en lecture seule à vos données."
       },
       "insights": {
         "title": "Analyses",
-        "description": "Ordre de la vue d'ensemble et des onglets de navigation."
+        "description": "Ordre de la vue d'ensemble et des onglets de navigation.",
+        "subtitle": "Organisez les sections d'aperçu et l'ordre des pastilles."
       },
       "medications": {
         "title": "Médicaments",
-        "description": "Vue liste, ordre et sites d’injection de vos médicaments."
+        "description": "Vue liste, ordre et sites d’injection de vos médicaments.",
+        "subtitle": "Gérez l'affichage et l'ordre de votre liste de médicaments."
       },
       "mood": {
         "title": "Étiquettes d’humeur",
-        "description": "Groupes, étiquettes et étiquettes archivées du sélecteur d’humeur."
+        "description": "Groupes, étiquettes et étiquettes archivées du sélecteur d’humeur.",
+        "subtitle": "Organisez vos tags d'humeur, groupes et ordre du sélecteur."
       },
       "modules": {
         "title": "Modules",
@@ -4012,26 +4028,24 @@
           "title": "Ce que vous suivez",
           "description": "Domaines optionnels. Les modules désactivés disparaissent de la navigation, des tuiles et des analyses ; vos données sont conservées."
         },
-        "core": {
-          "title": "Toujours actifs",
-          "description": "Les fondations de HealthLog. Ces domaines ne peuvent pas être désactivés.",
-          "note": "Domaine essentiel — toujours actif"
-        },
-        "description": "Choisissez ce que HealthLog suit pour vous. Activez ou désactivez chaque domaine : la navigation, les tuiles et les analyses s'adaptent aussitôt.",
         "manageIn": "Gérer dans {section}",
-        "operatorDisabled": "Désactivé sur tout le serveur"
+        "operatorDisabled": "Désactivé sur tout le serveur",
+        "subtitle": "Choisissez les domaines de suivi affichés par HealthLog."
       },
       "gesundheitsakte": {
         "title": "Dossier médical",
-        "description": "Exportez votre dossier médical complet au format PDF, FHIR R4 ou en paquet ZIP combiné."
+        "description": "Exportez votre dossier médical complet au format PDF, FHIR R4 ou en paquet ZIP combiné.",
+        "subtitle": "Exportez un dossier de santé complet, prêt pour le médecin."
       },
       "coach": {
         "title": "Coach",
-        "description": "Activez le Coach, le ton et la portée, les souvenirs enregistrés."
+        "description": "Activez le Coach, le ton et la portée, les souvenirs enregistrés.",
+        "subtitle": "Réglez le Coach, ses suggestions proactives et sa mémoire."
       },
       "channels": {
         "title": "Canaux",
-        "description": "Distribution via Telegram, ntfy, Web Push, Webhook et e-mail."
+        "description": "Distribution via Telegram, ntfy, Web Push, Webhook et e-mail.",
+        "subtitle": "Où sont envoyés les rappels et alertes."
       }
     },
     "profile": "Profil",
@@ -5291,7 +5305,12 @@
         "subtitle": "Opérations destructrices à l'échelle du système."
       },
       "about": {
-        "title": "À propos"
+        "title": "À propos",
+        "subtitle": "Version, licence et état des mises à jour."
+      },
+      "module-availability": {
+        "title": "Disponibilité des modules",
+        "subtitle": "Activez ou désactivez les modules pour tous les comptes de ce serveur."
       }
     },
     "carrier": "Opérateur",
@@ -6588,18 +6607,6 @@
       "label": "Rapport médical",
       "description": "Export PDF et FHIR pour votre cabinet."
     },
-    "weight": {
-      "label": "Poids",
-      "description": "Poids et composition corporelle."
-    },
-    "bloodPressure": {
-      "label": "Tension artérielle",
-      "description": "Systolique et diastolique."
-    },
-    "pulse": {
-      "label": "Pouls",
-      "description": "Pouls au repos et fréquence cardiaque."
-    },
     "medications": {
       "label": "Médicaments",
       "description": "Schémas, prises et observance."
diff --git a/messages/it.json b/messages/it.json
index 48507ed1d..8f3123811 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Account",
-        "description": "Profilo, password, passkey e il tour di benvenuto."
+        "description": "Profilo, password, passkey e il tour di benvenuto.",
+        "subtitle": "Il tuo profilo, la tua identità e i dati di accesso."
       },
       "integrations": {
         "title": "Integrazioni",
-        "description": "Servizi collegati, canali di consegna e priorità delle fonti in un unico posto."
+        "description": "Servizi collegati, canali di consegna e priorità delle fonti in un unico posto.",
+        "subtitle": "Collega e gestisci le tue fonti di dati e i dispositivi."
       },
       "notifications": {
         "title": "Notifiche",
         "description": "Tutti i promemoria in un unico posto — cosa e quando. I canali di recapito si trovano in Integrazioni.",
         "channelsHint": "Telegram, ntfy, Web Push, Webhook ed e-mail ora si configurano in",
         "channelsHintLink": "Integrazioni → Canali",
-        "inboxLink": "Apri la posta in arrivo"
+        "inboxLink": "Apri la posta in arrivo",
+        "subtitle": "Scegli quali promemoria ricevere."
       },
       "layout": {
         "title": "Layout",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Approfondimenti",
           "description": "Ordine della panoramica e delle schede di navigazione."
-        }
+        },
+        "subtitle": "Personalizza la disposizione di dashboard e insights."
       },
       "dashboard": {
         "title": "Cruscotto",
-        "description": "Layout e ordine dei riquadri."
+        "description": "Layout e ordine dei riquadri.",
+        "subtitle": "Disponi i riquadri della tua dashboard."
       },
       "thresholds": {
         "title": "Obiettivi",
-        "description": "Per metrica: il tuo intervallo target per valori sani."
+        "description": "Per metrica: il tuo intervallo target per valori sani.",
+        "subtitle": "Imposta i tuoi intervalli target personali per metrica."
       },
       "sources": {
         "title": "Priorità delle fonti",
@@ -3869,19 +3875,23 @@
           "scale": "Bilancia",
           "other": "Altro",
           "unknown": "Sconosciuto"
-        }
+        },
+        "subtitle": "Decidi quale fonte prevale quando due riportano la stessa metrica."
       },
       "ai": {
-        "title": "Analisi IA",
-        "description": "Provider, modello e chiave API per gli approfondimenti, oltre al tuo contesto «su di me»."
+        "title": "Provider IA",
+        "description": "Provider, modello e chiave API per gli approfondimenti, oltre al tuo contesto «su di me».",
+        "subtitle": "Scegli il tuo provider IA e usa la tua chiave."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Token Bearer per i tuoi script e le tue app — registra misurazioni o assunzioni di farmaci da ovunque."
+        "description": "Token Bearer per i tuoi script e le tue app — registra misurazioni o assunzioni di farmaci da ovunque.",
+        "subtitle": "Gestisci gli endpoint API e i token di accesso."
       },
       "advanced": {
         "title": "Avanzate",
-        "description": "Interruttore opt-in della modalità Ricerca e zona pericolosa per cancellare in modo irrevocabile tutti i dati di salute."
+        "description": "Interruttore opt-in della modalità Ricerca e zona pericolosa per cancellare in modo irrevocabile tutti i dati di salute.",
+        "subtitle": "Modalità ricerca, ripristino dati ed eliminazione account."
       },
       "export": {
         "title": "Esporta e importa",
@@ -3982,27 +3992,33 @@
             "resultSummary": "{inserted} nuove importate e {updated} aggiornate, {skipped} saltate.",
             "rowError": "Riga {line}: {reason}"
           }
-        }
+        },
+        "subtitle": "Esporta i tuoi dati o importa da un backup."
       },
       "about": {
         "title": "Informazioni su questa app",
-        "description": "Versione, licenza, link."
+        "description": "Versione, licenza, link.",
+        "subtitle": "Versione, licenza e link al progetto."
       },
       "sharing": {
         "title": "Condivisione",
-        "description": "Crea un link di sola lettura per condividere la tua cartella clinica con un medico."
+        "description": "Crea un link di sola lettura per condividere la tua cartella clinica con un medico.",
+        "subtitle": "Condividi l'accesso in sola lettura ai tuoi dati."
       },
       "insights": {
         "title": "Approfondimenti",
-        "description": "Ordine della panoramica e delle schede di navigazione."
+        "description": "Ordine della panoramica e delle schede di navigazione.",
+        "subtitle": "Disponi le sezioni della panoramica e l'ordine dei pill."
       },
       "medications": {
         "title": "Farmaci",
-        "description": "Vista elenco, ordine e siti di iniezione dei tuoi farmaci."
+        "description": "Vista elenco, ordine e siti di iniezione dei tuoi farmaci.",
+        "subtitle": "Gestisci vista e ordine del tuo elenco di farmaci."
       },
       "mood": {
         "title": "Tag dell’umore",
-        "description": "Gruppi, tag e tag archiviati del selettore dell’umore."
+        "description": "Gruppi, tag e tag archiviati del selettore dell’umore.",
+        "subtitle": "Organizza i tag dell'umore, i gruppi e l'ordine del selettore."
       },
       "modules": {
         "title": "Moduli",
@@ -4012,26 +4028,24 @@
           "title": "Cosa monitori",
           "description": "Ambiti opzionali. I moduli disattivati spariscono da navigazione, riquadri e analisi; i tuoi dati restano intatti."
         },
-        "core": {
-          "title": "Sempre attivi",
-          "description": "Le fondamenta di HealthLog. Questi ambiti non possono essere disattivati.",
-          "note": "Ambito di base — sempre attivo"
-        },
-        "description": "Scegli cosa registra HealthLog per te. Attiva o disattiva i singoli ambiti: navigazione, riquadri e analisi si adattano subito.",
         "manageIn": "Gestisci in {section}",
-        "operatorDisabled": "Disattivato a livello di server"
+        "operatorDisabled": "Disattivato a livello di server",
+        "subtitle": "Scegli quali aree di monitoraggio HealthLog mostra nell'app."
       },
       "gesundheitsakte": {
         "title": "Cartella clinica",
-        "description": "Esporta la tua cartella clinica completa in PDF, FHIR R4 o in un pacchetto ZIP combinato."
+        "description": "Esporta la tua cartella clinica completa in PDF, FHIR R4 o in un pacchetto ZIP combinato.",
+        "subtitle": "Esporta una cartella clinica completa, pronta per il medico."
       },
       "coach": {
         "title": "Coach",
-        "description": "Attiva il Coach, tono e ambito, ricordi salvati."
+        "description": "Attiva il Coach, tono e ambito, ricordi salvati.",
+        "subtitle": "Regola il Coach, i suoi suggerimenti proattivi e la sua memoria."
       },
       "channels": {
         "title": "Canali",
-        "description": "Recapito tramite Telegram, ntfy, Web Push, Webhook ed e-mail."
+        "description": "Recapito tramite Telegram, ntfy, Web Push, Webhook ed e-mail.",
+        "subtitle": "Dove vengono recapitati promemoria e avvisi."
       }
     },
     "profile": "Profilo",
@@ -5291,7 +5305,12 @@
         "subtitle": "Operazioni distruttive a livello di sistema."
       },
       "about": {
-        "title": "Informazioni"
+        "title": "Informazioni",
+        "subtitle": "Versione, licenza e stato degli aggiornamenti."
+      },
+      "module-availability": {
+        "title": "Disponibilità dei moduli",
+        "subtitle": "Attiva o disattiva i moduli per tutti gli account su questo server."
       }
     },
     "carrier": "Operatore",
@@ -6588,18 +6607,6 @@
       "label": "Referto medico",
       "description": "Esportazione PDF e FHIR per il tuo studio."
     },
-    "weight": {
-      "label": "Peso",
-      "description": "Peso e composizione corporea."
-    },
-    "bloodPressure": {
-      "label": "Pressione",
-      "description": "Sistolica e diastolica."
-    },
-    "pulse": {
-      "label": "Battito",
-      "description": "Battito a riposo e frequenza cardiaca."
-    },
     "medications": {
       "label": "Farmaci",
       "description": "Schemi, assunzioni e aderenza."
diff --git a/messages/pl.json b/messages/pl.json
index c60c651f4..5da1f13f1 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -3778,18 +3778,21 @@
     "sections": {
       "account": {
         "title": "Konto",
-        "description": "Profil, hasło, klucze dostępu i przewodnik wprowadzający."
+        "description": "Profil, hasło, klucze dostępu i przewodnik wprowadzający.",
+        "subtitle": "Twój profil, tożsamość i dane logowania."
       },
       "integrations": {
         "title": "Integracje",
-        "description": "Połączone usługi, kanały dostarczania i priorytet źródeł w jednym miejscu."
+        "description": "Połączone usługi, kanały dostarczania i priorytet źródeł w jednym miejscu.",
+        "subtitle": "Połącz i zarządzaj źródłami danych oraz urządzeniami."
       },
       "notifications": {
         "title": "Powiadomienia",
         "description": "Wszystkie przypomnienia w jednym miejscu — co i kiedy. Kanały dostarczania znajdują się w Integracjach.",
         "channelsHint": "Telegram, ntfy, Web Push, Webhook i e-mail konfigurujesz teraz w",
         "channelsHintLink": "Integracje → Kanały",
-        "inboxLink": "Otwórz skrzynkę odbiorczą"
+        "inboxLink": "Otwórz skrzynkę odbiorczą",
+        "subtitle": "Wybierz, które przypomnienia otrzymujesz."
       },
       "layout": {
         "title": "Układ",
@@ -3802,15 +3805,18 @@
         "insights": {
           "title": "Analizy",
           "description": "Kolejność przeglądu i pigułek nawigacyjnych."
-        }
+        },
+        "subtitle": "Dostosuj układ pulpitu i analiz."
       },
       "dashboard": {
         "title": "Pulpit",
-        "description": "Układ i kolejność kafelków."
+        "description": "Układ i kolejność kafelków.",
+        "subtitle": "Rozmieść kafelki na pulpicie."
       },
       "thresholds": {
         "title": "Cele",
-        "description": "Dla każdej metryki: własny zakres docelowy zdrowych wartości."
+        "description": "Dla każdej metryki: własny zakres docelowy zdrowych wartości.",
+        "subtitle": "Ustaw osobiste zakresy docelowe dla każdej metryki."
       },
       "sources": {
         "title": "Priorytet źródeł",
@@ -3869,19 +3875,23 @@
           "scale": "Waga",
           "other": "Inne",
           "unknown": "Nieznane"
-        }
+        },
+        "subtitle": "Zdecyduj, które źródło wygrywa, gdy dwa podają tę samą metrykę."
       },
       "ai": {
-        "title": "Analizy AI",
-        "description": "Dostawca, model i klucz API do analiz, a także Twój kontekst „o mnie”."
+        "title": "Dostawca AI",
+        "description": "Dostawca, model i klucz API do analiz, a także Twój kontekst „o mnie”.",
+        "subtitle": "Wybierz dostawcę AI i użyj własnego klucza."
       },
       "api": {
         "title": "API & Tokens",
-        "description": "Tokeny Bearer dla własnych skryptów i aplikacji — zapisuj pomiary lub przyjęcia leków z dowolnego miejsca."
+        "description": "Tokeny Bearer dla własnych skryptów i aplikacji — zapisuj pomiary lub przyjęcia leków z dowolnego miejsca.",
+        "subtitle": "Zarządzaj punktami końcowymi API i tokenami dostępu."
       },
       "advanced": {
         "title": "Zaawansowane",
-        "description": "Opt-in przełącznika trybu Badawczego oraz strefa zagrożenia umożliwiająca nieodwracalne wymazanie wszystkich danych zdrowotnych."
+        "description": "Opt-in przełącznika trybu Badawczego oraz strefa zagrożenia umożliwiająca nieodwracalne wymazanie wszystkich danych zdrowotnych.",
+        "subtitle": "Tryb badawczy, reset danych i usunięcie konta."
       },
       "export": {
         "title": "Eksport i import",
@@ -3982,27 +3992,33 @@
             "resultSummary": "Zaimportowano {inserted} nowych i zaktualizowano {updated}, pominięto {skipped}.",
             "rowError": "Wiersz {line}: {reason}"
           }
-        }
+        },
+        "subtitle": "Wyeksportuj dane lub zaimportuj z kopii zapasowej."
       },
       "about": {
         "title": "O tej aplikacji",
-        "description": "Wersja, licencja, linki."
+        "description": "Wersja, licencja, linki.",
+        "subtitle": "Wersja, licencja i linki do projektu."
       },
       "sharing": {
         "title": "Udostępnianie",
-        "description": "Utwórz link tylko do odczytu, aby udostępnić swoją dokumentację zdrowotną lekarzowi."
+        "description": "Utwórz link tylko do odczytu, aby udostępnić swoją dokumentację zdrowotną lekarzowi.",
+        "subtitle": "Udostępnij dostęp tylko do odczytu do swoich danych."
       },
       "insights": {
         "title": "Analizy",
-        "description": "Kolejność przeglądu i pigułek nawigacyjnych."
+        "description": "Kolejność przeglądu i pigułek nawigacyjnych.",
+        "subtitle": "Rozmieść sekcje przeglądu i kolejność etykiet."
       },
       "medications": {
         "title": "Leki",
-        "description": "Widok listy, kolejność i miejsca wstrzyknięć Twoich leków."
+        "description": "Widok listy, kolejność i miejsca wstrzyknięć Twoich leków.",
+        "subtitle": "Zarządzaj widokiem i kolejnością listy leków."
       },
       "mood": {
         "title": "Tagi nastroju",
-        "description": "Grupy, tagi i zarchiwizowane tagi w wyborze nastroju."
+        "description": "Grupy, tagi i zarchiwizowane tagi w wyborze nastroju.",
+        "subtitle": "Uporządkuj tagi nastroju, grupy i kolejność wyboru."
       },
       "modules": {
         "title": "Moduły",
@@ -4012,26 +4028,24 @@
           "title": "Co śledzisz",
           "description": "Obszary opcjonalne. Wyłączone moduły znikają z nawigacji, kafelków i analiz — Twoje dane pozostają nienaruszone."
         },
-        "core": {
-          "title": "Zawsze aktywne",
-          "description": "Podstawy HealthLog. Tych obszarów nie można wyłączyć.",
-          "note": "Obszar podstawowy — zawsze aktywny"
-        },
-        "description": "Wybierz, co HealthLog ma dla Ciebie śledzić. Włączaj i wyłączaj poszczególne obszary — nawigacja, kafelki i analizy dostosują się od razu.",
         "manageIn": "Zarządzaj w {section}",
-        "operatorDisabled": "Wyłączone na całym serwerze"
+        "operatorDisabled": "Wyłączone na całym serwerze",
+        "subtitle": "Wybierz, które obszary śledzenia pokazuje HealthLog w aplikacji."
       },
       "gesundheitsakte": {
         "title": "Dokumentacja zdrowotna",
-        "description": "Wyeksportuj pełną dokumentację zdrowotną jako PDF, FHIR R4 lub łączony pakiet ZIP."
+        "description": "Wyeksportuj pełną dokumentację zdrowotną jako PDF, FHIR R4 lub łączony pakiet ZIP.",
+        "subtitle": "Eksportuj kompletną dokumentację zdrowotną gotową dla lekarza."
       },
       "coach": {
         "title": "Coach",
-        "description": "Włącz Coacha, ton i zakres, zapisane wspomnienia."
+        "description": "Włącz Coacha, ton i zakres, zapisane wspomnienia.",
+        "subtitle": "Dostosuj Coacha, jego proaktywne podpowiedzi i pamięć."
       },
       "channels": {
         "title": "Kanały",
-        "description": "Dostarczanie przez Telegram, ntfy, Web Push, Webhook i e-mail."
+        "description": "Dostarczanie przez Telegram, ntfy, Web Push, Webhook i e-mail.",
+        "subtitle": "Gdzie dostarczane są przypomnienia i powiadomienia."
       }
     },
     "profile": "Profil",
@@ -5291,7 +5305,12 @@
         "subtitle": "Destrukcyjne operacje obejmujące cały system."
       },
       "about": {
-        "title": "O programie"
+        "title": "O programie",
+        "subtitle": "Wersja, licencja i stan aktualizacji."
+      },
+      "module-availability": {
+        "title": "Dostępność modułów",
+        "subtitle": "Włącz lub wyłącz moduły dla wszystkich kont na tym serwerze."
       }
     },
     "carrier": "Operator",
@@ -6588,18 +6607,6 @@
       "label": "Raport dla lekarza",
       "description": "Eksport PDF i FHIR dla Twojej przychodni."
     },
-    "weight": {
-      "label": "Waga",
-      "description": "Waga i skład ciała."
-    },
-    "bloodPressure": {
-      "label": "Ciśnienie krwi",
-      "description": "Skurczowe i rozkurczowe."
-    },
-    "pulse": {
-      "label": "Tętno",
-      "description": "Tętno spoczynkowe i rytm serca."
-    },
     "medications": {
       "label": "Leki",
       "description": "Schematy, przyjęcia i zgodność."
diff --git a/src/app/admin/[section]/renderer.tsx b/src/app/admin/[section]/renderer.tsx
index aeea25435..4adc26c77 100644
--- a/src/app/admin/[section]/renderer.tsx
+++ b/src/app/admin/[section]/renderer.tsx
@@ -94,18 +94,32 @@ export function AdminSectionRenderer({
       // v1.18.1 — the former ai-quality, assistant, and coach-feedback
       // sections fold into one Coach area: surface toggles + operator
       // config first, then the two feedback-quality tables.
+      // v1.18.6 (W9) — server-wide module availability moved out to its own
+      // `module-availability` section: it gates EVERY module, not just the
+      // coach, so it no longer belongs stacked under Coach.
       return (
         <SectionFrame
           title={t("admin.section.coach.title")}
           subtitle={t("admin.section.coach.subtitle")}
         >
           <AssistantSection />
-          <ModuleAvailabilitySection />
           <AiServerKeySection />
           <CoachFeedbackSection />
           <AiQualitySection />
         </SectionFrame>
       );
+    case "module-availability":
+      // v1.18.6 (W9) — operator-side server-wide module on/off, its own
+      // admin section (was stacked under Coach). Reconciled name: the
+      // user-facing "Module" settings pick from what is available here.
+      return (
+        <SectionFrame
+          title={t("admin.section.module-availability.title")}
+          subtitle={t("admin.section.module-availability.subtitle")}
+        >
+          <ModuleAvailabilitySection />
+        </SectionFrame>
+      );
     case "feedback":
       return (
         <SectionFrame
@@ -191,12 +205,18 @@ export function AdminSectionRenderer({
         </SectionFrame>
       );
     case "about":
-      // v1.4.36 W4e — About section reused as-is from the settings
-      // surface. The component owns its own heading + cards layout
-      // so no SectionFrame wrapper.
-      // v1.18.6 — the About surface no longer carries the tour-replay card
-      // (consolidated onto Settings → Advanced), so there's nothing to hide.
-      return <AboutSection />;
+      // v1.4.36 W4e — About section reused as-is from the settings surface.
+      // v1.18.6 (W9) — route it through `SectionFrame` like every other admin
+      // section so it gets the same visible heading + subtitle (the one admin
+      // page that was bypassing the frame and showing no heading).
+      return (
+        <SectionFrame
+          title={t("admin.section.about.title")}
+          subtitle={t("admin.section.about.subtitle")}
+        >
+          <AboutSection />
+        </SectionFrame>
+      );
     default:
       slug satisfies never;
       return null;
diff --git a/src/app/settings/[section]/page.tsx b/src/app/settings/[section]/page.tsx
index 78115b334..b5295c215 100644
--- a/src/app/settings/[section]/page.tsx
+++ b/src/app/settings/[section]/page.tsx
@@ -1,5 +1,5 @@
 import { notFound } from "next/navigation";
-import type { JSX } from "react";
+import type { JSX, ReactNode } from "react";
 
 import { AccountSection } from "@/components/settings/account-section";
 import { AboutSection } from "@/components/settings/about-section";
@@ -29,6 +29,9 @@ import {
   type SettingsSectionSlug,
 } from "@/components/settings/section-slugs";
 import { SettingsShell } from "@/components/settings/settings-shell";
+import { SettingsSectionFrame } from "@/components/settings/settings-section-frame";
+import { SettingsHubBackLink } from "@/components/settings/settings-hub-back-link";
+import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 /**
  * Dynamic settings section route. Each of the `SETTINGS_SECTION_SLUGS`
@@ -71,6 +74,50 @@ const SECTION_COMPONENTS: Record<
   advanced: AdvancedSection,
 };
 
+// v1.18.6 (W9) — the two Layout-hub child editors render a "← back to hub"
+// link above their heading. The shared `<SettingsSectionFrame>` exposes a
+// `topSlot` for exactly this; the link lives here so the section bodies stay
+// pure card content.
+const HUB_CHILD_SLUGS: ReadonlySet<SettingsSectionSlug> = new Set([
+  "dashboard",
+  "insights",
+]);
+
+/** Optional content rendered above the canonical heading, per slug. */
+function frameTopSlot(slug: SettingsSectionSlug): ReactNode {
+  if (HUB_CHILD_SLUGS.has(slug)) {
+    return (
+      <SettingsHubBackLink
+        href="/settings/layout"
+        labelKey="settings.sections.layout.backToHub"
+      />
+    );
+  }
+  return undefined;
+}
+
+/** Optional inline content rendered at the top-right of the heading row. */
+function frameHeadingAccessory(slug: SettingsSectionSlug): ReactNode {
+  // v1.18.6 (W9) — the module guided-tour re-entry triggers used to live in
+  // a `justify-end` header inside the section body; they move to the frame's
+  // heading row so the heading itself is the spotlight anchor.
+  if (slug === "gesundheitsakte") {
+    return (
+      <span data-tour-id="export-hero">
+        <ModuleTourTrigger stopId="export" />
+      </span>
+    );
+  }
+  if (slug === "integrations") {
+    return (
+      <span data-tour-id="integrations-hero">
+        <ModuleTourTrigger stopId="integrations" />
+      </span>
+    );
+  }
+  return undefined;
+}
+
 interface PageProps {
   // Next.js 16 made route `params` an async Promise. We `await` it before use.
   params: Promise<{ section: string }>;
@@ -91,8 +138,17 @@ export default async function SettingsSectionPage({ params }: PageProps) {
   // guards the slug, but a future slug added to `SETTINGS_SECTION_SLUGS`
   // without a wired component would otherwise crash silently — placeholder
   // surfaces the gap visually instead.
+  // v1.18.6 (W9) — every section now renders inside the shared
+  // `<SettingsSectionFrame>`, which emits the one visible heading + subtitle
+  // each page must show (the section bodies no longer carry their own).
   const body = SectionComponent ? (
-    <SectionComponent />
+    <SettingsSectionFrame
+      slug={section}
+      topSlot={frameTopSlot(section)}
+      headingAccessory={frameHeadingAccessory(section)}
+    >
+      <SectionComponent />
+    </SettingsSectionFrame>
   ) : (
     <SectionPlaceholder slug={section} />
   );
diff --git a/src/components/admin/admin-shell.tsx b/src/components/admin/admin-shell.tsx
index 70924d726..4b44785cf 100644
--- a/src/components/admin/admin-shell.tsx
+++ b/src/components/admin/admin-shell.tsx
@@ -18,6 +18,7 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 import {
   Bell,
+  Blocks,
   Database,
   FileText,
   Info,
@@ -39,6 +40,7 @@ import { cn } from "@/lib/utils";
 import { scrollBehaviorForUser } from "@/lib/motion";
 import { useAuth } from "@/hooks/use-auth";
 import { useTranslations } from "@/lib/i18n/context";
+import { SectionNavHeadingSpacer } from "@/components/settings/section-nav-heading-spacer";
 import { isAdminSectionSlug, type AdminSectionSlug } from "./section-slugs";
 
 interface AdminSection {
@@ -82,6 +84,13 @@ export const ADMIN_SECTIONS: readonly AdminSection[] = [
     titleKey: "admin.section.coach.title",
     icon: Sparkles,
   },
+  // v1.18.6 (W9) — server-wide module availability split out of Coach into
+  // its own entry, sitting next to it.
+  {
+    slug: "module-availability",
+    titleKey: "admin.section.module-availability.title",
+    icon: Blocks,
+  },
   {
     slug: "feedback",
     titleKey: "admin.section.feedback.title",
@@ -276,6 +285,9 @@ export function AdminShell({ active, children }: AdminShellProps) {
           className="hidden md:block"
         >
           <div className="sticky top-20">
+            {/* v1.18.6 (W9) — align the first nav item with the top of the
+                first card, matching the settings shell. */}
+            <SectionNavHeadingSpacer />
             <ul className="space-y-1">
               <li>
                 <Link
diff --git a/src/components/admin/section-slugs.ts b/src/components/admin/section-slugs.ts
index 9fa94f773..45689aab4 100644
--- a/src/components/admin/section-slugs.ts
+++ b/src/components/admin/section-slugs.ts
@@ -16,11 +16,15 @@ export const ADMIN_SECTION_SLUGS = [
   "integrations",
   // v1.18.1 — the former `ai-quality`, `assistant`, and `coach-feedback`
   // sections collapse into one "Coach" area. It holds the assistant
-  // surface toggles, the server-key + module-availability operator
-  // config, and both feedback-quality tables (Coach + Insights). Three
-  // navigation entries for one coherent coach-quality concern read as
-  // clutter; one card opens the full picture.
+  // surface toggles, the server-key operator config, and both
+  // feedback-quality tables (Coach + Insights). Three navigation entries
+  // for one coherent coach-quality concern read as clutter; one card opens
+  // the full picture.
   "coach",
+  // v1.18.6 (W9) — server-wide module availability is its own section now
+  // (was stacked under Coach). It gates every module, not just the coach,
+  // so it reads better next to Coach than buried inside it.
+  "module-availability",
   "feedback",
   "reminders",
   "users",
diff --git a/src/components/settings/__tests__/coach-section.test.tsx b/src/components/settings/__tests__/coach-section.test.tsx
index 16f2f34d9..921dae86a 100644
--- a/src/components/settings/__tests__/coach-section.test.tsx
+++ b/src/components/settings/__tests__/coach-section.test.tsx
@@ -31,12 +31,17 @@ vi.mock("@/hooks/use-auth", () => ({
 }));
 
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
 import { CoachSection } from "../coach-section";
 
 function render(locale: "en" | "de" = "en") {
+  // v1.18.6 (W9) — the visible heading lives in the shared frame the route
+  // wraps the section in; render through it so the heading id is present.
   return renderToStaticMarkup(
     <I18nProvider initialLocale={locale}>
-      <CoachSection />
+      <SettingsSectionFrame slug="coach">
+        <CoachSection />
+      </SettingsSectionFrame>
     </I18nProvider>,
   );
 }
@@ -51,6 +56,9 @@ describe("<CoachSection> — SSR smoke", () => {
     // v1.18.1 (D7) — polarity flipped to activate/default-on.
     expect(html).toContain("Activate Coach");
     expect(html).toContain("Show the Coach button and drawer. On by default");
+    // v1.18.6 (W9) — the proactive Coach nudge card moved here from
+    // Benachrichtigungen; its anchor renders under the enabled-coach gate.
+    expect(html).toContain('id="coach-nudge"');
     // Raw key never leaks past i18n.
     expect(html).not.toContain("settings.sections.coach.");
     expect(html).not.toContain("settings.coach.activate.");
diff --git a/src/components/settings/__tests__/export-section.test.tsx b/src/components/settings/__tests__/export-section.test.tsx
index 264277863..bc648c7d2 100644
--- a/src/components/settings/__tests__/export-section.test.tsx
+++ b/src/components/settings/__tests__/export-section.test.tsx
@@ -44,6 +44,7 @@ vi.mock("@/hooks/use-auth", () => ({
 }));
 
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
 import { ExportSection } from "../export-section";
 
 function render(node: React.ReactElement, locale: "en" | "de" = "en") {
@@ -54,7 +55,13 @@ function render(node: React.ReactElement, locale: "en" | "de" = "en") {
 
 describe("<ExportSection> — SSR smoke", () => {
   it("renders the section heading + description", () => {
-    const html = render(<ExportSection />);
+    // v1.18.6 (W9) — the page heading comes from the shared frame the route
+    // wraps the section in.
+    const html = render(
+      <SettingsSectionFrame slug="export">
+        <ExportSection />
+      </SettingsSectionFrame>,
+    );
     // v1.15.7 — the section was relabelled "Export & Import" (issue #281).
     expect(html).toContain("Export &amp; Import");
     // Raw key never leaks past i18n.
diff --git a/src/components/settings/__tests__/gesundheitsakte-section.test.tsx b/src/components/settings/__tests__/gesundheitsakte-section.test.tsx
index 57ab31493..baee6ffba 100644
--- a/src/components/settings/__tests__/gesundheitsakte-section.test.tsx
+++ b/src/components/settings/__tests__/gesundheitsakte-section.test.tsx
@@ -29,6 +29,7 @@ vi.mock("@/hooks/use-auth", () => ({
 }));
 
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
 import { GesundheitsakteSection } from "../gesundheitsakte-section";
 
 function render(node: React.ReactElement, locale: "en" | "de" = "en") {
@@ -38,8 +39,14 @@ function render(node: React.ReactElement, locale: "en" | "de" = "en") {
 }
 
 describe("<GesundheitsakteSection> — SSR smoke", () => {
-  it("renders the section description and the health-record panel", () => {
-    const html = render(<GesundheitsakteSection />);
+  it("renders the section heading and the health-record panel", () => {
+    // v1.18.6 (W9) — the visible heading (with the historic id) comes from
+    // the shared frame the route wraps the section in.
+    const html = render(
+      <SettingsSectionFrame slug="gesundheitsakte">
+        <GesundheitsakteSection />
+      </SettingsSectionFrame>,
+    );
     expect(html).toContain('id="settings-section-gesundheitsakte-title"');
     expect(html).toContain('data-testid="health-record-export-panel"');
     // Raw key never leaks past i18n.
diff --git a/src/components/settings/__tests__/medications-section.test.tsx b/src/components/settings/__tests__/medications-section.test.tsx
index 7fc9b3d70..7bc97a732 100644
--- a/src/components/settings/__tests__/medications-section.test.tsx
+++ b/src/components/settings/__tests__/medications-section.test.tsx
@@ -65,12 +65,17 @@ vi.mock("@/hooks/use-auth", () => ({
 }));
 
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
 import { MedicationsSection } from "../medications-section";
 
 function render(locale: "en" | "de" = "en"): string {
+  // v1.18.6 (W9) — the visible heading (with the historic id) comes from the
+  // shared frame the route wraps the section in.
   return renderToStaticMarkup(
     <I18nProvider initialLocale={locale}>
-      <MedicationsSection />
+      <SettingsSectionFrame slug="medications">
+        <MedicationsSection />
+      </SettingsSectionFrame>
     </I18nProvider>,
   );
 }
diff --git a/src/components/settings/__tests__/modules-section.test.tsx b/src/components/settings/__tests__/modules-section.test.tsx
index 32d23c180..cb97fa27b 100644
--- a/src/components/settings/__tests__/modules-section.test.tsx
+++ b/src/components/settings/__tests__/modules-section.test.tsx
@@ -20,11 +20,7 @@ import { renderToStaticMarkup } from "react-dom/server";
 import { I18nProvider } from "@/lib/i18n/context";
 import type { AuthUser } from "@/hooks/use-auth";
 import { queryKeys } from "@/lib/query-keys";
-import {
-  MODULE_KEYS,
-  CORE_DOMAIN_KEYS,
-  moduleDelegatesTo,
-} from "@/lib/modules/registry";
+import { MODULE_KEYS, moduleDelegatesTo } from "@/lib/modules/registry";
 
 // Capture the latest useMutation config + a shared mutate spy so we can
 // invoke `mutationFn` / `onSuccess` by hand (the SSR pass can't fire a
@@ -46,9 +42,9 @@ vi.mock("@tanstack/react-query", () => ({
   },
 }));
 
-const authSpy = vi.fn<() => { user: AuthUser | null; isAuthenticated: boolean }>(
-  () => ({ user: buildUser({}), isAuthenticated: true }),
-);
+const authSpy = vi.fn<
+  () => { user: AuthUser | null; isAuthenticated: boolean }
+>(() => ({ user: buildUser({}), isAuthenticated: true }));
 vi.mock("@/hooks/use-auth", async () => {
   const actual =
     await vi.importActual<typeof import("@/hooks/use-auth")>(
@@ -109,7 +105,10 @@ afterEach(() => {
 });
 
 describe("<ModulesSection>", () => {
-  it("renders a Switch for every non-delegated toggleable module, a managed deep-link for delegated ones, and locked switches for core", () => {
+  it("renders a Switch for every non-delegated toggleable module and a managed deep-link for delegated ones", () => {
+    // v1.18.6 (W9) — the "Always on" core-domains card was removed (a domain
+    // that can't be turned off doesn't need listing), so this section now
+    // only renders the toggleable modules.
     const html = render();
     for (const key of MODULE_KEYS) {
       if (moduleDelegatesTo(key) !== undefined) {
@@ -126,8 +125,16 @@ describe("<ModulesSection>", () => {
         );
       }
     }
-    for (const key of CORE_DOMAIN_KEYS) {
-      expect(html, `core switch ${key}`).toContain(`id="module-toggle-${key}"`);
+  });
+
+  it("no longer renders the 'Always on' core-domains card", () => {
+    // v1.18.6 (W9) — the read-only core card (weight / BP / pulse) was
+    // removed; the core domains are always active regardless.
+    const html = render();
+    for (const key of ["weight", "bloodPressure", "pulse"]) {
+      expect(html, `core ${key} not rendered`).not.toContain(
+        `id="module-toggle-${key}"`,
+      );
     }
   });
 
@@ -152,18 +159,6 @@ describe("<ModulesSection>", () => {
     expect(moodTag).toMatch(/data-state="checked"/);
   });
 
-  it("renders the core domains locked (checked + disabled)", () => {
-    const html = render();
-    for (const key of CORE_DOMAIN_KEYS) {
-      const tag = html.match(
-        new RegExp(`<button[^>]*id="module-toggle-${key}"[^>]*>`),
-      )?.[0];
-      expect(tag, `core ${key}`).toBeDefined();
-      expect(tag).toMatch(/data-state="checked"/);
-      expect(tag).toMatch(/disabled/);
-    }
-  });
-
   it("PATCHes only the flipped key as a disabled-allowlist entry", async () => {
     render();
     expect(lastMutation?.mutationFn).toBeTypeOf("function");
diff --git a/src/components/settings/__tests__/mood-section.test.tsx b/src/components/settings/__tests__/mood-section.test.tsx
index 8f3975704..5f949344b 100644
--- a/src/components/settings/__tests__/mood-section.test.tsx
+++ b/src/components/settings/__tests__/mood-section.test.tsx
@@ -131,12 +131,17 @@ vi.mock("@/hooks/use-auth", () => ({
 }));
 
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
 import { MoodSection } from "../mood-section";
 
 function render(locale: "en" | "de" = "en"): string {
+  // v1.18.6 (W9) — the visible heading (with the historic id) comes from the
+  // shared frame the route wraps the section in.
   return renderToStaticMarkup(
     <I18nProvider initialLocale={locale}>
-      <MoodSection />
+      <SettingsSectionFrame slug="mood">
+        <MoodSection />
+      </SettingsSectionFrame>
     </I18nProvider>,
   );
 }
diff --git a/src/components/settings/__tests__/notifications-section-module-gating.test.tsx b/src/components/settings/__tests__/notifications-section-module-gating.test.tsx
index 4cc5cd46b..7b7831108 100644
--- a/src/components/settings/__tests__/notifications-section-module-gating.test.tsx
+++ b/src/components/settings/__tests__/notifications-section-module-gating.test.tsx
@@ -2,10 +2,13 @@
  * v1.18.0 (S4) — module-gated per-type visibility on the consolidated
  * "Benachrichtigungen" reminder-types home.
  *
- * The mood reminder shows only when the `mood` module is enabled; the Coach
- * nudge only when `coach` is enabled. Low-stock maps to the medications CORE
- * domain (always shown). The gate fails OPEN, so a `/me` payload without a
- * module map keeps every card visible.
+ * The mood reminder shows only when the `mood` module is enabled. Low-stock
+ * maps to the medications domain (shown unless explicitly disabled). The gate
+ * fails OPEN, so a `/me` payload without a module map keeps every card
+ * visible.
+ *
+ * v1.18.6 (W9) — the proactive Coach nudge card moved to Settings → Coach, so
+ * it no longer appears on this screen.
  */
 import { describe, expect, it, vi } from "vitest";
 import { renderToStaticMarkup } from "react-dom/server";
@@ -47,30 +50,23 @@ function render(modules?: Record<string, boolean>) {
 }
 
 describe("<NotificationsSection> module-gated reminder types", () => {
-  it("shows mood + coach cards when no module map (fails open)", () => {
+  it("shows mood + low-stock cards when no module map (fails open); no coach nudge", () => {
     const html = render(undefined);
     expect(html).toContain('id="mood-reminder"');
-    expect(html).toContain('id="coach-nudge"');
     expect(html).toContain('id="low-stock"');
+    // v1.18.6 (W9) — the coach nudge moved to Settings → Coach.
+    expect(html).not.toContain('id="coach-nudge"');
   });
 
   it("hides the mood card when the mood module is disabled", () => {
     const html = render({ mood: false });
     expect(html).not.toContain('id="mood-reminder"');
-    // Coach + low-stock are unaffected.
-    expect(html).toContain('id="coach-nudge"');
+    // Low-stock is unaffected.
     expect(html).toContain('id="low-stock"');
   });
 
-  it("hides the coach card when the coach module is disabled", () => {
-    const html = render({ coach: false });
-    expect(html).not.toContain('id="coach-nudge"');
-    expect(html).toContain('id="mood-reminder"');
-    expect(html).toContain('id="low-stock"');
-  });
-
-  it("always shows low-stock (medications is a CORE domain)", () => {
-    const html = render({ mood: false, coach: false });
+  it("always shows low-stock unless medications is disabled", () => {
+    const html = render({ mood: false });
     expect(html).toContain('id="low-stock"');
     expect(html).not.toContain('id="mood-reminder"');
     expect(html).not.toContain('id="coach-nudge"');
@@ -82,9 +78,9 @@ describe("<NotificationsSection> module-gated reminder types", () => {
     const html = render({});
     expect(html).not.toContain('data-slot="notifications-channels-cross-link"');
     expect(html).not.toContain('data-slot="notifications-inbox-cross-link"');
-    // The three reminder-type cards remain.
+    // The remaining reminder-type cards (no coach nudge here anymore).
     expect(html).toContain('id="mood-reminder"');
     expect(html).toContain('id="low-stock"');
-    expect(html).toContain('id="coach-nudge"');
+    expect(html).not.toContain('id="coach-nudge"');
   });
 });
diff --git a/src/components/settings/__tests__/sections-i18n-parity.test.ts b/src/components/settings/__tests__/sections-i18n-parity.test.ts
index f85254a4d..d51d75cfc 100644
--- a/src/components/settings/__tests__/sections-i18n-parity.test.ts
+++ b/src/components/settings/__tests__/sections-i18n-parity.test.ts
@@ -2,11 +2,11 @@
  * v1.4.16 phase B6 — settings i18n parity.
  *
  * Every slug declared in `SETTINGS_SECTION_SLUGS` MUST have a
- * `settings.sections.<slug>.title` AND a `settings.sections.<slug>.description`
- * resolved in both English and German. The audit doc
- * (`docs/audit/v1416-settings-audit.md`) calls this out as the canonical
- * shape — the sidebar, the page `<h1>`, and the page subtitle all read
- * from these two keys, so a missing key paints a raw key in production.
+ * `settings.sections.<slug>.title` AND a `settings.sections.<slug>.subtitle`
+ * resolved in both English and German. The sidebar reads `.title`; the shared
+ * `<SettingsSectionFrame>` reads `.title` + `.subtitle` for the visible page
+ * heading + subheading (v1.18.6 W9), so a missing key paints a raw key in
+ * production.
  */
 
 import { describe, expect, it } from "vitest";
@@ -46,43 +46,39 @@ describe("settings sections — i18n parity (B6)", () => {
       expect(deValue?.length ?? 0).toBeGreaterThan(0);
     });
 
-    it(`every locale resolves settings.sections.${slug}.description`, () => {
+    it(`every locale resolves settings.sections.${slug}.subtitle`, () => {
       const enValue = lookup(en as Bag, [
         "settings",
         "sections",
         slug,
-        "description",
+        "subtitle",
       ]);
       const deValue = lookup(de as Bag, [
         "settings",
         "sections",
         slug,
-        "description",
+        "subtitle",
       ]);
-      expect(enValue, `EN missing description for ${slug}`).toBeTypeOf(
-        "string",
-      );
+      expect(enValue, `EN missing subtitle for ${slug}`).toBeTypeOf("string");
       expect(enValue?.length ?? 0).toBeGreaterThan(0);
-      expect(deValue, `DE missing description for ${slug}`).toBeTypeOf(
-        "string",
-      );
+      expect(deValue, `DE missing subtitle for ${slug}`).toBeTypeOf("string");
       expect(deValue?.length ?? 0).toBeGreaterThan(0);
     });
   }
 
-  it("EN and DE description for every slug are different (catches accidental copy-paste)", () => {
+  it("EN and DE subtitle for every slug are different (catches accidental copy-paste)", () => {
     for (const slug of SETTINGS_SECTION_SLUGS) {
       const enValue = lookup(en as Bag, [
         "settings",
         "sections",
         slug,
-        "description",
+        "subtitle",
       ]);
       const deValue = lookup(de as Bag, [
         "settings",
         "sections",
         slug,
-        "description",
+        "subtitle",
       ]);
       // It's legitimate for some titles to coincide between locales when
       // the proper noun is the same (e.g. "Dashboard", "API & Tokens").
@@ -90,7 +86,7 @@ describe("settings sections — i18n parity (B6)", () => {
       // EN value into the DE bag is a bug.
       expect(
         deValue,
-        `DE description for ${slug} is identical to EN — needs translation`,
+        `DE subtitle for ${slug} is identical to EN — needs translation`,
       ).not.toBe(enValue);
     }
   });
diff --git a/src/components/settings/__tests__/sections.test.tsx b/src/components/settings/__tests__/sections.test.tsx
index 50704d6e9..34ac19d7e 100644
--- a/src/components/settings/__tests__/sections.test.tsx
+++ b/src/components/settings/__tests__/sections.test.tsx
@@ -87,6 +87,8 @@ vi.mock("@/components/settings/thresholds-editor-section", () => ({
   ThresholdsEditorSection: () => <div data-testid="thresholds-editor" />,
 }));
 import { I18nProvider } from "@/lib/i18n/context";
+import { SettingsSectionFrame } from "../settings-section-frame";
+import type { SettingsSectionSlug } from "../section-slugs";
 import { AboutSection } from "../about-section";
 import { AccountSection } from "../account-section";
 import { AdvancedSection } from "../advanced-section";
@@ -108,10 +110,25 @@ function render(node: React.ReactElement, locale: "en" | "de" = "en") {
   );
 }
 
+// v1.18.6 (W9) — the visible page heading + subtitle moved out of the section
+// bodies into the shared `<SettingsSectionFrame>` that the route wraps every
+// section in. The heading-level smoke checks render the body THROUGH the frame
+// (mirroring production) so they assert what the user actually sees.
+function renderFramed(
+  slug: SettingsSectionSlug,
+  node: React.ReactElement,
+  locale: "en" | "de" = "en",
+) {
+  return render(
+    <SettingsSectionFrame slug={slug}>{node}</SettingsSectionFrame>,
+    locale,
+  );
+}
+
 describe("settings sections — SSR smoke", () => {
   it("<AccountSection> renders the Account heading and Profile card", () => {
-    const html = render(<AccountSection />);
-    // Section title resolves via the i18n provider.
+    const html = renderFramed("account", <AccountSection />);
+    // Section title resolves via the frame + i18n provider.
     expect(html).toContain("Account");
     // Profile card heading is also painted.
     expect(html).toContain("Profile");
@@ -136,7 +153,7 @@ describe("settings sections — SSR smoke", () => {
   });
 
   it("<AboutSection> renders version + license + sources/docs cards (no Updates panel)", () => {
-    const html = render(<AboutSection />);
+    const html = renderFramed("about", <AboutSection />);
     expect(html).toContain("About");
     // v1.4.36 W4f — the dedicated "Updates" card with its manual
     // "Check now" button is gone. The 24 h auto-check still runs and
@@ -158,34 +175,33 @@ describe("settings sections — SSR smoke", () => {
     expect(html).not.toContain("Replay the tour");
   });
 
-  it("<AiSection> renders the AI Insights heading", () => {
-    const html = render(<AiSection />);
-    // v1.8.7.1 — section renamed to "AI Insights" so the AI nature of the
-    // surface is explicit (was the bare "Insights"). The section H1 carries
-    // the only heading.
-    expect(html).toContain("AI Insights");
+  it("<AiSection> renders the AI provider heading", () => {
+    const html = renderFramed("ai", <AiSection />);
+    // v1.18.6 (W9) — section renamed to "AI provider"; the visible heading
+    // now comes from the shared frame, which keeps the historic id.
+    expect(html).toContain("AI provider");
     expect(html).toContain("settings-section-ai-title");
   });
 
   it("<IntegrationsSection> renders Withings card title", () => {
-    const html = render(<IntegrationsSection />);
+    const html = renderFramed("integrations", <IntegrationsSection />);
     expect(html).toContain("Integrations");
     expect(html).toContain("Withings");
   });
 
   it("<NotificationsSection> renders the single reminder-types home", () => {
-    const html = render(<NotificationsSection />);
-    // v1.18.1 (D0/D5) — the screen is lean: sr-only h1 only, no section blurb,
-    // no channels/inbox cross-links, and no embedded Vorsorge editor.
+    const html = renderFramed("notifications", <NotificationsSection />);
+    // v1.18.6 (W9) — the visible heading comes from the frame; the proactive
+    // Coach nudge moved to Settings → Coach, so it no longer renders here.
     expect(html).toContain("settings-section-notifications-title");
     expect(html).not.toContain("Notification channels");
     expect(html).not.toContain('data-slot="notifications-channels-cross-link"');
     expect(html).not.toContain('data-slot="notifications-inbox-cross-link"');
-    // The mood + coach cards fail OPEN (mock user carries no module map),
-    // so all three reminder-type cards render.
+    // The mood card fails OPEN (mock user carries no module map), so both
+    // remaining reminder-type cards render. The coach-nudge card is gone.
     expect(html).toContain('id="mood-reminder"');
-    expect(html).toContain('id="coach-nudge"');
     expect(html).toContain('id="low-stock"');
+    expect(html).not.toContain('id="coach-nudge"');
     // No raw i18n key leaks past the provider.
     expect(html).not.toContain("settings.sections.notifications.");
   });
@@ -194,32 +210,31 @@ describe("settings sections — SSR smoke", () => {
     // v1.4.3 split: the per-metric thresholds (Persönliche Zielwerte) moved
     // out into their own settings section under `/settings/thresholds`,
     // so the dashboard panel is now layout-only. Verifying the heading
-    // says "Dashboard" (not "Übersicht" — the v1.4.2 placeholder) and the
-    // layout slot still mounts.
-    const html = render(<DashboardSection />);
+    // (supplied by the frame) says "Dashboard" and the layout slot mounts.
+    const html = renderFramed("dashboard", <DashboardSection />);
     expect(html).toContain("Dashboard");
     expect(html).toContain('data-testid="dashboard-layout"');
     expect(html).not.toContain('data-testid="thresholds"');
   });
 
   it("<ApiSection> renders endpoints + tokens cards", () => {
-    const html = render(<ApiSection />);
+    const html = renderFramed("api", <ApiSection />);
     expect(html).toContain("API &amp; Tokens");
   });
 
   it("<AdvancedSection> renders the danger-zone card only (export moved to /settings/export)", () => {
-    const html = render(<AdvancedSection />);
+    const html = renderFramed("advanced", <AdvancedSection />);
     // v1.4.16 phase B7: every export path moved out into the dedicated
     // `<ExportSection>` so what remains is the irreversible delete-all
-    // path. The section heading + dangerZone surface are the only
-    // primary surfaces here now.
+    // path. The heading (supplied by the frame) + dangerZone surface are the
+    // only primary surfaces here now.
     expect(html).toContain("Advanced");
     expect(html).not.toContain("settings.export");
     expect(html).not.toContain("doctorReport");
   });
 
   it("<AboutSection> resolves about.* keys in German", () => {
-    const html = render(<AboutSection />, "de");
+    const html = renderFramed("about", <AboutSection />, "de");
     // v1.4.36 W4f — "Updates" panel + "Jetzt prüfen" button removed;
     // the surviving German copy is the section title + the Sources
     // & docs heading + the version line.
@@ -235,7 +250,7 @@ describe("settings sections — SSR smoke", () => {
     // `<ThresholdsEditorSection>` (was `<ThresholdsSection>`).
     // v1.8.7.1 — Sources split back onto its own page, so this wrapper
     // renders the target-range editor only.
-    const html = render(<ThresholdsSection />);
+    const html = renderFramed("thresholds", <ThresholdsSection />);
     // v1.8.7.1: section renamed to "Targets".
     expect(html).toContain("Targets");
     expect(html).toContain('data-testid="thresholds-editor"');
@@ -244,7 +259,7 @@ describe("settings sections — SSR smoke", () => {
   });
 
   it("<ThresholdsSection> resolves the German title", () => {
-    const html = render(<ThresholdsSection />, "de");
+    const html = renderFramed("thresholds", <ThresholdsSection />, "de");
     // v1.8.7.1 — German title is "Zielwerte" (Targets only).
     expect(html).toContain("Zielwerte");
     expect(html).toContain('data-testid="thresholds-editor"');
diff --git a/src/components/settings/__tests__/settings-shell.test.tsx b/src/components/settings/__tests__/settings-shell.test.tsx
index ce27d54d2..275a4ec9f 100644
--- a/src/components/settings/__tests__/settings-shell.test.tsx
+++ b/src/components/settings/__tests__/settings-shell.test.tsx
@@ -319,9 +319,9 @@ describe("<SettingsShell>", () => {
     expect(html).toContain('href="/settings/mood"');
     // Targets keeps its German nav entry ("Zielwerte").
     expect(html).toContain("Zielwerte");
-    // v1.8.7.1 — the AI Insights section is named "KI-Auswertungen" in
-    // German (the "KI" prefix makes the AI nature explicit).
-    expect(html).toContain("KI-Auswertungen");
+    // v1.18.6 (W9) — the AI section is named "KI-Anbieter" in German: the
+    // page is about the provider / BYOK, not an "Auswertung".
+    expect(html).toContain("KI-Anbieter");
     // API & Tokens is identical in both locales (proper noun + ampersand)
     expect(html).toContain("API &amp; Tokens");
     expect(html).toContain("Erweitert");
diff --git a/src/components/settings/about-section.tsx b/src/components/settings/about-section.tsx
index 847c43357..787c5b46a 100644
--- a/src/components/settings/about-section.tsx
+++ b/src/components/settings/about-section.tsx
@@ -181,17 +181,12 @@ export function AboutSection() {
   }, [version?.version]);
   /* eslint-enable react-hooks/exhaustive-deps, react-hooks/set-state-in-effect */
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the section
+  // frame that wraps this component: `<SettingsSectionFrame>` on the settings
+  // route and the admin renderer's `SectionFrame` on `/admin/about`. The body
+  // is the version / license / sources cards.
   return (
-    <section
-      aria-labelledby="settings-section-about-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-about-title" className="sr-only">
-          {t("settings.sections.about.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* Identity card — version + license inline. The v1.4.2 layout
           stacked the license under the version inside its own boxed Badge,
           which read as a separate field even though the two values belong
@@ -321,6 +316,6 @@ export function AboutSection() {
           button were collectively never the point of the surface —
           the only signal users ever cared about was "is a newer
           release out?", and the badge answers that with no clicks. */}
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/account-section.tsx b/src/components/settings/account-section.tsx
index bcd976592..bddb12312 100644
--- a/src/components/settings/account-section.tsx
+++ b/src/components/settings/account-section.tsx
@@ -367,20 +367,10 @@ export function AccountSection() {
 
   if (!user) return null;
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the profile cards.
   return (
-    <section
-      aria-labelledby="settings-section-account-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — the explanatory section blurb was dropped so every
-          settings section starts at the same vertical height; the sr-only
-          heading stays for the accessibility tree. */}
-      <header>
-        <h1 id="settings-section-account-title" className="sr-only">
-          {t("settings.sections.account.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* Profile card */}
       {/* Profile photo card */}
       <AvatarSection />
@@ -760,7 +750,7 @@ export function AccountSection() {
           </form>
         </DialogContent>
       </Dialog>
-    </section>
+    </div>
   );
 }
 
diff --git a/src/components/settings/advanced-section.tsx b/src/components/settings/advanced-section.tsx
index 98462ca15..b8710d71f 100644
--- a/src/components/settings/advanced-section.tsx
+++ b/src/components/settings/advanced-section.tsx
@@ -51,26 +51,16 @@ import { apiFetchRaw } from "@/lib/api/api-fetch";
  * dialog.
  */
 export function AdvancedSection() {
-  const { t } = useTranslations();
-
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the advanced cards.
   return (
-    <section
-      aria-labelledby="settings-section-advanced-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
-        <h1 id="settings-section-advanced-title" className="sr-only">
-          {t("settings.sections.advanced.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* v1.18.1 (D1) — "Tour neu starten" relocated here from Account. */}
       <TourReplayCard />
       <ResearchModeCard />
       <DataResetCard />
       <AccountDeleteCard />
-    </section>
+    </div>
   );
 }
 
diff --git a/src/components/settings/ai-section.tsx b/src/components/settings/ai-section.tsx
index 2ee988267..8cd89e9a7 100644
--- a/src/components/settings/ai-section.tsx
+++ b/src/components/settings/ai-section.tsx
@@ -21,10 +21,8 @@
 import { AiInsightsCard } from "@/components/settings/ai/ai-insights-card";
 import { useAuth } from "@/hooks/use-auth";
 import { useMounted } from "@/hooks/use-mounted";
-import { useTranslations } from "@/lib/i18n/context";
 
 export function AiSection() {
-  const { t } = useTranslations();
   const { isAuthenticated } = useAuth();
   // v1.16.6 — the auth query can resolve before this boundary
   // hydrates; every `disabled={!isAuthenticated}` binding in the child
@@ -35,19 +33,8 @@ export function AiSection() {
   const mounted = useMounted();
   const authed = mounted && isAuthenticated;
 
-  return (
-    <section aria-labelledby="settings-section-ai-title" className="space-y-6">
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
-        <h1 id="settings-section-ai-title" className="sr-only">
-          {t("settings.sections.ai.title")}
-        </h1>
-      </header>
-
-      <AiInsightsCard isAuthenticated={authed} />
-
-      {/* v1.18.1 (D8) — the "About me" context moved to Settings → Account
-          (under Profil, before Zyklus-Tracking). */}
-    </section>
-  );
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the single provider
+  // card. (The "About me" context moved to Settings → Account in v1.18.1 D8.)
+  return <AiInsightsCard isAuthenticated={authed} />;
 }
diff --git a/src/components/settings/api-section.tsx b/src/components/settings/api-section.tsx
index 8580b14cc..417b081de 100644
--- a/src/components/settings/api-section.tsx
+++ b/src/components/settings/api-section.tsx
@@ -37,19 +37,13 @@ interface ApiTokenInfo {
 }
 
 export function ApiSection() {
-  const { t } = useTranslations();
-
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the API cards.
   return (
-    <section aria-labelledby="settings-section-api-title" className="space-y-6">
-      <header>
-        <h1 id="settings-section-api-title" className="sr-only">
-          {t("settings.sections.api.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       <ApiEndpointsCard />
       <ApiTokensCard />
-    </section>
+    </div>
   );
 }
 
diff --git a/src/components/settings/channels-section.tsx b/src/components/settings/channels-section.tsx
index 65da12c95..ebceea87e 100644
--- a/src/components/settings/channels-section.tsx
+++ b/src/components/settings/channels-section.tsx
@@ -8,30 +8,13 @@
  * delivery provider — the same family as a connected device — and now reads as
  * a first-class settings home rather than a tab hidden behind Integrationen.
  *
- * The content is the existing `<NotificationChannelsPanel>`; this wrapper only
- * owns the section frame (sr-only heading scaffold matching every other
- * settings section).
+ * The content is the existing `<NotificationChannelsPanel>`. v1.18.6 (W9) —
+ * the visible heading + subtitle now come from the shared
+ * `<SettingsSectionFrame>` in the route; this wrapper is the panel only.
  */
 
 import { NotificationChannelsPanel } from "@/components/settings/integrations/notification-channels-panel";
-import { useTranslations } from "@/lib/i18n/context";
 
 export function ChannelsSection() {
-  const { t } = useTranslations();
-
-  return (
-    <section
-      aria-labelledby="settings-section-channels-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
-        <h1 id="settings-section-channels-title" className="sr-only">
-          {t("settings.sections.channels.title")}
-        </h1>
-      </header>
-
-      <NotificationChannelsPanel />
-    </section>
-  );
+  return <NotificationChannelsPanel />;
 }
diff --git a/src/components/settings/coach-section.tsx b/src/components/settings/coach-section.tsx
index 2d732bad2..7bdc78e9e 100644
--- a/src/components/settings/coach-section.tsx
+++ b/src/components/settings/coach-section.tsx
@@ -10,25 +10,31 @@
  *   1. Disable Coach    — the per-user opt-out (kept first so a user who
  *                         wants the surface gone finds it immediately).
  *   2. Coach preferences — tone, verbosity, data scope (`useCoachPrefs`).
- *   3. Coach memory      — durable-fact review + forget controls.
+ *   3. Proactive nudge   — the daily-nudge opt-out + per-group frequency
+ *                          (moved here from Settings → Benachrichtigungen in
+ *                          v1.18.6: it is a Coach setting, not a generic
+ *                          notification).
+ *   4. Coach memory      — durable-fact review + forget controls.
  *
- * The nav entry is module-gated on `coach`. The preference + memory cards
- * keep their own content gate on `!user.disableCoach` (mirrored from the
+ * The nav entry is module-gated on `coach`. The preference + nudge + memory
+ * cards keep their own content gate on `!user.disableCoach` (mirrored from the
  * old AI section): hiding the Coach hides its tuning + memory controls too.
  *
  * The "about me" context lives in the AI section, not here — the daily
  * briefing reads it too, so it is not a Coach-only setting.
+ *
+ * v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+ * `<SettingsSectionFrame>` in the route; this body is the Coach cards only.
  */
 
 import { DisableCoachCard } from "@/components/settings/ai/disable-coach-card";
 import { CoachMemorySection } from "@/components/settings/coach-memory-section";
+import { CoachNudgeCard } from "@/components/settings/coach-nudge-card";
 import { CoachPrefsSection } from "@/components/settings/coach-prefs-section";
 import { useAuth } from "@/hooks/use-auth";
 import { useMounted } from "@/hooks/use-mounted";
-import { useTranslations } from "@/lib/i18n/context";
 
 export function CoachSection() {
-  const { t } = useTranslations();
   const { isAuthenticated, user } = useAuth();
   // Mirror the AI section's hydration-safe gating: the auth query can
   // resolve before this boundary hydrates, so gate the child props on
@@ -42,22 +48,20 @@ export function CoachSection() {
   const coachEnabled = !mounted || !user?.disableCoach;
 
   return (
-    <section
-      aria-labelledby="settings-section-coach-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header>
-        <h1 id="settings-section-coach-title" className="sr-only">
-          {t("settings.sections.coach.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       <DisableCoachCard isAuthenticated={authed} />
 
       {coachEnabled && <CoachPrefsSection isAuthenticated={authed} />}
 
+      {/* Proactive Coach nudge — moved here from Benachrichtigungen (v1.18.6).
+          Keeps the `#coach-nudge` anchor so existing deep links resolve. */}
+      {coachEnabled && (
+        <div id="coach-nudge" className="scroll-mt-28">
+          <CoachNudgeCard isAuthenticated={isAuthenticated} />
+        </div>
+      )}
+
       {coachEnabled && <CoachMemorySection isAuthenticated={authed} />}
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/dashboard-section.tsx b/src/components/settings/dashboard-section.tsx
index 70fa97477..8342fbb7c 100644
--- a/src/components/settings/dashboard-section.tsx
+++ b/src/components/settings/dashboard-section.tsx
@@ -1,29 +1,12 @@
 "use client";
 
 import { DashboardLayoutSection } from "@/components/settings/dashboard-layout-section";
-import { SettingsHubBackLink } from "@/components/settings/settings-hub-back-link";
-import { useTranslations } from "@/lib/i18n/context";
 
+/**
+ * v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+ * `<SettingsSectionFrame>`, and the "← back to hub" link rides the frame's
+ * `topSlot`. The body is the layout customizer only.
+ */
 export function DashboardSection() {
-  const { t } = useTranslations();
-
-  return (
-    <section
-      aria-labelledby="settings-section-dashboard-title"
-      className="space-y-6"
-    >
-      <header className="space-y-2">
-        <SettingsHubBackLink
-          href="/settings/layout"
-          labelKey="settings.sections.layout.backToHub"
-        />
-        <h1 id="settings-section-dashboard-title" className="sr-only">
-          {t("settings.sections.dashboard.title")}
-        </h1>
-        {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      </header>
-
-      <DashboardLayoutSection id="dashboard-layout" />
-    </section>
-  );
+  return <DashboardLayoutSection id="dashboard-layout" />;
 }
diff --git a/src/components/settings/export-section.tsx b/src/components/settings/export-section.tsx
index f6cf3d354..4116dd584 100644
--- a/src/components/settings/export-section.tsx
+++ b/src/components/settings/export-section.tsx
@@ -70,17 +70,11 @@ async function downloadFromUrl(url: string, filename: string): Promise<void> {
 
 export function ExportSection() {
   const { t } = useTranslations();
+  // v1.18.6 (W9) — the visible page heading + subtitle now come from the
+  // shared `<SettingsSectionFrame>` in the route; the inner `<h2>` keeps its
+  // own "other options" subsection label.
   return (
-    <section
-      aria-labelledby="settings-section-export-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-export-title" className="sr-only">
-          {t("settings.sections.export.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* v1.18.0 (S5) — the full health-record export moved to its own
           top-level "Gesundheitsakte" section. This page keeps the generic
           CSV/JSON data-out paths and the import surface. */}
@@ -111,7 +105,7 @@ export function ExportSection() {
           `export.zip` and the generic JSON paths. The export routes had
           backends with no UI until now. */}
       <ImportPanel />
-    </section>
+    </div>
   );
 }
 
diff --git a/src/components/settings/gesundheitsakte-section.tsx b/src/components/settings/gesundheitsakte-section.tsx
index 7bf511e54..72ee9adac 100644
--- a/src/components/settings/gesundheitsakte-section.tsx
+++ b/src/components/settings/gesundheitsakte-section.tsx
@@ -18,32 +18,10 @@
  */
 
 import { HealthRecordExportPanel } from "@/components/settings/health-record-export-panel";
-import { useTranslations } from "@/lib/i18n/context";
-import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export function GesundheitsakteSection() {
-  const { t } = useTranslations();
-  return (
-    <section
-      aria-labelledby="settings-section-gesundheitsakte-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header className="flex items-center justify-end">
-        <h1
-          id="settings-section-gesundheitsakte-title"
-          className="sr-only"
-        >
-          {t("settings.sections.gesundheitsakte.title")}
-        </h1>
-        {/* v1.18.6 — guided-tour re-entry for the doctor-report module + a
-            real spotlight anchor (the section h1 is sr-only). */}
-        <span data-tour-id="export-hero">
-          <ModuleTourTrigger stopId="export" />
-        </span>
-      </header>
-
-      <HealthRecordExportPanel />
-    </section>
-  );
+  // v1.18.6 (W9) — the visible heading + subtitle and the module tour-replay
+  // trigger now live in the shared `<SettingsSectionFrame>` in the route; the
+  // body is the health-record export panel only.
+  return <HealthRecordExportPanel />;
 }
diff --git a/src/components/settings/insights-section.tsx b/src/components/settings/insights-section.tsx
index ffc434e4b..2fa49fa9d 100644
--- a/src/components/settings/insights-section.tsx
+++ b/src/components/settings/insights-section.tsx
@@ -2,8 +2,6 @@
 
 import { InsightsOverviewArrangeSection } from "@/components/settings/insights-overview-arrange-section";
 import { InsightsPillOrderSection } from "@/components/settings/insights-pill-order-section";
-import { SettingsHubBackLink } from "@/components/settings/settings-hub-back-link";
-import { useTranslations } from "@/lib/i18n/context";
 
 /**
  * v1.15.18 — the "Insights" settings section (analogous to the Dashboard
@@ -15,28 +13,16 @@ import { useTranslations } from "@/lib/i18n/context";
  *
  * Both write through the same `/api/insights/layout` contract the tab strip
  * and the overview share, so a save here repaints both surfaces in lockstep.
+ *
+ * v1.18.6 (W9) — the visible "Insights" heading + subtitle now come from the
+ * shared `<SettingsSectionFrame>`, and the "← back to hub" link rides the
+ * frame's `topSlot`. The body is the two arrange cards only.
  */
 export function InsightsSection() {
-  const { t } = useTranslations();
-
   return (
-    <section
-      aria-labelledby="settings-section-insights-title"
-      className="space-y-6"
-    >
-      <header className="space-y-2">
-        <SettingsHubBackLink
-          href="/settings/layout"
-          labelKey="settings.sections.layout.backToHub"
-        />
-        <h1 id="settings-section-insights-title" className="sr-only">
-          {t("settings.sections.insights.title")}
-        </h1>
-        {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      </header>
-
+    <div className="space-y-6">
       <InsightsOverviewArrangeSection id="insights-overview-arrange" />
       <InsightsPillOrderSection id="insights-pill-order" />
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/integrations-section.tsx b/src/components/settings/integrations-section.tsx
index 2bd9fc16c..ef21a48bf 100644
--- a/src/components/settings/integrations-section.tsx
+++ b/src/components/settings/integrations-section.tsx
@@ -16,8 +16,6 @@
  */
 
 import { ConnectionsPanel } from "@/components/settings/integrations/connections-panel";
-import { useTranslations } from "@/lib/i18n/context";
-import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 export {
   parseOAuthOutcome,
@@ -25,27 +23,8 @@ export {
 } from "@/components/settings/integrations/connections-panel";
 
 export function IntegrationsSection() {
-  const { t } = useTranslations();
-
-  return (
-    <section
-      aria-labelledby="settings-section-integrations-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0) — section blurb dropped for consistent top alignment. */}
-      <header className="flex items-center justify-end">
-        <h1 id="settings-section-integrations-title" className="sr-only">
-          {t("settings.sections.integrations.title")}
-        </h1>
-        {/* v1.18.6 — guided-tour re-entry for the integrations module. The
-            visible affordance also gives the spotlight a real anchor (the
-            section h1 is sr-only). */}
-        <span data-tour-id="integrations-hero">
-          <ModuleTourTrigger stopId="integrations" />
-        </span>
-      </header>
-
-      <ConnectionsPanel />
-    </section>
-  );
+  // v1.18.6 (W9) — the visible heading + subtitle and the module tour-replay
+  // trigger now live in the shared `<SettingsSectionFrame>` in the route; the
+  // body is the connections panel only.
+  return <ConnectionsPanel />;
 }
diff --git a/src/components/settings/layout-section.tsx b/src/components/settings/layout-section.tsx
index a636c39af..e5ad4528c 100644
--- a/src/components/settings/layout-section.tsx
+++ b/src/components/settings/layout-section.tsx
@@ -53,47 +53,38 @@ const LAYOUT_LINKS: ReadonlyArray<LayoutLink> = [
 export function LayoutSection() {
   const { t } = useTranslations();
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the hub link list.
   return (
-    <section
-      aria-labelledby="settings-section-layout-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-layout-title" className="sr-only">
-          {t("settings.sections.layout.title")}
-        </h1>
-      </header>
-
-      <ul className="space-y-3">
-        {LAYOUT_LINKS.map((link) => {
-          const Icon = link.icon;
-          return (
-            <li key={link.href}>
-              <Link
-                href={link.href}
-                className={cn(
-                  "bg-card border-border hover:bg-accent/40 group flex items-center gap-4 rounded-xl border p-4 transition-colors sm:p-5",
-                )}
-              >
-                <Icon
-                  className="text-muted-foreground h-5 w-5 shrink-0"
-                  aria-hidden="true"
-                />
-                <div className="min-w-0 flex-1 space-y-0.5">
-                  <p className="text-sm font-semibold">{t(link.titleKey)}</p>
-                  <p className="text-muted-foreground text-xs">
-                    {t(link.descriptionKey)}
-                  </p>
-                </div>
-                <ChevronRight
-                  className="text-muted-foreground/60 group-hover:text-foreground h-4 w-4 shrink-0 transition-colors"
-                  aria-hidden="true"
-                />
-              </Link>
-            </li>
-          );
-        })}
-      </ul>
-    </section>
+    <ul className="space-y-3">
+      {LAYOUT_LINKS.map((link) => {
+        const Icon = link.icon;
+        return (
+          <li key={link.href}>
+            <Link
+              href={link.href}
+              className={cn(
+                "bg-card border-border hover:bg-accent/40 group flex items-center gap-4 rounded-xl border p-4 transition-colors sm:p-5",
+              )}
+            >
+              <Icon
+                className="text-muted-foreground h-5 w-5 shrink-0"
+                aria-hidden="true"
+              />
+              <div className="min-w-0 flex-1 space-y-0.5">
+                <p className="text-sm font-semibold">{t(link.titleKey)}</p>
+                <p className="text-muted-foreground text-xs">
+                  {t(link.descriptionKey)}
+                </p>
+              </div>
+              <ChevronRight
+                className="text-muted-foreground/60 group-hover:text-foreground h-4 w-4 shrink-0 transition-colors"
+                aria-hidden="true"
+              />
+            </Link>
+          </li>
+        );
+      })}
+    </ul>
   );
 }
diff --git a/src/components/settings/medications-section.tsx b/src/components/settings/medications-section.tsx
index c19d5c261..a1421aba9 100644
--- a/src/components/settings/medications-section.tsx
+++ b/src/components/settings/medications-section.tsx
@@ -73,17 +73,10 @@ export function MedicationsSection() {
     ),
   ].map((m) => ({ id: m.id, name: m.name, dose: m.dose, active: m.active }));
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the medication cards.
   return (
-    <section
-      aria-labelledby="settings-section-medications-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-medications-title" className="sr-only">
-          {t("settings.sections.medications.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* View preference — cards vs table. The shared header toggle
           writes optimistically, so there is no Save button here. */}
       <div
@@ -130,6 +123,6 @@ export function MedicationsSection() {
           they moved here from the account profile so all medication-specific
           preferences live in one place. */}
       <InjectionSitesCard isAuthenticated={isAuthenticated} />
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/modules-section.tsx b/src/components/settings/modules-section.tsx
index f90fff8f7..d52ed2507 100644
--- a/src/components/settings/modules-section.tsx
+++ b/src/components/settings/modules-section.tsx
@@ -32,12 +32,9 @@ import {
   Droplet,
   Dumbbell,
   FileText,
-  HeartPulse,
-  Lock,
   MessageCircleHeart,
   Moon,
   Pill,
-  Scale,
   Smile,
   Sparkles,
   TestTube,
@@ -52,10 +49,8 @@ import { useTranslations } from "@/lib/i18n/context";
 import { apiPatch } from "@/lib/api/api-fetch";
 import { queryKeys } from "@/lib/query-keys";
 import {
-  CORE_DOMAIN_KEYS,
   MODULE_REGISTRY,
   moduleDelegatesTo,
-  type CoreDomainKey,
   type ModuleKey,
 } from "@/lib/modules/registry";
 
@@ -77,13 +72,6 @@ const MODULE_ICONS: Record<ModuleKey, LucideIcon> = {
   doctorReport: FileText,
 };
 
-/** Neutral Lucide glyph per core (always-on) domain. */
-const CORE_ICONS: Record<CoreDomainKey, LucideIcon> = {
-  weight: Scale,
-  bloodPressure: HeartPulse,
-  pulse: Activity,
-};
-
 export function ModulesSection() {
   const { t } = useTranslations();
   const { user } = useAuth();
@@ -113,103 +101,65 @@ export function ModulesSection() {
     },
   });
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` (the former muted-`<p>` intro folded into the
+  // frame's standard subtitle). The "Module immer aktiv" core-domains card
+  // was removed: a domain that can't be turned off doesn't need to be listed.
   return (
-    <section
-      aria-labelledby="settings-section-modules-title"
-      className="space-y-6"
-    >
-      {/* v1.18.6 — restore a short intro line so a new user understands
-          that this page drives the nav, tiles and assessments they see.
-          (Dropped in v1.18.1 D0 for top alignment; the orientation cost
-          outweighed the alignment.) */}
-      <header className="space-y-1">
-        <h1 id="settings-section-modules-title" className="sr-only">
-          {t("settings.sections.modules.title")}
-        </h1>
-        <p className="text-muted-foreground text-sm leading-relaxed">
-          {t("settings.sections.modules.description")}
-        </p>
-      </header>
-
-      <div className="bg-card border-border rounded-xl border p-4 sm:p-6">
-        <SettingsCardHeader
-          icon={Blocks}
-          title={t("settings.sections.modules.toggleable.title")}
-          className="mb-2"
-        />
-        {/* v1.18.6 — restore the one-line "what this section does" hint. */}
-        <p className="text-muted-foreground mb-3 pl-7 text-sm leading-relaxed">
-          {t("settings.sections.modules.toggleable.description")}
-        </p>
-        <div className="divide-border divide-y pl-7">
-          {(Object.keys(MODULE_REGISTRY) as ModuleKey[]).map((key) => {
-            const def = MODULE_REGISTRY[key];
-            // Default-on: a module is enabled unless explicitly `false`.
-            const enabled = modules[key] !== false;
-            // Delegated modules (cycle/coach) are owned elsewhere — never a
-            // live toggle here; deep-link to their real control instead.
-            const delegated = moduleDelegatesTo(key) !== undefined;
-            // Operator turned this module off server-wide: no per-user
-            // toggle can re-enable it, so show a read-only note. Delegated
-            // rows already deep-link, so this only matters for owned keys.
-            const operatorDisabled =
-              !delegated && moduleAvailability[key] === false;
-            return (
-              <ModuleToggleRow
-                key={key}
-                moduleKey={key}
-                icon={MODULE_ICONS[key]}
-                label={t(def.labelKey)}
-                description={t(def.descriptionKey)}
-                enabled={enabled}
-                pending={toggle.isPending}
-                managedAt={
-                  delegated && def.managedAt
-                    ? {
-                        href: def.managedAt.href,
-                        label: t(def.managedAt.labelKey),
-                      }
-                    : undefined
-                }
-                manageLinkLabel={
-                  delegated && def.managedAt
-                    ? t("settings.sections.modules.manageIn", {
-                        section: t(def.managedAt.labelKey),
-                      })
-                    : undefined
-                }
-                operatorDisabled={operatorDisabled}
-                operatorNote={t("settings.sections.modules.operatorDisabled")}
-                onToggle={(next) => toggle.mutate({ key, enabled: next })}
-              />
-            );
-          })}
-        </div>
-      </div>
-
-      {/* Core domains — always on, read-only */}
-      <div className="bg-card border-border rounded-xl border p-4 sm:p-6">
-        <SettingsCardHeader
-          icon={Lock}
-          title={t("settings.sections.modules.core.title")}
-          description={t("settings.sections.modules.core.description")}
-          className="mb-2"
-        />
-        <div className="divide-border divide-y pl-7">
-          {CORE_DOMAIN_KEYS.map((key) => (
+    <div className="bg-card border-border rounded-xl border p-4 sm:p-6">
+      <SettingsCardHeader
+        icon={Blocks}
+        title={t("settings.sections.modules.toggleable.title")}
+        className="mb-2"
+      />
+      {/* v1.18.6 — restore the one-line "what this section does" hint. */}
+      <p className="text-muted-foreground mb-3 pl-7 text-sm leading-relaxed">
+        {t("settings.sections.modules.toggleable.description")}
+      </p>
+      <div className="divide-border divide-y pl-7">
+        {(Object.keys(MODULE_REGISTRY) as ModuleKey[]).map((key) => {
+          const def = MODULE_REGISTRY[key];
+          // Default-on: a module is enabled unless explicitly `false`.
+          const enabled = modules[key] !== false;
+          // Delegated modules (cycle/coach) are owned elsewhere — never a
+          // live toggle here; deep-link to their real control instead.
+          const delegated = moduleDelegatesTo(key) !== undefined;
+          // Operator turned this module off server-wide: no per-user
+          // toggle can re-enable it, so show a read-only note. Delegated
+          // rows already deep-link, so this only matters for owned keys.
+          const operatorDisabled =
+            !delegated && moduleAvailability[key] === false;
+          return (
             <ModuleToggleRow
               key={key}
               moduleKey={key}
-              icon={CORE_ICONS[key]}
-              label={t(`modules.${key}.label`)}
-              description={t(`modules.${key}.description`)}
-              enabled
-              locked
-              lockedNote={t("settings.sections.modules.core.note")}
+              icon={MODULE_ICONS[key]}
+              label={t(def.labelKey)}
+              description={t(def.descriptionKey)}
+              enabled={enabled}
+              pending={toggle.isPending}
+              managedAt={
+                delegated && def.managedAt
+                  ? {
+                      href: def.managedAt.href,
+                      label: t(def.managedAt.labelKey),
+                    }
+                  : undefined
+              }
+              manageLinkLabel={
+                delegated && def.managedAt
+                  ? t("settings.sections.modules.manageIn", {
+                      section: t(def.managedAt.labelKey),
+                    })
+                  : undefined
+              }
+              operatorDisabled={operatorDisabled}
+              operatorNote={t("settings.sections.modules.operatorDisabled")}
+              onToggle={(next) => toggle.mutate({ key, enabled: next })}
             />
-          ))}
-        </div>
+          );
+        })}
       </div>
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/mood-section.tsx b/src/components/settings/mood-section.tsx
index 5f31a7b58..dff7c7019 100644
--- a/src/components/settings/mood-section.tsx
+++ b/src/components/settings/mood-section.tsx
@@ -40,17 +40,10 @@ export function MoodSection() {
     </div>
   );
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` in the route; this body is the mood-tag cards.
   return (
-    <section
-      aria-labelledby="settings-section-mood-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-mood-title" className="sr-only">
-          {t("settings.sections.mood.title")}
-        </h1>
-      </header>
-
+    <div className="space-y-6">
       {/* Groups — picker group order + own groups. */}
       <div
         id="mood-groups"
@@ -87,6 +80,6 @@ export function MoodSection() {
           <ArchivedTagsCard catalog={catalog} />
         )}
       </div>
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/notifications-section.tsx b/src/components/settings/notifications-section.tsx
index ff979d0c5..edeeb8df3 100644
--- a/src/components/settings/notifications-section.tsx
+++ b/src/components/settings/notifications-section.tsx
@@ -1,8 +1,6 @@
 "use client";
 
 import { useAuth } from "@/hooks/use-auth";
-import { useTranslations } from "@/lib/i18n/context";
-import { CoachNudgeCard } from "@/components/settings/coach-nudge-card";
 import { LowStockCard } from "@/components/settings/low-stock-card";
 import { MoodReminderCard } from "@/components/settings/mood-reminder-card";
 
@@ -17,44 +15,31 @@ import { MoodReminderCard } from "@/components/settings/mood-reminder-card";
  *
  * Each reminder-type card is shown ONLY when its module is enabled, read from
  * the resolved `useAuth().user.modules` map (the same `/auth/me` map nav and
- * Insights pills gate off). Mood → `mood`, Coach nudge → `coach`, low-stock
- * runway → `medications` (a toggleable fail-open module since D3, so a missing
- * key reads as enabled and a stale `/me` payload never blanks a card).
+ * Insights pills gate off). Mood → `mood`, low-stock runway → `medications`
+ * (a toggleable fail-open module since D3, so a missing key reads as enabled
+ * and a stale `/me` payload never blanks a card).
  *
  * v1.18.1 (D5) — the page is intentionally lean: the section blurb, the
  * channels / inbox cross-links, and the embedded Vorsorge (preventive-care)
  * editor were all removed. Vorsorge has its own `/vorsorge` page, so embedding
  * it here was a duplicate. Delivery CHANNELS (Telegram / ntfy / Web Push /
  * Webhook / Email) live under Settings → Integrations → Channels.
+ *
+ * v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+ * `<SettingsSectionFrame>`. The proactive-Coach nudge card moved to Settings →
+ * Coach (it is a Coach setting, not a generic notification), so this screen
+ * carries the mood + low-stock reminder cards only.
  */
 export function NotificationsSection() {
-  const { t } = useTranslations();
   const { isAuthenticated, user } = useAuth();
 
   // v1.18.0 (S4) — module-gated per-type visibility. Fail OPEN (`!== false`)
   // so a stale `/me` payload without the module map keeps every card visible.
   const moodEnabled = user?.modules?.mood !== false;
-  const coachEnabled = user?.modules?.coach !== false;
   const medsEnabled = user?.modules?.medications !== false;
 
   return (
-    <section
-      aria-labelledby="settings-section-notifications-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0/D5) — the section blurb and the channels / inbox cross-
-          links were dropped: the header now starts at the same height as every
-          other section and the page carries only the reminder-type cards. */}
-      <header>
-        <h1 id="settings-section-notifications-title" className="sr-only">
-          {t("settings.sections.notifications.title")}
-        </h1>
-      </header>
-
-      {/* v1.18.1 (D5) — the Vorsorge (preventive-care) block was removed; it
-          has its own /vorsorge page, so embedding the editor here was a
-          duplicate. This screen keeps the three reminder-type cards below. */}
-
+    <div className="space-y-6">
       {/* Mood check-in reminder — only when the mood module is enabled. */}
       {moodEnabled ? (
         <div id="mood-reminder" className="scroll-mt-28">
@@ -69,13 +54,6 @@ export function NotificationsSection() {
           <LowStockCard isAuthenticated={isAuthenticated} />
         </div>
       ) : null}
-
-      {/* Proactive Coach nudge — only when the coach module is enabled. */}
-      {coachEnabled ? (
-        <div id="coach-nudge" className="scroll-mt-28">
-          <CoachNudgeCard isAuthenticated={isAuthenticated} />
-        </div>
-      ) : null}
-    </section>
+    </div>
   );
 }
diff --git a/src/components/settings/section-nav-heading-spacer.tsx b/src/components/settings/section-nav-heading-spacer.tsx
new file mode 100644
index 000000000..5a5bcf962
--- /dev/null
+++ b/src/components/settings/section-nav-heading-spacer.tsx
@@ -0,0 +1,25 @@
+/**
+ * `<SectionNavHeadingSpacer>` — invisible spacer that reserves exactly the
+ * height of a section's heading block (h1 + subtitle) plus the `space-y-6`
+ * gap that separates the heading from the first card.
+ *
+ * v1.18.6 (W9) — Marc's symmetry ask: the left settings / admin menu's first
+ * item must line up with the TOP OF THE FIRST CARD, not with the page
+ * heading. The page heading lives in the content column above the first card,
+ * so the sidebar needs to start one heading-block lower. Replicating the
+ * exact heading markup (same `text-2xl` h1 + `text-sm` subtitle) as a hidden,
+ * `aria-hidden` block keeps the offset pixel-accurate across locales and
+ * line-wrapping — a hard-coded `pt-[…]` would drift the moment a title or
+ * subtitle wraps to a second line.
+ *
+ * It is only rendered on `md+` (the desktop sticky sidebar); the mobile chip
+ * strip has no heading-to-align-with.
+ */
+export function SectionNavHeadingSpacer() {
+  return (
+    <div aria-hidden="true" className="invisible mb-6 select-none">
+      <h1 className="text-2xl font-bold tracking-tight">&nbsp;</h1>
+      <p className="text-muted-foreground text-sm">&nbsp;</p>
+    </div>
+  );
+}
diff --git a/src/components/settings/settings-section-frame.tsx b/src/components/settings/settings-section-frame.tsx
new file mode 100644
index 000000000..1191d1cb0
--- /dev/null
+++ b/src/components/settings/settings-section-frame.tsx
@@ -0,0 +1,74 @@
+"use client";
+
+/**
+ * `<SettingsSectionFrame>` — the canonical page-frame for every Settings
+ * section. The settings twin of the admin renderer's `SectionFrame`
+ * (`src/app/admin/[section]/renderer.tsx`): it emits the one visible
+ * heading + subheading every page must show, in the reference style used by
+ * the Admin Konsole → Übersicht landing.
+ *
+ * Before this primitive every settings section hand-rolled its own
+ * `sr-only` `<h1>`, so no settings page showed a visible heading and the
+ * left-menu-to-first-card alignment drifted page to page. Routing all 19
+ * sections through one frame fixes both: a constant-height heading block
+ * above the first card, and a real visible `h1 + subtitle`.
+ *
+ *   <SettingsSectionFrame slug="account">
+ *     {cards}
+ *   </SettingsSectionFrame>
+ *
+ * Title comes from `settings.sections.<slug>.title`; subtitle from
+ * `settings.sections.<slug>.subtitle`. The `<h1>` keeps the historic
+ * `settings-section-<slug>-title` id so the section's own `aria-labelledby`
+ * linkage — and the spotlight-tour anchors that reference it — stay intact.
+ *
+ * `topSlot` renders ABOVE the heading (used by the Layout-hub child
+ * editors for their "← back to hub" link, which must sit above the title).
+ * `headingAccessory` renders inline at the top-right of the heading row
+ * (used by Gesundheitsakte for its guided-tour re-entry trigger).
+ */
+
+import * as React from "react";
+
+import { useTranslations } from "@/lib/i18n/context";
+import type { SettingsSectionSlug } from "./section-slugs";
+
+export interface SettingsSectionFrameProps {
+  slug: SettingsSectionSlug;
+  /** Optional content rendered above the heading (e.g. a back-to-hub link). */
+  topSlot?: React.ReactNode;
+  /** Optional content rendered inline at the top-right of the heading row
+   *  (e.g. a guided-tour re-entry trigger). */
+  headingAccessory?: React.ReactNode;
+  children: React.ReactNode;
+}
+
+export function SettingsSectionFrame({
+  slug,
+  topSlot,
+  headingAccessory,
+  children,
+}: SettingsSectionFrameProps) {
+  const { t } = useTranslations();
+  const titleId = `settings-section-${slug}-title`;
+
+  return (
+    <section aria-labelledby={titleId} className="space-y-6">
+      {topSlot ? <div>{topSlot}</div> : null}
+      <div className="flex items-start justify-between gap-2">
+        <div className="min-w-0">
+          <h1 id={titleId} className="text-2xl font-bold tracking-tight">
+            {t(`settings.sections.${slug}.title`)}
+          </h1>
+          <p className="text-muted-foreground text-sm">
+            {t(`settings.sections.${slug}.subtitle`)}
+          </p>
+        </div>
+        {headingAccessory ? (
+          <div className="shrink-0">{headingAccessory}</div>
+        ) : null}
+      </div>
+      {children}
+    </section>
+  );
+}
diff --git a/src/components/settings/settings-shell.tsx b/src/components/settings/settings-shell.tsx
index e47b640a4..f99b74e2f 100644
--- a/src/components/settings/settings-shell.tsx
+++ b/src/components/settings/settings-shell.tsx
@@ -48,6 +48,7 @@ import {
   isSettingsSectionSlug,
   type SettingsSectionSlug,
 } from "./section-slugs";
+import { SectionNavHeadingSpacer } from "./section-nav-heading-spacer";
 
 // Re-export so existing call-sites importing from this module keep working.
 // New server-side call-sites (e.g. `generateStaticParams()`) should import
@@ -259,8 +260,7 @@ export function SettingsShell({ active, children }: SettingsShellProps) {
   // no `moduleGate` (global / CORE) are always shown.
   const modules = user?.modules;
   const visibleSections = SETTINGS_SECTIONS.filter(
-    (section) =>
-      !section.moduleGate || modules?.[section.moduleGate] !== false,
+    (section) => !section.moduleGate || modules?.[section.moduleGate] !== false,
   );
 
   // v1.4.33 IW4 — keep the active chip in view inside the horizontal
@@ -358,6 +358,10 @@ export function SettingsShell({ active, children }: SettingsShellProps) {
           className="hidden md:block"
         >
           <div className="sticky top-20">
+            {/* v1.18.6 (W9) — push the first nav item down to the top of the
+                first card (level with the page heading's following gap), so
+                the menu reads symmetric with the content column. */}
+            <SectionNavHeadingSpacer />
             <ul className="space-y-1">
               {visibleSections.map((section) => {
                 const isActive = section.slug === activeSlug;
diff --git a/src/components/settings/sources-section.tsx b/src/components/settings/sources-section.tsx
index 077b6de04..9a714b156 100644
--- a/src/components/settings/sources-section.tsx
+++ b/src/components/settings/sources-section.tsx
@@ -278,31 +278,13 @@ export function SourcesSection() {
     return Object.keys(priority.deviceTypePriority).length;
   }, [priority]);
 
+  // v1.18.6 (W9) — the visible heading + subtitle now come from the shared
+  // `<SettingsSectionFrame>` (the off-style muted intro folded into the
+  // standard subtitle). The quiet cross-link back to Integrationen — where
+  // the sources this ladder ranks are added / removed — stays inside the
+  // card, below the ladder.
   return (
-    <section
-      aria-labelledby="settings-section-sources-title"
-      className="space-y-6"
-    >
-      {/* v1.18.1 (D0/D4) — standalone left-side entry again. The section
-          blurb is dropped for consistent top alignment; the cross-link back
-          to Integrationen (where the sources this ladder ranks are added /
-          removed) stays as a quiet pointer. */}
-      <header>
-        <h1 id="settings-section-sources-title" className="sr-only">
-          {t("settings.sections.sources.title")}
-        </h1>
-        <p className="text-muted-foreground text-xs">
-          {t("settings.sections.sources.integrationsHint")}{" "}
-          <Link
-            href="/settings/integrations"
-            className="text-primary underline underline-offset-2"
-            data-slot="sources-integrations-cross-link"
-          >
-            {t("settings.sections.sources.integrationsHintLink")}
-          </Link>
-        </p>
-      </header>
-
+    <div className="space-y-6">
       <div className="bg-card border-border space-y-4 rounded-xl border p-4 sm:p-6">
         <SettingsCardHeader
           icon={Layers}
@@ -578,8 +560,22 @@ export function SourcesSection() {
             </Button>
           </div>
         )}
+
+        {/* v1.18.6 (W9) — quiet pointer back to Integrationen, where the
+            sources this ladder ranks are connected / removed. Folded into
+            the card so the page top stays the standard heading + subtitle. */}
+        <p className="text-muted-foreground border-border border-t pt-3 text-xs">
+          {t("settings.sections.sources.integrationsHint")}{" "}
+          <Link
+            href="/settings/integrations"
+            className="text-primary underline underline-offset-2"
+            data-slot="sources-integrations-cross-link"
+          >
+            {t("settings.sections.sources.integrationsHintLink")}
+          </Link>
+        </p>
       </div>
-    </section>
+    </div>
   );
 }
 
diff --git a/src/components/settings/thresholds-section.tsx b/src/components/settings/thresholds-section.tsx
index 7dd154044..2b94ab727 100644
--- a/src/components/settings/thresholds-section.tsx
+++ b/src/components/settings/thresholds-section.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { ThresholdsEditorSection } from "@/components/settings/thresholds-editor-section";
-import { useTranslations } from "@/lib/i18n/context";
 
 /**
  * `<ThresholdsSection>` — route-level wrapper for `/settings/thresholds`
@@ -16,7 +15,8 @@ import { useTranslations } from "@/lib/i18n/context";
  * flows, so each concern is self-contained on its own page.
  *
  * Visual structure on this page:
- *   1. Section header (title + description).
+ *   1. Section heading + subtitle — supplied by the shared
+ *      `<SettingsSectionFrame>` in the route (v1.18.6 W9).
  *   2. `<ThresholdsEditorSection>` — per-metric range inputs. The editor
  *      card keeps its own affordance row (icon, reset-all button).
  *
@@ -31,21 +31,6 @@ import { useTranslations } from "@/lib/i18n/context";
  * the names stop clashing.
  */
 export function ThresholdsSection() {
-  const { t } = useTranslations();
-
-  return (
-    <section
-      aria-labelledby="settings-section-thresholds-title"
-      className="space-y-6"
-    >
-      <header>
-        <h1 id="settings-section-thresholds-title" className="sr-only">
-          {t("settings.sections.thresholds.title")}
-        </h1>
-      </header>
-
-      {/* Per-metric threshold ranges. */}
-      <ThresholdsEditorSection id="thresholds" />
-    </section>
-  );
+  // Per-metric threshold ranges; the heading is supplied by the route frame.
+  return <ThresholdsEditorSection id="thresholds" />;
 }

From 267dcad13d92c8d4bd09fabb72e3ef025ea63c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:36:58 +0200
Subject: [PATCH 53/71] feat(modules): unify Vorsorge, Illness and Labs with
 the medication pattern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add a wrench beside each module's add button linking to the module's own
  settings page; rename every add button to a plain "hinzufügen"
- give each module a settings page: view (cards/list) + manual reorder; Labs
  also gets a sort-order choice (by last reading) and biomarker CRUD/reorder
- collapse the Illness "abgeschlossen" list by default
- rebuild the Vorsorge card on the medication card's building blocks: a green
  "Jetzt messen" action, the interval as a chip beside the name, and an
  in-interval progress signal; drop the kebab "anpassen" and stray actions
- persist per-module view/order/sort client-side; add reverse-coverage-clean
  strings across all six locales
---
 messages/de.json                              |  55 ++-
 messages/en.json                              |  55 ++-
 messages/es.json                              |  55 ++-
 messages/fr.json                              |  55 ++-
 messages/it.json                              |  55 ++-
 messages/pl.json                              |  55 ++-
 src/app/labs/page.tsx                         |  63 +--
 src/app/settings/illness/page.tsx             |  39 ++
 src/app/settings/labs/page.tsx                |  39 ++
 src/app/settings/vorsorge/page.tsx            |  43 ++
 src/components/illness/illness-settings.tsx   |  69 +++
 src/components/illness/illness-view.tsx       | 168 ++++++-
 src/components/labs/lab-list.tsx              |  77 ++-
 src/components/labs/labs-settings.tsx         | 115 +++++
 .../__tests__/vorsorge-section.test.tsx       |   9 +-
 .../vorsorge-section.tsx                      | 452 +++++++++++-------
 .../vorsorge-settings.tsx                     | 125 +++++
 .../module-list/module-order-editor.tsx       | 221 +++++++++
 .../module-list/module-settings-frame.tsx     |  46 ++
 .../module-list/module-view-toggle.tsx        |  69 +++
 src/lib/__tests__/module-list-prefs.test.ts   |  61 +++
 src/lib/module-list-prefs.ts                  | 181 +++++++
 22 files changed, 1834 insertions(+), 273 deletions(-)
 create mode 100644 src/app/settings/illness/page.tsx
 create mode 100644 src/app/settings/labs/page.tsx
 create mode 100644 src/app/settings/vorsorge/page.tsx
 create mode 100644 src/components/illness/illness-settings.tsx
 create mode 100644 src/components/labs/labs-settings.tsx
 create mode 100644 src/components/measurement-reminders/vorsorge-settings.tsx
 create mode 100644 src/components/module-list/module-order-editor.tsx
 create mode 100644 src/components/module-list/module-settings-frame.tsx
 create mode 100644 src/components/module-list/module-view-toggle.tsx
 create mode 100644 src/lib/__tests__/module-list-prefs.test.ts
 create mode 100644 src/lib/module-list-prefs.ts

diff --git a/messages/de.json b/messages/de.json
index 3dcc80763..32a97fae7 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -3697,6 +3697,10 @@
       "body": "Das Onboarding hast du bereits abgeschlossen. Möchtest du etwas anpassen, findest du alles in den Einstellungen.",
       "cta": "Zum Dashboard"
     },
+    "disclaimer": {
+      "acknowledge": "Mir ist klar: HealthLog ist ein privates Tracking-Tool, keine klinische Bewertung und keine Diagnose. Bei Sorgen wende ich mich an meine Ärztin oder meinen Arzt, nicht an diese App.",
+      "learnMore": "Mehr erfahren"
+    },
     "welcome": {
       "title": "Willkommen bei HealthLog",
       "carouselLabel": "Begrüßungs-Karussell",
@@ -6379,13 +6383,26 @@
     "until": "Bis {date}",
     "selfPlanned": "Selbstgeplant",
     "captureValue": "Wert erfassen",
+    "measureNow": "Jetzt messen",
+    "nextDueLabel": "Nächste Fälligkeit:",
+    "lastDoneLabel": "Zuletzt erledigt:",
+    "customize": "Vorsorge anpassen",
+    "adherence": {
+      "label": "Im Intervall",
+      "onTrack": "Im Plan",
+      "due": "Jetzt fällig"
+    },
+    "settings": {
+      "title": "Vorsorge anpassen",
+      "description": "Ansicht, Reihenfolge und einzelne Erinnerungen verwalten.",
+      "back": "Zurück zur Vorsorge"
+    },
     "capture": {
       "title": "Messwert erfassen",
       "description": "Wert eintragen; die Erinnerung wird als erledigt markiert."
     },
     "manage": {
-      "menuItem": "Anpassen",
-      "title": "Erinnerungen anpassen",
+      "title": "Erinnerungen verwalten",
       "description": "Einzelne Erinnerungen aktivieren oder deaktivieren.",
       "empty": "Noch keine Erinnerungen zum Anpassen."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Vorsorge öffnen"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "Ansicht",
+    "viewCards": "Kartenansicht",
+    "viewList": "Listenansicht",
+    "viewHeading": "Ansicht",
+    "viewDescription": "Lege fest, ob die Einträge als Karten oder als kompakte Liste angezeigt werden.",
+    "reorder": {
+      "heading": "Reihenfolge",
+      "empty": "Noch keine Einträge zum Sortieren."
+    }
+  },
   "labs": {
     "title": "Laborwerte",
     "subtitle": "Blutwerte und Biomarker",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Wert gelöscht",
     "deleteError": "Wert konnte nicht gelöscht werden",
     "loadError": "Laborwerte konnten nicht geladen werden",
+    "customize": "Laborwerte anpassen",
+    "settings": {
+      "title": "Laborwerte anpassen",
+      "description": "Ansicht, Sortierung und Biomarker verwalten.",
+      "back": "Zurück zu den Laborwerten"
+    },
+    "sort": {
+      "heading": "Sortierung",
+      "label": "Reihenfolge der Werte",
+      "recentDesc": "Neueste Messung zuerst",
+      "recentAsc": "Älteste Messung zuerst",
+      "manual": "Manuell sortieren",
+      "hint": "Bei manueller Sortierung kannst du die Biomarker unten in deine eigene Reihenfolge bringen."
+    },
     "range": {
       "inRange": "Im Bereich",
       "below": "Unter Bereich",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarker",
       "manageTitle": "Biomarker",
-      "manageSheetDescription": "Lege die Marker an, die du verfolgst. Jeder wird einmal mit Einheit und Referenzbereich eingerichtet.",
       "managerDescription": "Marker einmal definieren — Einheit und Bereich gelten für jede Messung.",
       "define": "Anlegen",
       "defineFirst": "Ersten Biomarker anlegen",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Krankheitstagebuch",
     "subtitle": "Ein rückblickendes Protokoll deiner Krankheits- und Beschwerde-Episoden.",
-    "disclaimer": "Ein persönliches Tagebuch — kein Medizinprodukt. Es stellt keine Diagnose und keine Prognose.",
+    "customize": "Krankheitstagebuch anpassen",
+    "settings": {
+      "title": "Krankheitstagebuch anpassen",
+      "description": "Ansicht und Reihenfolge der Episoden verwalten.",
+      "back": "Zurück zum Krankheitstagebuch"
+    },
     "newEpisode": "Neue Episode",
     "logDay": "Tag erfassen",
     "markRecovered": "Als genesen markieren",
diff --git a/messages/en.json b/messages/en.json
index a87949920..c0a330bde 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -3697,6 +3697,10 @@
       "body": "You've already finished onboarding. To adjust anything, head to Settings — everything you set up is editable from there.",
       "cta": "Open dashboard"
     },
+    "disclaimer": {
+      "acknowledge": "I understand: HealthLog is a private tracking tool, not a clinical assessment or diagnosis. If I'm worried I'll talk to my doctor, not this app.",
+      "learnMore": "Learn more"
+    },
     "welcome": {
       "title": "Welcome to HealthLog",
       "carouselLabel": "Welcome carousel",
@@ -6379,13 +6383,26 @@
     "until": "Until {date}",
     "selfPlanned": "Self-planned",
     "captureValue": "Log value",
+    "measureNow": "Measure now",
+    "nextDueLabel": "Next due:",
+    "lastDoneLabel": "Last done:",
+    "customize": "Customize preventive care",
+    "adherence": {
+      "label": "Within interval",
+      "onTrack": "On track",
+      "due": "Due now"
+    },
+    "settings": {
+      "title": "Customize preventive care",
+      "description": "Manage the view, order, and individual reminders.",
+      "back": "Back to preventive care"
+    },
     "capture": {
       "title": "Log measurement",
       "description": "Enter the reading; the reminder is marked done."
     },
     "manage": {
-      "menuItem": "Customize",
-      "title": "Customize reminders",
+      "title": "Manage reminders",
       "description": "Enable or disable individual reminders.",
       "empty": "No reminders to customize yet."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Open preventive care"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "View",
+    "viewCards": "Card view",
+    "viewList": "List view",
+    "viewHeading": "View",
+    "viewDescription": "Choose whether entries show as cards or as a compact list.",
+    "reorder": {
+      "heading": "Order",
+      "empty": "No entries to reorder yet."
+    }
+  },
   "labs": {
     "title": "Lab results",
     "subtitle": "Bloodwork and biomarker readings",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Result deleted",
     "deleteError": "Could not delete the result",
     "loadError": "Could not load lab results",
+    "customize": "Customize labs",
+    "settings": {
+      "title": "Customize labs",
+      "description": "Manage the view, sort order, and biomarkers.",
+      "back": "Back to labs"
+    },
+    "sort": {
+      "heading": "Sort order",
+      "label": "Order of values",
+      "recentDesc": "Most recent reading first",
+      "recentAsc": "Oldest reading first",
+      "manual": "Sort manually",
+      "hint": "With manual sorting you can drag the biomarkers below into your own order."
+    },
     "range": {
       "inRange": "In range",
       "below": "Below range",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarkers",
       "manageTitle": "Biomarkers",
-      "manageSheetDescription": "Define the markers you track. Each is set up once with its unit and reference range.",
       "managerDescription": "Define a marker once — its unit and range are reused for every reading.",
       "define": "Define",
       "defineFirst": "Define your first biomarker",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Illness journal",
     "subtitle": "A retrospective log of your illness and condition episodes.",
-    "disclaimer": "A personal journal — not a medical device. It does not diagnose or predict.",
+    "customize": "Customize illness journal",
+    "settings": {
+      "title": "Customize illness journal",
+      "description": "Manage the view and order of episodes.",
+      "back": "Back to the illness journal"
+    },
     "newEpisode": "New episode",
     "logDay": "Log a day",
     "markRecovered": "Mark recovered",
diff --git a/messages/es.json b/messages/es.json
index 99b6d7782..744070485 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -3697,6 +3697,10 @@
       "body": "Ya completaste la configuración inicial. Para cambiar algo, abre Ajustes — todo lo que configuraste se puede editar desde ahí.",
       "cta": "Abrir el panel"
     },
+    "disclaimer": {
+      "acknowledge": "Lo entiendo: HealthLog es una herramienta privada de seguimiento, no una valoración clínica ni un diagnóstico. Si me preocupa algo, hablaré con mi médico, no con esta app.",
+      "learnMore": "Más información"
+    },
     "welcome": {
       "title": "Bienvenido a HealthLog",
       "carouselLabel": "Carrusel de bienvenida",
@@ -6379,13 +6383,26 @@
     "until": "Hasta {date}",
     "selfPlanned": "Autoplanificado",
     "captureValue": "Registrar valor",
+    "measureNow": "Medir ahora",
+    "nextDueLabel": "Próximo vencimiento:",
+    "lastDoneLabel": "Última vez:",
+    "customize": "Personalizar prevención",
+    "adherence": {
+      "label": "Dentro del intervalo",
+      "onTrack": "Al día",
+      "due": "Toca ahora"
+    },
+    "settings": {
+      "title": "Personalizar prevención",
+      "description": "Gestiona la vista, el orden y los recordatorios individuales.",
+      "back": "Volver a prevención"
+    },
     "capture": {
       "title": "Registrar medición",
       "description": "Introduce el valor; el recordatorio se marca como hecho."
     },
     "manage": {
-      "menuItem": "Personalizar",
-      "title": "Personalizar recordatorios",
+      "title": "Gestionar recordatorios",
       "description": "Activa o desactiva recordatorios individuales.",
       "empty": "Aún no hay recordatorios para personalizar."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Abrir prevención"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "Vista",
+    "viewCards": "Vista de tarjetas",
+    "viewList": "Vista de lista",
+    "viewHeading": "Vista",
+    "viewDescription": "Elige si las entradas se muestran como tarjetas o como lista compacta.",
+    "reorder": {
+      "heading": "Orden",
+      "empty": "Aún no hay entradas para ordenar."
+    }
+  },
   "labs": {
     "title": "Resultados de análisis",
     "subtitle": "Analíticas de sangre y biomarcadores",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Resultado eliminado",
     "deleteError": "No se pudo eliminar el resultado",
     "loadError": "No se pudieron cargar los resultados",
+    "customize": "Personalizar laboratorio",
+    "settings": {
+      "title": "Personalizar laboratorio",
+      "description": "Gestiona la vista, el orden y los biomarcadores.",
+      "back": "Volver al laboratorio"
+    },
+    "sort": {
+      "heading": "Orden",
+      "label": "Orden de los valores",
+      "recentDesc": "Medición más reciente primero",
+      "recentAsc": "Medición más antigua primero",
+      "manual": "Ordenar manualmente",
+      "hint": "Con el orden manual puedes arrastrar los biomarcadores de abajo en tu propio orden."
+    },
     "range": {
       "inRange": "En rango",
       "below": "Por debajo",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarcadores",
       "manageTitle": "Biomarcadores",
-      "manageSheetDescription": "Define los marcadores que sigues. Cada uno se configura una vez con su unidad y rango de referencia.",
       "managerDescription": "Define un marcador una vez: su unidad y rango se reutilizan en cada medición.",
       "define": "Definir",
       "defineFirst": "Define tu primer biomarcador",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Diario de enfermedad",
     "subtitle": "Un registro retrospectivo de tus episodios de enfermedad y dolencias.",
-    "disclaimer": "Un diario personal, no un dispositivo médico. No diagnostica ni predice.",
+    "customize": "Personalizar diario de enfermedad",
+    "settings": {
+      "title": "Personalizar diario de enfermedad",
+      "description": "Gestiona la vista y el orden de los episodios.",
+      "back": "Volver al diario de enfermedad"
+    },
     "newEpisode": "Nuevo episodio",
     "logDay": "Registrar un día",
     "markRecovered": "Marcar como recuperado",
diff --git a/messages/fr.json b/messages/fr.json
index 85cb525e9..93a0425fe 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -3697,6 +3697,10 @@
       "body": "Vous avez déjà terminé la configuration. Pour modifier un élément, ouvrez les paramètres — tout reste éditable.",
       "cta": "Ouvrir le tableau de bord"
     },
+    "disclaimer": {
+      "acknowledge": "Je comprends : HealthLog est un outil de suivi privé, pas une évaluation clinique ni un diagnostic. En cas d'inquiétude, je consulte mon médecin, pas cette application.",
+      "learnMore": "En savoir plus"
+    },
     "welcome": {
       "title": "Bienvenue dans HealthLog",
       "carouselLabel": "Carrousel de bienvenue",
@@ -6379,13 +6383,26 @@
     "until": "Jusqu'au {date}",
     "selfPlanned": "Auto-planifié",
     "captureValue": "Enregistrer la valeur",
+    "measureNow": "Mesurer maintenant",
+    "nextDueLabel": "Prochaine échéance :",
+    "lastDoneLabel": "Dernière fois :",
+    "customize": "Personnaliser la prévention",
+    "adherence": {
+      "label": "Dans l'intervalle",
+      "onTrack": "Dans les temps",
+      "due": "À faire maintenant"
+    },
+    "settings": {
+      "title": "Personnaliser la prévention",
+      "description": "Gérer l'affichage, l'ordre et les rappels individuels.",
+      "back": "Retour à la prévention"
+    },
     "capture": {
       "title": "Enregistrer une mesure",
       "description": "Saisissez la valeur ; le rappel est marqué comme fait."
     },
     "manage": {
-      "menuItem": "Personnaliser",
-      "title": "Personnaliser les rappels",
+      "title": "Gérer les rappels",
       "description": "Activer ou désactiver des rappels individuels.",
       "empty": "Aucun rappel à personnaliser pour l'instant."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Ouvrir la prévention"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "Affichage",
+    "viewCards": "Vue en cartes",
+    "viewList": "Vue en liste",
+    "viewHeading": "Affichage",
+    "viewDescription": "Choisissez si les entrées s'affichent en cartes ou en liste compacte.",
+    "reorder": {
+      "heading": "Ordre",
+      "empty": "Aucune entrée à réordonner pour l'instant."
+    }
+  },
   "labs": {
     "title": "Résultats d'analyses",
     "subtitle": "Analyses sanguines et biomarqueurs",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Résultat supprimé",
     "deleteError": "Impossible de supprimer le résultat",
     "loadError": "Impossible de charger les résultats",
+    "customize": "Personnaliser les analyses",
+    "settings": {
+      "title": "Personnaliser les analyses",
+      "description": "Gérer l'affichage, le tri et les biomarqueurs.",
+      "back": "Retour aux analyses"
+    },
+    "sort": {
+      "heading": "Tri",
+      "label": "Ordre des valeurs",
+      "recentDesc": "Mesure la plus récente d'abord",
+      "recentAsc": "Mesure la plus ancienne d'abord",
+      "manual": "Trier manuellement",
+      "hint": "En tri manuel, vous pouvez glisser les biomarqueurs ci-dessous dans votre propre ordre."
+    },
     "range": {
       "inRange": "Dans la norme",
       "below": "Sous la norme",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarqueurs",
       "manageTitle": "Biomarqueurs",
-      "manageSheetDescription": "Définissez les marqueurs que vous suivez. Chacun est configuré une fois avec son unité et sa plage de référence.",
       "managerDescription": "Définissez un marqueur une fois — son unité et sa plage sont réutilisées pour chaque mesure.",
       "define": "Définir",
       "defineFirst": "Définir votre premier biomarqueur",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Journal de maladie",
     "subtitle": "Un suivi rétrospectif de vos épisodes de maladie et d'affections.",
-    "disclaimer": "Un journal personnel, pas un dispositif médical. Il ne diagnostique ni ne prédit.",
+    "customize": "Personnaliser le journal de maladie",
+    "settings": {
+      "title": "Personnaliser le journal de maladie",
+      "description": "Gérer l'affichage et l'ordre des épisodes.",
+      "back": "Retour au journal de maladie"
+    },
     "newEpisode": "Nouvel épisode",
     "logDay": "Enregistrer un jour",
     "markRecovered": "Marquer comme rétabli",
diff --git a/messages/it.json b/messages/it.json
index 48507ed1d..5c3af1b83 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -3697,6 +3697,10 @@
       "body": "Hai già completato l'onboarding. Per modificare qualcosa apri le impostazioni — tutto ciò che hai configurato è ancora modificabile.",
       "cta": "Apri la dashboard"
     },
+    "disclaimer": {
+      "acknowledge": "Ho capito: HealthLog è uno strumento di monitoraggio privato, non una valutazione clinica né una diagnosi. Se sono preoccupato ne parlo con il medico, non con questa app.",
+      "learnMore": "Scopri di più"
+    },
     "welcome": {
       "title": "Benvenuto in HealthLog",
       "carouselLabel": "Carosello di benvenuto",
@@ -6379,13 +6383,26 @@
     "until": "Fino al {date}",
     "selfPlanned": "Autopianificato",
     "captureValue": "Registra valore",
+    "measureNow": "Misura ora",
+    "nextDueLabel": "Prossima scadenza:",
+    "lastDoneLabel": "Ultima volta:",
+    "customize": "Personalizza prevenzione",
+    "adherence": {
+      "label": "Nell'intervallo",
+      "onTrack": "In linea",
+      "due": "Da fare ora"
+    },
+    "settings": {
+      "title": "Personalizza prevenzione",
+      "description": "Gestisci la vista, l'ordine e i singoli promemoria.",
+      "back": "Torna alla prevenzione"
+    },
     "capture": {
       "title": "Registra misurazione",
       "description": "Inserisci il valore; il promemoria viene segnato come fatto."
     },
     "manage": {
-      "menuItem": "Personalizza",
-      "title": "Personalizza promemoria",
+      "title": "Gestisci promemoria",
       "description": "Attiva o disattiva singoli promemoria.",
       "empty": "Nessun promemoria da personalizzare."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Apri prevenzione"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "Vista",
+    "viewCards": "Vista a schede",
+    "viewList": "Vista a elenco",
+    "viewHeading": "Vista",
+    "viewDescription": "Scegli se le voci appaiono come schede o come elenco compatto.",
+    "reorder": {
+      "heading": "Ordine",
+      "empty": "Nessuna voce da riordinare."
+    }
+  },
   "labs": {
     "title": "Risultati degli esami",
     "subtitle": "Analisi del sangue e biomarcatori",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Risultato eliminato",
     "deleteError": "Impossibile eliminare il risultato",
     "loadError": "Impossibile caricare i risultati",
+    "customize": "Personalizza esami",
+    "settings": {
+      "title": "Personalizza esami",
+      "description": "Gestisci la vista, l'ordinamento e i biomarcatori.",
+      "back": "Torna agli esami"
+    },
+    "sort": {
+      "heading": "Ordinamento",
+      "label": "Ordine dei valori",
+      "recentDesc": "Misurazione più recente prima",
+      "recentAsc": "Misurazione più vecchia prima",
+      "manual": "Ordina manualmente",
+      "hint": "Con l'ordinamento manuale puoi trascinare i biomarcatori qui sotto nel tuo ordine."
+    },
     "range": {
       "inRange": "Nella norma",
       "below": "Sotto la norma",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarcatori",
       "manageTitle": "Biomarcatori",
-      "manageSheetDescription": "Definisci i marcatori che segui. Ognuno si imposta una volta con la sua unità e l'intervallo di riferimento.",
       "managerDescription": "Definisci un marcatore una volta — unità e intervallo valgono per ogni misurazione.",
       "define": "Definisci",
       "defineFirst": "Definisci il tuo primo biomarcatore",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Diario delle malattie",
     "subtitle": "Un registro retrospettivo dei tuoi episodi di malattia e disturbi.",
-    "disclaimer": "Un diario personale, non un dispositivo medico. Non diagnostica né prevede.",
+    "customize": "Personalizza diario delle malattie",
+    "settings": {
+      "title": "Personalizza diario delle malattie",
+      "description": "Gestisci la vista e l'ordine degli episodi.",
+      "back": "Torna al diario delle malattie"
+    },
     "newEpisode": "Nuovo episodio",
     "logDay": "Registra un giorno",
     "markRecovered": "Segna come guarito",
diff --git a/messages/pl.json b/messages/pl.json
index c60c651f4..e220a1d80 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -3697,6 +3697,10 @@
       "body": "Wstępne kroki masz już za sobą. Aby coś zmienić, otwórz ustawienia — wszystko, co skonfigurowałeś, da się tam edytować.",
       "cta": "Otwórz pulpit"
     },
+    "disclaimer": {
+      "acknowledge": "Rozumiem: HealthLog to prywatne narzędzie do śledzenia, a nie ocena kliniczna ani diagnoza. Gdy się niepokoję, rozmawiam z lekarzem, a nie z tą aplikacją.",
+      "learnMore": "Dowiedz się więcej"
+    },
     "welcome": {
       "title": "Witaj w HealthLog",
       "carouselLabel": "Karuzela powitalna",
@@ -6379,13 +6383,26 @@
     "until": "Do {date}",
     "selfPlanned": "Zaplanowane samodzielnie",
     "captureValue": "Zapisz wartość",
+    "measureNow": "Zmierz teraz",
+    "nextDueLabel": "Następny termin:",
+    "lastDoneLabel": "Ostatnio wykonano:",
+    "customize": "Dostosuj profilaktykę",
+    "adherence": {
+      "label": "W interwale",
+      "onTrack": "Zgodnie z planem",
+      "due": "Termin teraz"
+    },
+    "settings": {
+      "title": "Dostosuj profilaktykę",
+      "description": "Zarządzaj widokiem, kolejnością i poszczególnymi przypomnieniami.",
+      "back": "Powrót do profilaktyki"
+    },
     "capture": {
       "title": "Zapisz pomiar",
       "description": "Wpisz wartość; przypomnienie zostanie oznaczone jako wykonane."
     },
     "manage": {
-      "menuItem": "Dostosuj",
-      "title": "Dostosuj przypomnienia",
+      "title": "Zarządzaj przypomnieniami",
       "description": "Włącz lub wyłącz poszczególne przypomnienia.",
       "empty": "Brak przypomnień do dostosowania."
     },
@@ -6394,6 +6411,17 @@
       "openLink": "Otwórz profilaktykę"
     }
   },
+  "moduleList": {
+    "viewToggleLabel": "Widok",
+    "viewCards": "Widok kart",
+    "viewList": "Widok listy",
+    "viewHeading": "Widok",
+    "viewDescription": "Wybierz, czy pozycje mają być pokazywane jako karty czy jako zwarta lista.",
+    "reorder": {
+      "heading": "Kolejność",
+      "empty": "Brak pozycji do uporządkowania."
+    }
+  },
   "labs": {
     "title": "Wyniki badań",
     "subtitle": "Badania krwi i biomarkery",
@@ -6409,6 +6437,20 @@
     "deletedToast": "Wynik usunięty",
     "deleteError": "Nie udało się usunąć wyniku",
     "loadError": "Nie udało się wczytać wyników",
+    "customize": "Dostosuj wyniki badań",
+    "settings": {
+      "title": "Dostosuj wyniki badań",
+      "description": "Zarządzaj widokiem, sortowaniem i biomarkerami.",
+      "back": "Powrót do wyników badań"
+    },
+    "sort": {
+      "heading": "Sortowanie",
+      "label": "Kolejność wartości",
+      "recentDesc": "Najnowszy pomiar najpierw",
+      "recentAsc": "Najstarszy pomiar najpierw",
+      "manual": "Sortuj ręcznie",
+      "hint": "Przy sortowaniu ręcznym możesz przeciągnąć biomarkery poniżej we własnej kolejności."
+    },
     "range": {
       "inRange": "W normie",
       "below": "Poniżej normy",
@@ -6456,9 +6498,7 @@
       }
     },
     "biomarker": {
-      "manage": "Biomarkery",
       "manageTitle": "Biomarkery",
-      "manageSheetDescription": "Zdefiniuj śledzone markery. Każdy ustawiasz raz wraz z jednostką i zakresem referencyjnym.",
       "managerDescription": "Zdefiniuj marker raz — jednostka i zakres są używane dla każdego pomiaru.",
       "define": "Zdefiniuj",
       "defineFirst": "Zdefiniuj pierwszy biomarker",
@@ -6612,7 +6652,12 @@
   "illness": {
     "title": "Dziennik chorób",
     "subtitle": "Retrospektywny zapis Twoich epizodów chorób i dolegliwości.",
-    "disclaimer": "Osobisty dziennik — nie wyrób medyczny. Nie diagnozuje ani nie przewiduje.",
+    "customize": "Dostosuj dziennik chorób",
+    "settings": {
+      "title": "Dostosuj dziennik chorób",
+      "description": "Zarządzaj widokiem i kolejnością epizodów.",
+      "back": "Powrót do dziennika chorób"
+    },
     "newEpisode": "Nowy epizod",
     "logDay": "Zapisz dzień",
     "markRecovered": "Oznacz jako wyleczone",
diff --git a/src/app/labs/page.tsx b/src/app/labs/page.tsx
index 98196c102..9a4392835 100644
--- a/src/app/labs/page.tsx
+++ b/src/app/labs/page.tsx
@@ -1,20 +1,14 @@
 "use client";
 
 import { useCallback, useEffect, useState } from "react";
+import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useQueryClient } from "@tanstack/react-query";
-import { FlaskConical, Loader2, MoreVertical, Plus } from "lucide-react";
+import { Loader2, Plus, Wrench } from "lucide-react";
 
-import { BiomarkerManager } from "@/components/labs/biomarker-manager";
 import { LabForm } from "@/components/labs/lab-form";
 import { LabList } from "@/components/labs/lab-list";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { PullToRefreshIndicator } from "@/components/ui/pull-to-refresh-indicator";
 import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
 import { useAuth } from "@/hooks/use-auth";
@@ -31,7 +25,6 @@ export default function LabsPage() {
   const queryClient = useQueryClient();
   const { t } = useTranslations();
   const [dialogOpen, setDialogOpen] = useState(false);
-  const [manageOpen, setManageOpen] = useState(false);
   // Sticky-footer slot element for the add-result sheet (filled by the
   // ResponsiveSheet `footer` ref so the form portals its action row there).
   const [addFooterEl, setAddFooterEl] = useState<HTMLDivElement | null>(null);
@@ -42,7 +35,7 @@ export default function LabsPage() {
   );
   const pull = usePullToRefresh({
     onRefresh: refreshVisible,
-    disabled: dialogOpen || manageOpen,
+    disabled: dialogOpen,
   });
 
   useEffect(() => {
@@ -76,34 +69,31 @@ export default function LabsPage() {
         </div>
         <div className="flex shrink-0 items-center gap-2">
           <ModuleTourTrigger stopId="labs" />
+          {/* v1.18.6 (MOD-01) — the wrench is the module's customize entry
+              point, left of the primary Add and linking to the Labs settings
+              page (view, sort order, biomarker CRUD + reorder). Mirrors the
+              medication page header's wrench glyph + slot + 44px tap floor. */}
+          <Button
+            asChild
+            variant="ghost"
+            size="icon"
+            className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
+          >
+            <Link
+              href="/settings/labs"
+              aria-label={t("labs.customize")}
+              title={t("labs.customize")}
+            >
+              <Wrench className="h-4 w-4" aria-hidden="true" />
+            </Link>
+          </Button>
           <Button
             onClick={() => setDialogOpen(true)}
             className="min-h-11 sm:min-h-9"
           >
             <Plus className="h-4 w-4" />
-            {t("labs.addResult")}
+            {t("common.add")}
           </Button>
-          {/* Secondary actions fold into one overflow kebab beside the primary
-              Add, mirroring the medication-card header (one cluster, not a
-              two-button row). */}
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
-                aria-label={t("common.moreOptions")}
-              >
-                <MoreVertical className="h-4 w-4" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end" className="w-56">
-              <DropdownMenuItem onClick={() => setManageOpen(true)}>
-                <FlaskConical className="mr-2 h-4 w-4" />
-                {t("labs.biomarker.manage")}
-              </DropdownMenuItem>
-            </DropdownMenuContent>
-          </DropdownMenu>
         </div>
       </div>
 
@@ -126,15 +116,6 @@ export default function LabsPage() {
         />
       </ResponsiveSheet>
 
-      <ResponsiveSheet
-        open={manageOpen}
-        onOpenChange={setManageOpen}
-        title={t("labs.biomarker.manageTitle")}
-        description={t("labs.biomarker.manageSheetDescription")}
-      >
-        <BiomarkerManager />
-      </ResponsiveSheet>
-
       <LabList onAddFirst={() => setDialogOpen(true)} />
     </div>
   );
diff --git a/src/app/settings/illness/page.tsx b/src/app/settings/illness/page.tsx
new file mode 100644
index 000000000..b6b37b890
--- /dev/null
+++ b/src/app/settings/illness/page.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { Loader2 } from "lucide-react";
+
+import { useAuth } from "@/hooks/use-auth";
+import { useMounted } from "@/hooks/use-mounted";
+import { useTranslations } from "@/lib/i18n/context";
+import { ModuleSettingsFrame } from "@/components/module-list/module-settings-frame";
+import { IllnessSettings } from "@/components/illness/illness-settings";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — the Illness module's own settings page. Dedicated
+ * static route (wins over `/settings/[section]`); reached from the wrench
+ * beside the Illness page's "hinzufügen" button.
+ */
+export default function IllnessSettingsPage() {
+  const { isLoading } = useAuth();
+  const mounted = useMounted();
+  const { t } = useTranslations();
+
+  if (!mounted || isLoading) {
+    return (
+      <div className="flex min-h-[40vh] items-center justify-center">
+        <Loader2 className="text-muted-foreground h-6 w-6 animate-spin motion-reduce:animate-none" />
+      </div>
+    );
+  }
+
+  return (
+    <ModuleSettingsFrame
+      title={t("illness.settings.title")}
+      description={t("illness.settings.description")}
+      backHref="/illness"
+      backLabelKey="illness.settings.back"
+    >
+      <IllnessSettings />
+    </ModuleSettingsFrame>
+  );
+}
diff --git a/src/app/settings/labs/page.tsx b/src/app/settings/labs/page.tsx
new file mode 100644
index 000000000..5805b5fa9
--- /dev/null
+++ b/src/app/settings/labs/page.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { Loader2 } from "lucide-react";
+
+import { useAuth } from "@/hooks/use-auth";
+import { useMounted } from "@/hooks/use-mounted";
+import { useTranslations } from "@/lib/i18n/context";
+import { ModuleSettingsFrame } from "@/components/module-list/module-settings-frame";
+import { LabsSettings } from "@/components/labs/labs-settings";
+
+/**
+ * v1.18.6 (W8 / MOD-03 + MOD-04) — the Labs module's own settings page.
+ * Dedicated static route (wins over `/settings/[section]`); reached from the
+ * wrench beside the Labs page's "hinzufügen" button.
+ */
+export default function LabsSettingsPage() {
+  const { isLoading } = useAuth();
+  const mounted = useMounted();
+  const { t } = useTranslations();
+
+  if (!mounted || isLoading) {
+    return (
+      <div className="flex min-h-[40vh] items-center justify-center">
+        <Loader2 className="text-muted-foreground h-6 w-6 animate-spin motion-reduce:animate-none" />
+      </div>
+    );
+  }
+
+  return (
+    <ModuleSettingsFrame
+      title={t("labs.settings.title")}
+      description={t("labs.settings.description")}
+      backHref="/labs"
+      backLabelKey="labs.settings.back"
+    >
+      <LabsSettings />
+    </ModuleSettingsFrame>
+  );
+}
diff --git a/src/app/settings/vorsorge/page.tsx b/src/app/settings/vorsorge/page.tsx
new file mode 100644
index 000000000..147b3d51f
--- /dev/null
+++ b/src/app/settings/vorsorge/page.tsx
@@ -0,0 +1,43 @@
+"use client";
+
+import { Loader2 } from "lucide-react";
+
+import { useAuth } from "@/hooks/use-auth";
+import { useMounted } from "@/hooks/use-mounted";
+import { useTranslations } from "@/lib/i18n/context";
+import { ModuleSettingsFrame } from "@/components/module-list/module-settings-frame";
+import { VorsorgeSettings } from "@/components/measurement-reminders/vorsorge-settings";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — the Vorsorge module's own settings page.
+ *
+ * A dedicated static route that wins over the dynamic `/settings/[section]`
+ * router (static segments take precedence in Next.js), so it adds a
+ * per-module settings surface without touching the parallel-phase-owned
+ * `section-slugs` registry or `settings-shell`. Reached from the wrench
+ * beside the Vorsorge page's "hinzufügen" button.
+ */
+export default function VorsorgeSettingsPage() {
+  const { isLoading } = useAuth();
+  const mounted = useMounted();
+  const { t } = useTranslations();
+
+  if (!mounted || isLoading) {
+    return (
+      <div className="flex min-h-[40vh] items-center justify-center">
+        <Loader2 className="text-muted-foreground h-6 w-6 animate-spin motion-reduce:animate-none" />
+      </div>
+    );
+  }
+
+  return (
+    <ModuleSettingsFrame
+      title={t("measurementReminders.settings.title")}
+      description={t("measurementReminders.settings.description")}
+      backHref="/vorsorge"
+      backLabelKey="measurementReminders.settings.back"
+    >
+      <VorsorgeSettings />
+    </ModuleSettingsFrame>
+  );
+}
diff --git a/src/components/illness/illness-settings.tsx b/src/components/illness/illness-settings.tsx
new file mode 100644
index 000000000..7b33496f3
--- /dev/null
+++ b/src/components/illness/illness-settings.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — the Illness module's own settings page body.
+ *
+ * Reached from the wrench beside the page's "hinzufügen" button. Lets the
+ * user reorder conditions/episodes + pick the card-vs-list page view. Order
+ * + view persist client-side via `useModuleListPrefs("illness")`.
+ */
+import { Skeleton } from "@/components/ui/skeleton";
+import { useTranslations, useFormatters } from "@/lib/i18n/context";
+import { ModuleViewToggle } from "@/components/module-list/module-view-toggle";
+import {
+  ModuleOrderEditor,
+  type ReorderItem,
+} from "@/components/module-list/module-order-editor";
+import { applyOrder, useModuleListPrefs } from "@/lib/module-list-prefs";
+import { useIllnessEpisodes } from "./use-illness";
+
+export function IllnessSettings() {
+  const { t } = useTranslations();
+  const fmt = useFormatters();
+  const { data: episodes, isLoading } = useIllnessEpisodes(true);
+  const { prefs, setView, setOrder } = useModuleListPrefs("illness");
+
+  const ordered = applyOrder(episodes ?? [], prefs.order, (e) => e.id);
+  const reorderItems: ReorderItem[] = ordered.map((e) => ({
+    id: e.id,
+    name: e.label,
+    secondary: `${t(`illness.type.${e.type}`)} · ${
+      e.resolvedAt
+        ? t("illness.status.recovered")
+        : e.lifecycle === "CHRONIC_ONGOING"
+          ? t("illness.status.ongoing")
+          : t("illness.status.active")
+    } · ${fmt.dateShort(new Date(e.onsetAt))}`,
+  }));
+
+  return (
+    <div className="space-y-8">
+      <section className="space-y-3">
+        <div className="flex items-center justify-between gap-3">
+          <h2 className="text-sm font-semibold">
+            {t("moduleList.viewHeading")}
+          </h2>
+          <ModuleViewToggle view={prefs.view} onChange={setView} />
+        </div>
+        <p className="text-muted-foreground text-sm">
+          {t("moduleList.viewDescription")}
+        </p>
+      </section>
+
+      <section className="space-y-3">
+        <h2 className="text-sm font-semibold">
+          {t("moduleList.reorder.heading")}
+        </h2>
+        {isLoading ? (
+          <div className="space-y-2">
+            {Array.from({ length: 3 }, (_, i) => (
+              <Skeleton key={i} className="h-12 w-full" />
+            ))}
+          </div>
+        ) : (
+          <ModuleOrderEditor items={reorderItems} onChange={setOrder} />
+        )}
+      </section>
+    </div>
+  );
+}
diff --git a/src/components/illness/illness-view.tsx b/src/components/illness/illness-view.tsx
index 49ffe5b9c..10101938c 100644
--- a/src/components/illness/illness-view.tsx
+++ b/src/components/illness/illness-view.tsx
@@ -17,7 +17,7 @@
  */
 import { useMemo, useState } from "react";
 import Link from "next/link";
-import { Plus, Stethoscope } from "lucide-react";
+import { ChevronDown, Plus, Stethoscope, Wrench } from "lucide-react";
 
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -32,6 +32,7 @@ import { EmptyState } from "@/components/ui/empty-state";
 import { Skeleton } from "@/components/ui/skeleton";
 import { cn } from "@/lib/utils";
 import { useTranslations, useFormatters } from "@/lib/i18n/context";
+import { applyOrder, useModuleListPrefs } from "@/lib/module-list-prefs";
 import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 
 import { LogDaySheet } from "./log-day-sheet";
@@ -58,6 +59,7 @@ interface EpisodeCardProps {
   onEdit: (episode: IllnessEpisodeDTO) => void;
   onResolve: (id: string) => void;
   resolving: boolean;
+  view: "cards" | "list";
 }
 
 function EpisodeCard({
@@ -67,6 +69,7 @@ function EpisodeCard({
   onEdit,
   onResolve,
   resolving,
+  view,
 }: EpisodeCardProps) {
   const { t } = useTranslations();
   const fmt = useFormatters();
@@ -74,6 +77,58 @@ function EpisodeCard({
   const isChronic = episode.lifecycle === "CHRONIC_ONGOING";
   const flareCount = flares?.length ?? 0;
 
+  // v1.18.6 (MOD-03) — compact list row: a single divided line per episode
+  // (label + status chips + onset; tap navigates to the detail surface).
+  if (view === "list") {
+    return (
+      <Card>
+        <CardContent className="flex items-center justify-between gap-3 px-4 py-2.5">
+          <div className="min-w-0 space-y-0.5">
+            <Link
+              href={`/illness/${episode.id}`}
+              className="block truncate text-sm font-medium hover:underline focus-visible:underline"
+            >
+              {episode.label}
+            </Link>
+            <div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs">
+              <Badge variant="secondary">
+                {t(`illness.type.${episode.type}`)}
+              </Badge>
+              <Badge variant="outline">
+                {active
+                  ? isChronic
+                    ? t("illness.status.ongoing")
+                    : t("illness.status.active")
+                  : t("illness.status.recovered")}
+              </Badge>
+              <span className="text-muted-foreground">
+                {fmt.dateShort(new Date(episode.onsetAt))}
+              </span>
+            </div>
+          </div>
+          <div className="flex shrink-0 items-center gap-1">
+            <Button
+              variant="outline"
+              size="sm"
+              className="min-h-9"
+              onClick={() => onLogDay(episode.id)}
+            >
+              {t("illness.logDay")}
+            </Button>
+            <EpisodeMenu
+              episode={episode}
+              onEdit={() => onEdit(episode)}
+              onResolve={
+                active && !isChronic ? () => onResolve(episode.id) : undefined
+              }
+              resolving={resolving}
+            />
+          </div>
+        </CardContent>
+      </Card>
+    );
+  }
+
   return (
     <Card className="h-full gap-3 md:gap-3">
       <CardHeader className="pb-0">
@@ -170,6 +225,8 @@ function EpisodeGroup({
   onEdit,
   onResolve,
   resolving,
+  view,
+  collapsible = false,
 }: {
   title: string;
   parents: IllnessEpisodeDTO[];
@@ -178,26 +235,71 @@ function EpisodeGroup({
   onEdit: (episode: IllnessEpisodeDTO) => void;
   onResolve: (id: string) => void;
   resolving: boolean;
+  view: "cards" | "list";
+  /**
+   * v1.18.6 (MOD-05) — the resolved group collapses by default behind a
+   * disclosure trigger so a long recovered history never pushes the active
+   * conditions below the fold.
+   */
+  collapsible?: boolean;
 }) {
+  // Hooks must run unconditionally; bail on the empty render afterwards.
+  const [open, setOpen] = useState(false);
   if (parents.length === 0) return null;
+
+  const grid = (
+    <div
+      className={cn(
+        view === "list" ? "space-y-2" : "grid gap-4 sm:grid-cols-2",
+      )}
+    >
+      {parents.map((episode) => (
+        <EpisodeCard
+          key={episode.id}
+          episode={episode}
+          flares={childrenByParent.get(episode.id)}
+          resolving={resolving}
+          onLogDay={onLogDay}
+          onEdit={onEdit}
+          onResolve={onResolve}
+          view={view}
+        />
+      ))}
+    </div>
+  );
+
+  if (collapsible) {
+    return (
+      <section className="space-y-3">
+        <button
+          type="button"
+          onClick={() => setOpen((v) => !v)}
+          aria-expanded={open}
+          className="text-muted-foreground hover:text-foreground -mx-1 flex w-fit items-center gap-1.5 rounded-md px-1 py-0.5 text-xs font-medium uppercase tracking-wide transition-colors"
+        >
+          <ChevronDown
+            className={cn(
+              "h-3.5 w-3.5 shrink-0 transition-transform motion-reduce:transition-none",
+              open ? "rotate-0" : "-rotate-90",
+            )}
+            aria-hidden="true"
+          />
+          {title}
+          <span className="text-muted-foreground/70 normal-case">
+            ({parents.length})
+          </span>
+        </button>
+        {open ? grid : null}
+      </section>
+    );
+  }
+
   return (
     <section className="space-y-3">
       <h2 className="text-muted-foreground text-xs font-medium uppercase tracking-wide">
         {title}
       </h2>
-      <div className="grid gap-4 sm:grid-cols-2">
-        {parents.map((episode) => (
-          <EpisodeCard
-            key={episode.id}
-            episode={episode}
-            flares={childrenByParent.get(episode.id)}
-            resolving={resolving}
-            onLogDay={onLogDay}
-            onEdit={onEdit}
-            onResolve={onResolve}
-          />
-        ))}
-      </div>
+      {grid}
     </section>
   );
 }
@@ -206,6 +308,7 @@ export function IllnessView() {
   const { t } = useTranslations();
   const { data: episodes, isLoading } = useIllnessEpisodes(true);
   const resolve = useResolveEpisode();
+  const { prefs } = useModuleListPrefs("illness");
 
   const today = todayLocal();
   const [newOpen, setNewOpen] = useState(false);
@@ -248,8 +351,14 @@ export function IllnessView() {
       }
     }
 
-    return { activeParents, resolvedParents, childrenByParent };
-  }, [episodes]);
+    return {
+      // v1.18.6 (MOD-03) — honour the user's persisted manual order within
+      // each status group (ids absent from the order sort after the block).
+      activeParents: applyOrder(activeParents, prefs.order, (e) => e.id),
+      resolvedParents: applyOrder(resolvedParents, prefs.order, (e) => e.id),
+      childrenByParent,
+    };
+  }, [episodes, prefs.order]);
 
   const hasEpisodes = (episodes?.length ?? 0) > 0;
 
@@ -269,17 +378,37 @@ export function IllnessView() {
         </div>
         <div className="flex shrink-0 items-center gap-2">
           <ModuleTourTrigger stopId="illness" />
+          {/* v1.18.6 (MOD-01) — wrench left of the primary Add, linking to the
+              Illness settings page (view + reorder). */}
+          <Button
+            asChild
+            variant="ghost"
+            size="icon"
+            className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
+          >
+            <Link
+              href="/settings/illness"
+              aria-label={t("illness.customize")}
+              title={t("illness.customize")}
+            >
+              <Wrench className="h-4 w-4" aria-hidden="true" />
+            </Link>
+          </Button>
+          {/* v1.18.6 (MOD-02) — the add button reads "hinzufügen" like every
+              other module, not the bespoke "neue Episode". */}
           <Button
             onClick={() => setNewOpen(true)}
             className="min-h-11 sm:min-h-9"
           >
             <Plus className="h-4 w-4" />
-            {t("illness.newEpisode")}
+            {t("common.add")}
           </Button>
         </div>
       </div>
 
-      <p className="text-muted-foreground text-xs">{t("illness.disclaimer")}</p>
+      {/* v1.18.6 (DISC-01) — the per-page medical disclaimer line is removed;
+          the one-time acknowledgment now lives at onboarding and the legal
+          text stays reachable on the public privacy page. */}
 
       {isLoading ? (
         <div className={cn("grid gap-4 sm:grid-cols-2")}>
@@ -297,6 +426,7 @@ export function IllnessView() {
             parents={grouped.activeParents}
             childrenByParent={grouped.childrenByParent}
             resolving={resolve.isPending}
+            view={prefs.view}
             onLogDay={(id) => setLogEpisodeId(id)}
             onEdit={(e) => setEditEpisode(e)}
             onResolve={(id) => resolve.mutate(id)}
@@ -306,6 +436,8 @@ export function IllnessView() {
             parents={grouped.resolvedParents}
             childrenByParent={grouped.childrenByParent}
             resolving={resolve.isPending}
+            view={prefs.view}
+            collapsible
             onLogDay={(id) => setLogEpisodeId(id)}
             onEdit={(e) => setEditEpisode(e)}
             onResolve={(id) => resolve.mutate(id)}
diff --git a/src/components/labs/lab-list.tsx b/src/components/labs/lab-list.tsx
index d53b69a68..7c31e6351 100644
--- a/src/components/labs/lab-list.tsx
+++ b/src/components/labs/lab-list.tsx
@@ -20,6 +20,7 @@ import { formatReferenceRange } from "@/lib/labs/reference-range";
 import { formatLabValue } from "@/lib/labs/format-value";
 import { useTranslations } from "@/lib/i18n/context";
 import { queryKeys } from "@/lib/query-keys";
+import { applyOrder, useModuleListPrefs } from "@/lib/module-list-prefs";
 
 import { LabTrendSparkline } from "./lab-trend-sparkline";
 import { ReferenceRangeBadge } from "./reference-range-badge";
@@ -79,6 +80,7 @@ function groupReadings(results: LabResultDto[]): MarkerGroup[] {
 
 export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
   const { t } = useTranslations();
+  const { prefs } = useModuleListPrefs("labs");
 
   const listKey = queryKeys.labResultsList({
     biomarkerId: undefined,
@@ -96,10 +98,18 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
       apiGet<LabResultListResponse>("/api/labs?limit=500&sortDir=desc"),
   });
 
-  const groups = useMemo(
-    () => groupReadings(data?.results ?? []),
-    [data?.results],
-  );
+  const groups = useMemo(() => {
+    const base = groupReadings(data?.results ?? []);
+    // v1.18.6 (MOD-04) — honour the user's Labs sort choice. `groupReadings`
+    // already returns most-recent-first; `recentAsc` reverses, and `manual`
+    // applies the persisted biomarker order (legacy un-linked groups, which
+    // carry no biomarkerId, sort after the ordered block).
+    if (prefs.sortDir === "recentAsc") return [...base].reverse();
+    if (prefs.sortDir === "manual") {
+      return applyOrder(base, prefs.order, (g) => g.biomarkerId ?? g.key);
+    }
+    return base;
+  }, [data?.results, prefs.sortDir, prefs.order]);
 
   // The list caps at 500 rows server-side (the `limit` ceiling). Surface a
   // calm "showing latest N of M" hint when the cap truncates so the count is
@@ -149,6 +159,65 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
     );
   }
 
+  // v1.18.6 (MOD-03) — compact list view: one bordered card holding tight
+  // divided rows instead of a card per biomarker. The card view stays the
+  // default; this is the denser alternative the settings toggle selects.
+  if (prefs.view === "list") {
+    return (
+      <div className="space-y-3">
+        {truncated ? (
+          <p className="text-muted-foreground text-xs">
+            {t("labs.showingLatestOf", { shown, total })}
+          </p>
+        ) : null}
+        <Card>
+          <CardContent className="divide-border divide-y p-0">
+            {groups.map((group) => {
+              const row = (
+                <div className="flex items-center justify-between gap-3 px-4 py-2.5">
+                  <div className="min-w-0 space-y-0.5">
+                    <div className="flex flex-wrap items-baseline gap-x-2 text-sm">
+                      <span className="truncate font-medium">
+                        {group.analyte}
+                      </span>
+                      <ReferenceRangeBadge status={group.latest.rangeStatus} />
+                    </div>
+                    <div className="text-muted-foreground flex flex-wrap items-center gap-x-2 text-xs">
+                      <span className="text-foreground font-semibold tabular-nums">
+                        {formatLabValue(group.latest.value)}{" "}
+                        {group.latest.unit}
+                      </span>
+                      <span>{formatDate(group.latest.takenAt)}</span>
+                    </div>
+                  </div>
+                  <div className="flex items-center gap-2">
+                    <LabTrendSparkline
+                      values={group.readings.map((r) => r.value)}
+                    />
+                    {group.biomarkerId ? (
+                      <ChevronRight className="text-muted-foreground h-4 w-4 shrink-0" />
+                    ) : null}
+                  </div>
+                </div>
+              );
+              return group.biomarkerId ? (
+                <Link
+                  key={group.key}
+                  href={`/labs/${group.biomarkerId}`}
+                  className="hover:bg-muted/40 block transition-colors"
+                >
+                  {row}
+                </Link>
+              ) : (
+                <div key={group.key}>{row}</div>
+              );
+            })}
+          </CardContent>
+        </Card>
+      </div>
+    );
+  }
+
   return (
     <div className="space-y-3">
       {truncated ? (
diff --git a/src/components/labs/labs-settings.tsx b/src/components/labs/labs-settings.tsx
new file mode 100644
index 000000000..176dec090
--- /dev/null
+++ b/src/components/labs/labs-settings.tsx
@@ -0,0 +1,115 @@
+"use client";
+
+/**
+ * v1.18.6 (W8 / MOD-03 + MOD-04) — the Labs module's own settings page body.
+ *
+ * Reached from the wrench beside the page's "hinzufügen" button. Lets the
+ * user:
+ *   - pick the card-vs-list page view (MOD-03),
+ *   - choose the sort order (by most-recent reading, descending / ascending,
+ *     or manual) — MOD-04,
+ *   - reorder biomarkers when sort = manual (MOD-03/04),
+ *   - and create / edit / delete biomarkers via the existing
+ *     `BiomarkerManager` (MOD-04).
+ * View / sort / order persist client-side via `useModuleListPrefs("labs")`.
+ */
+import { useQuery } from "@tanstack/react-query";
+
+import { NativeSelect } from "@/components/ui/native-select";
+import { Label } from "@/components/ui/label";
+import { Skeleton } from "@/components/ui/skeleton";
+import { apiGet } from "@/lib/api/api-fetch";
+import { useTranslations } from "@/lib/i18n/context";
+import { queryKeys } from "@/lib/query-keys";
+import { ModuleViewToggle } from "@/components/module-list/module-view-toggle";
+import {
+  ModuleOrderEditor,
+  type ReorderItem,
+} from "@/components/module-list/module-order-editor";
+import {
+  applyOrder,
+  useModuleListPrefs,
+  type ModuleSortDir,
+} from "@/lib/module-list-prefs";
+
+import { BiomarkerManager } from "./biomarker-manager";
+import type { BiomarkerDto, BiomarkerListResponse } from "./types";
+
+export function LabsSettings() {
+  const { t } = useTranslations();
+  const { prefs, setView, setOrder, setSortDir } = useModuleListPrefs("labs");
+
+  const { data, isLoading } = useQuery({
+    queryKey: queryKeys.biomarkers(),
+    queryFn: () => apiGet<BiomarkerListResponse>("/api/biomarkers"),
+  });
+  const markers: BiomarkerDto[] = data?.biomarkers ?? [];
+
+  const ordered = applyOrder(markers, prefs.order, (m) => m.id);
+  const reorderItems: ReorderItem[] = ordered.map((m) => ({
+    id: m.id,
+    name: m.name,
+    secondary: m.panel ? `${m.unit} · ${m.panel}` : m.unit,
+  }));
+
+  const manual = prefs.sortDir === "manual";
+
+  return (
+    <div className="space-y-8">
+      <section className="space-y-3">
+        <div className="flex items-center justify-between gap-3">
+          <h2 className="text-sm font-semibold">
+            {t("moduleList.viewHeading")}
+          </h2>
+          <ModuleViewToggle view={prefs.view} onChange={setView} />
+        </div>
+        <p className="text-muted-foreground text-sm">
+          {t("moduleList.viewDescription")}
+        </p>
+      </section>
+
+      <section className="space-y-3">
+        <h2 className="text-sm font-semibold">{t("labs.sort.heading")}</h2>
+        <div className="space-y-2">
+          <Label htmlFor="labs-sort">{t("labs.sort.label")}</Label>
+          <NativeSelect
+            id="labs-sort"
+            value={prefs.sortDir}
+            onChange={(e) => setSortDir(e.target.value as ModuleSortDir)}
+          >
+            <option value="recentDesc">{t("labs.sort.recentDesc")}</option>
+            <option value="recentAsc">{t("labs.sort.recentAsc")}</option>
+            <option value="manual">{t("labs.sort.manual")}</option>
+          </NativeSelect>
+          <p className="text-muted-foreground text-xs">
+            {t("labs.sort.hint")}
+          </p>
+        </div>
+      </section>
+
+      {manual ? (
+        <section className="space-y-3">
+          <h2 className="text-sm font-semibold">
+            {t("moduleList.reorder.heading")}
+          </h2>
+          {isLoading ? (
+            <div className="space-y-2">
+              {Array.from({ length: 3 }, (_, i) => (
+                <Skeleton key={i} className="h-12 w-full" />
+              ))}
+            </div>
+          ) : (
+            <ModuleOrderEditor items={reorderItems} onChange={setOrder} />
+          )}
+        </section>
+      ) : null}
+
+      <section className="space-y-3">
+        <h2 className="text-sm font-semibold">
+          {t("labs.biomarker.manageTitle")}
+        </h2>
+        <BiomarkerManager />
+      </section>
+    </div>
+  );
+}
diff --git a/src/components/measurement-reminders/__tests__/vorsorge-section.test.tsx b/src/components/measurement-reminders/__tests__/vorsorge-section.test.tsx
index bc60d3b41..748b7999e 100644
--- a/src/components/measurement-reminders/__tests__/vorsorge-section.test.tsx
+++ b/src/components/measurement-reminders/__tests__/vorsorge-section.test.tsx
@@ -73,9 +73,10 @@ describe("<VorsorgeSection> loading + empty", () => {
     expect(html).not.toContain('data-slot="vorsorge-loading"');
   });
 
-  it("renders a 'Log value' action for a measurement-linked reminder", () => {
-    // v1.18.2 — a typed reminder's primary action opens the value-entry
-    // form, surfaced as a "Log value" button (not a silent checkmark).
+  it("renders a 'Measure now' action for a measurement-linked reminder", () => {
+    // v1.18.2 — a typed reminder's primary action opens the value-entry form.
+    // v1.18.6 (MOD-06) — surfaced as a green "Measure now" button (a
+    // measurement is not an intake), not a silent checkmark.
     const reminder: MeasurementReminder = {
       id: "linked",
       label: "Measure blood pressure",
@@ -95,7 +96,7 @@ describe("<VorsorgeSection> loading + empty", () => {
     } as MeasurementReminder;
     remindersMock.mockReturnValue({ data: [reminder], isLoading: false });
     const html = render(<VorsorgeSection />);
-    expect(html).toContain("Log value");
+    expect(html).toContain("Measure now");
     expect(html).not.toContain(">Done<");
   });
 
diff --git a/src/components/measurement-reminders/vorsorge-section.tsx b/src/components/measurement-reminders/vorsorge-section.tsx
index 3ec86c63a..359192b65 100644
--- a/src/components/measurement-reminders/vorsorge-section.tsx
+++ b/src/components/measurement-reminders/vorsorge-section.tsx
@@ -29,9 +29,18 @@
  *     card so the card carries a single med-style kebab).
  */
 import { useState } from "react";
-import { CalendarClock, CheckCircle2, Plus, Settings2 } from "lucide-react";
+import Link from "next/link";
+import {
+  Activity,
+  CalendarClock,
+  CheckCircle2,
+  Plus,
+  Wrench,
+} from "lucide-react";
 
 import { useFormatters, useTranslations } from "@/lib/i18n/context";
+import { cn } from "@/lib/utils";
+import { applyOrder, useModuleListPrefs } from "@/lib/module-list-prefs";
 import { ModuleTourTrigger } from "@/components/onboarding/module-tour-trigger";
 import { SettingsCardHeader } from "@/components/settings/_card-header";
 import {
@@ -59,12 +68,11 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { MoreVertical, Pencil, Trash2 } from "lucide-react";
 import { NativeSelect } from "@/components/ui/native-select";
+import { Progress } from "@/components/ui/progress";
 import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
 import { Skeleton } from "@/components/ui/skeleton";
-import { Switch } from "@/components/ui/switch";
 import { MeasurementForm } from "@/components/measurements/measurement-form";
 import { MedicationCardHeader } from "@/components/medications/MedicationCardHeader";
-import { MedicationNextLastSlot } from "@/components/medications/card-parts/medication-next-last-slot";
 import {
   useMeasurementReminders,
   useMeasurementReminderMutations,
@@ -204,15 +212,15 @@ export function VorsorgeSection({
   const { data: reminders, isLoading } = useMeasurementReminders(enabled);
   const { create, update, remove, satisfy } =
     useMeasurementReminderMutations();
+  // v1.18.6 (MOD-03) — page view (cards/list) + manual order persist
+  // client-side; the settings page writes them, the page reads them.
+  const { prefs } = useModuleListPrefs("vorsorge");
 
   // `null` = sheet closed; "new" = create; a reminder = edit pre-filled.
   const [editing, setEditing] = useState<MeasurementReminder | "new" | null>(
     null,
   );
   const [form, setForm] = useState<FormState>(EMPTY_FORM);
-  // The customize ("wrench") sheet — re-homes the per-reminder enable
-  // toggles that no longer live on the card itself.
-  const [manageOpen, setManageOpen] = useState(false);
   // The value-capture sheet: holds the reminder whose measurement we are
   // entering. Non-null ⇒ the MeasurementForm sheet is open for that row.
   const [capturing, setCapturing] = useState<MeasurementReminder | null>(null);
@@ -328,7 +336,8 @@ export function VorsorgeSection({
   const cadenceCustom = form.cadenceChoice === CADENCE_CUSTOM;
   const cadenceRrule = form.cadenceChoice === CADENCE_RRULE;
 
-  // The shared primary add-entry affordance — identical in both variants.
+  // v1.18.6 (MOD-02) — the primary add affordance reads "hinzufügen" like
+  // every other module's add button.
   const addButton = (
     <Button
       type="button"
@@ -336,32 +345,29 @@ export function VorsorgeSection({
       onClick={openCreate}
     >
       <Plus className="h-4 w-4" />
-      {t("measurementReminders.addButton")}
+      {t("common.add")}
     </Button>
   );
 
-  // v1.18.2 — wrench/customize affordance, mirroring the labs page: a
-  // ghost icon button beside Add opening the manage sheet.
+  // v1.18.6 (MOD-01) — the wrench links to the Vorsorge settings page (view,
+  // reorder, per-reminder enable toggles), left of the Add button — the
+  // canonical medication-page pattern. The old kebab "Anpassen" sheet is
+  // gone (MOD-07); its toggles moved to the settings page.
   const wrenchButton = (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon"
-          className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
-          aria-label={t("common.moreOptions")}
-        >
-          <MoreVertical className="h-4 w-4" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="w-56">
-        <DropdownMenuItem onClick={() => setManageOpen(true)}>
-          <Settings2 className="mr-2 h-4 w-4" />
-          {t("measurementReminders.manage.menuItem")}
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
+    <Button
+      asChild
+      variant="ghost"
+      size="icon"
+      className="min-h-11 min-w-11 sm:min-h-9 sm:min-w-9"
+    >
+      <Link
+        href="/settings/vorsorge"
+        aria-label={t("measurementReminders.customize")}
+        title={t("measurementReminders.customize")}
+      >
+        <Wrench className="h-4 w-4" aria-hidden="true" />
+      </Link>
+    </Button>
   );
 
   return (
@@ -382,8 +388,8 @@ export function VorsorgeSection({
           </div>
           <div className="flex shrink-0 items-center gap-2">
             <ModuleTourTrigger stopId="vorsorge" />
-            {addButton}
             {wrenchButton}
+            {addButton}
           </div>
         </div>
       ) : (
@@ -634,42 +640,6 @@ export function VorsorgeSection({
         )}
       </ResponsiveSheet>
 
-      {/* v1.18.2 — customize sheet: re-homes the per-reminder enable/disable
-          toggles (moved off the card so it carries a single med-style kebab). */}
-      <ResponsiveSheet
-        open={manageOpen}
-        onOpenChange={setManageOpen}
-        title={t("measurementReminders.manage.title")}
-        description={t("measurementReminders.manage.description")}
-      >
-        {(reminders?.length ?? 0) === 0 ? (
-          <p className="text-muted-foreground text-sm">
-            {t("measurementReminders.manage.empty")}
-          </p>
-        ) : (
-          <ul className="space-y-2">
-            {reminders?.map((reminder) => (
-              <li
-                key={reminder.id}
-                className="flex items-center justify-between gap-3 rounded-md border p-3"
-              >
-                <span className="min-w-0 truncate text-sm">
-                  {resolveReminderLabel(reminder, t)}
-                </span>
-                <Switch
-                  checked={reminder.enabled}
-                  onCheckedChange={(next) =>
-                    update.mutate({ id: reminder.id, body: { enabled: next } })
-                  }
-                  disabled={update.isPending}
-                  aria-label={t("measurementReminders.enabledToggleAria")}
-                />
-              </li>
-            ))}
-          </ul>
-        )}
-      </ResponsiveSheet>
-
       {isLoading && (
         <div
           className="grid gap-4 sm:grid-cols-2"
@@ -694,37 +664,68 @@ export function VorsorgeSection({
           description={t("measurementReminders.empty.description")}
           action={
             <Button type="button" onClick={openCreate}>
-              {t("measurementReminders.addButton")}
+              {t("common.add")}
             </Button>
           }
         />
       )}
 
       {!isLoading && (reminders?.length ?? 0) > 0 && (
-        <ul className="grid list-none gap-4 p-0 sm:grid-cols-2">
-          {reminders?.map((reminder) => (
-            <li key={reminder.id} className="contents">
-              <VorsorgeCard
-                reminder={reminder}
-                now={now}
-                onPrimaryAction={() => onPrimaryAction(reminder)}
-                onRemove={() => remove.mutate(reminder.id)}
-                onEdit={() => openEdit(reminder)}
-                busy={
-                  satisfy.isPending || remove.isPending || update.isPending
-                }
-              />
-            </li>
-          ))}
+        <ul
+          className={
+            prefs.view === "list"
+              ? "list-none space-y-2 p-0"
+              : "grid list-none gap-4 p-0 sm:grid-cols-2"
+          }
+        >
+          {applyOrder(reminders ?? [], prefs.order, (r) => r.id).map(
+            (reminder) => (
+              <li key={reminder.id} className="contents">
+                <VorsorgeCard
+                  reminder={reminder}
+                  now={now}
+                  view={prefs.view}
+                  onPrimaryAction={() => onPrimaryAction(reminder)}
+                  onRemove={() => remove.mutate(reminder.id)}
+                  onEdit={() => openEdit(reminder)}
+                  busy={
+                    satisfy.isPending || remove.isPending || update.isPending
+                  }
+                />
+              </li>
+            ),
+          )}
         </ul>
       )}
     </section>
   );
 }
 
+/**
+ * v1.18.6 (MOD-06) — progress through the current interval toward the next
+ * due date, as a 0–100 percentage. Honest "are we on track" gamification
+ * that reuses the medication card's `Progress` building block without
+ * fabricating a streak the reminder data cannot support: 100 % (or beyond)
+ * means due/overdue now, lower means time still remains in the window.
+ * Returns null when there is no interval to measure against (RRULE / unset).
+ */
+function intervalProgress(
+  reminder: MeasurementReminder,
+  now: number,
+): number | null {
+  if (reminder.intervalDays == null || reminder.nextDueAt == null) return null;
+  const dueMs = new Date(reminder.nextDueAt).getTime();
+  if (Number.isNaN(dueMs)) return null;
+  const windowMs = reminder.intervalDays * DAY_MS;
+  const startMs = dueMs - windowMs;
+  const elapsed = now - startMs;
+  return Math.max(0, Math.min(100, Math.round((elapsed / windowMs) * 100)));
+}
+
 function VorsorgeCard({
   reminder,
   now,
+  view,
   onPrimaryAction,
   onRemove,
   onEdit,
@@ -732,6 +733,7 @@ function VorsorgeCard({
 }: {
   reminder: MeasurementReminder;
   now: number;
+  view: "cards" | "list";
   onPrimaryAction: () => void;
   onRemove: () => void;
   onEdit: () => void;
@@ -751,6 +753,12 @@ function VorsorgeCard({
         : "";
   const isCoach = reminder.origin === "COACH";
   const isLinked = reminder.measurementType != null;
+  // Due now / overdue ⇒ the action button takes the green "do it now" tone,
+  // analogous to the medication card's due affordance. The CARD stays neutral
+  // (no tint) per the project rule — only the action button goes green.
+  const isDue =
+    due.key === "nextDue.today" || due.key === "overdueByDays";
+  const progress = intervalProgress(reminder, now);
 
   // Category-style header badge: the measurement label, or "self-planned"
   // for a free-text exam — mirroring the medication card's class badge.
@@ -758,21 +766,22 @@ function VorsorgeCard({
     ? t(`measurementReminders.types.${reminder.measurementType}`)
     : t("measurementReminders.selfPlanned");
 
-  const stateBadges =
-    isCoach || !reminder.enabled ? (
-      <>
-        {isCoach && (
-          <Badge variant="outline">
-            {t("measurementReminders.originCoach")}
-          </Badge>
-        )}
-        {!reminder.enabled && (
-          <Badge variant="outline">
-            {t("measurementReminders.disabledBadge")}
-          </Badge>
-        )}
-      </>
-    ) : null;
+  // v1.18.6 (MOD-06) — the cadence renders as a chip beside the item name
+  // (the med-card cadence-chip convention), alongside the provenance /
+  // disabled state badges.
+  const stateBadges = (
+    <>
+      {cadence && <Badge variant="secondary">{cadence}</Badge>}
+      {isCoach && (
+        <Badge variant="outline">{t("measurementReminders.originCoach")}</Badge>
+      )}
+      {!reminder.enabled && (
+        <Badge variant="outline">
+          {t("measurementReminders.disabledBadge")}
+        </Badge>
+      )}
+    </>
+  );
 
   // Single med-style kebab: Edit + Delete. The Delete item is the shared
   // confirm-on-delete control rendered as a full-width menu row.
@@ -806,95 +815,186 @@ function VorsorgeCard({
     </DropdownMenu>
   );
 
-  // Next/last block in the med-card grammar. The "next" value carries the
-  // discreet neutral due badge + cadence; the "last" value is the last
-  // satisfied date.
-  const nextValue = (
-    <span className="inline-flex flex-wrap items-center justify-end gap-x-2 gap-y-1">
-      <Badge variant="secondary">
-        {t(`measurementReminders.${due.key}`, { days: due.days })}
-      </Badge>
-      {cadence && <span className="text-muted-foreground">{cadence}</span>}
-    </span>
+  // v1.18.6 (MOD-06) — the green "Jetzt messen" / mark-done action. Green only
+  // on the action button (never the card surface). When not due it stays the
+  // calm default tone so the green reads as "now is the time".
+  const primaryButton = (
+    <Button
+      type="button"
+      className={cn(
+        "min-h-11 w-full",
+        isDue && "bg-success text-white hover:bg-success/90",
+      )}
+      onClick={onPrimaryAction}
+      disabled={busy}
+    >
+      {isLinked ? (
+        <>
+          <Activity className="h-4 w-4" />
+          {t("measurementReminders.measureNow")}
+        </>
+      ) : (
+        <>
+          <CheckCircle2 className="h-4 w-4" />
+          {t("measurementReminders.markDone")}
+        </>
+      )}
+    </Button>
   );
+
+  const deleteDialog = (
+    <AlertDialog open={confirmDelete} onOpenChange={setConfirmDelete}>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            {t("measurementReminders.deleteConfirmTitle")}
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            {t("measurementReminders.deleteConfirmDescription")}
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel>{t("common.cancel")}</AlertDialogCancel>
+          <AlertDialogAction variant="destructive" onClick={onRemove}>
+            {t("measurementReminders.delete")}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+
+  // v1.18.6 (MOD-03) — compact list row variant.
+  if (view === "list") {
+    return (
+      <>
+        <Card>
+          <CardContent className="flex items-center justify-between gap-3 px-4 py-2.5">
+            <div className="min-w-0 space-y-0.5">
+              <div className="flex flex-wrap items-baseline gap-x-2 text-sm">
+                <span className="truncate font-medium">
+                  {resolveReminderLabel(reminder, t)}
+                </span>
+                {cadence && <Badge variant="secondary">{cadence}</Badge>}
+              </div>
+              <div className="flex flex-wrap items-center gap-x-2 text-xs">
+                <Badge variant="outline">
+                  {t(`measurementReminders.${due.key}`, { days: due.days })}
+                </Badge>
+                <span className="text-muted-foreground">{categoryLabel}</span>
+              </div>
+            </div>
+            <div className="flex shrink-0 items-center gap-1">
+              <Button
+                type="button"
+                size="sm"
+                className={cn(
+                  "min-h-9",
+                  isDue && "bg-success text-white hover:bg-success/90",
+                )}
+                onClick={onPrimaryAction}
+                disabled={busy}
+              >
+                {isLinked
+                  ? t("measurementReminders.measureNow")
+                  : t("measurementReminders.markDone")}
+              </Button>
+              {headerActions}
+            </div>
+          </CardContent>
+        </Card>
+        {deleteDialog}
+      </>
+    );
+  }
+
+  // Next/last block in the med-card grammar, but with MEASUREMENT wording
+  // (MOD-06: never "Einnahme" / intake — a measurement is not an intake). The
+  // "next" value carries the discreet neutral due badge; the "last" value is
+  // the last satisfied date.
   const lastValue = reminder.lastSatisfiedAt
     ? fmt.date(new Date(reminder.lastSatisfiedAt))
     : null;
+  const nextLastSlot = (
+    <div className="min-h-[2.75rem] space-y-1.5 text-sm">
+      <div className="text-muted-foreground flex items-baseline justify-between gap-3">
+        <span className="min-w-0 flex-shrink truncate font-medium">
+          {t("measurementReminders.nextDueLabel")}
+        </span>
+        <span className="text-right">
+          <Badge variant="secondary">
+            {t(`measurementReminders.${due.key}`, { days: due.days })}
+          </Badge>
+        </span>
+      </div>
+      {lastValue && (
+        <div className="text-muted-foreground flex items-baseline justify-between gap-3">
+          <span className="min-w-0 flex-shrink truncate font-medium">
+            {t("measurementReminders.lastDoneLabel")}
+          </span>
+          <span className="text-foreground text-right">{lastValue}</span>
+        </div>
+      )}
+    </div>
+  );
 
   return (
     <>
-    {/* NEUTRAL card — no status-driven colour. Due state reads only through
-        the discreet badge below. Shares the medication card shell + tokens. */}
-    <Card className="h-full gap-3 md:gap-3">
-      <MedicationCardHeader
-        name={resolveReminderLabel(reminder, t)}
-        dose=""
-        categoryLabel={categoryLabel}
-        stateBadges={stateBadges}
-        actions={headerActions}
-      />
-      <CardContent className="flex h-full flex-col space-y-3.5">
-        <MedicationNextLastSlot next={nextValue} last={lastValue} />
+      {/* NEUTRAL card — no status-driven colour. Due state reads only through
+          the discreet badge + the green action button below (MOD-06). Shares
+          the medication card shell + tokens. */}
+      <Card className="h-full gap-3 md:gap-3">
+        <MedicationCardHeader
+          name={resolveReminderLabel(reminder, t)}
+          dose=""
+          categoryLabel={categoryLabel}
+          stateBadges={stateBadges}
+          actions={headerActions}
+        />
+        <CardContent className="flex h-full flex-col space-y-3.5">
+          {nextLastSlot}
 
-        {reminder.endsOn && (
-          <p className="text-muted-foreground text-sm">
-            {t("measurementReminders.until", {
-              date: fmt.date(new Date(reminder.endsOn)),
-            })}
-          </p>
-        )}
-        {reminder.location && (
-          <p className="text-muted-foreground text-sm">
-            {t("measurementReminders.location.prefix", {
-              location: reminder.location,
-            })}
-          </p>
-        )}
+          {/* v1.18.6 (MOD-06) — light gamification: progress through the
+              current interval toward next-due, reusing the medication card's
+              Progress building block. Honest "on track / due" signal without
+              a fabricated streak; hidden for RRULE / unscheduled reminders. */}
+          {progress != null && (
+            <div className="space-y-1">
+              <div className="text-muted-foreground flex items-center justify-between text-xs">
+                <span>{t("measurementReminders.adherence.label")}</span>
+                <span className="tabular-nums">
+                  {isDue
+                    ? t("measurementReminders.adherence.due")
+                    : t("measurementReminders.adherence.onTrack")}
+                </span>
+              </div>
+              <Progress
+                value={progress}
+                aria-label={t("measurementReminders.adherence.label")}
+              />
+            </div>
+          )}
 
-        {/* Bottom-pinned single primary action — branches on the link state:
-            a self-planned exam marks done; a measurement-linked reminder
-            opens the value-entry form. */}
-        <div className="mt-auto pt-0">
-          <Button
-            type="button"
-            className="min-h-11 w-full"
-            onClick={onPrimaryAction}
-            disabled={busy}
-          >
-            {isLinked ? (
-              <>
-                <Plus className="h-4 w-4" />
-                {t("measurementReminders.captureValue")}
-              </>
-            ) : (
-              <>
-                <CheckCircle2 className="h-4 w-4" />
-                {t("measurementReminders.markDone")}
-              </>
-            )}
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
+          {reminder.endsOn && (
+            <p className="text-muted-foreground text-sm">
+              {t("measurementReminders.until", {
+                date: fmt.date(new Date(reminder.endsOn)),
+              })}
+            </p>
+          )}
+          {reminder.location && (
+            <p className="text-muted-foreground text-sm">
+              {t("measurementReminders.location.prefix", {
+                location: reminder.location,
+              })}
+            </p>
+          )}
 
-      <AlertDialog open={confirmDelete} onOpenChange={setConfirmDelete}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>
-              {t("measurementReminders.deleteConfirmTitle")}
-            </AlertDialogTitle>
-            <AlertDialogDescription>
-              {t("measurementReminders.deleteConfirmDescription")}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t("common.cancel")}</AlertDialogCancel>
-            <AlertDialogAction variant="destructive" onClick={onRemove}>
-              {t("measurementReminders.delete")}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
+          {/* Bottom-pinned single primary action — green when due (MOD-06). */}
+          <div className="mt-auto pt-0">{primaryButton}</div>
+        </CardContent>
+      </Card>
+
+      {deleteDialog}
     </>
   );
 }
diff --git a/src/components/measurement-reminders/vorsorge-settings.tsx b/src/components/measurement-reminders/vorsorge-settings.tsx
new file mode 100644
index 000000000..47710d026
--- /dev/null
+++ b/src/components/measurement-reminders/vorsorge-settings.tsx
@@ -0,0 +1,125 @@
+"use client";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — the Vorsorge module's own settings page body.
+ *
+ * Reached from the wrench beside the page's "hinzufügen" button. Lets the
+ * user reorder reminders + pick the card-vs-list page view, and re-homes the
+ * per-reminder enable/disable toggles that used to live in the page's
+ * "Anpassen" sheet. Order + view persist client-side via
+ * `useModuleListPrefs("vorsorge")`; the toggles persist through the existing
+ * reminder PATCH route.
+ */
+import { Card, CardContent } from "@/components/ui/card";
+import { Switch } from "@/components/ui/switch";
+import { Skeleton } from "@/components/ui/skeleton";
+import { useTranslations } from "@/lib/i18n/context";
+import { ModuleViewToggle } from "@/components/module-list/module-view-toggle";
+import {
+  ModuleOrderEditor,
+  type ReorderItem,
+} from "@/components/module-list/module-order-editor";
+import { applyOrder, useModuleListPrefs } from "@/lib/module-list-prefs";
+import {
+  useMeasurementReminders,
+  useMeasurementReminderMutations,
+  type MeasurementReminder,
+} from "@/hooks/use-measurement-reminders";
+
+function resolveLabel(
+  reminder: MeasurementReminder,
+  t: (key: string) => string,
+): string {
+  if (reminder.origin === "COACH") {
+    const translated = t(reminder.label);
+    return translated === reminder.label ? reminder.label : translated;
+  }
+  return reminder.label;
+}
+
+export function VorsorgeSettings() {
+  const { t } = useTranslations();
+  const { data: reminders, isLoading } = useMeasurementReminders(true);
+  const { update } = useMeasurementReminderMutations();
+  const { prefs, setView, setOrder } = useModuleListPrefs("vorsorge");
+
+  const ordered = applyOrder(reminders ?? [], prefs.order, (r) => r.id);
+  const reorderItems: ReorderItem[] = ordered.map((r) => ({
+    id: r.id,
+    name: resolveLabel(r, t),
+    secondary: r.measurementType
+      ? t(`measurementReminders.types.${r.measurementType}`)
+      : t("measurementReminders.selfPlanned"),
+  }));
+
+  return (
+    <div className="space-y-8">
+      <section className="space-y-3">
+        <div className="flex items-center justify-between gap-3">
+          <h2 className="text-sm font-semibold">{t("moduleList.viewHeading")}</h2>
+          <ModuleViewToggle view={prefs.view} onChange={setView} />
+        </div>
+        <p className="text-muted-foreground text-sm">
+          {t("moduleList.viewDescription")}
+        </p>
+      </section>
+
+      <section className="space-y-3">
+        <h2 className="text-sm font-semibold">
+          {t("moduleList.reorder.heading")}
+        </h2>
+        {isLoading ? (
+          <div className="space-y-2">
+            {Array.from({ length: 3 }, (_, i) => (
+              <Skeleton key={i} className="h-12 w-full" />
+            ))}
+          </div>
+        ) : (
+          <ModuleOrderEditor items={reorderItems} onChange={setOrder} />
+        )}
+      </section>
+
+      <section className="space-y-3">
+        <h2 className="text-sm font-semibold">
+          {t("measurementReminders.manage.title")}
+        </h2>
+        <p className="text-muted-foreground text-sm">
+          {t("measurementReminders.manage.description")}
+        </p>
+        {isLoading ? (
+          <Skeleton className="h-24 w-full" />
+        ) : (reminders?.length ?? 0) === 0 ? (
+          <p className="text-muted-foreground text-sm">
+            {t("measurementReminders.manage.empty")}
+          </p>
+        ) : (
+          <Card>
+            <CardContent className="divide-border divide-y p-0">
+              {ordered.map((reminder) => (
+                <div
+                  key={reminder.id}
+                  className="flex items-center justify-between gap-3 px-4 py-3"
+                >
+                  <span className="min-w-0 truncate text-sm">
+                    {resolveLabel(reminder, t)}
+                  </span>
+                  <Switch
+                    checked={reminder.enabled}
+                    onCheckedChange={(next) =>
+                      update.mutate({
+                        id: reminder.id,
+                        body: { enabled: next },
+                      })
+                    }
+                    disabled={update.isPending}
+                    aria-label={t("measurementReminders.enabledToggleAria")}
+                  />
+                </div>
+              ))}
+            </CardContent>
+          </Card>
+        )}
+      </section>
+    </div>
+  );
+}
diff --git a/src/components/module-list/module-order-editor.tsx b/src/components/module-list/module-order-editor.tsx
new file mode 100644
index 000000000..ce12ae97d
--- /dev/null
+++ b/src/components/module-list/module-order-editor.tsx
@@ -0,0 +1,221 @@
+"use client";
+
+import { useId } from "react";
+import { ArrowDown, ArrowUp, GripVertical } from "lucide-react";
+import {
+  DndContext,
+  KeyboardSensor,
+  PointerSensor,
+  closestCenter,
+  useSensor,
+  useSensors,
+  type DragEndEvent,
+} from "@dnd-kit/core";
+import {
+  SortableContext,
+  sortableKeyboardCoordinates,
+  useSortable,
+  verticalListSortingStrategy,
+} from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+
+import { Button } from "@/components/ui/button";
+import { reorderById } from "@/lib/insights-layout-reorder";
+import { prefersReducedMotion } from "@/lib/charts/reduced-motion";
+import { useTranslations } from "@/lib/i18n/context";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — generic, controlled reorder list shared by the
+ * Vorsorge / Illness / Labs settings pages.
+ *
+ * A single section (no active/inactive split — the secondary modules have a
+ * flat list) with the same vocabulary as the medication order editor: an
+ * `@dnd-kit` drag handle (pointer + keyboard sensors) plus per-row up/down
+ * arrow buttons as the primary keyboard surface. Unlike the medication
+ * editor it is fully controlled — there is no Save/Cancel draft state
+ * because the host persists each move immediately to the localStorage order
+ * (the choice is presentational, not a server write). The swap-and-renumber
+ * logic is the shared `reorderById` helper so the order semantics match the
+ * dashboard / insights / medications surfaces exactly.
+ */
+
+export interface ReorderItem {
+  id: string;
+  /** Primary label (bold). */
+  name: string;
+  /** Optional secondary line (muted). */
+  secondary?: string;
+}
+
+interface ModuleOrderEditorProps {
+  /** The list in its current effective order. */
+  items: ReorderItem[];
+  /** Persist the full id order after every move. */
+  onChange: (order: string[]) => void;
+}
+
+export function ModuleOrderEditor({ items, onChange }: ModuleOrderEditorProps) {
+  const { t } = useTranslations();
+  const dragHintId = useId();
+  const ids = items.map((i) => i.id);
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, { activationConstraint: { distance: 6 } }),
+    useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
+    }),
+  );
+
+  const labels = {
+    moveUp: t("dashboard.moveUp"),
+    moveDown: t("dashboard.moveDown"),
+    dragHandle: t("dashboard.dragHandle"),
+  };
+
+  function applyReorder(fromId: string, toId: string) {
+    onChange(
+      reorderById(
+        ids.map((id, order) => ({ id, order })),
+        fromId,
+        toId,
+      ).map((r) => r.id),
+    );
+  }
+
+  function move(id: string, delta: -1 | 1) {
+    const idx = ids.indexOf(id);
+    const targetIdx = idx + delta;
+    if (idx < 0 || targetIdx < 0 || targetIdx >= ids.length) return;
+    applyReorder(id, ids[targetIdx]);
+  }
+
+  function handleDragEnd(event: DragEndEvent) {
+    const { active, over } = event;
+    if (!over || active.id === over.id) return;
+    applyReorder(String(active.id), String(over.id));
+  }
+
+  if (items.length === 0) {
+    return (
+      <p className="text-muted-foreground text-sm">
+        {t("moduleList.reorder.empty")}
+      </p>
+    );
+  }
+
+  return (
+    <div className="space-y-2" data-slot="module-order-editor">
+      <DndContext
+        sensors={sensors}
+        collisionDetection={closestCenter}
+        onDragEnd={handleDragEnd}
+      >
+        <SortableContext items={ids} strategy={verticalListSortingStrategy}>
+          {items.map((item, index) => (
+            <SortableRow
+              key={item.id}
+              item={item}
+              index={index}
+              total={items.length}
+              dragHintId={dragHintId}
+              labels={labels}
+              onMove={move}
+            />
+          ))}
+        </SortableContext>
+      </DndContext>
+      <p id={dragHintId} className="text-muted-foreground sr-only">
+        {t("dashboard.dragHandleHint")}
+      </p>
+    </div>
+  );
+}
+
+interface SortableRowProps {
+  item: ReorderItem;
+  index: number;
+  total: number;
+  dragHintId: string;
+  labels: { moveUp: string; moveDown: string; dragHandle: string };
+  onMove: (id: string, delta: -1 | 1) => void;
+}
+
+function SortableRow({
+  item,
+  index,
+  total,
+  dragHintId,
+  labels,
+  onMove,
+}: SortableRowProps) {
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging,
+  } = useSortable({ id: item.id });
+
+  const style: React.CSSProperties = {
+    transform: CSS.Transform.toString(transform),
+    transition: prefersReducedMotion() ? "none" : transition,
+  };
+
+  return (
+    <div
+      ref={setNodeRef}
+      style={style}
+      data-slot="module-reorder-row"
+      data-dragging={isDragging ? "true" : undefined}
+      className={`border-border bg-background/30 flex min-h-12 items-center gap-2 rounded-md border px-3 py-2 ${
+        isDragging ? "ring-primary z-10 opacity-90 shadow-lg ring-2" : ""
+      }`}
+    >
+      <button
+        type="button"
+        {...attributes}
+        {...listeners}
+        aria-label={`${labels.dragHandle} — ${item.name}`}
+        aria-describedby={dragHintId}
+        title={labels.dragHandle}
+        data-slot="module-drag-handle"
+        className="text-muted-foreground hover:text-foreground focus-visible:ring-ring focus-visible:ring-offset-background relative -m-1 inline-flex h-7 w-7 cursor-grab touch-none items-center justify-center rounded transition-colors before:absolute before:inset-[-8px] before:content-[''] focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none active:cursor-grabbing motion-reduce:transition-none"
+      >
+        <GripVertical className="h-4 w-4" />
+      </button>
+      <span className="min-w-0 flex-1 text-sm">
+        <span className="block truncate font-medium" title={item.name}>
+          {item.name}
+        </span>
+        {item.secondary ? (
+          <span className="text-muted-foreground block truncate text-xs">
+            {item.secondary}
+          </span>
+        ) : null}
+      </span>
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon"
+        className="size-11 sm:size-9"
+        onClick={() => onMove(item.id, -1)}
+        disabled={index === 0}
+        aria-label={`${labels.moveUp} — ${item.name}`}
+      >
+        <ArrowUp className="h-4 w-4" />
+      </Button>
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon"
+        className="size-11 sm:size-9"
+        onClick={() => onMove(item.id, 1)}
+        disabled={index === total - 1}
+        aria-label={`${labels.moveDown} — ${item.name}`}
+      >
+        <ArrowDown className="h-4 w-4" />
+      </Button>
+    </div>
+  );
+}
diff --git a/src/components/module-list/module-settings-frame.tsx b/src/components/module-list/module-settings-frame.tsx
new file mode 100644
index 000000000..12c6887d1
--- /dev/null
+++ b/src/components/module-list/module-settings-frame.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import type { ReactNode } from "react";
+
+import { SettingsHubBackLink } from "@/components/settings/settings-hub-back-link";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — heading frame for the per-module settings pages
+ * (Vorsorge / Illness / Labs).
+ *
+ * FRAME-ADOPTION SEAM: a parallel phase is introducing a shared
+ * `SettingsSectionFrame` primitive under `src/components/settings/*` (which
+ * this phase must not edit). Until that lands, this renders the canonical
+ * settings heading markup verbatim — `h1.text-2xl.font-bold.tracking-tight`
+ * + `p.text-muted-foreground.text-sm` — so the three new pages already
+ * conform to the standard and can be swapped to the shared frame at merge by
+ * replacing this single wrapper. The back-link reuses the existing
+ * `SettingsHubBackLink` (read-only import) so the pages have a consistent
+ * "return to the hub" affordance even though they are not listed in the
+ * settings-shell sidebar.
+ */
+export function ModuleSettingsFrame({
+  title,
+  description,
+  backHref,
+  backLabelKey,
+  children,
+}: {
+  title: string;
+  description: string;
+  /** Where the "← back" link returns to — the module's own page. */
+  backHref: string;
+  backLabelKey: string;
+  children: ReactNode;
+}) {
+  return (
+    <div className="space-y-6">
+      <div className="space-y-1">
+        <SettingsHubBackLink href={backHref} labelKey={backLabelKey} />
+        <h1 className="text-2xl font-bold tracking-tight">{title}</h1>
+        <p className="text-muted-foreground text-sm">{description}</p>
+      </div>
+      {children}
+    </div>
+  );
+}
diff --git a/src/components/module-list/module-view-toggle.tsx b/src/components/module-list/module-view-toggle.tsx
new file mode 100644
index 000000000..2fc25c0cb
--- /dev/null
+++ b/src/components/module-list/module-view-toggle.tsx
@@ -0,0 +1,69 @@
+"use client";
+
+import { LayoutGrid, List as ListIcon } from "lucide-react";
+
+import { useTranslations } from "@/lib/i18n/context";
+import { cn } from "@/lib/utils";
+import type { ModuleListView } from "@/lib/module-list-prefs";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — icon-only card/list view toggle shared by the
+ * Vorsorge / Illness / Labs settings pages. Mirrors the medication module's
+ * `MedicationViewToggle` grammar (two ghost segments, the active one filled,
+ * `aria-pressed` per segment) but switches between a card grid and a compact
+ * list rather than cards-vs-table, so the label set is `moduleList.view*`.
+ */
+interface ModuleViewToggleProps {
+  view: ModuleListView;
+  onChange: (view: ModuleListView) => void;
+}
+
+export function ModuleViewToggle({ view, onChange }: ModuleViewToggleProps) {
+  const { t } = useTranslations();
+
+  const segments = [
+    {
+      value: "cards" as const,
+      label: t("moduleList.viewCards"),
+      icon: LayoutGrid,
+    },
+    {
+      value: "list" as const,
+      label: t("moduleList.viewList"),
+      icon: ListIcon,
+    },
+  ];
+
+  return (
+    <div
+      role="group"
+      aria-label={t("moduleList.viewToggleLabel")}
+      className="border-border bg-background/30 inline-flex shrink-0 items-center rounded-md border p-0.5"
+    >
+      {segments.map(({ value, label, icon: Icon }) => {
+        const active = view === value;
+        return (
+          <button
+            key={value}
+            type="button"
+            onClick={() => {
+              if (!active) onChange(value);
+            }}
+            aria-pressed={active}
+            aria-label={label}
+            title={label}
+            data-slot={`module-view-${value}`}
+            className={cn(
+              "focus-visible:ring-ring inline-flex size-10 items-center justify-center rounded-[5px] transition-colors focus-visible:ring-2 focus-visible:outline-none motion-reduce:transition-none sm:size-8",
+              active
+                ? "bg-secondary text-secondary-foreground shadow-sm"
+                : "text-muted-foreground hover:text-foreground",
+            )}
+          >
+            <Icon className="size-4" aria-hidden="true" />
+          </button>
+        );
+      })}
+    </div>
+  );
+}
diff --git a/src/lib/__tests__/module-list-prefs.test.ts b/src/lib/__tests__/module-list-prefs.test.ts
new file mode 100644
index 000000000..8434b9615
--- /dev/null
+++ b/src/lib/__tests__/module-list-prefs.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it } from "vitest";
+
+import { applyOrder, parseModuleListPrefs } from "@/lib/module-list-prefs";
+
+describe("module-list-prefs", () => {
+  describe("parseModuleListPrefs", () => {
+    it("returns defaults for null / malformed input", () => {
+      expect(parseModuleListPrefs(null)).toEqual({
+        view: "cards",
+        order: [],
+        sortDir: "recentDesc",
+      });
+      expect(parseModuleListPrefs("{not json")).toEqual({
+        view: "cards",
+        order: [],
+        sortDir: "recentDesc",
+      });
+    });
+
+    it("coerces unknown view / sortDir to defaults but keeps a valid order", () => {
+      const parsed = parseModuleListPrefs(
+        JSON.stringify({ view: "grid", sortDir: "weird", order: ["a", "b"] }),
+      );
+      expect(parsed).toEqual({
+        view: "cards",
+        sortDir: "recentDesc",
+        order: ["a", "b"],
+      });
+    });
+
+    it("round-trips valid values", () => {
+      const parsed = parseModuleListPrefs(
+        JSON.stringify({ view: "list", sortDir: "manual", order: ["x"] }),
+      );
+      expect(parsed).toEqual({
+        view: "list",
+        sortDir: "manual",
+        order: ["x"],
+      });
+    });
+  });
+
+  describe("applyOrder", () => {
+    const items = [{ id: "a" }, { id: "b" }, { id: "c" }];
+    const idOf = (i: { id: string }) => i.id;
+
+    it("returns the input order when no order is persisted", () => {
+      expect(applyOrder(items, [], idOf)).toEqual(items);
+    });
+
+    it("places ordered ids first, then the server-default tail", () => {
+      const result = applyOrder(items, ["c", "a"], idOf);
+      expect(result.map(idOf)).toEqual(["c", "a", "b"]);
+    });
+
+    it("ignores ids in the order that are absent from the data", () => {
+      const result = applyOrder(items, ["z", "b"], idOf);
+      expect(result.map(idOf)).toEqual(["b", "a", "c"]);
+    });
+  });
+});
diff --git a/src/lib/module-list-prefs.ts b/src/lib/module-list-prefs.ts
new file mode 100644
index 000000000..c23a396ce
--- /dev/null
+++ b/src/lib/module-list-prefs.ts
@@ -0,0 +1,181 @@
+"use client";
+
+/**
+ * v1.18.6 (W8 / MOD-03) — client-side per-module list preferences for the
+ * three secondary modules (Vorsorge, Illness, Labs).
+ *
+ * These modules do not carry a server-side list-layout column the way
+ * Medications does (`/api/medications/layout`). Rather than mint three new
+ * Prisma columns + routes — which a parallel backend phase owns — the
+ * reorder + view choice live in `localStorage`, keyed per module. The choice
+ * is presentational only: it reorders / reshapes what the page already
+ * fetched and never feeds a server read, so a missing or stale blob degrades
+ * to the server's own default order.
+ *
+ * Shape per module (one localStorage key each):
+ *   { view: "cards" | "list", order: string[] }
+ * `order` is an id allow-list; ids absent from the live data are ignored and
+ * ids present in the data but absent from `order` sort after the ordered
+ * block (the server default order is preserved for the tail).
+ */
+
+import { useCallback, useSyncExternalStore } from "react";
+
+export const MODULE_LIST_VIEWS = ["cards", "list"] as const;
+export type ModuleListView = (typeof MODULE_LIST_VIEWS)[number];
+
+export type ModuleListKey = "vorsorge" | "illness" | "labs";
+
+/**
+ * Sort choice for the Labs surface (MOD-04): order biomarker groups by the
+ * recency of their most-recent reading. `manual` defers to the persisted
+ * `order` array instead.
+ */
+export const MODULE_SORT_DIRS = ["recentDesc", "recentAsc", "manual"] as const;
+export type ModuleSortDir = (typeof MODULE_SORT_DIRS)[number];
+
+export interface ModuleListPrefs {
+  view: ModuleListView;
+  order: string[];
+  /** Only consumed by the Labs surface; defaults to most-recent-first. */
+  sortDir: ModuleSortDir;
+}
+
+const DEFAULT_PREFS: ModuleListPrefs = {
+  view: "cards",
+  order: [],
+  sortDir: "recentDesc",
+};
+
+function storageKey(module: ModuleListKey): string {
+  return `healthlog:module-list-prefs:${module}`;
+}
+
+function isView(value: unknown): value is ModuleListView {
+  return (
+    typeof value === "string" &&
+    (MODULE_LIST_VIEWS as readonly string[]).includes(value)
+  );
+}
+
+function isSortDir(value: unknown): value is ModuleSortDir {
+  return (
+    typeof value === "string" &&
+    (MODULE_SORT_DIRS as readonly string[]).includes(value)
+  );
+}
+
+export function parseModuleListPrefs(raw: string | null): ModuleListPrefs {
+  if (!raw) return DEFAULT_PREFS;
+  try {
+    const blob = JSON.parse(raw) as Record<string, unknown>;
+    const view = isView(blob.view) ? blob.view : DEFAULT_PREFS.view;
+    const order = Array.isArray(blob.order)
+      ? blob.order.filter((v): v is string => typeof v === "string")
+      : [];
+    const sortDir = isSortDir(blob.sortDir)
+      ? blob.sortDir
+      : DEFAULT_PREFS.sortDir;
+    return { view, order, sortDir };
+  } catch {
+    return DEFAULT_PREFS;
+  }
+}
+
+/**
+ * Apply a persisted id order to a live list. Items whose id appears in
+ * `order` come first in that order; everything else keeps the input order
+ * (the server default) after the ordered block. Ids in `order` but absent
+ * from the data are silently dropped.
+ */
+export function applyOrder<T>(
+  items: readonly T[],
+  order: readonly string[],
+  idOf: (item: T) => string,
+): T[] {
+  if (order.length === 0) return [...items];
+  const rank = new Map(order.map((id, i) => [id, i]));
+  const ordered: T[] = [];
+  const rest: T[] = [];
+  for (const item of items) {
+    if (rank.has(idOf(item))) ordered.push(item);
+    else rest.push(item);
+  }
+  ordered.sort((a, b) => rank.get(idOf(a))! - rank.get(idOf(b))!);
+  return [...ordered, ...rest];
+}
+
+// A module-scoped event so every mounted hook for the same module repaints
+// when one writer flushes a change (the settings page + the module page can
+// both be alive across a client navigation without a full reload).
+const listeners = new Set<() => void>();
+function emit() {
+  for (const l of listeners) l();
+}
+
+/**
+ * Read + write the per-module list preferences. SSR-safe via
+ * `useSyncExternalStore` with a null server snapshot (parsed to defaults).
+ */
+export function useModuleListPrefs(module: ModuleListKey): {
+  prefs: ModuleListPrefs;
+  setView: (view: ModuleListView) => void;
+  setOrder: (order: string[]) => void;
+  setSortDir: (sortDir: ModuleSortDir) => void;
+} {
+  const key = storageKey(module);
+
+  const subscribe = useCallback(
+    (onChange: () => void) => {
+      listeners.add(onChange);
+      const onStorage = (e: StorageEvent) => {
+        if (e.key === null || e.key === key) onChange();
+      };
+      if (typeof window !== "undefined") {
+        window.addEventListener("storage", onStorage);
+      }
+      return () => {
+        listeners.delete(onChange);
+        if (typeof window !== "undefined") {
+          window.removeEventListener("storage", onStorage);
+        }
+      };
+    },
+    [key],
+  );
+
+  const getSnapshot = useCallback(() => {
+    if (typeof window === "undefined") return null;
+    return window.localStorage.getItem(key);
+  }, [key]);
+
+  const raw = useSyncExternalStore(subscribe, getSnapshot, () => null);
+  const prefs = parseModuleListPrefs(raw);
+
+  const write = useCallback(
+    (next: ModuleListPrefs) => {
+      if (typeof window === "undefined") return;
+      window.localStorage.setItem(key, JSON.stringify(next));
+      emit();
+    },
+    [key],
+  );
+
+  const setView = useCallback(
+    (view: ModuleListView) =>
+      write({ ...parseModuleListPrefs(getSnapshot()), view }),
+    [write, getSnapshot],
+  );
+  const setOrder = useCallback(
+    (order: string[]) =>
+      write({ ...parseModuleListPrefs(getSnapshot()), order }),
+    [write, getSnapshot],
+  );
+  const setSortDir = useCallback(
+    (sortDir: ModuleSortDir) =>
+      write({ ...parseModuleListPrefs(getSnapshot()), sortDir }),
+    [write, getSnapshot],
+  );
+
+  return { prefs, setView, setOrder, setSortDir };
+}

From 0a8ccaa30c51901814e00b98854556587ae2e8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:37:13 +0200
Subject: [PATCH 54/71] feat(onboarding): one-time medical-disclaimer
 acknowledgment

Replace the per-page and per-chart disclaimer banners with a single
acknowledgment at the start of onboarding: HealthLog is a private tracking
tool, not a clinical assessment or diagnosis; talk to a doctor if worried.

- record the acknowledgment per user (disclaimer_acknowledged_at/_version,
  migration 0175) mirroring the research-mode acknowledgment precedent
- gate the welcome "Get started" on the checkbox; expose the timestamp on
  /api/auth/me so a returning user is never re-asked
- keep the full legal text reachable on the public privacy page
---
 .../0175_v1186_disclaimer_ack/migration.sql   | 18 ++++++
 prisma/schema.prisma                          | 11 ++++
 src/app/api/auth/me/route.ts                  |  4 ++
 src/app/api/onboarding/disclaimer/route.ts    | 61 +++++++++++++++++++
 src/components/onboarding/WelcomeCarousel.tsx | 51 +++++++++++++++-
 src/hooks/use-auth.ts                         |  9 +++
 src/lib/onboarding/disclaimer.ts              | 10 +++
 7 files changed, 162 insertions(+), 2 deletions(-)
 create mode 100644 prisma/migrations/0175_v1186_disclaimer_ack/migration.sql
 create mode 100644 src/app/api/onboarding/disclaimer/route.ts
 create mode 100644 src/lib/onboarding/disclaimer.ts

diff --git a/prisma/migrations/0175_v1186_disclaimer_ack/migration.sql b/prisma/migrations/0175_v1186_disclaimer_ack/migration.sql
new file mode 100644
index 000000000..389c580ec
--- /dev/null
+++ b/prisma/migrations/0175_v1186_disclaimer_ack/migration.sql
@@ -0,0 +1,18 @@
+-- v1.18.6 (DISC-02) — one-time medical-disclaimer acknowledgment.
+--
+-- Two nullable columns on `users` recording that the user acknowledged, once
+-- at the start of onboarding, that HealthLog is a private tracking tool — not
+-- a clinical assessment or diagnosis — and that they should talk to a doctor
+-- if worried. The `*_version` pins exactly which copy was read (mirrors the
+-- `research_mode_acknowledged_*` pair), so a future material wording change
+-- can re-prompt without a schema change.
+--
+-- Both nullable with no default: NULL = never acknowledged. The prompt only
+-- gates fresh onboarding, so existing accounts (backfilled to NULL) are never
+-- re-walled. This replaces the per-page / per-chart disclaimer banners that
+-- were removed app-wide in the same release; the acknowledged legal text
+-- stays reachable on the public privacy page.
+
+ALTER TABLE "users"
+  ADD COLUMN "disclaimer_acknowledged_at" TIMESTAMP(3),
+  ADD COLUMN "disclaimer_acknowledged_version" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index f87097c6e..b4de47a28 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -279,6 +279,17 @@ model User {
   // null on a Settings replay so the tour genuinely restarts.
   onboardingTourProgressJson Json? @map("onboarding_tour_progress_json")
 
+  // v1.18.6 (DISC-02) — one-time medical-disclaimer acknowledgment. Shown
+  // once at the start of onboarding: HealthLog is a private tracking tool,
+  // not a clinical assessment or diagnosis; if worried, talk to a doctor.
+  // Mirrors the `researchModeAcknowledged*` pair — the version pins exactly
+  // which copy the user read, so a future material wording change can ask
+  // again. Null = never acknowledged (legacy accounts read as never-asked;
+  // the prompt only gates fresh onboarding, so they are not re-walled). The
+  // acknowledged legal text stays reachable on the public privacy page.
+  disclaimerAcknowledgedAt      DateTime? @map("disclaimer_acknowledged_at")
+  disclaimerAcknowledgedVersion String?   @map("disclaimer_acknowledged_version")
+
   // HealthKit (iOS) integration config — list of per-metric direction toggles.
   // Shape: { entries: [{ id, kind, direction, enabled }], lastSyncedAt }
   healthKitConfigJson   Json?     @map("healthkit_config_json")
diff --git a/src/app/api/auth/me/route.ts b/src/app/api/auth/me/route.ts
index d23f63b8e..434f29221 100644
--- a/src/app/api/auth/me/route.ts
+++ b/src/app/api/auth/me/route.ts
@@ -71,6 +71,10 @@ export const GET = apiHandler(async () => {
     timezone: user.timezone,
     onboardingCompletedAt: user.onboardingCompletedAt,
     onboardingTourCompleted: user.onboardingTourCompleted,
+    // v1.18.6 (DISC-02) — one-time medical-disclaimer acknowledgment. Null
+    // when never acknowledged; the onboarding welcome gate reads this to
+    // decide whether to require the acknowledgment before "Get started".
+    disclaimerAcknowledgedAt: user.disclaimerAcknowledgedAt,
     // v1.18.6 — resumable module-tour progress. Null when the user has
     // not started the tour; otherwise the resume point the launcher
     // seeds its index from. Fail-soft parse: a corrupt blob degrades to
diff --git a/src/app/api/onboarding/disclaimer/route.ts b/src/app/api/onboarding/disclaimer/route.ts
new file mode 100644
index 000000000..5422adb60
--- /dev/null
+++ b/src/app/api/onboarding/disclaimer/route.ts
@@ -0,0 +1,61 @@
+import { z } from "zod/v4";
+
+import { prisma } from "@/lib/db";
+import { apiHandler, requireAuth } from "@/lib/api-handler";
+import { annotate } from "@/lib/logging/context";
+import { apiSuccess, apiError, safeJson } from "@/lib/api-response";
+import { DISCLAIMER_VERSION } from "@/lib/onboarding/disclaimer";
+
+/**
+ * v1.18.6 (DISC-02) — one-time medical-disclaimer acknowledgment.
+ *
+ *   POST { version: string }
+ *     → stamps `users.disclaimer_acknowledged_at = now()` +
+ *       `disclaimer_acknowledged_version = <version>`. Idempotent: a repeat
+ *       acknowledgment of the same version simply refreshes the timestamp.
+ *
+ * Replaces the per-page / per-chart disclaimer banners removed app-wide in
+ * the same release. The acknowledged legal text stays reachable on the public
+ * privacy page. Never auto-set; the onboarding welcome step is the one writer.
+ */
+
+const bodySchema = z.object({
+  // Echoed back from the client so a stale shell cannot silently record an
+  // acknowledgment of copy it never rendered. Bounded; the server pins the
+  // canonical version it persists regardless.
+  version: z.string().min(1).max(64),
+});
+
+export const POST = apiHandler(async (request) => {
+  const { user } = await requireAuth();
+
+  const { data: rawBody, error: jsonError } = await safeJson(request, {
+    maxBytes: 4 * 1024,
+  });
+  if (jsonError) return jsonError;
+
+  const parsed = z.safeParse(bodySchema, rawBody);
+  if (!parsed.success) {
+    return apiError("Invalid input", 422);
+  }
+
+  // The server pins the canonical version it stamps — the body version is
+  // only a freshness signal, never the source of truth.
+  await prisma.user.update({
+    where: { id: user.id },
+    data: {
+      disclaimerAcknowledgedAt: new Date(),
+      disclaimerAcknowledgedVersion: DISCLAIMER_VERSION,
+    },
+  });
+
+  annotate({
+    action: { name: "onboarding.disclaimer.acknowledge" },
+    meta: {
+      version: DISCLAIMER_VERSION,
+      clientVersion: parsed.data.version,
+    },
+  });
+
+  return apiSuccess({ acknowledgedVersion: DISCLAIMER_VERSION });
+});
diff --git a/src/components/onboarding/WelcomeCarousel.tsx b/src/components/onboarding/WelcomeCarousel.tsx
index 937e0fa0d..986a666f7 100644
--- a/src/components/onboarding/WelcomeCarousel.tsx
+++ b/src/components/onboarding/WelcomeCarousel.tsx
@@ -13,11 +13,16 @@ import {
   type LucideIcon,
 } from "lucide-react";
 
+import Link from "next/link";
+
 import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { useAuth } from "@/hooks/use-auth";
 import { useTranslations } from "@/lib/i18n/context";
 import { scrollBehaviorForUser } from "@/lib/motion";
 import { cn } from "@/lib/utils";
 import { apiPost } from "@/lib/api/api-fetch";
+import { DISCLAIMER_VERSION } from "@/lib/onboarding/disclaimer";
 
 /**
  * v1.4.25 W14b-Content — onboarding welcome carousel.
@@ -72,11 +77,19 @@ export function WelcomeCarousel() {
   const { t } = useTranslations();
   const router = useRouter();
   const queryClient = useQueryClient();
+  const { user } = useAuth();
 
   const railRef = useRef<HTMLDivElement | null>(null);
   const liveRegionId = useId();
+  const disclaimerId = useId();
   const [active, setActive] = useState(0);
   const [advancing, setAdvancing] = useState(false);
+  // v1.18.6 (DISC-02) — the one-time medical-disclaimer acknowledgment gates
+  // "Get started". Pre-checked for an account that already acknowledged (a
+  // re-walk of step 0) so a returning user is not re-asked.
+  const [acknowledged, setAcknowledged] = useState(
+    () => user?.disclaimerAcknowledgedAt != null,
+  );
 
   // Track which slide is centred in the rail. We observe each slide
   // with an IntersectionObserver — simpler and more reliable than
@@ -128,9 +141,16 @@ export function WelcomeCarousel() {
   }, []);
 
   async function handleGetStarted() {
-    if (advancing) return;
+    if (advancing || !acknowledged) return;
     setAdvancing(true);
     try {
+      // v1.18.6 (DISC-02) — record the one-time acknowledgment before
+      // advancing. Skipped when the account already acknowledged (re-walk).
+      if (user?.disclaimerAcknowledgedAt == null) {
+        await apiPost("/api/onboarding/disclaimer", {
+          version: DISCLAIMER_VERSION,
+        });
+      }
       await apiPost("/api/onboarding/step", { step: 1 });
       await queryClient.invalidateQueries({ queryKey: ["auth"] });
       router.push("/onboarding/1");
@@ -273,12 +293,39 @@ export function WelcomeCarousel() {
         </Button>
       </div>
 
+      {/* v1.18.6 (DISC-02) — one-time medical-disclaimer acknowledgment. This
+          replaces the per-page / per-chart disclaimer banners removed app-wide
+          in the same release; the full legal text stays reachable on the
+          public privacy page (link below). */}
+      <div className="border-border/60 bg-muted/30 flex items-start gap-3 rounded-lg border p-4">
+        <Checkbox
+          id={disclaimerId}
+          checked={acknowledged}
+          onCheckedChange={(next) => setAcknowledged(next === true)}
+          className="mt-0.5"
+        />
+        <label
+          htmlFor={disclaimerId}
+          className="text-muted-foreground text-sm leading-relaxed"
+        >
+          {t("onboarding.disclaimer.acknowledge")}{" "}
+          <Link
+            href="/privacy#medical-boundary"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-primary underline-offset-4 hover:underline"
+          >
+            {t("onboarding.disclaimer.learnMore")}
+          </Link>
+        </label>
+      </div>
+
       <div className="flex justify-end pt-2">
         <Button
           type="button"
           size="lg"
           onClick={handleGetStarted}
-          disabled={advancing}
+          disabled={advancing || !acknowledged}
           className="min-h-11"
         >
           {t("onboarding.welcome.cta")}
diff --git a/src/hooks/use-auth.ts b/src/hooks/use-auth.ts
index 4fcf04a7d..499e2795f 100644
--- a/src/hooks/use-auth.ts
+++ b/src/hooks/use-auth.ts
@@ -43,6 +43,15 @@ export interface AuthUser {
    * `onboardingTourCompleted` boolean, which stays the auto-launch gate.
    */
   onboardingTourProgress: AuthTourProgress | null;
+  /**
+   * v1.18.6 (DISC-02) — ISO timestamp of the one-time medical-disclaimer
+   * acknowledgment, or null when never acknowledged. The onboarding welcome
+   * step gates "Get started" on a non-null value for a fresh account.
+   * Optional in the type so a stale /me payload (older server image without
+   * the field) and existing test fixtures coerce to "never acknowledged"
+   * rather than failing the shape.
+   */
+  disclaimerAcknowledgedAt?: string | null;
   /**
    * v1.5.5 — relative URL of the user's self-hosted avatar, served
    * from `/api/user/avatar/{id}?v={updatedAtMs}`. Replaces the
diff --git a/src/lib/onboarding/disclaimer.ts b/src/lib/onboarding/disclaimer.ts
new file mode 100644
index 000000000..d4ae9dd7a
--- /dev/null
+++ b/src/lib/onboarding/disclaimer.ts
@@ -0,0 +1,10 @@
+/**
+ * v1.18.6 (DISC-02) — the one-time medical-disclaimer acknowledgment version.
+ *
+ * Pinned per the `researchModeAcknowledged*` precedent: the user row stores
+ * exactly which copy was acknowledged, so a future material wording change
+ * can bump this constant to re-prompt. Keep it in lockstep with the
+ * `onboarding.disclaimer.*` i18n copy — bump on a substantive text change,
+ * not on a typo fix.
+ */
+export const DISCLAIMER_VERSION = "2026-06-18";

From 70f92558e6c89ff792d7384d64dffd0f313bba4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 21:39:24 +0200
Subject: [PATCH 55/71] feat(reminders): add server-side completion route for
 Vorsorge reminders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add POST /api/measurement-reminders/{id}/complete so a client can mark a
measurement reminder done on the server, rather than only dismissing the
notification locally. The route is the explicit user-action equivalent of
the cron auto-resolve: it routes through the one shared satisfaction
primitive, stamps lastSatisfiedAt, re-anchors the server-authoritative
nextDueAt, and fires no notification of its own.

Idempotent via the primitive's forward-only guard — completing an
already-completed or auto-satisfied reminder returns 200 with
completed=false so a repeat tap need not be special-cased. Owner-scoped;
a cross-user or tombstoned id 404s and never satisfies. No schema change:
lastSatisfiedAt already records the completion instant.

Extend the OpenAPI contract with the new path and the completion result
schema, and cover the route with unit tests (marks done, idempotent
no-op, owner-scoped 404, no double-notify).
---
 docs/api/openapi.yaml                         |  58 ++++++++
 .../[id]/complete/__tests__/route.test.ts     | 133 ++++++++++++++++++
 .../[id]/complete/route.ts                    |  81 +++++++++++
 .../openapi/routes/measurement-reminders.ts   |  26 ++++
 src/lib/validations/measurement-reminders.ts  |  23 +++
 5 files changed, 321 insertions(+)
 create mode 100644 src/app/api/measurement-reminders/[id]/complete/__tests__/route.test.ts
 create mode 100644 src/app/api/measurement-reminders/[id]/complete/route.ts

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index 3b6ddd195..b632c1c2b 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -5866,6 +5866,33 @@ paths:
         "404": *a7
         "422": *a3
         "429": *a4
+  /api/measurement-reminders/{id}/complete:
+    post:
+      tags:
+        - MeasurementReminders
+      summary: Complete a Vorsorge reminder (v1.18.6)
+      description: "Explicit user-action completion (iOS #23): the app marks a reminder done server-side instead of only
+        dismissing it locally. Routes through the same satisfaction primitive as the cron auto-resolve — stamps
+        lastSatisfiedAt = now, re-anchors nextDueAt, fires no notification. Idempotent: completing an already-completed
+        / auto-satisfied reminder returns 200 with completed=false. Owner-scoped."
+      parameters:
+        - in: path
+          name: id
+          schema:
+            type: string
+          required: true
+      responses:
+        "200":
+          description: Completion applied (completed=true) or already-satisfied no-op (completed=false); reminder carries the
+            canonical post-completion DTO.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/MeasurementReminderCompleteEnvelope"
+        "401": *a1
+        "404": *a7
+        "422": *a3
+        "429": *a4
   /api/labs:
     get:
       tags:
@@ -18498,6 +18525,37 @@ components:
         - data
         - error
       additionalProperties: false
+    MeasurementReminderCompleteEnvelope:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/MeasurementReminderCompletion"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    MeasurementReminderCompletion:
+      type: object
+      properties:
+        completed:
+          type: boolean
+        reminder:
+          $ref: "#/components/schemas/MeasurementReminderDTO"
+      required:
+        - completed
+        - reminder
+      additionalProperties: false
+      description: Result of an explicit reminder completion. completed=true when this call advanced lastSatisfiedAt;
+        completed=false when an earlier satisfy or a matching reading had already fulfilled the current cycle
+        (idempotent no-op). reminder is the canonical post-completion DTO.
     ListLabResultsEnvelope:
       type: object
       properties:
diff --git a/src/app/api/measurement-reminders/[id]/complete/__tests__/route.test.ts b/src/app/api/measurement-reminders/[id]/complete/__tests__/route.test.ts
new file mode 100644
index 000000000..78778d154
--- /dev/null
+++ b/src/app/api/measurement-reminders/[id]/complete/__tests__/route.test.ts
@@ -0,0 +1,133 @@
+/**
+ * v1.18.6 — explicit-completion route (iOS #23 follow-up).
+ *
+ * Covers: marks done via the shared primitive, idempotent no-op surfaces
+ * completed=false, owner-scoped 404 on a cross-user / tombstoned id, and the
+ * structural no-double-notify guarantee (the route delegates to
+ * `satisfyReminder` and never reaches the notification dispatcher).
+ */
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { NextRequest } from "next/server";
+
+vi.mock("@/lib/api-handler", () => ({
+  apiHandler: <T extends (...args: unknown[]) => unknown>(fn: T) => fn,
+  requireAuth: vi.fn(async () => ({ user: { id: "u1", locale: "en" } })),
+}));
+
+vi.mock("@/lib/auth/audit", () => ({
+  auditLog: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("@/lib/logging/context", () => ({ annotate: vi.fn() }));
+
+const satisfyReminderMock = vi.fn();
+vi.mock("@/lib/measurement-reminders/satisfy", () => ({
+  satisfyReminder: (...args: unknown[]) => satisfyReminderMock(...args),
+}));
+
+const findFirstMock = vi.fn();
+const findUserMock = vi.fn();
+const findUniqueOrThrowMock = vi.fn();
+vi.mock("@/lib/db", () => ({
+  prisma: {
+    measurementReminder: {
+      findFirst: (...a: unknown[]) => findFirstMock(...a),
+      findUniqueOrThrow: (...a: unknown[]) => findUniqueOrThrowMock(...a),
+    },
+    user: { findUnique: (...a: unknown[]) => findUserMock(...a) },
+  },
+}));
+
+import { POST } from "../route";
+
+const ROW = {
+  id: "r1",
+  userId: "u1",
+  label: "Blutdruck messen",
+  measurementType: "BLOOD_PRESSURE_SYS",
+  intervalDays: 7,
+  rrule: null,
+  anchorDate: null,
+  endsOn: null,
+  origin: "VORSORGE",
+  notifyHour: 9,
+  location: null,
+  nextDueAt: new Date("2026-06-25T07:00:00Z"),
+  lastSatisfiedAt: null,
+  enabled: true,
+  createdAt: new Date("2026-06-01T00:00:00Z"),
+  updatedAt: new Date("2026-06-18T00:00:00Z"),
+  deletedAt: null,
+};
+
+function makeRequest(): NextRequest {
+  return new NextRequest("http://localhost/api/measurement-reminders/r1/complete", {
+    method: "POST",
+  });
+}
+
+const params = { params: Promise.resolve({ id: "r1" }) };
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  findUserMock.mockResolvedValue({ timezone: "Europe/Berlin" });
+});
+
+describe("POST /api/measurement-reminders/[id]/complete", () => {
+  it("marks the reminder done via the shared primitive and returns completed=true", async () => {
+    findFirstMock.mockResolvedValue(ROW);
+    satisfyReminderMock.mockResolvedValue({
+      satisfied: true,
+      nextDueAt: new Date("2026-06-25T07:00:00Z"),
+    });
+    findUniqueOrThrowMock.mockResolvedValue({
+      ...ROW,
+      lastSatisfiedAt: new Date("2026-06-18T08:00:00Z"),
+    });
+
+    const res = await POST(makeRequest(), params);
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    expect(body.error).toBeNull();
+    expect(body.data.completed).toBe(true);
+    expect(body.data.reminder.id).toBe("r1");
+    expect(body.data.reminder.lastSatisfiedAt).toBe("2026-06-18T08:00:00.000Z");
+    // The route delegates to the ONE shared satisfaction primitive.
+    expect(satisfyReminderMock).toHaveBeenCalledTimes(1);
+  });
+
+  it("is idempotent: an already-satisfied reminder is a 200 no-op with completed=false", async () => {
+    findFirstMock.mockResolvedValue({
+      ...ROW,
+      lastSatisfiedAt: new Date("2026-06-18T08:00:00Z"),
+    });
+    // Forward-only guard inside the primitive returns satisfied=false.
+    satisfyReminderMock.mockResolvedValue({ satisfied: false, nextDueAt: null });
+    findUniqueOrThrowMock.mockResolvedValue({
+      ...ROW,
+      lastSatisfiedAt: new Date("2026-06-18T08:00:00Z"),
+    });
+
+    const res = await POST(makeRequest(), params);
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    expect(body.data.completed).toBe(false);
+    expect(body.data.reminder.id).toBe("r1");
+  });
+
+  it("is owner-scoped: a cross-user reminder 404s and never satisfies", async () => {
+    findFirstMock.mockResolvedValue({ ...ROW, userId: "someone-else" });
+
+    const res = await POST(makeRequest(), params);
+    expect(res.status).toBe(404);
+    expect(satisfyReminderMock).not.toHaveBeenCalled();
+  });
+
+  it("404s a tombstoned / missing reminder", async () => {
+    findFirstMock.mockResolvedValue(null);
+
+    const res = await POST(makeRequest(), params);
+    expect(res.status).toBe(404);
+    expect(satisfyReminderMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/app/api/measurement-reminders/[id]/complete/route.ts b/src/app/api/measurement-reminders/[id]/complete/route.ts
new file mode 100644
index 000000000..408bf12c8
--- /dev/null
+++ b/src/app/api/measurement-reminders/[id]/complete/route.ts
@@ -0,0 +1,81 @@
+/**
+ * v1.18.6 — explicit "complete" for a Vorsorge reminder (iOS #23 follow-up).
+ *
+ * The user-action equivalent of the cron auto-satisfy: the iOS app (and web)
+ * call this when the user actively marks a measurement reminder done, rather
+ * than only dismissing the notification locally. It routes through the ONE
+ * shared `satisfyReminder` primitive — the same code the cron auto-resolve
+ * and the eventful ingest worker use — so it:
+ *
+ *   - stamps `lastSatisfiedAt = now` and re-anchors the server-authoritative
+ *     `nextDueAt` past now (one engine, no duplicated reschedule logic);
+ *   - fires NO notification of its own (the primitive only writes the row;
+ *     the dispatcher is never invoked on this path);
+ *   - is idempotent via the primitive's forward-only guard — completing an
+ *     already-completed / auto-satisfied reminder is a no-op that still
+ *     returns 200, with `completed: false` so the client can tell the second
+ *     tap apart from the first.
+ *
+ * Distinct from `satisfy` only in that the response surfaces the `completed`
+ * flag the explicit-action flow benefits from; the underlying effect is the
+ * shared satisfaction primitive either way.
+ */
+import { NextRequest } from "next/server";
+
+import { prisma } from "@/lib/db";
+import { auditLog } from "@/lib/auth/audit";
+import { apiHandler, requireAuth } from "@/lib/api-handler";
+import { apiSuccess, apiError, getClientIp } from "@/lib/api-response";
+import { annotate } from "@/lib/logging/context";
+import { satisfyReminder } from "@/lib/measurement-reminders/satisfy";
+import { toMeasurementReminderDto } from "@/lib/measurement-reminders/dto";
+
+type RouteParams = { params: Promise<{ id: string }> };
+
+const DEFAULT_TIMEZONE = "Europe/Berlin";
+
+export const POST = apiHandler(
+  async (request: NextRequest, { params }: RouteParams) => {
+    const { user } = await requireAuth();
+    const { id } = await params;
+
+    const existing = await prisma.measurementReminder.findFirst({
+      where: { id, deletedAt: null },
+    });
+    if (!existing || existing.userId !== user.id) {
+      return apiError("Measurement reminder not found", 404);
+    }
+
+    const userRow = await prisma.user.findUnique({
+      where: { id: user.id },
+      select: { timezone: true },
+    });
+    const timezone = userRow?.timezone || DEFAULT_TIMEZONE;
+
+    const now = new Date();
+    // Forward-only: a completion strictly after any prior satisfy advances
+    // the row; a completion at/behind the last satisfy is a no-op. Either
+    // way no notification is emitted — the primitive only stamps + reschedules.
+    const result = await satisfyReminder(prisma, existing, timezone, now);
+
+    const updated = await prisma.measurementReminder.findUniqueOrThrow({
+      where: { id },
+    });
+
+    await auditLog("measurementReminder.complete", {
+      userId: user.id,
+      ipAddress: getClientIp(request),
+      details: { reminderId: id, completed: result.satisfied },
+    });
+
+    annotate({
+      action: { name: "measurement-reminders.complete" },
+      meta: { reminderId: id, completed: result.satisfied },
+    });
+
+    return apiSuccess({
+      completed: result.satisfied,
+      reminder: toMeasurementReminderDto(updated),
+    });
+  },
+);
diff --git a/src/lib/openapi/routes/measurement-reminders.ts b/src/lib/openapi/routes/measurement-reminders.ts
index 47952eec3..796c87fd5 100644
--- a/src/lib/openapi/routes/measurement-reminders.ts
+++ b/src/lib/openapi/routes/measurement-reminders.ts
@@ -12,6 +12,7 @@ import {
   createMeasurementReminderSchema,
   updateMeasurementReminderSchema,
   measurementReminderDto,
+  measurementReminderCompletionDto,
 } from "@/lib/validations/measurement-reminders";
 import { dataEnvelope, errorEnvelope, stdResponses } from "./shared";
 
@@ -169,4 +170,29 @@ export const measurementReminderPaths: NonNullable<
       },
     },
   },
+  "/api/measurement-reminders/{id}/complete": {
+    post: {
+      tags: ["MeasurementReminders"],
+      summary: "Complete a Vorsorge reminder (v1.18.6)",
+      description:
+        "Explicit user-action completion (iOS #23): the app marks a reminder done server-side instead of only dismissing it locally. Routes through the same satisfaction primitive as the cron auto-resolve — stamps lastSatisfiedAt = now, re-anchors nextDueAt, fires no notification. Idempotent: completing an already-completed / auto-satisfied reminder returns 200 with completed=false. Owner-scoped.",
+      requestParams: { path: z.object({ id: z.string() }) },
+      responses: {
+        "200": {
+          description:
+            "Completion applied (completed=true) or already-satisfied no-op (completed=false); reminder carries the canonical post-completion DTO.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(
+                measurementReminderCompletionDto,
+                "MeasurementReminderCompleteEnvelope",
+              ),
+            },
+          },
+        },
+        ...reminderNotFound,
+        ...stdResponses,
+      },
+    },
+  },
 };
diff --git a/src/lib/validations/measurement-reminders.ts b/src/lib/validations/measurement-reminders.ts
index fc4f55b50..3c17f2ea4 100644
--- a/src/lib/validations/measurement-reminders.ts
+++ b/src/lib/validations/measurement-reminders.ts
@@ -184,3 +184,26 @@ export const measurementReminderDto = z
     description:
       "A Vorsorge reminder. nextDueAt is server-computed (server-authoritative). A free-text reminder carries measurementType=null and resolves only on a manual satisfy. origin distinguishes a user-created (VORSORGE) reminder from one minted by a Coach cadence suggestion (COACH); endsOn bounds a finite course window (null = open-ended).",
   });
+
+/**
+ * v1.18.6 — explicit-completion result. The `complete` route is the
+ * user-action equivalent of the cron auto-satisfy: it stamps
+ * `lastSatisfiedAt` and re-anchors `nextDueAt` through the SAME shared
+ * primitive, so it fires no notification of its own and is idempotent.
+ *
+ * `completed` reports whether THIS call advanced the reminder (true) or was
+ * a forward-only no-op because a prior satisfy / matching reading already
+ * fulfilled the current cycle (false). Either way the response is a 200 so
+ * a client that completes an already-completed reminder need not special-case
+ * the second tap. `reminder` carries the canonical post-completion DTO.
+ */
+export const measurementReminderCompletionDto = z
+  .object({
+    completed: z.boolean(),
+    reminder: measurementReminderDto,
+  })
+  .meta({
+    id: "MeasurementReminderCompletion",
+    description:
+      "Result of an explicit reminder completion. completed=true when this call advanced lastSatisfiedAt; completed=false when an earlier satisfy or a matching reading had already fulfilled the current cycle (idempotent no-op). reminder is the canonical post-completion DTO.",
+  });

From c941ab24f4522004567bf71675121fb416fc2ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:05:17 +0200
Subject: [PATCH 56/71] fix(migrations): renumber coach last-seen migration to
 0176

The disclaimer-preference migration already claims 0175 in this release;
move the coach last-seen stamp to 0176 so both apply uniquely and in
order.
---
 .../migration.sql                                                 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename prisma/migrations/{0175_v1186_coach_last_seen => 0176_v1186_coach_last_seen}/migration.sql (100%)

diff --git a/prisma/migrations/0175_v1186_coach_last_seen/migration.sql b/prisma/migrations/0176_v1186_coach_last_seen/migration.sql
similarity index 100%
rename from prisma/migrations/0175_v1186_coach_last_seen/migration.sql
rename to prisma/migrations/0176_v1186_coach_last_seen/migration.sql

From bfba92cb833cdb94101917a0cf8500f308a3f0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:06:40 +0200
Subject: [PATCH 57/71] refactor(settings): share one heading frame across all
 settings pages

Teach SettingsSectionFrame an explicit title/subtitle mode alongside the
slug-driven mode, and have the per-module settings pages (Vorsorge,
Illness, Labs) delegate to it so every settings surface renders the same
heading frame.
---
 .../module-list/module-settings-frame.tsx     | 30 ++++-----
 .../settings/settings-section-frame.tsx       | 66 +++++++++++++++----
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/src/components/module-list/module-settings-frame.tsx b/src/components/module-list/module-settings-frame.tsx
index 12c6887d1..4d2959b19 100644
--- a/src/components/module-list/module-settings-frame.tsx
+++ b/src/components/module-list/module-settings-frame.tsx
@@ -3,21 +3,18 @@
 import type { ReactNode } from "react";
 
 import { SettingsHubBackLink } from "@/components/settings/settings-hub-back-link";
+import { SettingsSectionFrame } from "@/components/settings/settings-section-frame";
 
 /**
  * v1.18.6 (W8 / MOD-03) — heading frame for the per-module settings pages
  * (Vorsorge / Illness / Labs).
  *
- * FRAME-ADOPTION SEAM: a parallel phase is introducing a shared
- * `SettingsSectionFrame` primitive under `src/components/settings/*` (which
- * this phase must not edit). Until that lands, this renders the canonical
- * settings heading markup verbatim — `h1.text-2xl.font-bold.tracking-tight`
- * + `p.text-muted-foreground.text-sm` — so the three new pages already
- * conform to the standard and can be swapped to the shared frame at merge by
- * replacing this single wrapper. The back-link reuses the existing
- * `SettingsHubBackLink` (read-only import) so the pages have a consistent
- * "return to the hub" affordance even though they are not listed in the
- * settings-shell sidebar.
+ * Delegates to the shared `SettingsSectionFrame` so every settings page — the
+ * 19 shell sections and these three per-module pages — renders one identical
+ * heading frame. These pages stay out of the slug registry (their static
+ * routes win over `/settings/[section]`), so they drive the frame's explicit
+ * title/subtitle mode and supply the "return to the module" back-link through
+ * the frame's `topSlot`, which sits above the heading.
  */
 export function ModuleSettingsFrame({
   title,
@@ -34,13 +31,12 @@ export function ModuleSettingsFrame({
   children: ReactNode;
 }) {
   return (
-    <div className="space-y-6">
-      <div className="space-y-1">
-        <SettingsHubBackLink href={backHref} labelKey={backLabelKey} />
-        <h1 className="text-2xl font-bold tracking-tight">{title}</h1>
-        <p className="text-muted-foreground text-sm">{description}</p>
-      </div>
+    <SettingsSectionFrame
+      title={title}
+      subtitle={description}
+      topSlot={<SettingsHubBackLink href={backHref} labelKey={backLabelKey} />}
+    >
       {children}
-    </div>
+    </SettingsSectionFrame>
   );
 }
diff --git a/src/components/settings/settings-section-frame.tsx b/src/components/settings/settings-section-frame.tsx
index 1191d1cb0..067bd3b17 100644
--- a/src/components/settings/settings-section-frame.tsx
+++ b/src/components/settings/settings-section-frame.tsx
@@ -33,8 +33,7 @@ import * as React from "react";
 import { useTranslations } from "@/lib/i18n/context";
 import type { SettingsSectionSlug } from "./section-slugs";
 
-export interface SettingsSectionFrameProps {
-  slug: SettingsSectionSlug;
+interface SettingsSectionFrameBaseProps {
   /** Optional content rendered above the heading (e.g. a back-to-hub link). */
   topSlot?: React.ReactNode;
   /** Optional content rendered inline at the top-right of the heading row
@@ -43,14 +42,57 @@ export interface SettingsSectionFrameProps {
   children: React.ReactNode;
 }
 
-export function SettingsSectionFrame({
-  slug,
-  topSlot,
-  headingAccessory,
-  children,
-}: SettingsSectionFrameProps) {
+/**
+ * Slug mode (the 19 shell sections): title + subtitle come from
+ * `settings.sections.<slug>.{title,subtitle}` and the `<h1>` keeps the
+ * historic `settings-section-<slug>-title` id for `aria-labelledby` and
+ * spotlight-tour anchors.
+ */
+interface SettingsSectionFrameSlugProps extends SettingsSectionFrameBaseProps {
+  slug: SettingsSectionSlug;
+}
+
+/**
+ * Explicit mode (the per-module settings pages — Vorsorge / Illness / Labs —
+ * which deliberately stay out of the slug registry because their static
+ * routes win over `/settings/[section]`): caller passes resolved strings and
+ * an optional heading id. This lets `ModuleSettingsFrame` delegate here so
+ * every settings page shares one heading frame.
+ */
+interface SettingsSectionFrameExplicitProps
+  extends SettingsSectionFrameBaseProps {
+  title: string;
+  subtitle: string;
+  /** Heading element id (defaults to a stable slug-less id). */
+  titleId?: string;
+}
+
+export type SettingsSectionFrameProps =
+  | SettingsSectionFrameSlugProps
+  | SettingsSectionFrameExplicitProps;
+
+function isSlugProps(
+  props: SettingsSectionFrameProps,
+): props is SettingsSectionFrameSlugProps {
+  return "slug" in props;
+}
+
+export function SettingsSectionFrame(props: SettingsSectionFrameProps) {
   const { t } = useTranslations();
-  const titleId = `settings-section-${slug}-title`;
+  const { topSlot, headingAccessory, children } = props;
+
+  let title: string;
+  let subtitle: string;
+  let titleId: string;
+  if (isSlugProps(props)) {
+    titleId = `settings-section-${props.slug}-title`;
+    title = t(`settings.sections.${props.slug}.title`);
+    subtitle = t(`settings.sections.${props.slug}.subtitle`);
+  } else {
+    titleId = props.titleId ?? "settings-section-title";
+    title = props.title;
+    subtitle = props.subtitle;
+  }
 
   return (
     <section aria-labelledby={titleId} className="space-y-6">
@@ -58,11 +100,9 @@ export function SettingsSectionFrame({
       <div className="flex items-start justify-between gap-2">
         <div className="min-w-0">
           <h1 id={titleId} className="text-2xl font-bold tracking-tight">
-            {t(`settings.sections.${slug}.title`)}
+            {title}
           </h1>
-          <p className="text-muted-foreground text-sm">
-            {t(`settings.sections.${slug}.subtitle`)}
-          </p>
+          <p className="text-muted-foreground text-sm">{subtitle}</p>
         </div>
         {headingAccessory ? (
           <div className="shrink-0">{headingAccessory}</div>

From 04a50b2702d5b6cefa51371c571173223ff5cdaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:11:45 +0200
Subject: [PATCH 58/71] refactor(insights): drop the per-page generic medical
 disclaimers

Remove the page-level Insights disclaimer footer and the health-score and
correlation card disclaimers now that the not-a-diagnosis acknowledgment
is shown once at onboarding and the legal text stays on the privacy page.
Device-provenance, contraception-safety, statistical-method and
shared-report notes stay where they convey specific information.
---
 messages/de.json                              |  5 ---
 messages/en.json                              |  5 ---
 messages/es.json                              |  5 ---
 messages/fr.json                              |  5 ---
 messages/it.json                              |  5 ---
 messages/pl.json                              |  5 ---
 .../__tests__/health-score-card.test.tsx      | 35 -------------------
 src/components/insights/health-score-card.tsx | 22 ++----------
 .../insights/insights-layout-shell.tsx        | 25 +++----------
 .../insights/metric-correlation-card.tsx      |  9 ++---
 10 files changed, 11 insertions(+), 110 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index cc51cea47..1b04f3ff0 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Gewicht",
       "componentMood": "Stimmung",
       "componentCompliance": "Therapietreue",
-      "disclaimer": "Orientierungshilfe — keine ärztliche Bewertung.",
       "deltaExplainer": {
         "trigger": "Was bedeutet diese Veränderung?",
         "title": "So wird die Veränderung berechnet",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Zusammenhänge",
-      "disclaimer": "Zusammenhänge sind beobachtend, nicht kausal — sprich mit deinem Arzt, wenn der Blutdruck hoch ist.",
       "experimentCta": "7-Tage-Experiment starten",
       "experimentTooltip": "Bald verfügbar",
       "emptyTitle": "Mehr Daten nötig, um diesen Zusammenhang zu zeigen",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Ziel"
     },
-    "disclaimer": {
-      "footer": "HealthLog beschreibt deine eigenen erfassten Daten — es ist keine klinische Bewertung und keine Diagnose. Sprich mit deiner Ärztin oder deinem Arzt über alles, was dich beunruhigt."
-    },
     "settings": {
       "overviewTitle": "Übersicht anordnen",
       "overviewDescription": "Abschnitte ein- oder ausblenden und ihre Reihenfolge auf der Insights-Übersicht festlegen."
diff --git a/messages/en.json b/messages/en.json
index 68e3b250a..faf61d5e9 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Weight",
       "componentMood": "Mood",
       "componentCompliance": "Adherence",
-      "disclaimer": "Indicative — not a clinical assessment.",
       "deltaExplainer": {
         "trigger": "What does this delta mean?",
         "title": "How the delta is computed",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Relationships",
-      "disclaimer": "Relationships are observational, not causal — talk to your doctor if BP runs high.",
       "experimentCta": "Try a 7-day experiment",
       "experimentTooltip": "Coming soon",
       "emptyTitle": "Need more data to see this relationship",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Target"
     },
-    "disclaimer": {
-      "footer": "HealthLog describes your own tracked data — it is not a clinical assessment or diagnosis. Talk to your doctor about anything that concerns you."
-    },
     "settings": {
       "overviewTitle": "Arrange the overview",
       "overviewDescription": "Show or hide sections and set their order on the Insights overview."
diff --git a/messages/es.json b/messages/es.json
index 3b73054f9..bb248141b 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Peso",
       "componentMood": "Estado de ánimo",
       "componentCompliance": "Cumplimiento",
-      "disclaimer": "Orientación — no es valoración médica.",
       "deltaExplainer": {
         "trigger": "¿Qué significa este cambio?",
         "title": "Cómo se calcula el cambio",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Correlaciones",
-      "disclaimer": "Las correlaciones son observacionales, no causales — habla con tu médico si tu tensión es alta.",
       "experimentCta": "Iniciar experimento de 7 días",
       "experimentTooltip": "Próximamente",
       "emptyTitle": "Necesitamos más datos para mostrar esta correlación",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Objetivo"
     },
-    "disclaimer": {
-      "footer": "HealthLog describe tus propios datos registrados — no es una evaluación clínica ni un diagnóstico. Habla con tu médico sobre cualquier cosa que te preocupe."
-    },
     "settings": {
       "overviewTitle": "Organizar la vista general",
       "overviewDescription": "Muestra u oculta secciones y define su orden en la vista general de Análisis."
diff --git a/messages/fr.json b/messages/fr.json
index 9bec493ee..1f816ae81 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Poids",
       "componentMood": "Humeur",
       "componentCompliance": "Observance",
-      "disclaimer": "Repère — pas un avis médical.",
       "deltaExplainer": {
         "trigger": "Que signifie cet écart ?",
         "title": "Comment l'écart est calculé",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Corrélations",
-      "disclaimer": "Les corrélations sont observationnelles, pas causales — parle à ton médecin si ta tension est élevée.",
       "experimentCta": "Lancer une expérience de 7 jours",
       "experimentTooltip": "Bientôt disponible",
       "emptyTitle": "Il faut plus de données pour afficher cette corrélation",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Objectif"
     },
-    "disclaimer": {
-      "footer": "HealthLog décrit vos propres données suivies — il ne s'agit pas d'une évaluation clinique ni d'un diagnostic. Parlez à votre médecin de tout ce qui vous préoccupe."
-    },
     "settings": {
       "overviewTitle": "Organiser la vue d'ensemble",
       "overviewDescription": "Affichez ou masquez des sections et définissez leur ordre sur la vue d'ensemble des Analyses."
diff --git a/messages/it.json b/messages/it.json
index c05fab90f..d9d0c5c23 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Peso",
       "componentMood": "Umore",
       "componentCompliance": "Aderenza",
-      "disclaimer": "Indicazione — non è una valutazione medica.",
       "deltaExplainer": {
         "trigger": "Cosa significa questa variazione?",
         "title": "Come si calcola la variazione",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Correlazioni",
-      "disclaimer": "Le correlazioni sono osservazionali, non causali — parla con il medico se la pressione è alta.",
       "experimentCta": "Avvia esperimento di 7 giorni",
       "experimentTooltip": "In arrivo",
       "emptyTitle": "Servono più dati per mostrare questa correlazione",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Obiettivo"
     },
-    "disclaimer": {
-      "footer": "HealthLog descrive i tuoi dati registrati — non è una valutazione clinica né una diagnosi. Parla con il tuo medico di qualsiasi cosa ti preoccupi."
-    },
     "settings": {
       "overviewTitle": "Organizza la panoramica",
       "overviewDescription": "Mostra o nascondi le sezioni e definisci il loro ordine nella panoramica degli Approfondimenti."
diff --git a/messages/pl.json b/messages/pl.json
index 62f1c1acd..accaf8a3b 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -1971,7 +1971,6 @@
       "componentWeight": "Waga",
       "componentMood": "Nastrój",
       "componentCompliance": "Przestrzeganie",
-      "disclaimer": "Wskazówka — nie ocena medyczna.",
       "deltaExplainer": {
         "trigger": "Co oznacza ta zmiana?",
         "title": "Jak liczona jest ta zmiana",
@@ -2052,7 +2051,6 @@
     },
     "correlationRow": {
       "title": "Korelacje",
-      "disclaimer": "Korelacje są obserwacyjne, nie przyczynowe — porozmawiaj z lekarzem, jeśli ciśnienie jest wysokie.",
       "experimentCta": "Uruchom 7-dniowy eksperyment",
       "experimentTooltip": "Wkrótce",
       "emptyTitle": "Potrzeba więcej danych, aby pokazać tę korelację",
@@ -3452,9 +3450,6 @@
     "target": {
       "heading": "Cel"
     },
-    "disclaimer": {
-      "footer": "HealthLog opisuje Twoje własne zarejestrowane dane — nie jest oceną kliniczną ani diagnozą. Porozmawiaj z lekarzem o wszystkim, co Cię niepokoi."
-    },
     "settings": {
       "overviewTitle": "Uporządkuj przegląd",
       "overviewDescription": "Pokaż lub ukryj sekcje i ustaw ich kolejność w przeglądzie Analiz."
diff --git a/src/components/insights/__tests__/health-score-card.test.tsx b/src/components/insights/__tests__/health-score-card.test.tsx
index ade8459ed..0ed0a1eb0 100644
--- a/src/components/insights/__tests__/health-score-card.test.tsx
+++ b/src/components/insights/__tests__/health-score-card.test.tsx
@@ -192,19 +192,6 @@ describe("<HealthScoreCard>", () => {
     expect(moodSliceMatch?.[1]).toBe("—");
   });
 
-  it("renders the disclaimer", () => {
-    const html = ssr(
-      <HealthScoreCard
-        score={86}
-        band="green"
-        components={baseComponents}
-        delta={null}
-      />,
-    );
-    expect(html).toMatch(/data-slot="health-score-card-disclaimer"/);
-    expect(html).toContain("Indicative");
-  });
-
   it("v1.4.27 B1 — no longer mounts an inline Ask-the-Coach button (hero strip carries the CTA)", () => {
     // The hero strip's existing "Ask the coach" action covers this
     // surface; the card-internal duplicate button retired. The
@@ -245,7 +232,6 @@ describe("<HealthScoreCard>", () => {
     );
     expect(html).toContain("Gesundheitsscore");
     expect(html).toContain("im Vergleich zur Vorwoche");
-    expect(html).toContain("Orientierungshilfe");
     // v1.4.27 B1 — the inline Coach button retired; hero strip carries
     // the action now.
     expect(html).not.toContain("Coach fragen");
@@ -308,27 +294,6 @@ describe("<HealthScoreCard>", () => {
     expect(cardOpen?.[0]).toContain("flex-col");
   });
 
-  it("pins the disclaimer to the bottom of the stretched card via mt-auto", () => {
-    // Without `mt-auto` the disclaimer rides directly under the
-    // provenance accordion and leaves the recovered space below the
-    // disclaimer instead of between the body and the footer. The
-    // FB-H2 contract is "score number on top, disclaimer on bottom,
-    // recovered space in the middle".
-    const html = ssr(
-      <HealthScoreCard
-        score={86}
-        band="green"
-        components={baseComponents}
-        delta={null}
-      />,
-    );
-    const disclaimerOpen = html.match(
-      /<p[^>]*data-slot="health-score-card-disclaimer"[^>]*>/,
-    );
-    expect(disclaimerOpen).not.toBeNull();
-    expect(disclaimerOpen?.[0]).toContain("mt-auto");
-  });
-
   // v1.4.37 W4a item 1 — the inner column switched from `flex
   // flex-col gap-3` to a 7-row grid so the slack collects on row 6
   // (the provenance accordion) instead of clumping under the
diff --git a/src/components/insights/health-score-card.tsx b/src/components/insights/health-score-card.tsx
index 985454608..2782b5871 100644
--- a/src/components/insights/health-score-card.tsx
+++ b/src/components/insights/health-score-card.tsx
@@ -627,25 +627,9 @@ export function HealthScoreCard({
           )}
         </div>
 
-        {/* v1.4.27 B1 — disclaimer bumped from text-[10px] to
-            text-[11px] (BL-P4-9 L2: the 10 px size was borderline
-            against the 12 px mobile floor). The hero strip already
-            carries an "Ask the coach" action so the inline button
-            here retires; the parent still receives onAskCoach via
-            other surfaces but the card no longer mounts a duplicate
-            CTA.
-            v1.4.28 R3c-Insights — `mt-auto` pins the disclaimer to
-            the bottom of the stretched card so the score number and
-            sub-bars stay anchored at the top while the recovered
-            vertical space (when the parent column is taller) sits
-            quietly between the provenance accordion and the
-            disclaimer footer. */}
-        <p
-          data-slot="health-score-card-disclaimer"
-          className="text-muted-foreground mt-auto text-[11px] leading-snug"
-        >
-          {t("insights.healthScore.disclaimer")}
-        </p>
+        {/* v1.18.6 (DISC-01) — the "indicative, not a clinical assessment"
+            card disclaimer is removed; the one-time onboarding acknowledgment
+            now covers the not-a-diagnosis framing app-wide. */}
       </div>
     </div>
   );
diff --git a/src/components/insights/insights-layout-shell.tsx b/src/components/insights/insights-layout-shell.tsx
index d6b7cacb8..027f9dd02 100644
--- a/src/components/insights/insights-layout-shell.tsx
+++ b/src/components/insights/insights-layout-shell.tsx
@@ -3,7 +3,6 @@
 import { useMemo, type ReactNode } from "react";
 import { useQuery } from "@tanstack/react-query";
 
-import { useTranslations } from "@/lib/i18n/context";
 import { useAuth } from "@/hooks/use-auth";
 import { useMounted } from "@/hooks/use-mounted";
 import { useFeatureFlags } from "@/hooks/use-feature-flags";
@@ -52,7 +51,6 @@ interface ComprehensivePayload {
 }
 
 export function InsightsLayoutShell({ children }: { children: ReactNode }) {
-  const { t } = useTranslations();
   const { isAuthenticated, user } = useAuth();
   // v1.4.33 F18 — gate the advisor POST on the operator's assistant
   // feature flag. Pre-fix, every /insights mount fired POST
@@ -160,24 +158,11 @@ export function InsightsLayoutShell({ children }: { children: ReactNode }) {
         modules={user?.modules}
       />
       {children}
-      {/* v1.12.6 — SINGLE SOURCE of the generic Insights disclaimer.
-          The "describes your own data, not a clinical assessment / diagnosis"
-          sentence used to repeat across the overview, the metric tiles, the
-          mood page, and the medications page. It now lives here once, as a
-          page-level footer under every `/insights/*` route. Metric-SPECIFIC
-          caveats (health score, correlations, mood relations, derived cards,
-          rhythm events) stay on their own cards — those convey real,
-          non-generic information. Other waves remove the generic line from the
-          overview / mood / medications pages; this footer is where it lives.
-          v1.18.0 — Coach moved to the standalone `/coach` route (its own
-          disclaimer), so this footer now renders under every `/insights/*`
-          route unconditionally. */}
-      <p
-        data-slot="insights-disclaimer-footer"
-        className="text-muted-foreground border-border/60 border-t pt-4 text-center text-xs leading-relaxed"
-      >
-        {t("insights.disclaimer.footer")}
-      </p>
+      {/* v1.18.6 (DISC-01) — the page-level generic medical disclaimer is
+          removed. The "HealthLog is a private tracking tool, not a clinical
+          assessment or diagnosis" acknowledgment now lives once at the start
+          of onboarding, and the legal text stays reachable on the public
+          privacy page. */}
     </div>
   );
 }
diff --git a/src/components/insights/metric-correlation-card.tsx b/src/components/insights/metric-correlation-card.tsx
index 0ee1a97ee..c0f4677f6 100644
--- a/src/components/insights/metric-correlation-card.tsx
+++ b/src/components/insights/metric-correlation-card.tsx
@@ -84,12 +84,9 @@ export function MetricCorrelationCard({ slug }: MetricCorrelationCardProps) {
         {t("insights.correlationRow.title")}
       </h2>
       <CorrelationCard result={result} />
-      <p
-        data-slot="metric-correlation-disclaimer"
-        className="text-muted-foreground text-xs italic"
-      >
-        {t("insights.correlationRow.disclaimer")}
-      </p>
+      {/* v1.18.6 (DISC-01) — the "observational, not causal / talk to your
+          doctor" disclaimer is removed; the one-time onboarding acknowledgment
+          now covers the not-medical-advice framing app-wide. */}
     </section>
   );
 }

From 6acc3a72dfa622787a293627d530bada92b6b466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:12:38 +0200
Subject: [PATCH 59/71] docs(api): document the Coach nudge-status and seen
 endpoints

Add the GET /api/insights/coach/nudge-status unread signal and the POST
/api/insights/coach/seen open-stamp to the OpenAPI contract and regenerate
the spec.
---
 docs/api/openapi.yaml           | 99 +++++++++++++++++++++++++++++++++
 src/lib/openapi/routes/coach.ts | 60 ++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index b632c1c2b..a37716af5 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -4385,6 +4385,47 @@ paths:
         "401": *a1
         "422": *a3
         "429": *a4
+  /api/insights/coach/nudge-status:
+    get:
+      tags:
+        - Insights
+      summary: Whether an unopened Coach message is waiting
+      description: v1.18.6 (CCH-03) — server-authoritative unread signal for the Coach FAB. `unread` is true when the caller's
+        newest Coach ASSISTANT message (a proactive nudge or any reply) is newer than `User.coachLastSeenAt`; a user who
+        has never opened the Coach reads an existing nudge as unread exactly once. `nudgedAt` carries that newest
+        assistant-message timestamp (null when none exists) so the client can key a local seen-mirror on a stable value.
+        Coach-gated (`requireAssistantSurface("coach")`); a disabled surface 403s. Auth via cookie or Bearer; the owner
+        is narrowed from the session.
+      responses:
+        "200":
+          description: The current unread state.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CoachNudgeStatus"
+        "401": *a1
+        "422": *a3
+        "429": *a4
+  /api/insights/coach/seen:
+    post:
+      tags:
+        - Insights
+      summary: Mark the Coach as opened (clear the unread dot)
+      description: v1.18.6 (CCH-03) — opening the Coach (drawer or full page) stamps `User.coachLastSeenAt = now()`, so `GET
+        /api/insights/coach/nudge-status` then reports no assistant message newer than the stamp and the FAB drops the
+        unread dot. Server-authoritative, so the cleared state follows the caller across web + iOS rather than just the
+        opening device. No request body — the timestamp is server-minted, so a client can never backdate the stamp to
+        suppress a future nudge. Coach-gated; a disabled surface 403s. Auth via cookie or Bearer.
+      responses:
+        "200":
+          description: The Coach was marked opened; the stamp is echoed back.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CoachSeenResponse"
+        "401": *a1
+        "422": *a3
+        "429": *a4
   /api/coach/about-me:
     get:
       tags:
@@ -15777,6 +15818,64 @@ components:
         - data
         - error
       additionalProperties: false
+    CoachNudgeStatus:
+      type: object
+      properties:
+        data:
+          type: object
+          properties:
+            nudgedAt:
+              anyOf:
+                - type: string
+                  format: date-time
+                  pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z|([+-](?:[01]\d|2[0-3]):[0-5]\d)))$
+                - type: "null"
+              description: Timestamp of the newest Coach assistant message; null when none exists.
+            unread:
+              type: boolean
+              description: True when that message is newer than the last time the caller opened the Coach.
+          required:
+            - nudgedAt
+            - unread
+          additionalProperties: false
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    CoachSeenResponse:
+      type: object
+      properties:
+        data:
+          type: object
+          properties:
+            seenAt:
+              type: string
+              format: date-time
+              pattern: ^(?:(?:\d\d[2468][048]|\d\d[13579][26]|\d\d0[48]|[02468][048]00|[13579][26]00)-02-29|\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\d|30)|(?:02)-(?:0[1-9]|1\d|2[0-8])))T(?:(?:[01]\d|2[0-3]):[0-5]\d(?::[0-5]\d(?:\.\d+)?)?(?:Z|([+-](?:[01]\d|2[0-3]):[0-5]\d)))$
+              description: The server-minted open timestamp.
+          required:
+            - seenAt
+          additionalProperties: false
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
     GetCoachAboutMeResponse:
       type: object
       properties:
diff --git a/src/lib/openapi/routes/coach.ts b/src/lib/openapi/routes/coach.ts
index 94482c51d..1af5d018f 100644
--- a/src/lib/openapi/routes/coach.ts
+++ b/src/lib/openapi/routes/coach.ts
@@ -645,6 +645,66 @@ export const coachPaths: NonNullable<ZodOpenApiObject["paths"]> = {
       },
     },
   },
+  "/api/insights/coach/nudge-status": {
+    get: {
+      tags: ["Insights"],
+      summary: "Whether an unopened Coach message is waiting",
+      description:
+        "v1.18.6 (CCH-03) — server-authoritative unread signal for the Coach FAB. `unread` is true when the caller's newest Coach ASSISTANT message (a proactive nudge or any reply) is newer than `User.coachLastSeenAt`; a user who has never opened the Coach reads an existing nudge as unread exactly once. `nudgedAt` carries that newest assistant-message timestamp (null when none exists) so the client can key a local seen-mirror on a stable value. Coach-gated (`requireAssistantSurface(\"coach\")`); a disabled surface 403s. Auth via cookie or Bearer; the owner is narrowed from the session.",
+      responses: {
+        "200": {
+          description: "The current unread state.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(
+                z.object({
+                  nudgedAt: z
+                    .iso.datetime({ offset: true })
+                    .nullable()
+                    .describe(
+                      "Timestamp of the newest Coach assistant message; null when none exists.",
+                    ),
+                  unread: z
+                    .boolean()
+                    .describe(
+                      "True when that message is newer than the last time the caller opened the Coach.",
+                    ),
+                }),
+                "CoachNudgeStatus",
+              ),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
+  "/api/insights/coach/seen": {
+    post: {
+      tags: ["Insights"],
+      summary: "Mark the Coach as opened (clear the unread dot)",
+      description:
+        "v1.18.6 (CCH-03) — opening the Coach (drawer or full page) stamps `User.coachLastSeenAt = now()`, so `GET /api/insights/coach/nudge-status` then reports no assistant message newer than the stamp and the FAB drops the unread dot. Server-authoritative, so the cleared state follows the caller across web + iOS rather than just the opening device. No request body — the timestamp is server-minted, so a client can never backdate the stamp to suppress a future nudge. Coach-gated; a disabled surface 403s. Auth via cookie or Bearer.",
+      responses: {
+        "200": {
+          description: "The Coach was marked opened; the stamp is echoed back.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(
+                z.object({
+                  seenAt: z
+                    .iso.datetime({ offset: true })
+                    .describe("The server-minted open timestamp."),
+                }),
+                "CoachSeenResponse",
+              ),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
   "/api/coach/about-me": {
     get: {
       tags: ["Insights"],

From 547a7f890447b41e13ca89f38c2a9ebeefa9809b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:41:31 +0200
Subject: [PATCH 60/71] fix(a11y): give the due-reminder action a readable
 foreground
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Vorsorge "Jetzt messen" / mark-done button hard-coded white text on a
solid green fill. In the dark theme the fill is the bright Dracula green, so
white-on-green reads about 1.37:1 — below the WCAG AA floor.

Add a theme-aware `--success-foreground` token (near-black glyph on the dark
fill, white on the darker light-mode green) mirroring the existing
`--primary-foreground` pattern, and use `text-success-foreground` on both the
card and list variants. Green stays only on the action button; the card
surface remains neutral.
---
 src/app/globals.css                             | 17 +++++++++++++++++
 .../measurement-reminders/vorsorge-section.tsx  | 14 ++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index 73a7dd6d9..80d94a203 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -96,6 +96,7 @@
    *   - info    → dracula-cyan    (neutral informational note)
    */
   --color-success: var(--success);
+  --color-success-foreground: var(--success-foreground);
   --color-warning: var(--warning);
   --color-info: var(--info);
 
@@ -155,6 +156,17 @@
   --warning: var(--dracula-orange);
   --info: var(--dracula-cyan);
 
+  /*
+   * Foreground for glyphs/labels painted on a solid `bg-success` fill. The
+   * raw Dracula green (`#50fa7b`) is a bright tone, so white-on-green reads
+   * ~1.37:1 in dark mode — well under AA. The dark theme below pairs it with
+   * the near-black Dracula background (`#282a36`, ~10.4:1); the light theme
+   * keeps white on the darker light-mode green (`#14720a`, ~6.1:1). Mirrors
+   * the `--primary-foreground` pattern. Default here keeps the dark-theme
+   * value so an un-themed root never falls back to an unreadable pairing.
+   */
+  --success-foreground: #282a36;
+
   --radius: 0.625rem;
 }
 
@@ -212,6 +224,9 @@
   --status-pill-near: #ffb86c;
   --status-pill-out: #ff8a8a;
 
+  /* Dark glyph on the bright Dracula-green fill — ~10.4:1 on `#50fa7b`. */
+  --success-foreground: #282a36;
+
   /*
    * Dose accent in dark mode — the exact Tailwind `text-purple-400`
    * (`oklch(0.714 0.203 305.504)`) the cards used before, so the dark card
@@ -297,6 +312,8 @@
   --success: #14720a;
   --warning: #a34d14;
   --info: #036a96;
+  /* White glyph on the darker light-mode green — ~6.1:1 on `#14720a`. */
+  --success-foreground: #ffffff;
   --border: #cfcfde;
   --input: #cfcfde;
   --ring: #644ac9;
diff --git a/src/components/measurement-reminders/vorsorge-section.tsx b/src/components/measurement-reminders/vorsorge-section.tsx
index 359192b65..fef044321 100644
--- a/src/components/measurement-reminders/vorsorge-section.tsx
+++ b/src/components/measurement-reminders/vorsorge-section.tsx
@@ -753,9 +753,9 @@ function VorsorgeCard({
         : "";
   const isCoach = reminder.origin === "COACH";
   const isLinked = reminder.measurementType != null;
-  // Due now / overdue ⇒ the action button takes the green "do it now" tone,
-  // analogous to the medication card's due affordance. The CARD stays neutral
-  // (no tint) per the project rule — only the action button goes green.
+  // Due now / overdue ⇒ the action button takes the green "do it now" tone.
+  // The CARD stays neutral (no tint) per the project rule — only the action
+  // button goes green; the surface follows the medication-card grammar.
   const isDue =
     due.key === "nextDue.today" || due.key === "overdueByDays";
   const progress = intervalProgress(reminder, now);
@@ -817,13 +817,15 @@ function VorsorgeCard({
 
   // v1.18.6 (MOD-06) — the green "Jetzt messen" / mark-done action. Green only
   // on the action button (never the card surface). When not due it stays the
-  // calm default tone so the green reads as "now is the time".
+  // calm default tone so the green reads as "now is the time". `bg-success`
+  // pairs with the theme-aware `text-success-foreground` (dark glyph in dark,
+  // white in light) so the label clears WCAG AA in both themes.
   const primaryButton = (
     <Button
       type="button"
       className={cn(
         "min-h-11 w-full",
-        isDue && "bg-success text-white hover:bg-success/90",
+        isDue && "bg-success text-success-foreground hover:bg-success/90",
       )}
       onClick={onPrimaryAction}
       disabled={busy}
@@ -889,7 +891,7 @@ function VorsorgeCard({
                 size="sm"
                 className={cn(
                   "min-h-9",
-                  isDue && "bg-success text-white hover:bg-success/90",
+                  isDue && "bg-success text-success-foreground hover:bg-success/90",
                 )}
                 onClick={onPrimaryAction}
                 disabled={busy}

From 442eb83e2b5840707e20207281ecec294de49862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:41:38 +0200
Subject: [PATCH 61/71] test(e2e): drive coach launch through the FAB after the
 inline icon retired

The per-metric inline coach launch icon was removed from the insights
sub-page header; the floating FAB is now the single entry point. The spec
still asserted the removed icon, so every inline-launch case would fail.

Rewrite the per-slug and drawer-open cases to assert the inline icon is
absent and to open the drawer via the FAB (the pattern the surviving unread
case already used), and update the docstring. Route mocks and the hydration
gate stay as they were.
---
 e2e/v1427-coach-launch.spec.ts | 93 ++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/e2e/v1427-coach-launch.spec.ts b/e2e/v1427-coach-launch.spec.ts
index 9616b30b0..dd1573888 100644
--- a/e2e/v1427-coach-launch.spec.ts
+++ b/e2e/v1427-coach-launch.spec.ts
@@ -5,17 +5,17 @@ import { STORAGE_STATE_PATH } from "./setup/global-setup";
 /**
  * Coach launch surfaces on `/insights/{slug}` sub-pages.
  *
- * Contracts under test (v1.16.8):
+ * Contracts under test (v1.18.6, CCH-04):
  *
- *   1. The floating Coach FAB (`data-slot="coach-fab"`) is a permanent
- *      launcher on every authenticated page. An unread Coach-initiated
+ *   1. The floating Coach FAB (`data-slot="coach-fab"`) is the single
+ *      Coach launcher on every authenticated page. The per-metric inline
+ *      launch icon the sub-page header used to mount was retired in
+ *      CCH-04 — the FAB is now the only entry. An unread Coach-initiated
  *      nudge (`GET /api/insights/coach/nudge-status`) paints an unread
  *      dot (`data-slot="coach-fab-unread"`) on its corner; with nothing
- *      unread the FAB renders without the dot. The inline launch the
- *      sub-page shell mounts in the header
- *      (`data-slot="coach-launch-icon"`) stays the contextual entry.
+ *      unread the FAB renders without the dot.
  *
- *   2. Clicking the inline launch opens the Coach drawer — as a
+ *   2. Clicking the FAB opens the Coach drawer in place — as a
  *      bottom-sheet (`data-variant="bottom-sheet"`) on `<sm`, as a
  *      right-side sheet (`data-variant="side-sheet"`) on `>=sm`.
  *
@@ -27,16 +27,16 @@ import { STORAGE_STATE_PATH } from "./setup/global-setup";
  *      tray; it hands off to the full-page route `/coach`.
  *
  * The three sub-pages covered (blutdruck, gewicht, schlaf) span the
- * empty-state branch (no data → CTA + Coach launch) and the populated
- * branch (with data → full chart + Coach launch in the header).
+ * empty-state branch (no data → CTA) and the populated branch (with
+ * data → full chart). The FAB launcher is present on both.
  */
 test.describe("Coach launch surfaces on insights sub-pages", () => {
   test.use({ storageState: STORAGE_STATE_PATH });
 
   test.beforeEach(async ({ page }) => {
     // Populated analytics so each sub-page paints the data branch
-    // (`hasMetricData` true) — the inline Coach launch is mounted in
-    // the sub-page header by the shell.
+    // (`hasMetricData` true). The Coach FAB is the launcher on every
+    // authenticated page regardless of the data branch.
     // Regex form matches the slim slice the dashboard split fires
     // alongside the thick request.
     await page.route(/\/api\/analytics(\?|$)/, (route) =>
@@ -126,21 +126,23 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
   });
 
   for (const slug of ["blutdruck", "gewicht", "schlaf"] as const) {
-    test(`/insights/${slug} mounts the inline Coach launch and the dot-free FAB on Pixel 5`, async ({
+    test(`/insights/${slug} mounts the dot-free Coach FAB on Pixel 5`, async ({
       page,
     }, testInfo) => {
       test.skip(
         testInfo.project.name !== "chromium-mobile",
-        "mobile inline-launch branch",
+        "mobile FAB-launcher branch",
       );
 
       await page.goto(`/insights/${slug}`, { waitUntil: "domcontentloaded" });
 
-      // The header launch icon stays the contextual entry point.
-      const icon = page.locator('[data-slot="coach-launch-icon"]').first();
-      await expect(icon).toBeVisible({ timeout: 10_000 });
+      // CCH-04 — the per-metric inline launch icon is retired; no header
+      // launcher renders on the sub-page.
+      await expect(
+        page.locator('[data-slot="coach-launch-icon"]'),
+      ).toHaveCount(0);
 
-      // The FAB is a permanent launcher; with no unread nudge it
+      // The FAB is the permanent launcher; with no unread nudge it
       // renders without the unread dot.
       const fab = page.locator('[data-slot="coach-fab"]');
       await expect(fab).toBeVisible({ timeout: 10_000 });
@@ -149,18 +151,19 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
       ).toHaveCount(0);
     });
 
-    test(`/insights/${slug} mounts the inline Coach launch and the dot-free FAB on Desktop Chrome`, async ({
+    test(`/insights/${slug} mounts the dot-free Coach FAB on Desktop Chrome`, async ({
       page,
     }, testInfo) => {
       test.skip(
         testInfo.project.name !== "chromium-desktop",
-        "desktop inline-launch branch",
+        "desktop FAB-launcher branch",
       );
 
       await page.goto(`/insights/${slug}`, { waitUntil: "domcontentloaded" });
 
-      const icon = page.locator('[data-slot="coach-launch-icon"]').first();
-      await expect(icon).toBeVisible({ timeout: 10_000 });
+      await expect(
+        page.locator('[data-slot="coach-launch-icon"]'),
+      ).toHaveCount(0);
 
       const fab = page.locator('[data-slot="coach-fab"]');
       await expect(fab).toBeVisible({ timeout: 10_000 });
@@ -170,7 +173,7 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
     });
   }
 
-  test("clicking the inline Coach launch opens the drawer as a bottom-sheet on Pixel 5", async ({
+  test("clicking the Coach FAB opens the drawer as a bottom-sheet on Pixel 5", async ({
     page,
   }, testInfo) => {
     test.skip(
@@ -178,26 +181,26 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
       "drawer bottom-sheet branch is mobile-only",
     );
 
-    // Hydration gate — the status query is fired by the sub-page
-    // boundary itself, so its response proves React has hydrated the
-    // page and attached the launch icon's click handler. Clicking the
-    // SSR-painted icon any earlier is silently lost (CI flake).
-    const pageHydrated = page.waitForResponse(
-      /\/api\/insights\/blood-pressure-status/,
+    // Hydration gate — the nudge-status query is fired by the FAB
+    // component itself, so its response proves the FAB's click handler
+    // is attached. Clicking the SSR-painted FAB any earlier is silently
+    // lost (CI flake).
+    const fabHydrated = page.waitForResponse(
+      /\/api\/insights\/coach\/nudge-status/,
     );
     await page.goto("/insights/blutdruck", { waitUntil: "domcontentloaded" });
-    await pageHydrated;
+    await fabHydrated;
 
-    const icon = page.locator('[data-slot="coach-launch-icon"]').first();
-    await expect(icon).toBeVisible({ timeout: 10_000 });
-    await icon.click();
+    const fab = page.locator('[data-slot="coach-fab"]');
+    await expect(fab).toBeVisible({ timeout: 10_000 });
+    await fab.click();
 
     const drawer = page.locator('[data-slot="coach-drawer"]');
     await expect(drawer).toBeVisible({ timeout: 10_000 });
     await expect(drawer).toHaveAttribute("data-variant", "bottom-sheet");
   });
 
-  test("clicking the inline Coach launch opens the drawer as a side-sheet on Desktop Chrome", async ({
+  test("clicking the Coach FAB opens the drawer as a side-sheet on Desktop Chrome", async ({
     page,
   }, testInfo) => {
     test.skip(
@@ -206,15 +209,15 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
     );
 
     // Hydration gate — see the bottom-sheet branch above.
-    const pageHydrated = page.waitForResponse(
-      /\/api\/insights\/blood-pressure-status/,
+    const fabHydrated = page.waitForResponse(
+      /\/api\/insights\/coach\/nudge-status/,
     );
     await page.goto("/insights/blutdruck", { waitUntil: "domcontentloaded" });
-    await pageHydrated;
+    await fabHydrated;
 
-    const icon = page.locator('[data-slot="coach-launch-icon"]').first();
-    await expect(icon).toBeVisible({ timeout: 10_000 });
-    await icon.click();
+    const fab = page.locator('[data-slot="coach-fab"]');
+    await expect(fab).toBeVisible({ timeout: 10_000 });
+    await fab.click();
 
     const drawer = page.locator('[data-slot="coach-drawer"]');
     await expect(drawer).toBeVisible({ timeout: 10_000 });
@@ -289,15 +292,15 @@ test.describe("Coach launch surfaces on insights sub-pages", () => {
     );
 
     // Hydration gate — see the bottom-sheet test above.
-    const pageHydrated = page.waitForResponse(
-      /\/api\/insights\/blood-pressure-status/,
+    const fabHydrated = page.waitForResponse(
+      /\/api\/insights\/coach\/nudge-status/,
     );
     await page.goto("/insights/blutdruck", { waitUntil: "domcontentloaded" });
-    await pageHydrated;
+    await fabHydrated;
 
-    const icon = page.locator('[data-slot="coach-launch-icon"]').first();
-    await expect(icon).toBeVisible({ timeout: 10_000 });
-    await icon.click();
+    const fab = page.locator('[data-slot="coach-fab"]');
+    await expect(fab).toBeVisible({ timeout: 10_000 });
+    await fab.click();
 
     const drawer = page.locator('[data-slot="coach-drawer"]');
     await expect(drawer).toBeVisible({ timeout: 10_000 });

From ddbb25d5d4bc5d9a08feb6a17b39d1eec9a71462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:41:47 +0200
Subject: [PATCH 62/71] fix(coach): cap proactive nudges by the persisted
 conversation, not push success

The proactive-nudge frequency gate only counted delivered push attempts. A
user with no push channel never wrote a delivered row, so the cap was inert
for them: every cron tick that hit a persistent trigger minted a fresh nudge
conversation in the rail.

Count a recently persisted nudge conversation toward the same rolling window
so the once-per-window contract holds regardless of push outcome. Add a
covering index on coach messages for the assistant-message scans the FAB poll
and the gate both run, and drop the unused providerType parameter from the
persistence helper now that the tag is fixed.
---
 .../migration.sql                             | 24 +++++++++++
 prisma/schema.prisma                          |  6 +++
 src/lib/ai/coach/persistence.ts               |  6 +--
 src/lib/jobs/__tests__/coach-nudge.test.ts    | 43 +++++++++++++++++++
 src/lib/jobs/coach-nudge.ts                   | 26 +++++++++--
 5 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 prisma/migrations/0177_v1186_coach_message_role_index/migration.sql

diff --git a/prisma/migrations/0177_v1186_coach_message_role_index/migration.sql b/prisma/migrations/0177_v1186_coach_message_role_index/migration.sql
new file mode 100644
index 000000000..1bdaed2d3
--- /dev/null
+++ b/prisma/migrations/0177_v1186_coach_message_role_index/migration.sql
@@ -0,0 +1,24 @@
+-- v1.18.6 (L1) — covering index for the Coach assistant-message scans.
+--
+-- Two hot reads walk a user's assistant messages newest-first:
+--   * the global Coach FAB poll (`GET /api/insights/coach/nudge-status`) —
+--     the newest assistant message across the caller's conversations, used
+--     to decide whether the unread dot paints; and
+--   * the proactive-nudge cron's frequency gate (CCH-02 / M1) — the newest
+--     `provider_type = 'nudge'` assistant message inside the rolling window.
+--
+-- The pre-existing `(conversation_id, created_at)` index does not cover the
+-- `role` / `provider_type` filter, so Postgres gathered every assistant row
+-- in the user's threads and sorted. `coach_messages` grows unbounded, and the
+-- FAB poll fires on every authenticated page with refetch-on-focus.
+--
+-- This index orders by `created_at DESC` after `(conversation_id, role)` so
+-- the planner can do an index-backed per-conversation merge for the
+-- newest-first reads. Additive; no data touched.
+--
+-- Reversibility (down):
+--   DROP INDEX IF EXISTS "coach_messages_conversation_id_role_created_at_idx";
+
+-- CreateIndex
+CREATE INDEX IF NOT EXISTS "coach_messages_conversation_id_role_created_at_idx"
+  ON "coach_messages"("conversation_id", "role", "created_at" DESC);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 76b09170c..c2f620a3c 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -3632,6 +3632,12 @@ model CoachMessage {
   feedback     RecommendationFeedback[]
 
   @@index([conversationId, createdAt])
+  // v1.18.6 (L1) — the FAB nudge-status poll and the cron's persisted-nudge
+  // frequency gate both scan a user's assistant messages newest-first
+  // (optionally filtered to provider_type = 'nudge'). This index lets the
+  // planner do an index-backed per-conversation merge instead of gathering +
+  // sorting every assistant row in the user's threads on each global poll.
+  @@index([conversationId, role, createdAt(sort: Desc)])
   @@map("coach_messages")
 }
 
diff --git a/src/lib/ai/coach/persistence.ts b/src/lib/ai/coach/persistence.ts
index 7e318ee93..a6f9ec7b4 100644
--- a/src/lib/ai/coach/persistence.ts
+++ b/src/lib/ai/coach/persistence.ts
@@ -194,8 +194,6 @@ export interface RecordProactiveNudgeParams {
   title: string;
   /** The nudge body, persisted as the initial ASSISTANT message. */
   body: string;
-  /** Trigger tag for the wide-event annotation on the caller side. */
-  providerType?: string | null;
 }
 
 /**
@@ -228,7 +226,9 @@ export async function recordProactiveNudge(
         role: "assistant",
         encryptedContent: encryptToBytes(params.body),
         metricSourceJson: null,
-        providerType: params.providerType ?? "nudge",
+        // Tags the message as a proactive nudge — the cron's frequency gate
+        // reads this back to cap rail conversations for no-push-channel users.
+        providerType: "nudge",
         promptVersion: null,
       },
     });
diff --git a/src/lib/jobs/__tests__/coach-nudge.test.ts b/src/lib/jobs/__tests__/coach-nudge.test.ts
index dfa3a5a23..d69313117 100644
--- a/src/lib/jobs/__tests__/coach-nudge.test.ts
+++ b/src/lib/jobs/__tests__/coach-nudge.test.ts
@@ -524,6 +524,7 @@ describe("runCoachNudgeTick — gates and prefs", () => {
     users?: unknown[];
     intakeRows?: unknown[];
     recentNudge?: unknown;
+    recentPersistedNudge?: unknown;
     coachFocusEncrypted?: Uint8Array | null;
   }) {
     return {
@@ -539,6 +540,12 @@ describe("runCoachNudgeTick — gates and prefs", () => {
           return overrides.recentNudge ?? null;
         }),
       },
+      coachMessage: {
+        findFirst: vi.fn(async (args?: unknown) => {
+          void args;
+          return overrides.recentPersistedNudge ?? null;
+        }),
+      },
       medicationIntakeEvent: {
         findMany: vi.fn(async () => overrides.intakeRows ?? []),
       },
@@ -643,6 +650,42 @@ describe("runCoachNudgeTick — gates and prefs", () => {
     );
   });
 
+  it("caps on a recently persisted nudge conversation even with no push-success row (M1)", async () => {
+    // A no-push-channel user never writes an `ok` push-attempt row, so the
+    // ledger side of gate 5 stays empty. The persisted nudge conversation
+    // from a prior tick must still pin the window so the rail does not get a
+    // brand-new nudge conversation every cron run.
+    const dispatch = vi.fn();
+    const recordNudge = vi.fn();
+    const prisma = prismaMock({
+      users: [userRow(null)],
+      intakeRows: failingIntakes,
+      recentNudge: null,
+      recentPersistedNudge: { id: "msg_recent" },
+    });
+    const summary = await runCoachNudgeTick(
+      prisma as unknown as PrismaClient,
+      now,
+      { dispatch: dispatch as never, recordNudge: recordNudge as never },
+    );
+    expect(summary.skippedRecentNudge).toBe(1);
+    expect(dispatch).not.toHaveBeenCalled();
+    expect(recordNudge).not.toHaveBeenCalled();
+    // The persisted-nudge query honours the same rolling cutoff as the ledger.
+    const arg = vi.mocked(prisma.coachMessage.findFirst).mock.calls[0]?.[0] as {
+      where: {
+        providerType: string;
+        role: string;
+        createdAt: { gte: Date };
+      };
+    } | undefined;
+    expect(arg?.where.providerType).toBe("nudge");
+    expect(arg?.where.role).toBe("assistant");
+    expect(arg?.where.createdAt.gte.getTime()).toBe(
+      now.getTime() - 7 * MS_PER_DAY,
+    );
+  });
+
   it("skips a disabled group's trigger queries entirely", async () => {
     const prisma = prismaMock({
       users: [
diff --git a/src/lib/jobs/coach-nudge.ts b/src/lib/jobs/coach-nudge.ts
index d1fe2724e..24c2d948f 100644
--- a/src/lib/jobs/coach-nudge.ts
+++ b/src/lib/jobs/coach-nudge.ts
@@ -782,10 +782,15 @@ export async function runCoachNudgeTick(
       }
 
       // Gate 5 — one nudge per rolling window (7 d default, 14 d when
-      // the user picked "biweekly"), anchored on the push-attempts
-      // ledger. A delivered nudge writes an `ok` row per succeeding
-      // channel; a fully failed dispatch leaves the slot free so
-      // tomorrow's tick can retry.
+      // the user picked "biweekly"). Anchored on BOTH the push-attempts
+      // ledger (a delivered nudge writes an `ok` row per succeeding
+      // channel) AND the persisted nudge conversation (v1.18.6 CCH-02
+      // writes one regardless of push outcome). A user with no push
+      // channel never gets an `ok` row, so without the persisted-side
+      // check the cap would be inert for them and every tick would mint a
+      // fresh rail conversation. A fully failed dispatch on a push-capable
+      // user still leaves the ledger slot free, but the persisted nudge
+      // already pins the window — exactly the once-per-window contract.
       const capCutoff = new Date(
         now.getTime() - nudgePrefs.minIntervalDays * MS_PER_DAY,
       );
@@ -802,6 +807,19 @@ export async function runCoachNudgeTick(
         summary.skippedRecentNudge += 1;
         continue;
       }
+      const recentPersistedNudge = await prisma.coachMessage.findFirst({
+        where: {
+          providerType: "nudge",
+          role: "assistant",
+          conversation: { userId: user.id },
+          createdAt: { gte: capCutoff },
+        },
+        select: { id: true },
+      });
+      if (recentPersistedNudge) {
+        summary.skippedRecentNudge += 1;
+        continue;
+      }
 
       // Gate 6 — Rest Mode pause (v1.18.1 P4). A user with an active
       // illness/condition episode should not be told to measure more often;

From 397423dddc261c5876e79889db581ff6443243dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:41:57 +0200
Subject: [PATCH 63/71] docs(api): register the onboarding disclaimer endpoint
 in the contract

The one-time disclaimer acknowledgment route shipped without an OpenAPI
entry, leaving a gap in the contract the iOS client consumes. Add the POST
path and regenerate the spec.
---
 docs/api/openapi.yaml                | 63 ++++++++++++++++++++++++++++
 src/lib/openapi/routes/onboarding.ts | 52 +++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index a37716af5..166748f5d 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -6861,6 +6861,30 @@ paths:
         "401": *a1
         "422": *a3
         "429": *a4
+  /api/onboarding/disclaimer:
+    post:
+      tags:
+        - Onboarding
+      summary: Acknowledge the one-time medical disclaimer
+      description: "Stamps the user's medical-disclaimer acknowledgment. Idempotent: a repeat acknowledgment of the same
+        version refreshes the timestamp. The body version is a freshness signal so a stale shell cannot record copy it
+        never rendered; the server persists its own canonical version."
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/DisclaimerAckRequest"
+      responses:
+        "200":
+          description: Disclaimer acknowledged.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DisclaimerAckEnvelope"
+        "401": *a1
+        "422": *a3
+        "429": *a4
   /api/onboarding/tour:
     post:
       tags:
@@ -8225,6 +8249,18 @@ components:
             type: string
       required:
         - ids
+    DisclaimerAckRequest:
+      type: object
+      properties:
+        version:
+          type: string
+          minLength: 1
+          maxLength: 64
+          description: The disclaimer copy version the client rendered. A freshness signal only — the server pins and persists its
+            own canonical version.
+      required:
+        - version
+      description: Acknowledge the one-time medical disclaimer shown at onboarding.
     TourUpdateRequest:
       type: object
       properties:
@@ -19681,6 +19717,33 @@ components:
       description: "Cross-episode retrospective summary over the trailing window: episode + resolved counts, the typical
         (median) recovery gap (null below the min-sample floor — withholds a thin claim), a recurrence-by-month tally,
         and a per-type breakdown. Retrospective only."
+    DisclaimerAckEnvelope:
+      type: object
+      properties:
+        data:
+          $ref: "#/components/schemas/DisclaimerAckResponse"
+        error:
+          type: "null"
+        meta:
+          type: object
+          properties:
+            requestId:
+              type: string
+          additionalProperties: false
+      required:
+        - data
+        - error
+      additionalProperties: false
+    DisclaimerAckResponse:
+      type: object
+      properties:
+        acknowledgedVersion:
+          type: string
+          description: The canonical disclaimer version the server stamped.
+      required:
+        - acknowledgedVersion
+      additionalProperties: false
+      description: The persisted disclaimer acknowledgment version.
     TourUpdateEnvelope:
       type: object
       properties:
diff --git a/src/lib/openapi/routes/onboarding.ts b/src/lib/openapi/routes/onboarding.ts
index efdc1b4cf..7f57fb4dd 100644
--- a/src/lib/openapi/routes/onboarding.ts
+++ b/src/lib/openapi/routes/onboarding.ts
@@ -54,7 +54,59 @@ const tourUpdateResponse = z
     description: "The persisted completion flag and resume point after the write.",
   });
 
+const disclaimerAckRequest = z
+  .object({
+    version: z
+      .string()
+      .min(1)
+      .max(64)
+      .describe(
+        "The disclaimer copy version the client rendered. A freshness signal only — the server pins and persists its own canonical version.",
+      ),
+  })
+  .meta({
+    id: "DisclaimerAckRequest",
+    description: "Acknowledge the one-time medical disclaimer shown at onboarding.",
+  });
+
+const disclaimerAckResponse = z
+  .object({
+    acknowledgedVersion: z
+      .string()
+      .describe("The canonical disclaimer version the server stamped."),
+  })
+  .meta({
+    id: "DisclaimerAckResponse",
+    description: "The persisted disclaimer acknowledgment version.",
+  });
+
 export const onboardingPaths: NonNullable<ZodOpenApiObject["paths"]> = {
+  "/api/onboarding/disclaimer": {
+    post: {
+      tags: ["Onboarding"],
+      summary: "Acknowledge the one-time medical disclaimer",
+      description:
+        "Stamps the user's medical-disclaimer acknowledgment. Idempotent: a repeat acknowledgment of the same version refreshes the timestamp. The body version is a freshness signal so a stale shell cannot record copy it never rendered; the server persists its own canonical version.",
+      requestBody: {
+        required: true,
+        content: { "application/json": { schema: disclaimerAckRequest } },
+      },
+      responses: {
+        "200": {
+          description: "Disclaimer acknowledged.",
+          content: {
+            "application/json": {
+              schema: dataEnvelope(
+                disclaimerAckResponse,
+                "DisclaimerAckEnvelope",
+              ),
+            },
+          },
+        },
+        ...stdResponses,
+      },
+    },
+  },
   "/api/onboarding/tour": {
     post: {
       tags: ["Onboarding"],

From 9014203d8a9d8e0dadaf231e415248ff9b1348a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:42:04 +0200
Subject: [PATCH 64/71] fix(a11y): label per-reminder toggles and wire
 disclosure controls

The diabetes PATCH parsed its body without a size cap; bound it through
safeJson like the sibling routes. Label each reminder's enable/disable switch
by its own name span so screen readers hear the reminder rather than one
generic label repeated per row. Point the chronotype and illness disclosure
triggers at the regions they reveal via aria-controls.
---
 src/app/api/auth/me/diabetes/route.ts             | 15 ++++++++-------
 src/components/illness/illness-view.tsx           |  5 ++++-
 src/components/insights/sleep/chronotype-card.tsx |  3 ++-
 .../measurement-reminders/vorsorge-settings.tsx   | 10 ++++++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/app/api/auth/me/diabetes/route.ts b/src/app/api/auth/me/diabetes/route.ts
index 56d72da64..2b3e48e15 100644
--- a/src/app/api/auth/me/diabetes/route.ts
+++ b/src/app/api/auth/me/diabetes/route.ts
@@ -19,12 +19,13 @@
  */
 import { z } from "zod";
 
-import { apiHandler, requireAuth, HttpError } from "@/lib/api-handler";
+import { apiHandler, requireAuth } from "@/lib/api-handler";
 import {
   apiError,
   apiSuccess,
   getClientIp,
   returnAllZodIssues,
+  safeJson,
 } from "@/lib/api-response";
 import { annotate } from "@/lib/logging/context";
 import { auditLog } from "@/lib/auth/audit";
@@ -74,12 +75,12 @@ export const PATCH = apiHandler(async (req: Request) => {
     return response;
   }
 
-  let body: unknown;
-  try {
-    body = await req.json();
-  } catch {
-    throw new HttpError(422, "diabetes.body.invalid_json");
-  }
+  // The body is a single boolean — bound the parse so a malformed or
+  // oversized payload is rejected before it is materialised.
+  const { data: body, error: jsonError } = await safeJson(req, {
+    maxBytes: 1024,
+  });
+  if (jsonError) return jsonError;
 
   const parsed = patchBodySchema.safeParse(body);
   if (!parsed.success) {
diff --git a/src/components/illness/illness-view.tsx b/src/components/illness/illness-view.tsx
index 10101938c..7af11279d 100644
--- a/src/components/illness/illness-view.tsx
+++ b/src/components/illness/illness-view.tsx
@@ -15,7 +15,7 @@
  * per-day timeline and correlation card live. Retrospective-only copy — a
  * journal, not a medical device, and it does not diagnose.
  */
-import { useMemo, useState } from "react";
+import { useId, useMemo, useState } from "react";
 import Link from "next/link";
 import { ChevronDown, Plus, Stethoscope, Wrench } from "lucide-react";
 
@@ -245,10 +245,12 @@ function EpisodeGroup({
 }) {
   // Hooks must run unconditionally; bail on the empty render afterwards.
   const [open, setOpen] = useState(false);
+  const gridId = useId();
   if (parents.length === 0) return null;
 
   const grid = (
     <div
+      id={gridId}
       className={cn(
         view === "list" ? "space-y-2" : "grid gap-4 sm:grid-cols-2",
       )}
@@ -275,6 +277,7 @@ function EpisodeGroup({
           type="button"
           onClick={() => setOpen((v) => !v)}
           aria-expanded={open}
+          aria-controls={gridId}
           className="text-muted-foreground hover:text-foreground -mx-1 flex w-fit items-center gap-1.5 rounded-md px-1 py-0.5 text-xs font-medium uppercase tracking-wide transition-colors"
         >
           <ChevronDown
diff --git a/src/components/insights/sleep/chronotype-card.tsx b/src/components/insights/sleep/chronotype-card.tsx
index 9b7ebfb4c..e7ddfa94e 100644
--- a/src/components/insights/sleep/chronotype-card.tsx
+++ b/src/components/insights/sleep/chronotype-card.tsx
@@ -103,6 +103,7 @@ export function ChronotypeCard({ chronotype }: { chronotype: ChronotypeDto }) {
           type="button"
           onClick={() => setShowAdvanced((v) => !v)}
           aria-expanded={showAdvanced}
+          aria-controls="chronotype-advanced"
           className="text-muted-foreground hover:text-foreground flex items-center gap-1 text-xs font-medium transition-colors"
         >
           {showAdvanced ? (
@@ -114,7 +115,7 @@ export function ChronotypeCard({ chronotype }: { chronotype: ChronotypeDto }) {
         </button>
 
         {showAdvanced && (
-          <div className="space-y-2 border-t pt-3">
+          <div id="chronotype-advanced" className="space-y-2 border-t pt-3">
             {chronotype.socialJetlagMinutes != null &&
               (() => {
                 const { hours, minutes } = hoursMinutes(
diff --git a/src/components/measurement-reminders/vorsorge-settings.tsx b/src/components/measurement-reminders/vorsorge-settings.tsx
index 47710d026..1d2820fa0 100644
--- a/src/components/measurement-reminders/vorsorge-settings.tsx
+++ b/src/components/measurement-reminders/vorsorge-settings.tsx
@@ -100,7 +100,10 @@ export function VorsorgeSettings() {
                   key={reminder.id}
                   className="flex items-center justify-between gap-3 px-4 py-3"
                 >
-                  <span className="min-w-0 truncate text-sm">
+                  <span
+                    id={`vorsorge-reminder-label-${reminder.id}`}
+                    className="min-w-0 truncate text-sm"
+                  >
                     {resolveLabel(reminder, t)}
                   </span>
                   <Switch
@@ -112,7 +115,10 @@ export function VorsorgeSettings() {
                       })
                     }
                     disabled={update.isPending}
-                    aria-label={t("measurementReminders.enabledToggleAria")}
+                    // L3 — label each row's Switch by its own name span so SR
+                    // users hear the reminder name (plus the switch role's
+                    // on/off state) instead of N identical generic labels.
+                    aria-labelledby={`vorsorge-reminder-label-${reminder.id}`}
                   />
                 </div>
               ))}

From 9eed8d9cfee222fdeb5644f5711fe3109362c2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:42:10 +0200
Subject: [PATCH 65/71] chore(i18n): drop orphaned message keys across the six
 locales

Remove three diabetes settings strings whose web toggle was never built, four
dead reference-state explainer keys with no consumer, and the generic
reminder-toggle aria label that the per-row aria-labelledby wiring replaced.
The backend and resolver behind the diabetes preference stay in place.
---
 messages/de.json | 14 ++------------
 messages/en.json | 14 ++------------
 messages/es.json | 14 ++------------
 messages/fr.json | 14 ++------------
 messages/it.json | 14 ++------------
 messages/pl.json | 14 ++------------
 6 files changed, 12 insertions(+), 72 deletions(-)

diff --git a/messages/de.json b/messages/de.json
index 1b04f3ff0..321cf3dc0 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "Der mittlere arterielle Druck ist der durchschnittliche Druck, den deine Organe über einen Herzschlag sehen – grob der diastolische Wert plus ein Drittel der Differenz zum systolischen. Als allgemeine Orientierung liegt ein Ruhewert bei etwa 70–100 mmHg (StatPearls/NIH 2023). Die oft genannte Grenze von ~60 mmHg ist ein Konzept der Akutmedizin, kein Alarm für die Selbstmessung.",
         "cycleEducationBody": "Dein Zyklus durchläuft vier hormongesteuerte Phasen, und seine Länge und Regelmäßigkeit sind ein gut zugängliches Fenster auf die allgemeine Gesundheit. Als allgemeine Orientierung dauern Zyklen bei Erwachsenen typischerweise 21–35 Tage (klinische Referenzen nennen 24–38), mit einer Blutung von rund fünf Tagen (ACOG 2015). Die Lutealphase ist der stabile Anker, daher schätzt man den Eisprung am besten durch Rückrechnen von der nächsten erwarteten Periode – nie über einen festen „Tag 14“. Ein vorhergesagtes fruchtbares Fenster ist eine Schätzung, die mehrere erfasste Zyklen braucht und ungefähr bleibt, und die Basaltemperatur bestätigt den Eisprung im Nachhinein, statt ihn vorherzusagen. Dies ist keine Verhütungsmethode.",
         "sleepHygieneBody": "Einige evidenzbasierte Gewohnheiten unterstützen den Schlaf: gleichbleibende Zubett- und Aufstehzeiten auch am Wochenende, helles Morgenlicht und gedämpfte Abende, ein kühles, dunkles und ruhiges Zimmer sowie der Verzicht auf Koffein am Nachmittag, späten Alkohol und große späte Mahlzeiten (CDC 2024). Regelmäßigkeit sagt die Gesundheit mindestens so stark voraus wie die Dauer, und die Gesamtschlafzeit eines Wearables ist weit verlässlicher als seine Aufteilung in Tief-, Leicht- und REM-Schlaf.",
-        "referenceGuidance": "Allgemeine Orientierung, keine medizinische Beratung. Referenzbereiche sind Populationswerte, die sich mit Alter, Geschlecht und Erkrankungen verschieben – dein eigener Verlauf über die Zeit führt die Einordnung.",
-        "referenceState": {
-          "within": "Dein letzter Wert liegt im allgemeinen Referenzbereich.",
-          "slightlyOutside": "Dein letzter Wert liegt knapp außerhalb des üblichen Bereichs – behalte den Verlauf im Blick.",
-          "outside": "Dein letzter Wert liegt außerhalb des üblichen Bereichs. Das ist eine Einordnungshilfe, keine Diagnose; besprich ein anhaltendes Muster mit einer Ärztin oder einem Arzt.",
-          "insufficient": "Es gibt noch nicht genug Daten, oder dieses Signal hat keinen festen Populationsbereich – dein eigener Ausgangswert führt die Einordnung."
-        }
+        "referenceGuidance": "Allgemeine Orientierung, keine medizinische Beratung. Referenzbereiche sind Populationswerte, die sich mit Alter, Geschlecht und Erkrankungen verschieben – dein eigener Verlauf über die Zeit führt die Einordnung."
       },
       "bpDerived": {
         "pulsePressure": "Der Pulsdruck (die Differenz zwischen deinen Werten) beträgt etwa {value} mmHg – rund 40 ist in Ruhe typisch.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach ist ausgeblendet.",
         "saveError": "Speichern fehlgeschlagen. Bitte erneut versuchen."
       }
-    },
-    "diabetes": "Ich habe Diabetes",
-    "diabetesDescription": "Nutze ärztliche Glukose-Zielwerte (nüchtern 80–130, nach dem Essen unter 180 mg/dL) statt der allgemeinen Bänder. Das ändert nur den Zielbereich, an dem du gemessen wirst — es ist keine Diagnose.",
-    "diabetesSaved": "Glukose-Zielwert-Einstellung gespeichert"
+    }
   },
   "admin": {
     "title": "Administration",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(bei {location})",
     "edit": "Bearbeiten",
     "originCoach": "Coach",
-    "enabledToggleAria": "Diese Erinnerung aktivieren oder deaktivieren",
     "until": "Bis {date}",
     "selfPlanned": "Selbstgeplant",
     "captureValue": "Wert erfassen",
diff --git a/messages/en.json b/messages/en.json
index faf61d5e9..2dd3fb4f3 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "Mean arterial pressure is the average pressure your organs see across a heartbeat, roughly the diastolic plus a third of the gap to systolic. As general guidance, a resting value sits around 70–100 mmHg (StatPearls/NIH 2023). The often-cited ~60 mmHg floor is an acute-care concept, not a consumer self-alarm.",
         "cycleEducationBody": "Your cycle runs through four phases driven by shifting hormones, and its length and regularity are an accessible window on overall health. As general guidance, adult cycles typically run 21–35 days (clinical references cite 24–38), with bleeding around five days (ACOG 2015). The luteal phase is the steady anchor, so ovulation is best estimated by counting back from your next expected period — never a fixed 'day 14'. A predicted fertile window is an estimate that needs several recorded cycles and stays approximate, and basal body temperature confirms ovulation after the fact rather than predicting it. This is not a contraceptive method.",
         "sleepHygieneBody": "A few evidence-based habits support sleep: keep consistent bed and wake times including weekends, get bright morning daylight and dim your evenings, keep the room cool, dark and quiet, and avoid afternoon caffeine, late alcohol and large late meals (CDC 2024). Regularity predicts health at least as strongly as duration, and a wearable's total sleep time is far more trustworthy than its deep, light and REM split.",
-        "referenceGuidance": "General guidance, not medical advice. Reference ranges are population anchors that shift with your age, sex and health conditions — your own trend over time leads the read.",
-        "referenceState": {
-          "within": "Your recent value sits within the general reference range.",
-          "slightlyOutside": "Your recent value sits just outside the usual range — worth keeping an eye on the trend.",
-          "outside": "Your recent value sits outside the usual range. This is a placement aid, not a diagnosis; discuss a sustained pattern with a clinician.",
-          "insufficient": "There isn't enough data yet, or this signal has no fixed population range — your own baseline carries the read."
-        }
+        "referenceGuidance": "General guidance, not medical advice. Reference ranges are population anchors that shift with your age, sex and health conditions — your own trend over time leads the read."
       },
       "bpDerived": {
         "pulsePressure": "Pulse pressure (the gap between your readings) is about {value} mmHg — roughly 40 is typical at rest.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach hidden.",
         "saveError": "Could not save the change. Please try again."
       }
-    },
-    "diabetes": "I have diabetes",
-    "diabetesDescription": "Use clinician glucose targets (fasting 80–130, post-meal under 180 mg/dL) instead of the general bands. This only changes the target you are measured against — it is never a diagnosis.",
-    "diabetesSaved": "Glucose target preference saved"
+    }
   },
   "admin": {
     "title": "Administration",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(at {location})",
     "edit": "Edit",
     "originCoach": "Coach",
-    "enabledToggleAria": "Enable or disable this reminder",
     "until": "Until {date}",
     "selfPlanned": "Self-planned",
     "captureValue": "Log value",
diff --git a/messages/es.json b/messages/es.json
index bb248141b..e5a4a8a3d 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "La presión arterial media es la presión promedio que ven tus órganos a lo largo de un latido, aproximadamente la diastólica más un tercio de la diferencia con la sistólica. Como orientación general, un valor en reposo ronda los 70–100 mmHg (StatPearls/NIH 2023). El umbral de ~60 mmHg que se suele citar es un concepto de cuidados agudos, no una alarma para el autocontrol.",
         "cycleEducationBody": "Tu ciclo atraviesa cuatro fases impulsadas por hormonas, y su duración y regularidad son una ventana accesible a la salud general. Como orientación general, los ciclos en personas adultas suelen durar 21–35 días (las referencias clínicas citan 24–38), con un sangrado de unos cinco días (ACOG 2015). La fase lútea es el ancla estable, así que la ovulación se estima mejor contando hacia atrás desde tu próxima regla prevista, nunca con un «día 14» fijo. Una ventana fértil predicha es una estimación que necesita varios ciclos registrados y sigue siendo aproximada, y la temperatura basal confirma la ovulación a posteriori en lugar de predecirla. No es un método anticonceptivo.",
         "sleepHygieneBody": "Algunos hábitos con respaldo de evidencia favorecen el sueño: mantener horarios constantes de acostarse y levantarse incluso los fines de semana, recibir luz brillante por la mañana y atenuar las noches, una habitación fresca, oscura y silenciosa, y evitar la cafeína por la tarde, el alcohol tardío y las comidas copiosas a última hora (CDC 2024). La regularidad predice la salud al menos tanto como la duración, y el tiempo total de sueño de un wearable es mucho más fiable que su reparto entre sueño profundo, ligero y REM.",
-        "referenceGuidance": "Orientación general, no consejo médico. Los rangos de referencia son valores poblacionales que cambian con tu edad, sexo y condiciones de salud; tu propia tendencia a lo largo del tiempo guía la lectura.",
-        "referenceState": {
-          "within": "Tu valor reciente se sitúa dentro del rango de referencia general.",
-          "slightlyOutside": "Tu valor reciente queda justo fuera del rango habitual; conviene vigilar la tendencia.",
-          "outside": "Tu valor reciente queda fuera del rango habitual. Es una ayuda de ubicación, no un diagnóstico; comenta un patrón sostenido con un profesional sanitario.",
-          "insufficient": "Aún no hay datos suficientes, o esta señal no tiene un rango poblacional fijo; tu propia base guía la lectura."
-        }
+        "referenceGuidance": "Orientación general, no consejo médico. Los rangos de referencia son valores poblacionales que cambian con tu edad, sexo y condiciones de salud; tu propia tendencia a lo largo del tiempo guía la lectura."
       },
       "bpDerived": {
         "pulsePressure": "La presión de pulso (la diferencia entre tus valores) es de unos {value} mmHg; alrededor de 40 es lo típico en reposo.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach oculto.",
         "saveError": "No se pudo guardar el cambio. Inténtalo de nuevo."
       }
-    },
-    "diabetes": "Tengo diabetes",
-    "diabetesDescription": "Usa objetivos de glucosa clínicos (en ayunas 80–130, tras la comida menos de 180 mg/dL) en lugar de las bandas generales. Esto solo cambia el objetivo con el que te comparas; nunca es un diagnóstico.",
-    "diabetesSaved": "Preferencia de objetivo de glucosa guardada"
+    }
   },
   "admin": {
     "title": "Administration",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(en {location})",
     "edit": "Editar",
     "originCoach": "Coach",
-    "enabledToggleAria": "Activar o desactivar este recordatorio",
     "until": "Hasta {date}",
     "selfPlanned": "Autoplanificado",
     "captureValue": "Registrar valor",
diff --git a/messages/fr.json b/messages/fr.json
index 1f816ae81..a9b43fc82 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "La pression artérielle moyenne est la pression moyenne que voient vos organes sur un battement, soit grosso modo la diastolique plus un tiers de l'écart avec la systolique. À titre indicatif général, une valeur au repos se situe autour de 70–100 mmHg (StatPearls/NIH 2023). Le seuil de ~60 mmHg souvent cité est un concept de soins aigus, pas une alarme pour l'autosurveillance.",
         "cycleEducationBody": "Votre cycle traverse quatre phases pilotées par les hormones, et sa durée et sa régularité sont une fenêtre accessible sur la santé globale. À titre indicatif général, les cycles chez l'adulte durent typiquement 21–35 jours (les références cliniques citent 24–38), avec des règles d'environ cinq jours (ACOG 2015). La phase lutéale est l'ancrage stable, donc l'ovulation s'estime au mieux en comptant à rebours depuis vos prochaines règles prévues, jamais à un « jour 14 » fixe. Une fenêtre fertile prédite est une estimation qui demande plusieurs cycles enregistrés et reste approximative, et la température basale confirme l'ovulation après coup plutôt qu'elle ne la prédit. Ce n'est pas une méthode de contraception.",
         "sleepHygieneBody": "Quelques habitudes fondées sur les preuves favorisent le sommeil : des heures de coucher et de lever régulières, week-ends compris, une lumière vive le matin et des soirées tamisées, une chambre fraîche, sombre et calme, et éviter la caféine l'après-midi, l'alcool tardif et les repas copieux tard le soir (CDC 2024). La régularité prédit la santé au moins autant que la durée, et le temps de sommeil total d'un wearable est bien plus fiable que sa répartition entre sommeil profond, léger et paradoxal.",
-        "referenceGuidance": "Indication générale, pas un avis médical. Les plages de référence sont des repères de population qui évoluent avec votre âge, votre sexe et vos conditions de santé ; votre propre tendance dans le temps guide la lecture.",
-        "referenceState": {
-          "within": "Votre valeur récente se situe dans la plage de référence générale.",
-          "slightlyOutside": "Votre valeur récente est juste en dehors de la plage habituelle — il vaut la peine de surveiller la tendance.",
-          "outside": "Votre valeur récente est en dehors de la plage habituelle. C'est une aide au repérage, pas un diagnostic ; parlez d'un schéma persistant à un professionnel de santé.",
-          "insufficient": "Il n'y a pas encore assez de données, ou ce signal n'a pas de plage de population fixe — votre propre référence guide la lecture."
-        }
+        "referenceGuidance": "Indication générale, pas un avis médical. Les plages de référence sont des repères de population qui évoluent avec votre âge, votre sexe et vos conditions de santé ; votre propre tendance dans le temps guide la lecture."
       },
       "bpDerived": {
         "pulsePressure": "La pression pulsée (l'écart entre vos valeurs) est d'environ {value} mmHg ; environ 40 est typique au repos.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach masqué.",
         "saveError": "Impossible d enregistrer la modification. Veuillez réessayer."
       }
-    },
-    "diabetes": "Je suis diabétique",
-    "diabetesDescription": "Utilise des objectifs glycémiques cliniques (à jeun 80–130, après le repas moins de 180 mg/dL) au lieu des plages générales. Cela ne change que l'objectif auquel tu es comparé — ce n'est jamais un diagnostic.",
-    "diabetesSaved": "Préférence d'objectif glycémique enregistrée"
+    }
   },
   "admin": {
     "title": "Administration",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(chez {location})",
     "edit": "Modifier",
     "originCoach": "Coach",
-    "enabledToggleAria": "Activer ou désactiver ce rappel",
     "until": "Jusqu'au {date}",
     "selfPlanned": "Auto-planifié",
     "captureValue": "Enregistrer la valeur",
diff --git a/messages/it.json b/messages/it.json
index d9d0c5c23..672aaa46a 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "La pressione arteriosa media è la pressione media che i tuoi organi vedono in un battito, all'incirca la diastolica più un terzo del divario con la sistolica. Come orientamento generale, un valore a riposo si aggira sui 70–100 mmHg (StatPearls/NIH 2023). La soglia di ~60 mmHg spesso citata è un concetto di terapia intensiva, non un allarme per l'automisurazione.",
         "cycleEducationBody": "Il tuo ciclo attraversa quattro fasi guidate dagli ormoni, e la sua durata e regolarità sono una finestra accessibile sulla salute generale. Come orientamento generale, nei adulti i cicli durano tipicamente 21–35 giorni (i riferimenti clinici citano 24–38), con un sanguinamento di circa cinque giorni (ACOG 2015). La fase luteale è l'ancora stabile, quindi l'ovulazione si stima meglio contando a ritroso dalla prossima mestruazione attesa, mai con un «giorno 14» fisso. Una finestra fertile prevista è una stima che richiede più cicli registrati e resta approssimativa, e la temperatura basale conferma l'ovulazione a posteriori anziché prevederla. Non è un metodo contraccettivo.",
         "sleepHygieneBody": "Alcune abitudini basate sull'evidenza favoriscono il sonno: orari costanti per coricarsi e svegliarsi anche nel weekend, luce intensa al mattino e serate soffuse, una stanza fresca, buia e silenziosa, ed evitare la caffeina nel pomeriggio, l'alcol a tarda ora e i pasti abbondanti a fine giornata (CDC 2024). La regolarità predice la salute almeno quanto la durata, e il tempo di sonno totale di un wearable è molto più affidabile della sua suddivisione tra sonno profondo, leggero e REM.",
-        "referenceGuidance": "Orientamento generale, non un consiglio medico. Gli intervalli di riferimento sono valori di popolazione che cambiano con la tua età, il sesso e le condizioni di salute; il tuo andamento nel tempo guida la lettura.",
-        "referenceState": {
-          "within": "Il tuo valore recente rientra nell'intervallo di riferimento generale.",
-          "slightlyOutside": "Il tuo valore recente è appena fuori dall'intervallo abituale: vale la pena tenere d'occhio l'andamento.",
-          "outside": "Il tuo valore recente è fuori dall'intervallo abituale. È un aiuto alla collocazione, non una diagnosi; parla di un andamento persistente con un medico.",
-          "insufficient": "Non ci sono ancora dati sufficienti, oppure questo segnale non ha un intervallo di popolazione fisso: il tuo riferimento personale guida la lettura."
-        }
+        "referenceGuidance": "Orientamento generale, non un consiglio medico. Gli intervalli di riferimento sono valori di popolazione che cambiano con la tua età, il sesso e le condizioni di salute; il tuo andamento nel tempo guida la lettura."
       },
       "bpDerived": {
         "pulsePressure": "La pressione differenziale (il divario tra i tuoi valori) è di circa {value} mmHg; circa 40 è tipico a riposo.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach nascosto.",
         "saveError": "Impossibile salvare la modifica. Riprova."
       }
-    },
-    "diabetes": "Ho il diabete",
-    "diabetesDescription": "Usa obiettivi glicemici clinici (a digiuno 80–130, dopo i pasti sotto 180 mg/dL) invece delle bande generali. Questo cambia solo l'obiettivo con cui ti confronti — non è mai una diagnosi.",
-    "diabetesSaved": "Preferenza dell'obiettivo glicemico salvata"
+    }
   },
   "admin": {
     "title": "Administration",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(presso {location})",
     "edit": "Modifica",
     "originCoach": "Coach",
-    "enabledToggleAria": "Attiva o disattiva questo promemoria",
     "until": "Fino al {date}",
     "selfPlanned": "Autopianificato",
     "captureValue": "Registra valore",
diff --git a/messages/pl.json b/messages/pl.json
index accaf8a3b..b4ccb8202 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -2498,13 +2498,7 @@
         "meanArterialPressureBody": "Średnie ciśnienie tętnicze to przeciętne ciśnienie, jakie widzą Twoje narządy w trakcie uderzenia serca, w przybliżeniu rozkurczowe plus jedna trzecia różnicy do skurczowego. Jako ogólna wskazówka, wartość spoczynkowa mieści się w okolicy 70–100 mmHg (StatPearls/NIH 2023). Często przywoływany próg ~60 mmHg to pojęcie z medycyny ostrej, nie alarm do samodzielnego pomiaru.",
         "cycleEducationBody": "Twój cykl przebiega przez cztery fazy sterowane hormonami, a jego długość i regularność to dostępne okno na ogólny stan zdrowia. Jako ogólna wskazówka, u osób dorosłych cykle trwają zwykle 21–35 dni (źródła kliniczne podają 24–38), z krwawieniem około pięciu dni (ACOG 2015). Faza lutealna jest stałą kotwicą, dlatego owulację najlepiej szacować, licząc wstecz od następnej spodziewanej miesiączki, nigdy według stałego „14. dnia”. Przewidziane okno płodne to oszacowanie, które wymaga kilku zarejestrowanych cykli i pozostaje przybliżone, a podstawowa temperatura ciała potwierdza owulację po fakcie, a nie ją przewiduje. To nie jest metoda antykoncepcji.",
         "sleepHygieneBody": "Kilka opartych na dowodach nawyków wspiera sen: stałe pory kładzenia się i wstawania także w weekendy, jasne światło rano i przyciemnione wieczory, chłodna, ciemna i cicha sypialnia oraz unikanie kofeiny po południu, alkoholu późnym wieczorem i obfitych posiłków przed snem (CDC 2024). Regularność przewiduje zdrowie co najmniej tak silnie jak długość snu, a całkowity czas snu z urządzenia jest znacznie bardziej wiarygodny niż jego podział na sen głęboki, lekki i REM.",
-        "referenceGuidance": "Ogólna wskazówka, nie porada medyczna. Zakresy referencyjne to wartości populacyjne, które zmieniają się wraz z Twoim wiekiem, płcią i stanem zdrowia; to Twój własny trend w czasie prowadzi odczyt.",
-        "referenceState": {
-          "within": "Twoja ostatnia wartość mieści się w ogólnym zakresie referencyjnym.",
-          "slightlyOutside": "Twoja ostatnia wartość jest tuż poza zwykłym zakresem – warto obserwować trend.",
-          "outside": "Twoja ostatnia wartość jest poza zwykłym zakresem. To pomoc w umiejscowieniu, nie diagnoza; omów utrzymujący się wzorzec z lekarzem.",
-          "insufficient": "Nie ma jeszcze wystarczających danych lub ten sygnał nie ma stałego zakresu populacyjnego – odczyt prowadzi Twoja własna wartość bazowa."
-        }
+        "referenceGuidance": "Ogólna wskazówka, nie porada medyczna. Zakresy referencyjne to wartości populacyjne, które zmieniają się wraz z Twoim wiekiem, płcią i stanem zdrowia; to Twój własny trend w czasie prowadzi odczyt."
       },
       "bpDerived": {
         "pulsePressure": "Ciśnienie tętna (różnica między Twoimi wartościami) wynosi około {value} mmHg – około 40 jest typowe w spoczynku.",
@@ -4768,10 +4762,7 @@
         "savedOff": "Coach ukryty.",
         "saveError": "Nie udało się zapisać zmiany. Spróbuj ponownie."
       }
-    },
-    "diabetes": "Mam cukrzycę",
-    "diabetesDescription": "Użyj klinicznych celów glukozy (na czczo 80–130, po posiłku poniżej 180 mg/dL) zamiast ogólnych zakresów. Zmienia to tylko cel, względem którego jesteś oceniany — to nigdy nie jest diagnoza.",
-    "diabetesSaved": "Zapisano preferencję celu glukozy"
+    }
   },
   "admin": {
     "title": "Administracja",
@@ -6405,7 +6396,6 @@
     "pushLocation": "(u {location})",
     "edit": "Edytuj",
     "originCoach": "Coach",
-    "enabledToggleAria": "Włącz lub wyłącz to przypomnienie",
     "until": "Do {date}",
     "selfPlanned": "Zaplanowane samodzielnie",
     "captureValue": "Zapisz wartość",

From 3ec9aca798ab6f5924bd69b48a7248b6ff0b6280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:42:14 +0200
Subject: [PATCH 66/71] perf(dashboard): memoise the band math and the
 module-list parse

The dashboard recomputed the client band fallback on every render even when
the server snapshot supplied bands, and the module-list-prefs hook reparsed
its stored JSON into a fresh object each render, defeating downstream
memoisation. Wrap both in useMemo keyed on their real inputs.
---
 src/app/page.tsx             | 19 ++++++++++++++-----
 src/lib/module-list-prefs.ts |  8 ++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4f267de25..d021b42b3 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -532,11 +532,20 @@ export default function DashboardPage() {
   // — it is pure + cheap — so a still-loading snapshot frame keeps real
   // bands rather than blank charts; `serverBands ?? clientBands` then
   // prefers the authoritative server numbers the moment they arrive.
-  const clientBands = buildDashboardBands({
-    dateOfBirth: user?.dateOfBirth ? new Date(user.dateOfBirth) : null,
-    gender: (user?.gender as "MALE" | "FEMALE" | null | undefined) ?? null,
-    heightCm: user?.heightCm ?? null,
-  });
+  // Inputs only change with profile facts, so memoise the band math — it
+  // ran on every dashboard render (and got discarded by `serverBands ??`
+  // in the snapshot steady state) before this. Keyed on the `user` object
+  // identity so the React Compiler can preserve the memo (a narrower
+  // property list trips `preserve-manual-memoization`).
+  const clientBands = useMemo(
+    () =>
+      buildDashboardBands({
+        dateOfBirth: user?.dateOfBirth ? new Date(user.dateOfBirth) : null,
+        gender: (user?.gender as "MALE" | "FEMALE" | null | undefined) ?? null,
+        heightCm: user?.heightCm ?? null,
+      }),
+    [user],
+  );
   const bands = serverBands ?? clientBands;
   const bpTargets = bands.bpTargets;
   const weightRange = bands.weightRange;
diff --git a/src/lib/module-list-prefs.ts b/src/lib/module-list-prefs.ts
index c23a396ce..0b2e5f4a7 100644
--- a/src/lib/module-list-prefs.ts
+++ b/src/lib/module-list-prefs.ts
@@ -19,7 +19,7 @@
  * block (the server default order is preserved for the tail).
  */
 
-import { useCallback, useSyncExternalStore } from "react";
+import { useCallback, useMemo, useSyncExternalStore } from "react";
 
 export const MODULE_LIST_VIEWS = ["cards", "list"] as const;
 export type ModuleListView = (typeof MODULE_LIST_VIEWS)[number];
@@ -150,7 +150,11 @@ export function useModuleListPrefs(module: ModuleListKey): {
   }, [key]);
 
   const raw = useSyncExternalStore(subscribe, getSnapshot, () => null);
-  const prefs = parseModuleListPrefs(raw);
+  // `useSyncExternalStore` returns a stable `raw` string when storage hasn't
+  // changed, so keying the parse on it gives downstream `applyOrder`
+  // memoisation a stable `prefs` reference instead of a fresh object + a
+  // JSON.parse on every render.
+  const prefs = useMemo(() => parseModuleListPrefs(raw), [raw]);
 
   const write = useCallback(
     (next: ModuleListPrefs) => {

From 22f588b34d913f7124fed787858d17e61684dcae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:42:22 +0200
Subject: [PATCH 67/71] refactor(ui): correct stale comments and steady the
 settings-nav spacer

Drop the overstated claim that the due-reminder green button mirrors the
medication card (the med take button is always the default tone), fix the
module-tour anchor attribute named in a doc comment, and feed the active
section title into the settings nav spacer so its heading line wraps the same
way a long localized title does.
---
 src/components/onboarding/module-tour-trigger.tsx    |  2 +-
 .../settings/section-nav-heading-spacer.tsx          | 11 +++++++++--
 src/components/settings/settings-shell.tsx           | 12 ++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/onboarding/module-tour-trigger.tsx b/src/components/onboarding/module-tour-trigger.tsx
index a502cbf16..717a3fa01 100644
--- a/src/components/onboarding/module-tour-trigger.tsx
+++ b/src/components/onboarding/module-tour-trigger.tsx
@@ -9,7 +9,7 @@
  * opens the spotlight narrowed to that single module card on the
  * current page (no cross-page navigation, no completion flip).
  *
- * Anchors to the page's `data-tour="<…>-hero"` element via the launcher
+ * Anchors to the page's `data-tour-id="<…>-hero"` element via the launcher
  * → overlay path. The button itself carries no anchor — it only fires
  * the event.
  */
diff --git a/src/components/settings/section-nav-heading-spacer.tsx b/src/components/settings/section-nav-heading-spacer.tsx
index 5a5bcf962..e8d7c13e6 100644
--- a/src/components/settings/section-nav-heading-spacer.tsx
+++ b/src/components/settings/section-nav-heading-spacer.tsx
@@ -14,11 +14,18 @@
  *
  * It is only rendered on `md+` (the desktop sticky sidebar); the mobile chip
  * strip has no heading-to-align-with.
+ *
+ * v1.18.6 (L11) — pass the active section's resolved `title` so the h1 line
+ * wraps identically when a locale's title runs to two lines, rather than
+ * reserving a single `&nbsp;` line. The subtitle copy lives per-page in the
+ * section frame and is not threaded up here, so the spacer reserves one
+ * subtitle line; a subtitle that wraps to two lines in a given locale is the
+ * residual known limitation the original comment called out.
  */
-export function SectionNavHeadingSpacer() {
+export function SectionNavHeadingSpacer({ title }: { title?: string }) {
   return (
     <div aria-hidden="true" className="invisible mb-6 select-none">
-      <h1 className="text-2xl font-bold tracking-tight">&nbsp;</h1>
+      <h1 className="text-2xl font-bold tracking-tight">{title || " "}</h1>
       <p className="text-muted-foreground text-sm">&nbsp;</p>
     </div>
   );
diff --git a/src/components/settings/settings-shell.tsx b/src/components/settings/settings-shell.tsx
index f99b74e2f..fd6c3464e 100644
--- a/src/components/settings/settings-shell.tsx
+++ b/src/components/settings/settings-shell.tsx
@@ -262,6 +262,9 @@ export function SettingsShell({ active, children }: SettingsShellProps) {
   const visibleSections = SETTINGS_SECTIONS.filter(
     (section) => !section.moduleGate || modules?.[section.moduleGate] !== false,
   );
+  const activeSection = visibleSections.find(
+    (section) => section.slug === activeSlug,
+  );
 
   // v1.4.33 IW4 — keep the active chip in view inside the horizontal
   // mobile strip. On a 393 CSS px viewport the strip is wider than the
@@ -360,8 +363,13 @@ export function SettingsShell({ active, children }: SettingsShellProps) {
           <div className="sticky top-20">
             {/* v1.18.6 (W9) — push the first nav item down to the top of the
                 first card (level with the page heading's following gap), so
-                the menu reads symmetric with the content column. */}
-            <SectionNavHeadingSpacer />
+                the menu reads symmetric with the content column. Feed the
+                active title so the spacer's h1 wraps the same way (L11). */}
+            <SectionNavHeadingSpacer
+              title={
+                activeSection ? t(activeSection.titleKey) : undefined
+              }
+            />
             <ul className="space-y-1">
               {visibleSections.map((section) => {
                 const isActive = section.slug === activeSlug;

From 8ff3b51ba396c17dd7b1d87a00bbebf85c428a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:42:27 +0200
Subject: [PATCH 68/71] refactor: remove dead exports and an unused prop

Drop the health-score card's inert onAskCoach prop and its now-dead
pass-through from the hero strip, the buildDashboardBands re-export that no
caller reached through the snapshot module, an unused tour-progress status
type, and an orphan service-worker cache helper.
---
 .../__tests__/health-score-card.test.tsx      | 21 +++++--------------
 src/components/insights/health-score-card.tsx | 11 ++--------
 src/components/insights/hero-strip.tsx        | 10 ---------
 src/lib/dashboard/snapshot.ts                 |  3 +--
 src/lib/onboarding/tour-progress.ts           |  2 --
 src/lib/pwa/query-persister.ts                | 21 -------------------
 6 files changed, 8 insertions(+), 60 deletions(-)

diff --git a/src/components/insights/__tests__/health-score-card.test.tsx b/src/components/insights/__tests__/health-score-card.test.tsx
index 0ed0a1eb0..af2a04019 100644
--- a/src/components/insights/__tests__/health-score-card.test.tsx
+++ b/src/components/insights/__tests__/health-score-card.test.tsx
@@ -194,10 +194,10 @@ describe("<HealthScoreCard>", () => {
 
   it("v1.4.27 B1 — no longer mounts an inline Ask-the-Coach button (hero strip carries the CTA)", () => {
     // The hero strip's existing "Ask the coach" action covers this
-    // surface; the card-internal duplicate button retired. The
-    // onAskCoach prop stays on the type signature so callers don't
-    // break, but the card no longer renders it.
-    const omitted = ssr(
+    // surface; the card-internal duplicate button retired. v1.18.6 (L13)
+    // dropped the now-dead `onAskCoach` prop too — the card renders no
+    // Coach affordance at all.
+    const html = ssr(
       <HealthScoreCard
         score={86}
         band="green"
@@ -205,17 +205,7 @@ describe("<HealthScoreCard>", () => {
         delta={null}
       />,
     );
-    const supplied = ssr(
-      <HealthScoreCard
-        score={86}
-        band="green"
-        components={baseComponents}
-        delta={null}
-        onAskCoach={() => {}}
-      />,
-    );
-    expect(omitted).not.toContain('data-slot="health-score-card-ask-coach"');
-    expect(supplied).not.toContain('data-slot="health-score-card-ask-coach"');
+    expect(html).not.toContain('data-slot="health-score-card-ask-coach"');
   });
 
 
@@ -226,7 +216,6 @@ describe("<HealthScoreCard>", () => {
         band="green"
         components={baseComponents}
         delta={5}
-        onAskCoach={() => {}}
       />,
       "de",
     );
diff --git a/src/components/insights/health-score-card.tsx b/src/components/insights/health-score-card.tsx
index 2782b5871..3e058eed6 100644
--- a/src/components/insights/health-score-card.tsx
+++ b/src/components/insights/health-score-card.tsx
@@ -26,8 +26,8 @@ import { HealthScoreDeltaExplainer } from "./health-score-delta-explainer";
  * at least one component blends entries from more than one source.
  *
  * Pure presentational — the parent owns the analytics query + the
- * drawer state. The same `onAskCoach` handler is shared with the hero
- * strip's main "Ask the coach" button (different prefill string).
+ * drawer state. The card mounts no inline Coach affordance; the hero
+ * strip carries the single "Ask the coach" entry point.
  */
 
 export type HealthScoreBand = "green" | "yellow" | "red";
@@ -70,7 +70,6 @@ export interface HealthScoreCardProps {
     compliance: HealthScoreCardComponent;
   };
   delta: number | null;
-  onAskCoach?: (prefill: string) => void;
   /**
    * v1.4.25 W8e — opens the provenance accordion on first render.
    * The SSR tests use it to exercise the expanded markup without a
@@ -175,12 +174,6 @@ export function HealthScoreCard({
   band,
   components,
   delta,
-  // v1.4.27 B1 — onAskCoach stays on the prop signature so the hero
-  // strip's existing wire-up doesn't break, but the card no longer
-  // mounts an inline button (the hero strip already carries the same
-  // action). Destructure-and-ignore is intentional.
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  onAskCoach: _onAskCoach,
   initiallyExpanded = false,
   moodEnabled = true,
   restModeActive = false,
diff --git a/src/components/insights/hero-strip.tsx b/src/components/insights/hero-strip.tsx
index f7fdedfac..025c01545 100644
--- a/src/components/insights/hero-strip.tsx
+++ b/src/components/insights/hero-strip.tsx
@@ -353,16 +353,6 @@ export function HeroStrip({
             delta={healthScore.delta}
             moodEnabled={moodEnabled}
             restModeActive={healthScore.restMode?.active ?? false}
-            onAskCoach={
-              // v1.4.37 W5 — short-circuit the prop drilling even
-              // though `HealthScoreCard` retired its inline button in
-              // v1.4.27. A future re-addition can't accidentally
-              // surface a Coach affordance from this card while the
-              // operator has the flag off.
-              coachEnabled && onAskCoach
-                ? (prefill: string) => onAskCoach(prefill)
-                : undefined
-            }
           />
         )}
       </div>
diff --git a/src/lib/dashboard/snapshot.ts b/src/lib/dashboard/snapshot.ts
index 668e38944..228c42814 100644
--- a/src/lib/dashboard/snapshot.ts
+++ b/src/lib/dashboard/snapshot.ts
@@ -78,7 +78,6 @@ import {
 } from "@/lib/dashboard/meds-today";
 import { computeUserHealthScoreFastPath } from "@/lib/analytics/health-score-fast-path";
 import {
-  buildDashboardBands,
   buildTargetBands,
   type DashboardTargetBands,
 } from "@/lib/dashboard/bands";
@@ -217,7 +216,7 @@ export interface DashboardSnapshotUser {
  * personalisation, no height → weight band), matching the client's
  * previous null-guards exactly.
  */
-export { buildDashboardBands, buildTargetBands };
+export { buildTargetBands };
 export type { DashboardTargetBands };
 
 export interface DashboardSnapshotMoodEntry {
diff --git a/src/lib/onboarding/tour-progress.ts b/src/lib/onboarding/tour-progress.ts
index b186ce7d3..c14c3a7f1 100644
--- a/src/lib/onboarding/tour-progress.ts
+++ b/src/lib/onboarding/tour-progress.ts
@@ -20,8 +20,6 @@ export const TOUR_PROGRESS_STATUSES = [
   "skipped",
 ] as const;
 
-export type TourProgressStatus = (typeof TOUR_PROGRESS_STATUSES)[number];
-
 /**
  * The persisted progress shape. `lastStopId` seeds the resume index;
  * `completedStopIds` is informational (analytics + future per-module
diff --git a/src/lib/pwa/query-persister.ts b/src/lib/pwa/query-persister.ts
index 2701f6431..302926f17 100644
--- a/src/lib/pwa/query-persister.ts
+++ b/src/lib/pwa/query-persister.ts
@@ -301,27 +301,6 @@ export async function clearPersistedQueryCache(): Promise<void> {
   }
 }
 
-/**
- * Drop the service-worker offline read-data cache (`healthlog-data-*`). It
- * holds the last-synced dashboard JSON and must never survive a session end on
- * a shared device. Scoped to the data cache only — the static cache (hashed
- * chunks, icons) carries no PII and dropping it would force a needless
- * re-download. Best-effort; never throws.
- */
-export async function clearServiceWorkerDataCache(): Promise<void> {
-  if (typeof caches === "undefined") return;
-  try {
-    const keys = await caches.keys();
-    await Promise.all(
-      keys
-        .filter((k) => k.startsWith("healthlog-data-"))
-        .map((k) => caches.delete(k)),
-    );
-  } catch {
-    /* best effort */
-  }
-}
-
 /**
  * Wipe every client-side cache that can hold one account's health data: the
  * IndexedDB query snapshot, the SW offline read-data cache, and the SW page

From 1118d36cf8212f93728d734c604a9269b16a6c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:45:26 +0200
Subject: [PATCH 69/71] docs: consolidate the v1.18.6 changelog for the full
 cycle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cover the whole release — offline reads, cited reference ranges + Coach
grounding, responsible safety alerts + diabetes opt-in, the module tour,
the module-consistency and settings/admin IA pass, sleep/coach polish,
and the reminder completion route — and correct the additive migration
note (0173–0177).
---
 CHANGELOG.md | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 309d35660..d73bcbf86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,26 +2,48 @@
 
 ## [Unreleased]
 
-## [1.18.6] — 2026-06-18 — a real offline app and a faster dashboard
+## [1.18.6] — 2026-06-18 — offline reads, grounded guidance, and one consistent app
 
-This release makes the installed app genuinely useful offline and lightens the dashboard. Opened without a connection, the home-screen app now shows your last synced data instead of empty placeholders, and a quiet line tells you it's the last sync. The dashboard fetches all its charts in one request instead of one per chart, and resolves its target ranges on the server. Plus a mobile touch-target pass and a reduced-motion safeguard. No breaking changes; no migration.
+A large release that makes the app genuinely useful offline, gives every metric cited reference context, grounds the AI Coach and Daily Briefing in that same context, adds responsible safety alerts for clinically urgent readings, and brings the newer modules (preventive care, illness, labs) and the whole settings area in line with the established patterns. A guided tour now explains what each module does and how they connect. No breaking changes; all schema changes are additive.
 
 ### Added
 
-- **Real offline reads.** The installed app caches your dashboard, recent readings, medications and insights (safe, read-only data only — never anything tied to sign-in), so opening it offline shows your last synced view with a "showing your last synced data" note, rather than blank skeletons. Changes you make offline still save when you reconnect.
+- **A module-by-module guided tour.** After onboarding, a short tour walks each module — what it does, one capability you might miss, and how it feeds the others — so the whole app makes sense on day one. Replayable any time from Settings, or per module from its page.
+- **Cited reference ranges everywhere.** Metrics now carry plain-language explainers and the general reference range they sit in (blood pressure, resting heart rate, glucose, blood oxygen, temperature, and more), framed as general guidance and sourced from recognised guidelines — never a diagnosis. Blood pressure follows the ESH range. The blood-pressure detail now also shows pulse pressure and mean arterial pressure, derived from your readings.
+- **A Coach that knows the ranges.** The AI Coach and Daily Briefing are now grounded in those cited ranges, so a comment about a value reflects where it sits in the general range — still general guidance, never a diagnosis, with no third-party attribution.
+- **Proactive Coach check-ins you can actually see.** A proactive nudge now appears as a message in your Coach conversation (not only as a push), with a discreet unread dot on the Coach button that clears when you open it — so it works even without notifications set up.
+- **Responsible safety alerts.** A confirmed, re-measured reading in a clinically urgent range (very high or low blood pressure, low or high glucose) now raises an alert that says to re-check or contact your doctor — never a diagnosis, and only for the modules you use.
+- **A diabetes setting.** An explicit opt-in switches glucose targets to the tighter clinical goal range; it is never inferred from your readings.
+- **Per-module settings for preventive care, illness and labs.** Each gets its own settings page to reorder items and switch between card and list view; labs additionally lets you manage biomarkers and choose the sort order.
+- **Mark a reminder done.** A measurement reminder can be completed server-side (for the apps), instead of only being dismissed locally.
+- **Real offline reads.** Opened without a connection, the installed app shows your last synced dashboard and recent data with a "showing your last synced data" note, rather than blank placeholders. Changes you make offline still save when you reconnect.
 
 ### Changed
 
-- **A faster dashboard.** All dashboard charts now load from a single batched request instead of one fetch per chart, and target ranges are computed on the server — less work on your device and lighter load on the database.
-- **Mobile polish.** Small tap targets (reminder-time chips, the dose-history and token-copy buttons, sortable headers) were brought up to a comfortable touch size, and a global reduced-motion safeguard now quiets animation when your device asks for it.
+- **Preventive-care cards match the medication cards.** A clear "measure now" action, the interval as a chip, and progress toward the next due date — with measurement-appropriate wording (no more "intake" for a blood-pressure check) and the same calm, neutral card.
+- **One consistent "add" and a settings wrench** across preventive care, illness and labs; the illness journal's resolved entries are collapsed by default.
+- **Every Settings and Admin page now has a clear heading and description**, in one shared frame, with the side menu lined up to the content — so the whole area reads as one piece. The AI section is now labelled "AI provider", and module availability has its own admin page.
+- **No more AI dead-end.** When no AI provider is connected, onboarding and the Coach/Insights/Briefing screens explain what the feature does and how to set it up, instead of a bare error.
+- **Clearer sleep, recovery and insights.** The estimated sleep-stage timeline is shown only when it reflects measured stages (with an honest note otherwise); the chronotype reads as labelled text; the sleep-quality assessment is more useful; the recovery page is de-cluttered; and insight cards link through to their detail pages, including steps.
+- **A faster dashboard.** All charts load in one batched request instead of one per chart, with target ranges computed on the server.
+- **Fewer disclaimers, one clear acknowledgment.** The repeated "not medical advice" banners are gone in favour of a single acknowledgment at onboarding (reachable any time in Settings).
+- **Mobile polish.** Small tap targets were brought up to a comfortable size, and a global reduced-motion safeguard quiets animation when your device asks for it.
+
+### Fixed
+
+- **Reduced motion no longer hides content.** Charts and list rows that animate in now stay visible when the device requests reduced motion, instead of disappearing.
+- **Read-after-write.** A reading or medication you just added now reliably appears in its list.
+- **A timezone bug** that anchored the local day at UTC midnight for one intake path.
+- **Contrast.** The preventive-care action button now meets AA contrast in dark mode.
 
 ### Security
 
-- The container scan ignores a known `picomatch` advisory (CVE-2026-33671) that exists only in the npm CLI bundled inside the base image, not in the app's own dependencies (which are pinned to the fixed version) — clearing a false-positive in the non-blocking security scan.
+- **The offline cache is hardened.** It stores only a safe, read-only allowlist (never anything tied to sign-in or sensitive AI conversations), is bound to the signed-in account, and is wiped when the session ends — not only on explicit sign-out.
+- The container scan ignores a known `picomatch` advisory (CVE-2026-33671) that exists only in the npm CLI bundled inside the base image, not in the app's own dependencies (pinned to the fixed version).
 
 ### Operator note
 
-- UI/API-only; no migration. The service worker cache version bumps with the release, so clients refresh their offline cache automatically on update.
+- Additive migrations only (`0173`–`0177`: tour progress, diabetes opt-in, disclaimer acknowledgment, Coach last-seen, a Coach-message index). The optional `APNS_CRITICAL_ENTITLEMENT` env var (introduced in 1.18.4) gates native critical alerts; urgent alerts ship as time-sensitive without it. The service-worker cache version bumps with the release, so clients refresh their offline cache automatically on update.
 
 ## [1.18.5] — 2026-06-18 — filter by value, a tidier advanced panel, and a titration timeline for injectables
 

From 742faffdda6e9db3c329457055130f22ef17dc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 22:55:22 +0200
Subject: [PATCH 70/71] refactor(dashboard): drop the duplicate band-builder
 export

buildTargetBands was a same-file alias of buildDashboardBands, which the
dead-code gate flags as a duplicate export. Keep the historic name only as
a re-export alias from the snapshot module, so callers and the parity test
are unchanged while bands.ts exposes a single builder.
---
 src/lib/dashboard/bands.ts    | 9 +++------
 src/lib/dashboard/snapshot.ts | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/dashboard/bands.ts b/src/lib/dashboard/bands.ts
index 8f2d1aed0..d7d7ad397 100644
--- a/src/lib/dashboard/bands.ts
+++ b/src/lib/dashboard/bands.ts
@@ -135,9 +135,6 @@ export function buildDashboardBands(profile: {
   };
 }
 
-/**
- * Snapshot-era alias. The snapshot builder and its parity test still
- * import `buildTargetBands`; keep the name pointing at the canonical
- * builder so neither has to change.
- */
-export const buildTargetBands = buildDashboardBands;
+// The snapshot builder re-exports `buildDashboardBands` under the historic
+// `buildTargetBands` name (see dashboard/snapshot.ts) so callers and the
+// parity test keep working without a duplicate export living in this file.
diff --git a/src/lib/dashboard/snapshot.ts b/src/lib/dashboard/snapshot.ts
index 228c42814..4a6b809aa 100644
--- a/src/lib/dashboard/snapshot.ts
+++ b/src/lib/dashboard/snapshot.ts
@@ -78,7 +78,7 @@ import {
 } from "@/lib/dashboard/meds-today";
 import { computeUserHealthScoreFastPath } from "@/lib/analytics/health-score-fast-path";
 import {
-  buildTargetBands,
+  buildDashboardBands as buildTargetBands,
   type DashboardTargetBands,
 } from "@/lib/dashboard/bands";
 import type {

From 8b03fb450e383c74ec392b576e8fd9e2e76f2355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Bombeck?= <mbombeck@gmail.com>
Date: Thu, 18 Jun 2026 23:04:27 +0200
Subject: [PATCH 71/71] fix(deps): patch undici and nodemailer high-severity
 advisories

Bump undici 8.4.1 -> 8.5.0 (GHSA-vmh5-mc38-953g, TLS certificate
validation bypass in the SOCKS5 ProxyAgent) and nodemailer 9.0.0 -> 9.0.1
(GHSA-p6gq-j5cr-w38f), both direct dependencies. Clears the production
high-severity dependency audit; no API change.
---
 package.json   |  4 ++--
 pnpm-lock.yaml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 7d097d9ba..ca1f3164d 100644
--- a/package.json
+++ b/package.json
@@ -73,11 +73,11 @@
     "mmdb-lib": "^3.0.2",
     "next": "16.2.6",
     "next-themes": "^0.4.6",
+    "nodemailer": "^9.0.1",
     "p-limit": "^7.3.0",
     "pg-boss": "^12.18.2",
     "prisma": "^7.8.0",
     "qrcode": "^1.5.4",
-    "nodemailer": "^9.0.0",
     "radix-ui": "^1.4.3",
     "react": "19.2.7",
     "react-dom": "19.2.7",
@@ -87,7 +87,7 @@
     "sax": "^1.6.0",
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.6.0",
-    "undici": "^8.4.1",
+    "undici": "^8.5.0",
     "web-push": "^3.6.7",
     "yaml": "^2.8.4",
     "zod": "^4.4.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15afc4d70..a1db36f88 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -82,8 +82,8 @@ importers:
         specifier: ^0.4.6
         version: 0.4.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       nodemailer:
-        specifier: ^9.0.0
-        version: 9.0.0
+        specifier: ^9.0.1
+        version: 9.0.1
       p-limit:
         specifier: ^7.3.0
         version: 7.3.0
@@ -124,8 +124,8 @@ importers:
         specifier: ^3.6.0
         version: 3.6.0
       undici:
-        specifier: ^8.4.1
-        version: 8.4.1
+        specifier: ^8.5.0
+        version: 8.5.0
       web-push:
         specifier: ^3.6.7
         version: 3.6.7
@@ -5196,8 +5196,8 @@ packages:
     resolution: {integrity: sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==}
     engines: {node: '>=18'}
 
-  nodemailer@9.0.0:
-    resolution: {integrity: sha512-tbPTid7d/p9jAA8CRZ3iomvrMaST0o6NYuY7v6JQZHpPRZ61mLFSPKYd7342NtOFuej9/+L48SOIxwfu2uDvtw==}
+  nodemailer@9.0.1:
+    resolution: {integrity: sha512-Gwv8SQewT616ZM/URn0H54b8PWo/Wum7md3EW2aWy1lO27+WZCX+Xyak3J+NlmHUjDh5ME+uesJUDRbR3Ye8Bw==}
     engines: {node: '>=6.0.0'}
 
   non-error@0.1.0:
@@ -6345,8 +6345,8 @@ packages:
     resolution: {integrity: sha512-3O9Tf67pGhgOv9jM35AbhkXAKi13f3oy3aE4CSgr+TckGeY+/iu97ZXN+J7DpHPzLbVApFd1IFhcnBjREYXYcg==}
     engines: {node: '>=20.18.1'}
 
-  undici@8.4.1:
-    resolution: {integrity: sha512-RNHlB4fxZK0IrkhBsxhlbx7s8kFWwr7rzzOqj5nvZugw3ig3RsB7KW3zVlV0eu8POl+rx5d1hmL7rRg0z1owow==}
+  undici@8.5.0:
+    resolution: {integrity: sha512-xamtWoB1EshgjpmlXd7GGm2VfdDtw1+rD8uhry8pSNW3If6S8E0m2T2+orSKeZXEn/aPJMviCpDBA65WJt8zhg==}
     engines: {node: '>=22.19.0'}
 
   unicorn-magic@0.3.0:
@@ -11834,7 +11834,7 @@ snapshots:
 
   node-releases@2.0.46: {}
 
-  nodemailer@9.0.0: {}
+  nodemailer@9.0.1: {}
 
   non-error@0.1.0: {}
 
@@ -13233,7 +13233,7 @@ snapshots:
 
   undici@7.26.0: {}
 
-  undici@8.4.1: {}
+  undici@8.5.0: {}
 
   unicorn-magic@0.3.0: {}