@teamscala/service-boot 0.23.377 → 0.23.379

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.377",
+  "version": "0.23.379",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",

package/src/compose-page-title.test.ts

@@ -86,3 +86,65 @@ describe("composePageTitle", () => {
 		expect(composePageTitle({ websiteName: "" })).toBe("Untitled");
 	});
 });
+
+describe("composePageTitle with orgPrefix (feature flag page-title-org-prefix)", () => {
+	test("prefix is the owning org's name, never the internal website label", () => {
+		// The defect: client-facing document tabs read "Public Pages: <subject>".
+		expect(
+			composePageTitle(
+				{
+					websiteName: "Public Pages",
+					organisationName: "GBG Indo",
+					entityTitle: "Launcha Blueprint",
+				},
+				{ orgPrefix: true },
+			),
+		).toBe("GBG Indo: Launcha Blueprint");
+	});
+
+	test("org with no display name gets NO prefix — never the website name", () => {
+		expect(
+			composePageTitle(
+				{ websiteName: "Public Pages", organisationName: "", entityTitle: "Launcha Blueprint" },
+				{ orgPrefix: true },
+			),
+		).toBe("Launcha Blueprint");
+		expect(
+			composePageTitle({ websiteName: "Public Pages", entityTitle: "Launcha Blueprint" }, { orgPrefix: true }),
+		).toBe("Launcha Blueprint");
+	});
+
+	test("per-page override and curated template still win over the org prefix", () => {
+		expect(
+			composePageTitle(
+				{ pageMetaTitle: "Override", organisationName: "GBG Indo", pageName: "P" },
+				{ orgPrefix: true },
+			),
+		).toBe("Override");
+		expect(
+			composePageTitle(
+				{ templateTitle: "T", organisationName: "GBG Indo", pageName: "P" },
+				{ orgPrefix: true },
+			),
+		).toBe("T");
+	});
+
+	test("no subject renders the org name alone; nothing at all is 'Untitled'", () => {
+		expect(composePageTitle({ organisationName: "GBG Indo" }, { orgPrefix: true })).toBe(
+			"GBG Indo",
+		);
+		expect(composePageTitle({}, { orgPrefix: true })).toBe("Untitled");
+	});
+
+	test("flag off keeps the legacy website-name derivation", () => {
+		expect(
+			composePageTitle(
+				{ websiteName: "Public Pages", organisationName: "GBG Indo", pageName: "Dashboard" },
+				{ orgPrefix: false },
+			),
+		).toBe("Public Pages: Dashboard");
+		expect(
+			composePageTitle({ websiteName: "Public Pages", organisationName: "GBG Indo", pageName: "Dashboard" }),
+		).toBe("Public Pages: Dashboard");
+	});
+});

package/src/compose-page-title.ts

@@ -32,8 +32,13 @@ export interface TitleContext {
 	pageMetaTitle?: string | null;
 	/** Resolved resource-template string (forms/quiz/gpt). Curated per-surface shape. */
 	templateTitle?: string | null;
-	/** builda_websites.name — the surface, the primary site context. */
+	/** builda_websites.name — the surface, the legacy site context (orgPrefix off). */
 	websiteName?: string | null;
+	/** The OWNING ORG's display name (brand.companyName, resolved from the
+	 * org the page's brand_org_path names). The title prefix when orgPrefix is
+	 * on — operator ruling 2026-08-17: a client-facing document's tab carries
+	 * the org's name, never the internal website label ("Public Pages"). */
+	organisationName?: string | null;
 	/** builda_pages.name — the page (e.g. "Dashboard"). */
 	pageName?: string | null;
 	/** Resource entity title (proposal/form/quiz/agent name) — preferred subject. */
@@ -46,20 +51,35 @@ function trimToDefined(value: unknown): string | undefined {
 	return trimmed ? trimmed : undefined;
 }
 
-export function composePageTitle(ctx: TitleContext): string {
+export function composePageTitle(
+	ctx: TitleContext,
+	opts?: { orgPrefix?: boolean },
+): string {
 	// 1. Explicit per-page override wins outright — the operator's escape
-	// hatch for a custom SEO/social title. It is NEVER the default source.
+	//    hatch for a custom SEO/social title. It is NEVER the default source.
 	const override = trimToDefined(ctx.pageMetaTitle);
 	if (override) return override;
 
 	// 2. Curated resource template (forms/quiz/gpt). Already contextual
-	// (entity + org), so it beats the generic derivation for those surfaces.
+	//    (entity + org), so it beats the generic derivation for those surfaces.
 	const template = trimToDefined(ctx.templateTitle);
 	if (template) return template;
 
-	// 3. Default derivation: <website.name>: <subject>. Site-first so the
-	// stable surface precedes the varying page — how a tab is scanned.
+	// 3. Default derivation. Site-first so the stable surface precedes the
+	//    varying page — how a tab is scanned. With orgPrefix on (feature flag
+	//    page-title-org-prefix), the prefix is the OWNING ORG's name, never the
+	//    website label: an internal site name ("Public Pages") on a
+	//    client-facing document is the defect the flag exists to remove. An org
+	//    with no display name gets NO prefix — falling back to the website name
+	//    would reintroduce the defect the mode exists to fix.
 	const subject = trimToDefined(ctx.entityTitle) ?? trimToDefined(ctx.pageName);
+	if (opts?.orgPrefix) {
+		const orgName = trimToDefined(ctx.organisationName);
+		if (orgName && subject) return `${orgName}: ${subject}`;
+		if (orgName) return orgName;
+		if (subject) return subject;
+		return "Untitled";
+	}
 	const websiteName = trimToDefined(ctx.websiteName);
 	if (websiteName && subject) return `${websiteName}: ${subject}`;
 	if (websiteName) return websiteName;

package/src/register-registry-page-route/meta-title.ts

@@ -4,11 +4,16 @@
  * @edit edit directly
  *
  * Meta/title helpers for the route registrar: interpolate the route's
- * meta_context against the resolved graph, and resolve a curated
- * page_meta_template title. Extracted from register-registry-page-route.ts.
+ * meta_context against the resolved graph. Extracted from
+ * register-registry-page-route.ts.
+ *
+ * resolveTemplateTitle (the page_meta_template title reader) was DELETED
+ * 2026-08-17: it only ever applied when NO resource entity resolved, and on a
+ * resource page an entity ALWAYS resolves — the curated template was discarded
+ * by construction, dead on exactly the pages the type exists for (Valencia's
+ * finding). composePageTitle (+ the org-prefix flag) owns titles end to end.
  */
 import { interpolateMeta } from "../resolve-from-loader-config.ts";
-import { getEntriesByType } from "@teamscala/db/registry/accessors";
 
 export function buildMetaFromContext(
 	metaContext: Record<string, Record<string, string>> | undefined,
@@ -18,70 +23,44 @@ export function buildMetaFromContext(
 	return interpolateMeta(metaContext as Record<string, unknown>, resolved);
 }
 
-export function resolveTemplateTitle(
-	service: string,
-	resolved: Record<string, unknown>,
-): string | undefined {
-	const rows = getEntriesByType("page_meta_template") as Array<{
-		slug: string;
-		config: Record<string, unknown>;
-	}>;
-	const bySlug = new Map<string, Record<string, unknown>>();
-	for (const row of rows) {
-		bySlug.set(row.slug, row.config);
-	}
-	const merged = (bySlug.get("default") ?? null) as Record<string, unknown> | null;
-	const serviceTmpl = (bySlug.get(service) ?? null) as Record<string, unknown> | null;
-	const tmpl = serviceTmpl ?? merged;
-	if (!tmpl) return undefined;
-	const titleTemplate = tmpl.titleTemplate as string | undefined;
-	if (!titleTemplate) return undefined;
-	const brand = (resolved.brand as Record<string, unknown>) ?? {};
-	const website = (resolved.website as Record<string, unknown>) ?? {};
-	const page = (resolved.page as Record<string, unknown>) ?? {};
-	// The full placeholder set the curated resource templates use:
-	// {org.name}, {website.name}, {page.name}, {form.name}, {quiz.name},
-	// {proposal.name}, {agent.name}. Previously only {org.name} resolved, so
-	// every resource template ("{agent.name} — {org.name}", "{form.name} by
-	// {org.name}") shipped with a blank subject. Resolving the graph here is
-	// the executor half of composePageTitle (business-logic-is-rows-plus-
-	// executors): the template ROWS carry the shape, this carries the values.
-	const context: Record<string, unknown> = {
-		org: { name: (brand.companyName as string) || undefined },
-		website: { name: (website.name as string) || undefined },
-		page: { name: (page.name as string) || undefined },
-		form: { name: ((resolved.form as Record<string, unknown>)?.name as string) || undefined },
-		// An assessment has no `name` column — it carries `title`, and a report
-		// surface carries `report_title` ("Personalised Authority Blueprint")
-		// which is the document's own name and the right subject for its tab.
-		// Reading `.name` here resolved to "", so the template produced " by
-		// <org>", was discarded as empty, and EVERY quiz page silently fell back
-		// to the "<website>: <subject>" derivation — surfacing the internal site
-		// name ("Public Pages") on a client-facing document. The failure was
-		// invisible because the fallback is itself a plausible title.
-		quiz: {
-			name:
-				((resolved.quiz as Record<string, unknown>)?.report_title as string) ||
-				((resolved.quiz as Record<string, unknown>)?.title as string) ||
-				((resolved.quiz as Record<string, unknown>)?.name as string) ||
-				undefined,
-		},
-		proposal: {
-			name: ((resolved.proposal as Record<string, unknown>)?.name as string) || undefined,
-		},
-		agent: { name: ((resolved.agent as Record<string, unknown>)?.name as string) || undefined },
-	};
-	const result = titleTemplate.replace(/\{([^}]+)\}/g, (_m, path: string) => {
-		const keys = path.trim().split(".");
-		let cur: unknown = context;
-		for (const k of keys) {
-			if (cur && typeof cur === "object") {
-				cur = (cur as Record<string, unknown>)[k];
-			} else {
-				return "";
-			}
+/**
+ * THE ONE SUBJECT DERIVATION. What a page is ABOUT — the entity whose name the
+ * browser tab should carry.
+ *
+ * This existed as THREE hand-written `||` chains, one per render branch in
+ * resolve-page-data, and they had already diverged: two ordered form before
+ * proposal, the third ordered proposal first. So which resource named the page
+ * depended on which branch happened to render it, silently.
+ *
+ * The divergence is the cheap half of the cost. The expensive half is that a
+ * correction has to be applied three times to work, and applying it twice looks
+ * exactly like applying it correctly — measured 2026-08-17, when a fix to the
+ * quiz subject was shipped, installed and verified present in the bundle while
+ * the page kept its old title, because the branch that rendered it held the
+ * second copy.
+ *
+ * One chain, one precedence, one place to change. Adding a resource type is an
+ * edit here rather than a fourth branch in three files.
+ */
+export function resolveEntityTitle(resolved: Record<string, unknown>): string | undefined {
+	const pick = (key: string, ...fields: string[]): string | undefined => {
+		const row = resolved[key] as Record<string, unknown> | undefined;
+		if (!row) return undefined;
+		for (const field of fields) {
+			const value = row[field];
+			if (typeof value === "string" && value.trim()) return value.trim();
 		}
-		return cur === null || cur === undefined ? "" : String(cur);
-	});
-	return result || undefined;
+		return undefined;
+	};
+	return (
+		pick("form", "name") ||
+		pick("proposal", "name") ||
+		// A report surface carries its own document name in `report_title`
+		// ("Personalised Authority Blueprint"); `title` names the DIAGNOSTIC
+		// ("The Launcha Authority Index"), which is the wrong subject for the tab
+		// of a document sent to a client. The landing page has no report_title
+		// and correctly falls through to the quiz title.
+		pick("quiz", "report_title", "title") ||
+		pick("agent", "name")
+	);
 }

package/src/register-registry-page-route/resolve-entity-title.test.ts

@@ -0,0 +1,54 @@
+/**
+ * @system ui-service-boot
+ * @status handwritten
+ * @edit edit directly
+ *
+ * Locks the single subject derivation that replaced three divergent copies.
+ */
+
+import { describe, expect, test } from "bun:test";
+import { resolveEntityTitle } from "./meta-title.ts";
+
+describe("resolveEntityTitle", () => {
+	test("a report is named by its own document name, not the diagnostic", () => {
+		// The Launcha Blueprint: `title` names the QUIZ, `report_title` names the
+		// DOCUMENT the client receives. The tab must carry the document.
+		expect(
+			resolveEntityTitle({
+				quiz: {
+					title: "The Launcha Authority Index",
+					report_title: "Personalised Authority Blueprint",
+				},
+			}),
+		).toBe("Personalised Authority Blueprint");
+	});
+
+	test("a quiz with no report name falls through to its title", () => {
+		expect(resolveEntityTitle({ quiz: { title: "The Launcha Authority Index" } })).toBe(
+			"The Launcha Authority Index",
+		);
+	});
+
+	test("precedence is single and fixed across every caller", () => {
+		// The three former copies disagreed: two put form first, one put proposal
+		// first, so the subject depended on which render branch ran. One order now.
+		const all = {
+			form: { name: "Form" },
+			proposal: { name: "Proposal" },
+			quiz: { report_title: "Report" },
+			agent: { name: "Agent" },
+		};
+		expect(resolveEntityTitle(all)).toBe("Form");
+		expect(resolveEntityTitle({ ...all, form: undefined })).toBe("Proposal");
+		expect(resolveEntityTitle({ ...all, form: undefined, proposal: undefined })).toBe("Report");
+	});
+
+	test("blank and whitespace-only names do not win", () => {
+		expect(resolveEntityTitle({ form: { name: "   " }, agent: { name: "Agent" } })).toBe("Agent");
+	});
+
+	test("undefined when nothing names the page", () => {
+		expect(resolveEntityTitle({})).toBeUndefined();
+		expect(resolveEntityTitle({ quiz: {} })).toBeUndefined();
+	});
+});

package/src/register-registry-page-route/resolve-page-data.ts

@@ -10,6 +10,7 @@
  */
 import { resolveThemeMode } from "../resolve-theme-mode.ts";
 import { composePageTitle } from "../compose-page-title.ts";
+import { resolveEntityTitle } from "./meta-title.ts";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 
 /**
@@ -90,6 +91,9 @@ export function resolvedToPageData(
 	// a page framed inside another shell (e.g. a form in a GPT tool panel)
 	// matches the host's light/dark scheme so an embedded page doesn't flash.
 	themeOverride?: "light" | "dark",
+	// feature flag page-title-org-prefix (read live by the caller): title
+	// prefixes carry the OWNING ORG's name instead of the website label.
+	orgPrefix?: boolean,
 ): Record<string, unknown> {
 	const brand = (resolved.brand as Record<string, unknown>) ?? {};
 	const primaryColor = (brand.primaryColor as string) ?? "";
@@ -124,11 +128,7 @@ export function resolvedToPageData(
 		// name in <title>/OG, not the generic "Portal". Falls back to the website
 		// name, then "Portal". Without this, the region-slots branch returned
 		// early with a hardcoded "Portal" title (gpt-test: SSR/DOM/OG title FAIL).
-		const entityTitle =
-			(resolved.form as { name?: string })?.name ||
-			(resolved.quiz as { title?: string })?.title ||
-			(resolved.proposal as { name?: string })?.name ||
-			(resolved.agent as { name?: string })?.name;
+		const entityTitle = resolveEntityTitle(resolved);
 
 		const regions: RegionEntry[] = [];
 		for (const slot of regionSlots) {
@@ -161,11 +161,15 @@ export function resolvedToPageData(
 					favicon: (brand.favicon as string) ?? null,
 				},
 				meta: {
-					title: composePageTitle({
-						templateTitle: (meta.title as string) || undefined,
-						websiteName: (website.name as string) || undefined,
-						entityTitle: entityTitle || undefined,
-					}),
+					title: composePageTitle(
+						{
+							templateTitle: (meta.title as string) || undefined,
+							websiteName: (website.name as string) || undefined,
+							organisationName: (brand.companyName as string) || undefined,
+							entityTitle: entityTitle || undefined,
+						},
+						{ orgPrefix },
+					),
 				},
 			};
 		}
@@ -229,12 +233,16 @@ export function resolvedToPageData(
 			},
 			theme,
 			meta: {
-				title: composePageTitle({
+				title: composePageTitle(
+				{
 					templateTitle: (meta.title as string) || undefined,
 					websiteName: (website.name as string) || undefined,
-					pageName: contentPageName,
-					entityTitle: entityTitle || undefined,
-				}),
+					organisationName: (brand.companyName as string) || undefined,
+						pageName: contentPageName,
+						entityTitle: entityTitle || undefined,
+					},
+					{ orgPrefix },
+				),
 			},
 		};
 	}
@@ -306,11 +314,7 @@ export function resolvedToPageData(
 		const overrideBody = pickRootProp<string>(regions, "bodyFont");
 
 		const pageName = (page.name as string) || null;
-		const entityTitle =
-			(resolved.proposal as { name?: string })?.name ||
-			(resolved.form as { name?: string })?.name ||
-			(resolved.quiz as { title?: string })?.title ||
-			(resolved.agent as { name?: string })?.name;
+		const entityTitle = resolveEntityTitle(resolved);
 		const bodyMetaTitle = regions.find((r) => r.slot === "body")?.metaTitle;
 		const pageRootTitle = pickRootProp<string>(regions, "title");
 		const pageDescription =
@@ -366,13 +370,17 @@ export function resolvedToPageData(
 			},
 			theme,
 			meta: {
-				title: composePageTitle({
-					pageMetaTitle: bodyMetaTitle,
-					templateTitle: (meta.title as string) || undefined,
-					websiteName: (website.name as string) || undefined,
-					pageName: pageName ?? pageRootTitle,
-					entityTitle: entityTitle || undefined,
-				}),
+			title: composePageTitle(
+				{
+						pageMetaTitle: bodyMetaTitle,
+						templateTitle: (meta.title as string) || undefined,
+						websiteName: (website.name as string) || undefined,
+						organisationName: (brand.companyName as string) || undefined,
+						pageName: pageName ?? pageRootTitle,
+						entityTitle: entityTitle || undefined,
+					},
+					{ orgPrefix },
+				),
 				...(pageDescription ? { description: pageDescription } : {}),
 			},
 		};
@@ -438,17 +446,7 @@ export function resolvedToPageData(
 	const screenMode = pageRoot?.screenMode as string | undefined;
 
 	const pageName = (page?.name as string) || null;
-	const entityTitle =
-		(resolved.form as { name?: string })?.name ||
-		// A report surface carries its own document name in `report_title`
-		// ("Personalised Authority Blueprint"); the quiz `title` names the
-		// DIAGNOSTIC ("The Launcha Authority Index"), which is the wrong subject
-		// for the tab of a document sent to a client. Prefer the document's name
-		// and fall back to the quiz title for the landing page, which has none.
-		(resolved.quiz as { report_title?: string })?.report_title ||
-		(resolved.quiz as { title?: string })?.title ||
-		(resolved.proposal as { name?: string })?.name ||
-		(resolved.agent as { name?: string })?.name;
+	const entityTitle = resolveEntityTitle(resolved);
 	const entityDescription =
 		((resolved.form as Record<string, unknown>)?.description as string) ||
 		((resolved.quiz as Record<string, unknown>)?.description as string) ||
@@ -479,13 +477,17 @@ export function resolvedToPageData(
 		...(pageDescription ? { description: pageDescription } : {}),
 		...meta,
 	};
-	mergedMeta.title = composePageTitle({
-		pageMetaTitle,
-		templateTitle: (meta.title as string) || undefined,
-		websiteName: (website.name as string) || undefined,
-		pageName: pageName ?? ((pageRoot?.title as string) || undefined),
-		entityTitle: entityTitle || undefined,
-	});
+	mergedMeta.title = composePageTitle(
+		{
+			pageMetaTitle,
+			templateTitle: (meta.title as string) || undefined,
+			websiteName: (website.name as string) || undefined,
+			organisationName: (brand.companyName as string) || undefined,
+			pageName: pageName ?? ((pageRoot?.title as string) || undefined),
+			entityTitle: entityTitle || undefined,
+		},
+		{ orgPrefix },
+	);
 
 	return {
 		puckData,

package/src/register-registry-page-route.ts

@@ -15,6 +15,7 @@
 import type { RenderModeLiteral } from "./page-route-shell-types.ts";
 import { PageRouteConfigSchema } from "@teamscala/db-validation/registry-schemas/page-route";
 import { ResourceLoaderConfigSchema } from "@teamscala/db-validation/registry-schemas/resource-loader";
+import { FeatureFlagConfigSchema } from "@teamscala/db-validation/registry-schemas/feature-flag";
 import {
 	loadRegistryConfig,
 	loadRegistryConfigsByType,
@@ -43,7 +44,6 @@ import {
 import { resolvedToPageData } from "./register-registry-page-route/resolve-page-data.ts";
 import {
 	buildMetaFromContext,
-	resolveTemplateTitle,
 } from "./register-registry-page-route/meta-title.ts";
 import { prefetchAiChatSession } from "./register-registry-page-route/ai-chat-prefetch.ts";
 import {
@@ -479,16 +479,24 @@ export async function registerRegistryPageRoute(
 		) {
 			meta.title = pageMetaTitle.trim();
 		}
-		const templateTitle = resolveTemplateTitle(serviceSlug, resolved);
-		if (templateTitle && !meta.title) {
-			const resolvedEntity =
-				(resolved.agent as { name?: string } | undefined)?.name ||
-				(resolved.proposal as { name?: string } | undefined)?.name ||
-				(resolved.form as { name?: string } | undefined)?.name ||
-				(resolved.quiz as { title?: string } | undefined)?.title;
-			if (!resolvedEntity) {
-				meta.title = templateTitle;
-			}
+		// Org-prefixed page titles (feature flag page-title-org-prefix, read
+		// LIVE per request — feature flags are never cached). The title prefix
+		// is the OWNING ORG's name, never the internal website label
+		// ("Public Pages: <subject>" on a client-facing document was the
+		// defect; operator ruling 2026-08-17). Absent or unreadable flag ⇒
+		// legacy <website.name>: <subject> derivation — the switch fails toward
+		// the pre-flag behaviour, and flipping it back is one registry edit.
+		let orgTitlePrefix = false;
+		try {
+			orgTitlePrefix = (
+				await loadRegistryConfig(
+					"feature_flag",
+					"page-title-org-prefix",
+					FeatureFlagConfigSchema,
+				)
+			).enabled;
+		} catch {
+			// Flag row absent — legacy derivation.
 		}
 			const regionSlots = (
 				loaderConfig as v.InferOutput<typeof ResourceLoaderConfigSchema> & {
@@ -515,6 +523,7 @@ export async function registerRegistryPageRoute(
 				routeProviders !== baseProviders ? routeProviders : undefined,
 				regionSlots,
 				themeOverride,
+				orgTitlePrefix,
 			);
 			const panelSlug = new URL(request.url).searchParams.get("panel");
 			if (panelSlug) {