@teamscala/service-boot 0.23.394 → 0.23.396

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.394",
+  "version": "0.23.396",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",
@@ -16,8 +16,10 @@
     "src"
   ],
   "dependencies": {
+    "@orpc/server": "*",
     "@teamscala/agreement-generation": "*",
     "@teamscala/api-resend": "*",
+    "@teamscala/assessment-block": "*",
     "@teamscala/auth": "*",
     "@teamscala/cache": "*",
     "@teamscala/channel": "*",
@@ -44,7 +46,6 @@
     "@teamscala/timing": "*",
     "@teamscala/tool-executor": "*",
     "@teamscala/watchdog": "*",
-    "@orpc/server": "*",
     "hono": "*",
     "pg-boss": "*",
     "tailwindcss": "*",

package/src/fn-routers/public-assessment-router.ts

@@ -29,6 +29,13 @@ import { resolveEmailSender } from "@teamscala/email/identity/resolve-email-send
 import { decryptSecretConfig } from "@teamscala/encryption/crypto/secret-config";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
 import { fetchOrgBrand } from "@teamscala/resolver-engine/data-resolvers/fetch-org-brand";
+import type { StageBand } from "@teamscala/assessment-block/report-data";
+import {
+	generateNarrative,
+	orderRoadmap,
+	readStageBands,
+	selectStageBand,
+} from "@teamscala/assessment-block/report-data";
 import { recordEvent } from "@teamscala/event-log/record-event";
 
 interface Context {
@@ -72,36 +79,14 @@ interface StoredQuestion {
 const SCALE_MAX = 4;
 
 /**
- * Bands are DATA, not code: each assessment that wants score-bands declares them
- * in a `config` registry row named `<assessment-slug>-bands` (shape:
- * `{bands: [{max, slug, label}, …]}`). An assessment with no such row is scored
- * but not banded — so the Authority Index bands without affecting other quizzes.
- * The band NARRATIVE is generated by the Strategist agent from its system prompt.
+ * A stage band names itself; the event tag needs a stable slug. Derived from
+ * the authored name rather than stored beside it, so the two cannot drift.
  */
-const bandsRowSchema = v.looseObject({
-	bands: v.array(
-		v.object({ max: v.number(), slug: v.string(), label: v.string() }),
-	),
-});
-
-async function getBands(
-	assessmentId: string | null | undefined,
-): Promise<Array<{ max: number; slug: string; label: string }> | null> {
-	if (!assessmentId) return null;
-	const row = await loadRegistryConfig(
-		"config",
-		`${assessmentId}-bands`,
-		bandsRowSchema,
-	).catch(() => null);
-	if (!row || !Array.isArray(row.bands) || row.bands.length === 0) return null;
-	return row.bands;
-}
-
-function bandForScore(
-	total: number,
-	bands: Array<{ max: number; slug: string; label: string }>,
-): { slug: string; label: string } {
-	return bands.find((b) => total <= b.max) ?? bands[bands.length - 1];
+function toBandSlug(name: string): string {
+	return name
+		.toLowerCase()
+		.replace(/[^a-z0-9]+/g, "-")
+		.replace(/^-+|-+$/g, "");
 }
 
 
@@ -116,6 +101,8 @@ async function sendAuthorityReportEmail(opts: {
 	firstName: string;
 	totalScore: number;
 	bandLabel: string;
+	stageBand: StageBand | null;
+	reportTitle: string;
 	categoryScores: Record<string, number>;
 	ctaUrl?: string;
 	organisationId?: string | null;
@@ -178,12 +165,65 @@ async function sendAuthorityReportEmail(opts: {
 	)
 		.map(([name, score]) => `${name}: ${score} / 100`)
 		.join("\n");
+	// REPORT SECTIONS. Authored per stage on assessments.stage_bands and rendered
+	// here as markup, so the template row stays copy + layout. Every section is
+	// optional: a stage that has not authored one yields an empty string and the
+	// row simply renders nothing for it.
+	const b = opts.stageBand;
+	const sectionHtml = (heading: string, inner: string) =>
+		inner
+			? `<h3 style="margin:24px 0 8px;font-size:15px;font-weight:700;color:${primary}">${heading}</h3>${inner}`
+			: "";
+	const paraHtml = (text?: string) =>
+		text ? `<p style="margin:0 0 12px;color:${muted}">${text}</p>` : "";
+	const bulletsHtml = (items?: string[]) =>
+		Array.isArray(items) && items.length > 0
+			? `<ul style="margin:0 0 12px;padding-left:20px;color:${muted}">${items
+					.map((i) => `<li style="margin:0 0 4px">${i}</li>`)
+					.join("")}</ul>`
+			: "";
+	const actionsHtml =
+		Array.isArray(b?.priorityActions) && b.priorityActions.length > 0
+			? b.priorityActions
+					.map(
+						(a) =>
+							`<p style="margin:0 0 10px"><strong style="color:${primary}">${a.title}</strong><br><span style="color:${muted}">${a.description ?? ""}</span></p>`,
+					)
+					.join("")
+			: "";
+	const roadmapHtml = orderRoadmap(b?.roadmap)
+		.map(
+			(phase) =>
+				`<p style="margin:0 0 10px"><strong style="color:${primary}">${phase.focus ?? ""}</strong><br><span style="color:${muted}">${(phase.actions ?? []).join(" · ")}</span></p>`,
+		)
+		.join("");
+	const notes = b?.pillarNotes ?? {};
+	const pillarNotesHtml = Object.keys(notes).length
+		? Object.entries(notes)
+				.map(
+					([k, v]) =>
+						`<p style="margin:0 0 8px;color:${muted}"><strong style="color:${primary};text-transform:capitalize">${k}</strong> — ${v}</p>`,
+				)
+				.join("")
+		: "";
+	const narrative = generateNarrative(opts.totalScore, b ?? null);
+
 	const tpl = applyTemplateVars(await lookupTemplate("authority-index-report"), {
 		firstName: opts.firstName || "there",
 		totalScore: String(opts.totalScore),
 		bandLabel: opts.bandLabel,
 		pillarRows,
 		pillarsText,
+		reportTitle: opts.reportTitle,
+		tagline: b?.tagline ?? "",
+		narrativeHtml: paraHtml(narrative),
+		pillarNotesHtml: sectionHtml("Where you stand", pillarNotesHtml),
+		priorityActionsHtml: sectionHtml("Your priority actions", actionsHtml),
+		roadmapHtml: sectionHtml("Your next 90 days", roadmapHtml),
+		strategicFocusHtml: sectionHtml("Strategic focus", paraHtml(b?.strategicFocus)),
+		opportunitiesHtml: sectionHtml("Opportunities", bulletsHtml(b?.opportunities)),
+		twelveMonthTargetHtml: sectionHtml("Twelve-month target", paraHtml(b?.twelveMonthTarget)),
+		narrativeText: narrative,
 		brandPrimaryColor: primary,
 		brandAccentColor: sender.brand.accentColor ?? primary,
 		brandLogoHtml: logoHtml,
@@ -338,6 +378,8 @@ export const publicAssessmentRouter = {
 					questions: true,
 					cta_url: true,
 					slug: true,
+					stage_bands: true,
+					report_title: true,
 				},
 			});
 			if (!assessment) return { error: "Assessment not found" } as const;
@@ -349,8 +391,16 @@ export const publicAssessmentRouter = {
 				questions,
 				input.answers,
 			);
-			const bands = await getBands(assessment.id);
-			const band = bands ? bandForScore(totalScore, bands) : null;
+			// ONE BAND SOURCE. The report page selects from assessments.stage_bands;
+			// the email used to select from a parallel `<id>-bands` config row whose
+			// thresholds disagreed (45 was Testing to the email and Experimenting to
+			// the report). Both now read the authored bands, so the band named in the
+			// email is by construction the band the report shows.
+			const stageBands = readStageBands(assessment);
+			const stageBand = selectStageBand(stageBands, totalScore);
+			const band = stageBand
+				? { label: stageBand.name, slug: toBandSlug(stageBand.name) }
+				: null;
 
 			// Find-or-create the contact in client_database (the single contact
 			// store) — same shape as publicGptSession's gate. OPTIONAL: only
@@ -461,6 +511,10 @@ export const publicAssessmentRouter = {
 					firstName,
 					totalScore,
 					bandLabel: band.label,
+					stageBand,
+					reportTitle:
+						(typeof assessment.report_title === "string" && assessment.report_title) ||
+						"Your report",
 					categoryScores,
 					ctaUrl,
 					organisationId: orgId,

package/src/register-page-routes.ts

@@ -44,6 +44,8 @@ export async function registerPageRoutes(
 	const authMode = (config as { auth?: string }).auth ?? "none";
 	const providers = ((config as { providers?: string[] }).providers ??
 		[]) as string[];
+	const portalScoped =
+		(config as { portal_scoped?: boolean }).portal_scoped === true;
 
 	const registryPatterns = await registerRegistryPageRoute({
 		app,
@@ -53,6 +55,7 @@ export async function registerPageRoutes(
 		authMode,
 		renderMode,
 		providers,
+		portalScoped,
 	});
 
 	return registryPatterns;

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

@@ -79,6 +79,12 @@ interface RegistryRouteArgs {
 	authMode: string;
 	renderMode: RenderModeLiteral;
 	providers: string[];
+	/** Declared service_install fact: this service's page URL space is
+	 * org-scoped portal-shaped (/<websiteId>/<orgId>/<path>). Gates the SSR
+	 * portal home redirect — NOT derivable from catchall presence: a flat-path
+	 * catchall service (scala-agents-ui) serves its real page at "/" and must
+	 * not be redirected to an org-scoped path that has no page there. */
+	portalScoped: boolean;
 }
 
 function extractUrlParams(
@@ -111,6 +117,7 @@ export async function registerRegistryPageRoute(
 		authMode,
 		renderMode,
 		providers: baseProviders,
+		portalScoped,
 	} = args;
 	const log = getAppLogger();
 
@@ -123,16 +130,6 @@ export async function registerRegistryPageRoute(
 	);
 	if (serviceRoutes.length === 0) return [];
 
-	// Only a service serving arbitrary portal paths (a `/*` catchall route —
-	// the portal) redirects signed-in users from `/` into
-	// /<website>/<org>/dashboard. Single-site portal-mode services (the
-	// fleet dashboard) serve their real page AT `/` — the unconditional
-	// redirect 404-looped them (2026-06-06; service-runtime@1.15.82 made
-	// the redirect opt-in via this flag).
-	const servesPortalCatchall = serviceRoutes.some(
-		(r) => r.config.pattern === "/*",
-	);
-
 	// Sort routes so more specific patterns register before wildcard/param routes.
 	// Hono matches by registration order, so `/*` (the portal catchall) registered
 	// before `/sign-in` would swallow the sign-in page and render it inside the
@@ -834,7 +831,11 @@ export async function registerRegistryPageRoute(
 			providers: routeProviders,
 			renderMode: routeRenderMode,
 			loadData: loadData as never,
-			portalHomeRedirect: servesPortalCatchall,
+			// The portal home redirect follows the DECLARED portal_scoped service
+		// fact (see RegistryRouteArgs.portalScoped) — a signed-in user at "/" of
+		// an org-scoped portal belongs at /<websiteId>/<orgId>/dashboard; a
+		// flat-path service (the fleet dashboard) serves its real page at "/".
+			portalHomeRedirect: portalScoped,
 			serviceSlug,
 		});