@teamscala/service-boot 0.23.352 → 0.23.355

package/package.json

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

package/src/agreement-gate.ts

@@ -37,10 +37,21 @@ import {
 	type CertificateData,
 } from "./fn-routers/public-agreement-router.ts";
 import { loadRegistryConfig } from "@teamscala/db/registry/load-config";
+import { getServerClient } from "./page-server-orpc/server-client.ts";
 import * as v from "valibot";
 
 const AG_COOKIE = "ag_token";
 
+async function findFirstAgreement<T>(input: {
+	where: Record<string, unknown>;
+	select: Record<string, boolean>;
+}): Promise<T | null> {
+	const client = getServerClient() as unknown as {
+		agreements: { findFirst: (args: typeof input) => Promise<T | null> };
+	};
+	return client.agreements.findFirst(input);
+}
+
 /**
  * Agreement gate display + behaviour, DB-driven (config/content-gate-agreement),
  * never hardcoded — mirrors proposal-gate's loadProposalGateSettings. requireOtp
@@ -112,9 +123,10 @@ const orgMemberCache = createCache<Map<string, string>>(
  * member of `organisationId`. Empty when the org is unknown or has no members.
  *
  * Resolved via a parameterized raw join over better_auth_member + "user" rather
- * than `getPrisma().member`: `member` is a shared @@map'd Prisma model, and each
+ * rather than a service-local Prisma `member` model: `member` is a shared
+ * @@map'd Prisma model, and each
  * service's per-service client is generated by live DB introspection from only
- * the tables its service_schema declares — so `getPrisma().member` is UNDEFINED
+ * the tables its service_schema declares — so that model is undefined
  * on a service (scala-sign, scala-proposals) that doesn't list better_auth_member.
  * A read-only raw query needs no model declaration and works on every client,
  * which is what makes org-member VIEW access actually resolve (the typed access
@@ -128,7 +140,6 @@ async function resolveOrgMemberDirectory(
 	if (cached !== undefined) return cached;
 	const directory = new Map<string, string>();
 	try {
-		const { getPrisma } = await import("@teamscala/db/prisma-registry");
 		const rows = await queryRows`
 			SELECT u.email AS email, u.name AS name
 			FROM better_auth_member m
@@ -245,8 +256,13 @@ async function buildSigningSession(
 	const log = getAppLogger();
 	const lower = verifiedEmail.trim().toLowerCase();
 	try {
-		const { getPrisma } = await import("@teamscala/db/prisma-registry");
-		const agreement = await getPrisma().agreements.findFirst({
+		const agreement = await findFirstAgreement<{
+			name: string | null;
+			signer_name: string | null;
+			signed_at: Date | string | null;
+			signature_data: unknown;
+			organisation_id: string | null;
+		}>({
 			where: { id: agreementUuid },
 			select: {
 				name: true,
@@ -638,8 +654,7 @@ export const agreementGateConfig: ContentGateConfig = {
 		}
 
 		try {
-			const { getPrisma } = await import("@teamscala/db/prisma-registry");
-			const agreement = await getPrisma().agreements.findFirst({
+			const agreement = await findFirstAgreement<{ id: string; name: string }>({
 				where: { page_id: pageId },
 				select: { id: true, name: true },
 			});
@@ -814,8 +829,10 @@ async function resolveAgreementSignerEmails(
 ): Promise<Set<string>> {
 	const emails = new Set<string>();
 	try {
-		const { getPrisma } = await import("@teamscala/db/prisma-registry");
-		const agreement = await getPrisma().agreements.findFirst({
+		const agreement = await findFirstAgreement<{
+			signer_email: string | null;
+			signature_data: unknown;
+		}>({
 			where: { id: agreementId },
 			select: { signer_email: true, signature_data: true },
 		});
@@ -849,8 +866,10 @@ async function resolveAgreementAuthorizedEmails(
 ): Promise<Set<string>> {
 	const emails = await resolveAgreementSignerEmails(agreementId);
 	try {
-		const { getPrisma } = await import("@teamscala/db/prisma-registry");
-		const agreement = await getPrisma().agreements.findFirst({
+		const agreement = await findFirstAgreement<{
+			organisation_id: string | null;
+			signature_data: unknown;
+		}>({
 			where: { id: agreementId },
 			select: { organisation_id: true, signature_data: true },
 		});

package/src/discover-blocks.test.ts

@@ -0,0 +1,20 @@
+import { expect, test } from "bun:test";
+import { registerPrismaClient } from "@teamscala/db/prisma-registry";
+import type { PrismaClient } from "@teamscala/db/client";
+import { discoverBlocks } from "./discover-blocks.ts";
+
+test("block discovery reads the global registry through the registered database client", async () => {
+	let calls = 0;
+	registerPrismaClient({
+		registry_entries: {
+			findMany: async () => {
+				calls += 1;
+				return [];
+			},
+		},
+	} as unknown as PrismaClient);
+
+	const result = await discoverBlocks([]);
+	expect(calls).toBe(1);
+	expect(result).toEqual({ components: {}, loaded: [], skipped: [] });
+});

package/src/discover-blocks.ts

@@ -22,8 +22,8 @@
 
 import { existsSync } from "node:fs";
 import { join } from "node:path";
+import { getPrisma } from "@teamscala/db/prisma-registry";
 import { BlockSchemaConfigSchema } from "@teamscala/db-validation/registry-schemas/block-schema";
-import { getServerClient } from "./page-server-orpc/server-client.ts";
 import * as v from "valibot";
 import type { RendererComponentEntry } from "./types.ts";
 
@@ -40,18 +40,6 @@ interface BlockSchemaConfig {
 	defaults?: Record<string, unknown>;
 }
 
-interface RegistryEntriesModel {
-	findMany: (args: {
-		where: Record<string, unknown>;
-		select: Record<string, unknown>;
-		orderBy: Record<string, unknown>;
-	}) => Promise<Array<{ slug: string; config: unknown }>>;
-}
-
-interface PrismaWithRegistry {
-	registry_entries: RegistryEntriesModel;
-}
-
 export async function discoverBlocks(
 	blockPackages: string[],
 ): Promise<DiscoveredBlocks> {
@@ -92,7 +80,11 @@ export async function discoverBlocks(
 	const loaded: string[] = [];
 	const skipped: string[] = [];
 
-	const prisma = (await getServerClient()) as unknown as PrismaWithRegistry;
+	// Block schemas are global registry data, not a model owned by this UI
+	// service. The page-server ORPC client is intentionally service-scoped and
+	// therefore cannot expose registry_entries. Use the registered database
+	// client for this shared model, as every other registry reader does.
+	const prisma = getPrisma();
 	const rows: Array<{ slug: string; config: unknown }> =
 		await prisma.registry_entries.findMany({
 			where: { type: "block_schema", is_active: true },

package/src/read-html-template.test.ts

@@ -3,7 +3,8 @@
  * @status handwritten
  * @edit edit directly
  *
- * Regression guard for the manifest-keyed HTML cache. The lifetime-pinned
+ * Regression guard for the runtime-owned Puck document and manifest-keyed
+ * HTML cache. The lifetime-pinned
  * cache served a deleted bundle hash after a post-boot rebuild (scala-docs
  * 2026-06-13): build-client-assets rewrites asset-manifest.json + deletes the
  * old hashed bundle, but the cached HTML kept the old hash → 404 → no
@@ -29,12 +30,7 @@ function writeManifest(hydrate: string, styles: string): void {
 beforeEach(() => {
 	origCwd = process.cwd();
 	dir = mkdtempSync(join(tmpdir(), "read-html-template-"));
-	mkdirSync(join(dir, "src"), { recursive: true });
 	mkdirSync(join(dir, "dist", "client"), { recursive: true });
-	writeFileSync(
-		join(dir, "src", "index.html"),
-		'<link href="{{stylesPath}}"><script src="{{hydratePath}}"></script>',
-	);
 	process.chdir(dir);
 });
 
@@ -44,6 +40,15 @@ afterEach(() => {
 });
 
 describe("readHtmlTemplate manifest-keyed cache", () => {
+	test("renders the shared Puck document without a per-service HTML file", async () => {
+		writeManifest("/assets/hydrate-aaa.js", "/assets/styles-aaa.css");
+		const html = await readHtmlTemplate();
+		expect(html).toContain('<div id="__page"><!--ssr-outlet--></div>');
+		expect(html).toContain("<!--head-outlet-->");
+		expect(html).toContain("<!--boot-data-->");
+		expect(await Bun.file(join(dir, "src", "index.html")).exists()).toBe(false);
+	});
+
 	test("substitutes the current manifest hashes", async () => {
 		writeManifest("/assets/hydrate-aaa.js", "/assets/styles-aaa.css");
 		const html = await readHtmlTemplate();

package/src/read-html-template.ts

@@ -3,11 +3,14 @@
  * @status handwritten
  * @edit edit directly
  *
- * Reads the per-service HTML template (codegen'd from
- * `@teamscala/scala-install/src/runtime/index.html`) and substitutes the
- * `{{stylesPath}}` / `{{hydratePath}}` placeholders with the current
+ * Builds the shared React/Puck document envelope and substitutes the current
  * content-hashed asset URLs from `dist/client/asset-manifest.json`.
  *
+ * The envelope is runtime-owned. UI services are Puck compositions and must
+ * not carry or generate a per-service `src/index.html`; requiring that file
+ * creates a second rendering surface that can disappear independently of the
+ * Hono + React/Puck runtime.
+ *
  * Build-time produces hashed filenames (e.g. `styles-abc123.css`); the
  * static-asset handler serves them with `cache-control: immutable`. New
  * deployments emit new hashes → new URLs → browsers refetch without ever
@@ -49,6 +52,24 @@ const FALLBACK: AssetManifest = {
 	hydratePath: "/assets/hydrate.js",
 };
 
+const PAGE_DOCUMENT = `<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover, interactive-widget=resizes-content" />
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+		<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=optional" />
+		<link rel="stylesheet" href="{{stylesPath}}" />
+		<!--head-outlet-->
+	</head>
+	<body>
+		<!--boot-data-->
+		<div id="__page"><!--ssr-outlet--></div>
+		<script type="module" src="{{hydratePath}}"></script>
+	</body>
+</html>`;
+
 let cached: { html: string; manifestMtime: number } | null = null;
 
 function manifestPath(): string {
@@ -79,10 +100,8 @@ async function loadManifest(): Promise<AssetManifest> {
 export async function readHtmlTemplate(): Promise<string> {
 	const mtime = await manifestMtimeMs();
 	if (cached && cached.manifestMtime === mtime) return cached.html;
-	const templatePath = join(process.cwd(), "src", "index.html");
-	const raw = await Bun.file(templatePath).text();
 	const manifest = await loadManifest();
-	let html = raw
+	let html = PAGE_DOCUMENT
 		.replace(/\{\{stylesPath\}\}/g, manifest.stylesPath)
 		.replace(/\{\{hydratePath\}\}/g, manifest.hydratePath);
 	// Tombstone stamp — surfaces a failed client build at the served layer.