+ // Match ModeHomeMain startOnPhone: top-align on phones, centre from sm up.
+ // A phone-centred skeleton jumped when content-rich homes mounted top-aligned.
+
);
diff --git a/src/components/services/services-home-page.tsx b/src/components/services/services-home-page.tsx
index d5d412c08..1f41d1ec2 100644
--- a/src/components/services/services-home-page.tsx
+++ b/src/components/services/services-home-page.tsx
@@ -122,9 +122,9 @@ export function ServicesHomePage({ defaultServiceSlug = null }: { defaultService
return (
= window.location) {
+ const params = new URLSearchParams(location.search);
+ params.delete("scopeRef");
+ const next = params.toString();
+ window.history.replaceState(null, "", `${location.pathname}${next ? `?${next}` : ""}`);
+}
diff --git a/src/lib/search-route-ownership.ts b/src/lib/search-route-ownership.ts
index 1c1ef4892..1f4796759 100644
--- a/src/lib/search-route-ownership.ts
+++ b/src/lib/search-route-ownership.ts
@@ -17,6 +17,33 @@ const routeOwnedSubmittedSearchModes = new Set([
"factsheets",
]);
+/**
+ * Exact pathnames that own an in-flow hero composer (no phone bottom dock).
+ * Derived from the URL alone so an optimistic mode-state update during
+ * navigation cannot flip the shell into dock reserve mid-transition.
+ */
+const standaloneModeHomePaths = new Set([
+ "/services",
+ "/forms",
+ "/favourites",
+ "/differentials",
+ "/dsm",
+ "/specifiers",
+ "/formulation",
+ "/factsheets",
+ "/therapy-compass",
+ "/tools",
+]);
+
+export function isStandaloneModeHomePath(pathname: string): boolean {
+ return standaloneModeHomePaths.has(pathname);
+}
+
+/** Dashboard-owned hrefs stay on `/` with `?mode=`; everything else leaves the dashboard shell. */
+export function isDashboardModeHref(href: string): boolean {
+ return href === "/" || href.startsWith("/?");
+}
+
export function shouldRenderDashboardSearch({
hasSubmittedSearch,
mode,
diff --git a/tests/document-detail-performance.test.ts b/tests/document-detail-performance.test.ts
index 265893fc7..c7e598d6b 100644
--- a/tests/document-detail-performance.test.ts
+++ b/tests/document-detail-performance.test.ts
@@ -18,7 +18,10 @@ describe("document detail loading contract", () => {
expect(page).toContain("loadAuthorizedDocumentDetail");
expect(page).toContain("initialDetail={initialDetail}");
expect(page).toContain("initialError={initialError}");
- expect(page).toContain('key={`${id}:${initialPage}:${query.chunk ?? ""}`}');
+ // Page/chunk updates stay inside DocumentViewer via URL sync — remounting
+ // on every page flip reloaded the PDF and felt like loading lag.
+ expect(page).toContain("key={id}");
+ expect(page).not.toContain('key={`${id}:${initialPage}:${query.chunk ?? ""}`}');
});
it("supports document and window asset scopes and starts independent detail reads together", () => {
diff --git a/tests/forms-client-boundary.test.ts b/tests/forms-client-boundary.test.ts
new file mode 100644
index 000000000..e46c776d8
--- /dev/null
+++ b/tests/forms-client-boundary.test.ts
@@ -0,0 +1,139 @@
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { dirname, join, relative, resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+
+// Mirror tests/services-client-boundary.test.ts: the forms catalog must not
+// enter any client module graph via a value import of @/lib/forms.
+const SRC_ROOT = join(process.cwd(), "src");
+const TARGET_SPECIFIER = "@/lib/forms";
+const SIDE_EFFECT_IMPORT_PATTERN = /^import\s+["']([^"']+)["']/gm;
+const DYNAMIC_IMPORT_PATTERN = /\bimport\s*\(\s*(?:\/\*[\s\S]*?\*\/\s*)*["']([^"']+)["'][\s\S]*?\)/g;
+const FROM_STATEMENT_PATTERN = /^(import|export)\s+([\s\S]+?)\s+from\s+["']([^"']+)["']/gm;
+
+function hasRuntimeBindings(kind: string, clause: string): boolean {
+ const trimmed = clause.trim();
+ if (/^type\b/.test(trimmed)) return false;
+ const named = trimmed.match(/^\{([\s\S]*)\}$/);
+ if (named) {
+ return named[1]
+ .split(",")
+ .map((specifier) => specifier.trim())
+ .filter(Boolean)
+ .some((specifier) => !/^type\b/.test(specifier));
+ }
+ return kind === "import" || kind === "export";
+}
+
+function collectSourceFiles(dir: string): string[] {
+ return readdirSync(dir).flatMap((entry) => {
+ const fullPath = join(dir, entry);
+ if (statSync(fullPath).isDirectory()) return collectSourceFiles(fullPath);
+ return /\.(?:ts|tsx)$/.test(entry) ? [fullPath] : [];
+ });
+}
+
+function resolveImport(specifier: string, fromFile: string): string | null {
+ let base: string;
+ if (specifier.startsWith("@/")) base = join(SRC_ROOT, specifier.slice(2));
+ else if (specifier.startsWith(".")) base = resolve(dirname(fromFile), specifier);
+ else return null;
+
+ for (const candidate of [base, `${base}.ts`, `${base}.tsx`, join(base, "index.ts"), join(base, "index.tsx")]) {
+ if (existsSync(candidate) && statSync(candidate).isFile()) return candidate;
+ }
+ return null;
+}
+
+const FORMS_MODULE_PATHS = new Set(
+ ["lib/forms.ts", "lib/forms.tsx", "lib/forms/index.ts", "lib/forms/index.tsx"].map((candidate) =>
+ join(SRC_ROOT, candidate),
+ ),
+);
+
+function isClientEntry(source: string): boolean {
+ const prologue = source.replace(/^(?:\s+|\/\/[^\n]*(?:\n|$)|\/\*[\s\S]*?\*\/)*/, "");
+ return /^["']use client["']/.test(prologue);
+}
+
+interface ModuleInfo {
+ importsForms: boolean;
+ isClientEntry: boolean;
+ valueImports: string[];
+}
+
+function buildModuleGraph(): Map {
+ const graph = new Map();
+
+ for (const filePath of collectSourceFiles(SRC_ROOT)) {
+ const source = readFileSync(filePath, "utf8");
+ const valueImports: string[] = [];
+ let importsForms = false;
+
+ const recordRuntimeSpecifier = (specifier: string) => {
+ const resolved = resolveImport(specifier, filePath);
+ if (
+ specifier === TARGET_SPECIFIER ||
+ specifier.startsWith(`${TARGET_SPECIFIER}/`) ||
+ (resolved !== null && FORMS_MODULE_PATHS.has(resolved))
+ ) {
+ importsForms = true;
+ }
+ if (resolved) valueImports.push(resolved);
+ };
+
+ for (const match of source.matchAll(SIDE_EFFECT_IMPORT_PATTERN)) recordRuntimeSpecifier(match[1]);
+ for (const match of source.matchAll(DYNAMIC_IMPORT_PATTERN)) recordRuntimeSpecifier(match[1]);
+ for (const match of source.matchAll(FROM_STATEMENT_PATTERN)) {
+ if (hasRuntimeBindings(match[1], match[2])) recordRuntimeSpecifier(match[3]);
+ }
+
+ graph.set(filePath, {
+ importsForms,
+ isClientEntry: isClientEntry(source),
+ valueImports,
+ });
+ }
+
+ return graph;
+}
+
+describe("forms catalog client boundary", () => {
+ it("keeps @/lib/forms value-imports out of every client module graph", () => {
+ const graph = buildModuleGraph();
+ const offenders: string[] = [];
+
+ for (const [entryPath, entry] of graph) {
+ if (!entry.isClientEntry) continue;
+
+ const cameFrom = new Map([[entryPath, ""]]);
+ const queue = [entryPath];
+ while (queue.length > 0) {
+ const currentPath = queue.shift() as string;
+ const current = graph.get(currentPath);
+ if (!current) continue;
+
+ if (current.importsForms) {
+ const chain: string[] = [];
+ for (let step: string | undefined = currentPath; step; step = cameFrom.get(step) || undefined) {
+ chain.unshift(relative(process.cwd(), step));
+ }
+ offenders.push(chain.join(" -> "));
+ break;
+ }
+ for (const next of current.valueImports) {
+ if (!cameFrom.has(next)) {
+ cameFrom.set(next, currentPath);
+ queue.push(next);
+ }
+ }
+ }
+ }
+
+ expect(
+ offenders,
+ "Client module graphs must not value-import @/lib/forms: it compiles the full forms " +
+ "catalog into their chunk. Compute what you need server-side and pass it as a prop " +
+ "(see src/app/(search-app)/forms/page.tsx), or use `import type` for types only.",
+ ).toEqual([]);
+ });
+});
diff --git a/tests/mode-home-loading-contract.test.ts b/tests/mode-home-loading-contract.test.ts
new file mode 100644
index 000000000..8e8f2eee7
--- /dev/null
+++ b/tests/mode-home-loading-contract.test.ts
@@ -0,0 +1,63 @@
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+
+const SEARCH_APP_ROOT = join(process.cwd(), "src/app/(search-app)");
+
+const MODE_HOME_LOADING_ROUTES = [
+ "services",
+ "forms",
+ "favourites",
+ "differentials",
+ "dsm",
+ "specifiers",
+ "formulation",
+ "therapy-compass",
+ "factsheets",
+ "tools",
+] as const;
+
+describe("mode-home loading contract", () => {
+ it("uses ModeHomeRouteLoading for every standalone mode home", () => {
+ for (const route of MODE_HOME_LOADING_ROUTES) {
+ const loadingPath = join(SEARCH_APP_ROOT, route, "loading.tsx");
+ expect(existsSync(loadingPath), `missing ${route}/loading.tsx`).toBe(true);
+ const source = readFileSync(loadingPath, "utf8");
+ expect(source).toContain("ModeHomeRouteLoading");
+ expect(source).not.toMatch(/Loading services|Loading medication|Loading library/);
+ }
+ });
+
+ it("does not blank standalone mode children behind ClientHydrationBoundary", () => {
+ const shellSource = readFileSync(
+ join(process.cwd(), "src/components/clinical-dashboard/global-search-shell.tsx"),
+ "utf8",
+ );
+ expect(shellSource).not.toMatch(/import\s*\{[^}]*ClientHydrationBoundary/);
+ expect(shellSource).not.toMatch(/{children}");
+ });
+
+ it("lazy-loads ClinicalDashboard so namespaced homes skip its module graph", () => {
+ const shellSource = readFileSync(
+ join(process.cwd(), "src/components/clinical-dashboard/global-search-shell.tsx"),
+ "utf8",
+ );
+ expect(shellSource).toMatch(/dynamic\(\s*\(\)\s*=>\s*import\("@\/components\/ClinicalDashboard"\)/);
+ expect(shellSource).not.toMatch(/^import \{ ClinicalDashboard \} from/m);
+ });
+
+ it("keeps mode-home route loading top-aligned on phones", () => {
+ const skeletonSource = readFileSync(join(process.cwd(), "src/components/mode-home-page-skeleton.tsx"), "utf8");
+ expect(skeletonSource).toContain("items-start");
+ expect(skeletonSource).toContain("sm:items-center");
+ });
+});
+
+// Keep the suite from being deleted as unused if the route inventory drifts.
+describe("search-app route inventory smoke", () => {
+ it("still has a (search-app) tree", () => {
+ expect(statSync(SEARCH_APP_ROOT).isDirectory()).toBe(true);
+ expect(readdirSync(SEARCH_APP_ROOT).length).toBeGreaterThan(5);
+ });
+});
diff --git a/tests/mode-home-main-align.test.ts b/tests/mode-home-main-align.test.ts
index 522c0cc32..7c9ba0f4d 100644
--- a/tests/mode-home-main-align.test.ts
+++ b/tests/mode-home-main-align.test.ts
@@ -70,14 +70,16 @@ describe("ModeHomeMain alignment contract", () => {
expect(source).not.toMatch(/ModeHomeMain[^>]*className="[^"]*justify-/);
}
- // Forms/services only top-align when the registry is seeded; short empty /
- // loading notices stay centred so the phone canvas does not look sparse.
+ // Forms/services top-align while loading or seeded so the registry ready
+ // flip does not jump center → start; confirmed empty/error stay centred.
for (const path of [
resolve(SRC_ROOT, "components/forms/forms-home-page.tsx"),
resolve(SRC_ROOT, "components/services/services-home-page.tsx"),
]) {
const source = readFileSync(path, "utf8");
- expect(source).toMatch(/contentAlign=\{hasRegistryRecords \? "startOnPhone" : "center"\}/);
+ expect(source).toMatch(
+ /contentAlign=\{registry\.status === "loading" \|\| hasRegistryRecords \? "startOnPhone" : "center"\}/,
+ );
expect(source).not.toMatch(/ModeHomeMain[^>]*className="[^"]*justify-/);
}
});
diff --git a/tests/search-route-ownership.test.ts b/tests/search-route-ownership.test.ts
index aab3f2147..eec3ce905 100644
--- a/tests/search-route-ownership.test.ts
+++ b/tests/search-route-ownership.test.ts
@@ -1,6 +1,13 @@
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
import { describe, expect, it } from "vitest";
-import { shouldRenderClinicalDashboard, shouldRenderDashboardSearch } from "@/lib/search-route-ownership";
+import {
+ isDashboardModeHref,
+ isStandaloneModeHomePath,
+ shouldRenderClinicalDashboard,
+ shouldRenderDashboardSearch,
+} from "@/lib/search-route-ownership";
describe("shared-search route ownership", () => {
it("keeps submitted searches in route-owned mode workflows", () => {
@@ -42,4 +49,84 @@ describe("shared-search route ownership", () => {
}),
).toBe(false);
});
+
+ it("classifies standalone mode homes from pathname alone", () => {
+ for (const pathname of [
+ "/services",
+ "/forms",
+ "/favourites",
+ "/differentials",
+ "/dsm",
+ "/specifiers",
+ "/formulation",
+ "/factsheets",
+ "/therapy-compass",
+ "/tools",
+ ]) {
+ expect(isStandaloneModeHomePath(pathname)).toBe(true);
+ }
+ expect(isStandaloneModeHomePath("/")).toBe(false);
+ expect(isStandaloneModeHomePath("/services/crisis")).toBe(false);
+ expect(isStandaloneModeHomePath("/dsm/search")).toBe(false);
+ });
+
+ it("classifies dashboard mode hrefs without parsing the destination page", () => {
+ expect(isDashboardModeHref("/")).toBe(true);
+ expect(isDashboardModeHref("/?mode=answer")).toBe(true);
+ expect(isDashboardModeHref("/?mode=documents&focus=1")).toBe(true);
+ expect(isDashboardModeHref("/services")).toBe(false);
+ expect(isDashboardModeHref("/differentials?q=mania&run=1")).toBe(false);
+ });
+
+ it("keeps shell mode-home detection pathname-gated (no searchMode∧pathname AND)", () => {
+ const shellSource = readFileSync(
+ resolve(process.cwd(), "src/components/clinical-dashboard/global-search-shell.tsx"),
+ "utf8",
+ );
+ expect(shellSource).toContain("isStandaloneModeHomePath(pathname)");
+ expect(shellSource).not.toMatch(/searchMode === "services" && pathname === "\/services"/);
+ // changeMode must not optimistic-set searchMode before navigation.
+ expect(shellSource).toMatch(/function changeMode\(mode: AppModeId\) \{[\s\S]*?navigateToMode\(mode\);\n \}/);
+ expect(shellSource).not.toMatch(
+ /function changeMode\(mode: AppModeId\) \{[\s\S]*?setSearchMode\(mode\);[\s\S]*?navigateToMode\(mode\);/,
+ );
+ });
+
+ it("resets shared phone scroll chrome when the pathname changes", () => {
+ const shellSource = readFileSync(
+ resolve(process.cwd(), "src/components/clinical-dashboard/global-search-shell.tsx"),
+ "utf8",
+ );
+ const hideSource = readFileSync(
+ resolve(process.cwd(), "src/components/clinical-dashboard/use-hide-on-scroll.ts"),
+ "utf8",
+ );
+ expect(hideSource).toContain("const reset = useCallback");
+ expect(hideSource).toMatch(/return \{ hidden: active && hidden, reportScroll, reset \}/);
+ expect(shellSource).toContain("resetPhoneScrollHideRef.current()");
+ expect(shellSource).toMatch(/main\.scrollTop = 0[\s\S]*\}, \[pathname\]\)/);
+ });
+
+ it("keeps the default composer until the hero portal host attaches", () => {
+ const headerSource = readFileSync(
+ resolve(process.cwd(), "src/components/clinical-dashboard/master-search-header.tsx"),
+ "utf8",
+ );
+ expect(headerSource).not.toContain("desktopHomeComposerFallback");
+ expect(headerSource).not.toContain("desktopHomeComposerSlotId && !desktopHomeComposerFallback");
+ expect(headerSource).toMatch(
+ /desktopHomeComposerActive && desktopHomeComposerHost\s*\?\s*null\s*:\s*renderSearchComposer\("default"\)/,
+ );
+ });
+
+ it("leaves the dashboard shell without eager chrome thrash", () => {
+ const dashboardSource = readFileSync(resolve(process.cwd(), "src/components/ClinicalDashboard.tsx"), "utf8");
+ expect(dashboardSource).toContain("isDashboardModeHref");
+ expect(dashboardSource).toMatch(
+ /function selectSearchMode\(mode: AppModeId\) \{[\s\S]*?if \(!isDashboardModeHref\(href\)\) \{[\s\S]*?router\.push\(href\);\n return;/,
+ );
+ expect(dashboardSource).toMatch(
+ /function crossModeSearch\(mode: AppModeId, crossQuery: string\) \{[\s\S]*?if \(!isDashboardModeHref\(href\)\) \{[\s\S]*?router\.push\(href\);\n return;/,
+ );
+ });
});
diff --git a/tests/therapy-compass-mode-wiring.test.ts b/tests/therapy-compass-mode-wiring.test.ts
index b16ecf8a9..9340788ab 100644
--- a/tests/therapy-compass-mode-wiring.test.ts
+++ b/tests/therapy-compass-mode-wiring.test.ts
@@ -132,6 +132,8 @@ describe("Therapy Compass production-mode wiring", () => {
"utf8",
);
expect(homeSrc).toContain("desktopComposerSlotId={modeHomeDesktopComposerSlotId}");
- expect(shellSrc).toContain('searchMode === "therapy-compass" && pathname === "/therapy-compass"');
+ // Mode homes are pathname-gated so optimistic searchMode cannot flip hero→dock mid-nav.
+ expect(shellSrc).toContain("isStandaloneModeHomePath(pathname)");
+ expect(shellSrc).toContain('"/therapy-compass"');
});
});
diff --git a/tests/ui-phone-scroll.spec.ts b/tests/ui-phone-scroll.spec.ts
index 495289765..c39377efa 100644
--- a/tests/ui-phone-scroll.spec.ts
+++ b/tests/ui-phone-scroll.spec.ts
@@ -22,7 +22,7 @@ import { expect, test, type Page } from "playwright/test";
// in-flow hero pill on phones (the composer sits in the hero and scrolls with the
// content — no bottom dock), while the sticky header still collapses on scroll;
// this sweep guards that the scroll geometry stays stable through that collapse.
-// (list mirrors global-search-shell.tsx isStandaloneModeHome).
+// (list mirrors isStandaloneModeHomePath in search-route-ownership.ts).
const modeHomeRoutes = [
"/formulation",
"/dsm",