@canmi/seam-server 0.5.27 → 0.5.36

package/dist/index.js

@@ -1,25 +1,19 @@
-import { validate } from "jtd";
 import { existsSync, readFileSync, watch } from "node:fs";
 import { extname, join } from "node:path";
+import { validate } from "jtd";
 import { escapeHtml, renderPage } from "@canmi/seam-engine";
 import { readFile } from "node:fs/promises";
-
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (!no_symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-
 //#endregion
 //#region src/types/schema.ts
 function createSchemaNode(schema) {
@@ -31,7 +25,6 @@ function createOptionalSchemaNode(schema) {
 		_optional: true
 	};
 }
-
 //#endregion
 //#region src/types/primitives.ts
 var primitives_exports = /* @__PURE__ */ __exportAll({
@@ -87,7 +80,6 @@ function html() {
 		metadata: { format: "html" }
 	});
 }
-
 //#endregion
 //#region src/types/composites.ts
 function object(fields) {
@@ -126,7 +118,6 @@ function discriminator(tag, mapping) {
 		mapping: jtdMapping
 	});
 }
-
 //#endregion
 //#region src/types/index.ts
 const t = {
@@ -139,7 +130,6 @@ const t = {
 	values,
 	discriminator
 };
-
 //#endregion
 //#region src/validation/index.ts
 function validateInput(schema, data) {
@@ -178,7 +168,6 @@ function formatValidationDetails(errors, schema, data) {
 		return detail;
 	});
 }
-
 //#endregion
 //#region src/errors.ts
 const DEFAULT_STATUS = {
@@ -213,7 +202,6 @@ var SeamError = class extends Error {
 		};
 	}
 };
-
 //#endregion
 //#region src/context.ts
 /** Parse extract rule into source type and key, e.g. "header:authorization" -> { source: "header", key: "authorization" } */
@@ -302,7 +290,6 @@ const extract = {
 	cookie: (name) => `cookie:${name}`,
 	query: (name) => `query:${name}`
 };
-
 //#endregion
 //#region src/manifest/index.ts
 function normalizeInvalidates(targets) {
@@ -347,7 +334,6 @@ function buildManifest(definitions, channels, contextConfig, transportDefaults)
 	if (channels && Object.keys(channels).length > 0) manifest.channels = channels;
 	return manifest;
 }
-
 //#endregion
 //#region src/page/route-matcher.ts
 function compileRoute(pattern) {
@@ -397,6 +383,12 @@ var RouteMatcher = class {
 			value
 		});
 	}
+	clear() {
+		this.routes = [];
+	}
+	get size() {
+		return this.routes.length;
+	}
 	match(path) {
 		const parts = path.split("/").filter(Boolean);
 		for (const route of this.routes) {
@@ -410,10 +402,9 @@ var RouteMatcher = class {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/router/handler.ts
-async function handleRequest(procedures, procedureName, rawBody, shouldValidateInput = true, validateOutput, ctx) {
+async function handleRequest(procedures, procedureName, rawBody, shouldValidateInput = true, validateOutput, ctx, state) {
 	const procedure = procedures.get(procedureName);
 	if (!procedure) return {
 		status: 404,
@@ -432,7 +423,8 @@ async function handleRequest(procedures, procedureName, rawBody, shouldValidateI
 	try {
 		const result = await procedure.handler({
 			input: rawBody,
-			ctx: ctx ?? {}
+			ctx: ctx ?? {},
+			state
 		});
 		if (validateOutput) {
 			const outValidation = validateInput(procedure.outputSchema, result);
@@ -459,10 +451,10 @@ async function handleRequest(procedures, procedureName, rawBody, shouldValidateI
 		};
 	}
 }
-async function handleBatchRequest(procedures, calls, shouldValidateInput = true, validateOutput, ctxResolver) {
+async function handleBatchRequest(procedures, calls, shouldValidateInput = true, validateOutput, ctxResolver, state) {
 	return { results: await Promise.all(calls.map(async (call) => {
 		const ctx = ctxResolver ? ctxResolver(call.procedure) : void 0;
-		const result = await handleRequest(procedures, call.procedure, call.input, shouldValidateInput, validateOutput, ctx);
+		const result = await handleRequest(procedures, call.procedure, call.input, shouldValidateInput, validateOutput, ctx, state);
 		if (result.status === 200) return {
 			ok: true,
 			data: result.body.data
@@ -473,7 +465,7 @@ async function handleBatchRequest(procedures, calls, shouldValidateInput = true,
 		};
 	})) };
 }
-async function* handleSubscription(subscriptions, name, rawInput, shouldValidateInput = true, validateOutput, ctx) {
+async function* handleSubscription(subscriptions, name, rawInput, shouldValidateInput = true, validateOutput, ctx, state, lastEventId) {
 	const sub = subscriptions.get(name);
 	if (!sub) throw new SeamError("NOT_FOUND", `Subscription '${name}' not found`);
 	if (shouldValidateInput) {
@@ -485,7 +477,9 @@ async function* handleSubscription(subscriptions, name, rawInput, shouldValidate
 	}
 	for await (const value of sub.handler({
 		input: rawInput,
-		ctx: ctx ?? {}
+		ctx: ctx ?? {},
+		state,
+		lastEventId
 	})) {
 		if (validateOutput) {
 			const outValidation = validateInput(sub.outputSchema, value);
@@ -494,7 +488,7 @@ async function* handleSubscription(subscriptions, name, rawInput, shouldValidate
 		yield value;
 	}
 }
-async function handleUploadRequest(uploads, procedureName, rawBody, file, shouldValidateInput = true, validateOutput, ctx) {
+async function handleUploadRequest(uploads, procedureName, rawBody, file, shouldValidateInput = true, validateOutput, ctx, state) {
 	const upload = uploads.get(procedureName);
 	if (!upload) return {
 		status: 404,
@@ -514,7 +508,8 @@ async function handleUploadRequest(uploads, procedureName, rawBody, file, should
 		const result = await upload.handler({
 			input: rawBody,
 			file,
-			ctx: ctx ?? {}
+			ctx: ctx ?? {},
+			state
 		});
 		if (validateOutput) {
 			const outValidation = validateInput(upload.outputSchema, result);
@@ -541,7 +536,7 @@ async function handleUploadRequest(uploads, procedureName, rawBody, file, should
 		};
 	}
 }
-async function* handleStream(streams, name, rawInput, shouldValidateInput = true, validateOutput, ctx) {
+async function* handleStream(streams, name, rawInput, shouldValidateInput = true, validateOutput, ctx, state) {
 	const stream = streams.get(name);
 	if (!stream) throw new SeamError("NOT_FOUND", `Stream '${name}' not found`);
 	if (shouldValidateInput) {
@@ -553,7 +548,8 @@ async function* handleStream(streams, name, rawInput, shouldValidateInput = true
 	}
 	for await (const value of stream.handler({
 		input: rawInput,
-		ctx: ctx ?? {}
+		ctx: ctx ?? {},
+		state
 	})) {
 		if (validateOutput) {
 			const outValidation = validateInput(stream.chunkOutputSchema, value);
@@ -562,7 +558,6 @@ async function* handleStream(streams, name, rawInput, shouldValidateInput = true
 		yield value;
 	}
 }
-
 //#endregion
 //#region src/router/categorize.ts
 function resolveKind(name, def) {
@@ -581,6 +576,7 @@ function categorizeProcedures(definitions, contextConfig) {
 	const uploadMap = /* @__PURE__ */ new Map();
 	const kindMap = /* @__PURE__ */ new Map();
 	for (const [name, def] of Object.entries(definitions)) {
+		if (name.startsWith("seam.")) throw new Error(`Procedure name "${name}" uses reserved "seam." namespace`);
 		const kind = resolveKind(name, def);
 		kindMap.set(name, kind);
 		const contextKeys = def.context ?? [];
@@ -620,13 +616,32 @@ function categorizeProcedures(definitions, contextConfig) {
 		kindMap
 	};
 }
-
+//#endregion
+//#region src/page/head.ts
+/**
+* Convert a HeadConfig with real values into escaped HTML.
+* Used at request-time by TS server backends.
+*/
+function headConfigToHtml(config) {
+	let html = "";
+	if (config.title !== void 0) html += `<title>${escapeHtml(config.title)}</title>`;
+	for (const meta of config.meta ?? []) {
+		html += "<meta";
+		for (const [k, v] of Object.entries(meta)) if (v !== void 0) html += ` ${k}="${escapeHtml(v)}"`;
+		html += ">";
+	}
+	for (const link of config.link ?? []) {
+		html += "<link";
+		for (const [k, v] of Object.entries(link)) if (v !== void 0) html += ` ${k}="${escapeHtml(v)}"`;
+		html += ">";
+	}
+	return html;
+}
 //#endregion
 //#region src/page/loader-error.ts
 function isLoaderError(value) {
 	return typeof value === "object" && value !== null && value.__error === true && typeof value.code === "string" && typeof value.message === "string";
 }
-
 //#endregion
 //#region src/page/projection.ts
 /** Set a nested field by dot-separated path, creating intermediate objects as needed. */
@@ -635,10 +650,13 @@ function setNestedField(target, path, value) {
 	let current = target;
 	for (let i = 0; i < parts.length - 1; i++) {
 		const key = parts[i];
+		if (key === "__proto__" || key === "prototype" || key === "constructor") return;
 		if (!(key in current) || typeof current[key] !== "object" || current[key] === null) current[key] = {};
 		current = current[key];
 	}
-	current[parts[parts.length - 1]] = value;
+	const lastPart = parts[parts.length - 1];
+	if (lastPart === "__proto__" || lastPart === "prototype" || lastPart === "constructor") return;
+	current[lastPart] = value;
 }
 /** Get a nested field by dot-separated path. */
 function getNestedField(source, path) {
@@ -692,13 +710,12 @@ function applyProjection(data, projections) {
 	}
 	return result;
 }
-
 //#endregion
 //#region src/page/handler.ts
 /** Execute loaders, returning keyed results and metadata.
 *  Each loader is wrapped in its own try-catch so a single failure
 *  does not abort sibling loaders — the page renders at 200 with partial data. */
-async function executeLoaders(loaders, params, procedures, searchParams, ctxResolver, shouldValidateInput) {
+async function executeLoaders(loaders, params, procedures, searchParams, ctxResolver, appState, shouldValidateInput) {
 	const entries = Object.entries(loaders);
 	const results = await Promise.all(entries.map(async ([key, loader]) => {
 		const { procedure, input } = loader(params, searchParams);
@@ -714,7 +731,8 @@ async function executeLoaders(loaders, params, procedures, searchParams, ctxReso
 				key,
 				result: await proc.handler({
 					input,
-					ctx
+					ctx,
+					state: appState
 				}),
 				procedure,
 				input
@@ -764,12 +782,28 @@ function lookupMessages(config, routePattern, locale) {
 	}
 	return config.messages[locale]?.[routeHash] ?? {};
 }
-async function handlePageRequest(page, params, procedures, i18nOpts, searchParams, ctxResolver, shouldValidateInput) {
+/** Build JSON payload for engine i18n injection */
+function buildI18nPayload(opts) {
+	const { config: i18nConfig, routePattern, locale } = opts;
+	const messages = lookupMessages(i18nConfig, routePattern, locale);
+	const routeHash = i18nConfig.routeHashes[routePattern];
+	const i18nData = {
+		locale,
+		default_locale: i18nConfig.default,
+		messages
+	};
+	if (i18nConfig.cache && routeHash) {
+		i18nData.hash = i18nConfig.contentHashes[routeHash]?.[locale];
+		i18nData.router = i18nConfig.contentHashes;
+	}
+	return JSON.stringify(i18nData);
+}
+async function handlePageRequest(page, params, procedures, i18nOpts, searchParams, ctxResolver, appState, shouldValidateInput) {
 	try {
 		const t0 = performance.now();
 		const layoutChain = page.layoutChain ?? [];
 		const locale = i18nOpts?.locale;
-		const loaderResults = await Promise.all([...layoutChain.map((layout) => executeLoaders(layout.loaders, params, procedures, searchParams, ctxResolver, shouldValidateInput)), executeLoaders(page.loaders, params, procedures, searchParams, ctxResolver, shouldValidateInput)]);
+		const loaderResults = await Promise.all([...layoutChain.map((layout) => executeLoaders(layout.loaders, params, procedures, searchParams, ctxResolver, appState, shouldValidateInput)), executeLoaders(page.loaders, params, procedures, searchParams, ctxResolver, appState, shouldValidateInput)]);
 		const t1 = performance.now();
 		const allData = {};
 		const allMeta = {};
@@ -783,32 +817,23 @@ async function handlePageRequest(page, params, procedures, i18nOpts, searchParam
 			const layout = layoutChain[i];
 			composedTemplate = selectTemplate(layout.template, layout.localeTemplates, locale).replace("<!--seam:outlet-->", composedTemplate);
 		}
+		let resolvedHeadMeta = page.headMeta;
+		if (page.headFn) try {
+			resolvedHeadMeta = headConfigToHtml(page.headFn(allData));
+		} catch (err) {
+			console.error("[seam] head function failed:", err);
+		}
 		const config = {
 			layout_chain: layoutChain.map((l) => ({
 				id: l.id,
 				loader_keys: Object.keys(l.loaders)
 			})),
 			data_id: page.dataId ?? "__data",
-			head_meta: page.headMeta,
+			head_meta: resolvedHeadMeta,
 			loader_metadata: allMeta
 		};
 		if (page.pageAssets) config.page_assets = page.pageAssets;
-		let i18nOptsJson;
-		if (i18nOpts) {
-			const { config: i18nConfig, routePattern } = i18nOpts;
-			const messages = lookupMessages(i18nConfig, routePattern, i18nOpts.locale);
-			const routeHash = i18nConfig.routeHashes[routePattern];
-			const i18nData = {
-				locale: i18nOpts.locale,
-				default_locale: i18nConfig.default,
-				messages
-			};
-			if (i18nConfig.cache && routeHash) {
-				i18nData.hash = i18nConfig.contentHashes[routeHash]?.[i18nOpts.locale];
-				i18nData.router = i18nConfig.contentHashes;
-			}
-			i18nOptsJson = JSON.stringify(i18nData);
-		}
+		const i18nOptsJson = i18nOpts ? buildI18nPayload(i18nOpts) : void 0;
 		const html = renderPage(composedTemplate, JSON.stringify(prunedData), JSON.stringify(config), i18nOptsJson);
 		const t2 = performance.now();
 		return {
@@ -822,11 +847,14 @@ async function handlePageRequest(page, params, procedures, i18nOpts, searchParam
 	} catch (error) {
 		return {
 			status: 500,
-			html: `<!DOCTYPE html><html><body><h1>500 Internal Server Error</h1><p>${escapeHtml(error instanceof Error ? error.message : "Unknown error")}</p></body></html>`
+			html: `<!DOCTYPE html><html><body><h1>500 Internal Server Error</h1><p>${escapeHtml(error instanceof Error ? error.message : "Unknown error")}</p></body></html>`,
+			timing: {
+				dataFetch: 0,
+				inject: 0
+			}
 		};
 	}
 }
-
 //#endregion
 //#region src/resolve.ts
 /** URL prefix strategy: trusts pathLocale if it is a known locale */
@@ -916,7 +944,6 @@ function defaultStrategies() {
 		fromAcceptLanguage()
 	];
 }
-
 //#endregion
 //#region src/router/helpers.ts
 /** Resolve a ValidationMode to a boolean flag */
@@ -934,14 +961,16 @@ function buildStrategies(opts) {
 		hasUrlPrefix: strategies.some((s) => s.kind === "url_prefix")
 	};
 }
-/** Register built-in __seam_i18n_query procedure (route-hash-based lookup) */
+/** Register built-in seam.i18n.query procedure (route-hash-based lookup) */
 function registerI18nQuery(procedureMap, config) {
-	procedureMap.set("__seam_i18n_query", {
+	const localeSet = new Set(config.locales);
+	procedureMap.set("seam.i18n.query", {
 		inputSchema: {},
 		outputSchema: {},
 		contextKeys: [],
 		handler: ({ input }) => {
-			const { route, locale } = input;
+			const { route, locale: rawLocale } = input;
+			const locale = localeSet.has(rawLocale) ? rawLocale : config.default;
 			const messages = lookupI18nMessages(config, route, locale);
 			return {
 				hash: config.contentHashes[route]?.[locale] ?? "",
@@ -975,7 +1004,7 @@ function resolveCtxFor(map, name, rawCtx, ctxConfig) {
 	return resolveContext(ctxConfig, rawCtx, proc.contextKeys);
 }
 /** Resolve locale and match page route */
-async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strategies, hasUrlPrefix, path, headers, rawCtx, ctxConfig, shouldValidateInput) {
+async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strategies, hasUrlPrefix, path, headers, rawCtx, ctxConfig, appState, shouldValidateInput) {
 	let pathLocale = null;
 	let routePath = path;
 	if (hasUrlPrefix && i18nConfig) {
@@ -998,6 +1027,15 @@ async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strateg
 	});
 	const match = pageMatcher.match(routePath);
 	if (!match) return null;
+	if (match.value.prerender && match.value.staticDir) {
+		const htmlPath = join(match.value.staticDir, routePath === "/" ? "" : routePath, "index.html");
+		try {
+			return {
+				status: 200,
+				html: readFileSync(htmlPath, "utf-8")
+			};
+		} catch {}
+	}
 	let searchParams;
 	if (headers?.url) try {
 		const url = new URL(headers.url, "http://localhost");
@@ -1012,7 +1050,7 @@ async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strateg
 		if (proc.contextKeys.length === 0) return {};
 		return resolveContext(ctxConfig ?? {}, rawCtx, proc.contextKeys);
 	} : void 0;
-	return handlePageRequest(match.value, match.params, procedureMap, i18nOpts, searchParams, ctxResolver, shouldValidateInput);
+	return handlePageRequest(match.value, match.params, procedureMap, i18nOpts, searchParams, ctxResolver, appState, shouldValidateInput);
 }
 /** Catch context resolution errors and return them as HandleResult */
 function resolveCtxSafe(map, name, rawCtx, ctxConfig) {
@@ -1026,7 +1064,6 @@ function resolveCtxSafe(map, name, rawCtx, ctxConfig) {
 		throw err;
 	}
 }
-
 //#endregion
 //#region src/router/state.ts
 /** Build all shared state that createRouter methods close over */
@@ -1056,7 +1093,10 @@ function initRouterState(procedures, opts) {
 		strategies,
 		hasUrlPrefix,
 		channelsMeta: collectChannelMeta(opts?.channels),
-		hasCtx: contextHasExtracts(ctxConfig)
+		hasCtx: contextHasExtracts(ctxConfig),
+		appState: opts?.state,
+		rpcHashMap: opts?.rpcHashMap,
+		publicDir: opts?.publicDir
 	};
 }
 /** Build request-response methods: handle, handleBatch, handleUpload */
@@ -1065,23 +1105,22 @@ function buildRpcMethods(state) {
 		async handle(procedureName, body, rawCtx) {
 			const { ctx, error } = resolveCtxSafe(state.procedureMap, procedureName, rawCtx, state.ctxConfig);
 			if (error) return error;
-			return handleRequest(state.procedureMap, procedureName, body, state.shouldValidateInput, state.shouldValidateOutput, ctx);
+			return handleRequest(state.procedureMap, procedureName, body, state.shouldValidateInput, state.shouldValidateOutput, ctx, state.appState);
 		},
 		handleBatch(calls, rawCtx) {
 			const ctxResolver = rawCtx ? (name) => resolveCtxFor(state.procedureMap, name, rawCtx, state.ctxConfig) ?? {} : void 0;
-			return handleBatchRequest(state.procedureMap, calls, state.shouldValidateInput, state.shouldValidateOutput, ctxResolver);
+			return handleBatchRequest(state.procedureMap, calls, state.shouldValidateInput, state.shouldValidateOutput, ctxResolver, state.appState);
 		},
 		async handleUpload(name, body, file, rawCtx) {
 			const { ctx, error } = resolveCtxSafe(state.uploadMap, name, rawCtx, state.ctxConfig);
 			if (error) return error;
-			return handleUploadRequest(state.uploadMap, name, body, file, state.shouldValidateInput, state.shouldValidateOutput, ctx);
+			return handleUploadRequest(state.uploadMap, name, body, file, state.shouldValidateInput, state.shouldValidateOutput, ctx, state.appState);
 		}
 	};
 }
 /** Build all Router method implementations from shared state */
 function buildRouterMethods(state, procedures, opts) {
 	return {
-		hasPages: !!state.pages && Object.keys(state.pages).length > 0,
 		ctxConfig: state.ctxConfig,
 		hasContext() {
 			return state.hasCtx;
@@ -1090,34 +1129,82 @@ function buildRouterMethods(state, procedures, opts) {
 			return buildManifest(procedures, state.channelsMeta, state.ctxConfig, opts?.transportDefaults);
 		},
 		...buildRpcMethods(state),
-		handleSubscription(name, input, rawCtx) {
+		handleSubscription(name, input, rawCtx, lastEventId) {
 			const ctx = resolveCtxFor(state.subscriptionMap, name, rawCtx, state.ctxConfig);
-			return handleSubscription(state.subscriptionMap, name, input, state.shouldValidateInput, state.shouldValidateOutput, ctx);
+			return handleSubscription(state.subscriptionMap, name, input, state.shouldValidateInput, state.shouldValidateOutput, ctx, state.appState, lastEventId);
 		},
 		handleStream(name, input, rawCtx) {
 			const ctx = resolveCtxFor(state.streamMap, name, rawCtx, state.ctxConfig);
-			return handleStream(state.streamMap, name, input, state.shouldValidateInput, state.shouldValidateOutput, ctx);
+			return handleStream(state.streamMap, name, input, state.shouldValidateInput, state.shouldValidateOutput, ctx, state.appState);
 		},
 		getKind(name) {
 			return state.kindMap.get(name) ?? null;
 		},
 		handlePage(path, headers, rawCtx) {
-			return matchAndHandlePage(state.pageMatcher, state.procedureMap, state.i18nConfig, state.strategies, state.hasUrlPrefix, path, headers, rawCtx, state.ctxConfig, state.shouldValidateInput);
+			return matchAndHandlePage(state.pageMatcher, state.procedureMap, state.i18nConfig, state.strategies, state.hasUrlPrefix, path, headers, rawCtx, state.ctxConfig, state.appState, state.shouldValidateInput);
+		},
+		reload(build) {
+			state.pageMatcher.clear();
+			for (const [pattern, page] of Object.entries(build.pages)) state.pageMatcher.add(pattern, page);
+			state.pages = build.pages;
+			state.i18nConfig = build.i18n ?? null;
+			if (state.i18nConfig) registerI18nQuery(state.procedureMap, state.i18nConfig);
+			state.rpcHashMap = build.rpcHashMap;
+			state.publicDir = build.publicDir;
+		},
+		handlePageData(path) {
+			const match = state.pageMatcher?.match(path);
+			if (!match) return Promise.resolve(null);
+			const page = match.value;
+			if (!page.prerender || !page.staticDir) return Promise.resolve(null);
+			const dataPath = join(page.staticDir, path === "/" ? "" : path, "__data.json");
+			try {
+				if (!existsSync(dataPath)) return Promise.resolve(null);
+				return Promise.resolve(JSON.parse(readFileSync(dataPath, "utf-8")));
+			} catch {
+				return Promise.resolve(null);
+			}
 		}
 	};
 }
-
 //#endregion
 //#region src/router/index.ts
+function isProcedureDef(value) {
+	return typeof value === "object" && value !== null && "input" in value && "handler" in value;
+}
+function flattenDefinitions(nested, prefix = "") {
+	const flat = {};
+	for (const [key, value] of Object.entries(nested)) {
+		const fullKey = prefix ? `${prefix}.${key}` : key;
+		if (isProcedureDef(value)) flat[fullKey] = value;
+		else Object.assign(flat, flattenDefinitions(value, fullKey));
+	}
+	return flat;
+}
 function createRouter(procedures, opts) {
-	const state = initRouterState(procedures, opts);
-	return {
-		procedures,
-		rpcHashMap: opts?.rpcHashMap,
-		...buildRouterMethods(state, procedures, opts)
+	const flat = flattenDefinitions(procedures);
+	const state = initRouterState(flat, opts);
+	const router = {
+		procedures: flat,
+		...buildRouterMethods(state, flat, opts)
 	};
+	Object.defineProperty(router, "hasPages", {
+		get: () => state.pageMatcher.size > 0,
+		enumerable: true,
+		configurable: true
+	});
+	Object.defineProperty(router, "rpcHashMap", {
+		get: () => state.rpcHashMap,
+		enumerable: true,
+		configurable: true
+	});
+	Object.defineProperty(router, "publicDir", {
+		get: () => state.publicDir,
+		enumerable: true,
+		configurable: true
+	});
+	return router;
 }
-
 //#endregion
 //#region src/factory.ts
 function query(def) {
@@ -1150,11 +1237,10 @@ function upload(def) {
 		kind: "upload"
 	};
 }
-
 //#endregion
 //#region src/seam-router.ts
 function createSeamRouter(config) {
-	const { context, ...restConfig } = config;
+	const { context, state, ...restConfig } = config;
 	const define = {
 		query(def) {
 			return {
@@ -1191,6 +1277,7 @@ function createSeamRouter(config) {
 		return createRouter(procedures, {
 			...restConfig,
 			context,
+			state,
 			...extraOpts
 		});
 	}
@@ -1199,7 +1286,6 @@ function createSeamRouter(config) {
 		define
 	};
 }
-
 //#endregion
 //#region src/channel.ts
 /** Merge channel-level and message-level JTD properties schemas */
@@ -1274,7 +1360,6 @@ function createChannel(name, def) {
 		channelMeta
 	};
 }
-
 //#endregion
 //#region src/page/index.ts
 function definePage(config) {
@@ -1283,103 +1368,383 @@ function definePage(config) {
 		layoutChain: config.layoutChain ?? []
 	};
 }
-
-//#endregion
-//#region src/mime.ts
-const MIME_TYPES = {
-	".js": "application/javascript",
-	".mjs": "application/javascript",
-	".css": "text/css",
-	".html": "text/html",
-	".json": "application/json",
-	".svg": "image/svg+xml",
-	".png": "image/png",
-	".jpg": "image/jpeg",
-	".jpeg": "image/jpeg",
-	".gif": "image/gif",
-	".woff": "font/woff",
-	".woff2": "font/woff2",
-	".ttf": "font/ttf",
-	".ico": "image/x-icon",
-	".map": "application/json",
-	".ts": "application/javascript",
-	".tsx": "application/javascript"
-};
-
 //#endregion
-//#region src/http.ts
-const PROCEDURE_PREFIX = "/_seam/procedure/";
-const PAGE_PREFIX = "/_seam/page/";
-const STATIC_PREFIX = "/_seam/static/";
-const MANIFEST_PATH = "/_seam/manifest.json";
-const JSON_HEADER = { "Content-Type": "application/json" };
-const HTML_HEADER = { "Content-Type": "text/html; charset=utf-8" };
-const SSE_HEADER = {
-	"Content-Type": "text/event-stream",
-	"Cache-Control": "no-cache",
-	Connection: "keep-alive"
+//#region src/dev/reload-watcher.ts
+const nodeReloadWatcherBackend = {
+	watchFile(path, onChange, onError) {
+		const watcher = watch(path, () => onChange());
+		watcher.on("error", onError);
+		return watcher;
+	},
+	fileExists(path) {
+		return existsSync(path);
+	},
+	setPoll(callback, intervalMs) {
+		const timer = setInterval(callback, intervalMs);
+		return { close() {
+			clearInterval(timer);
+		} };
+	}
 };
-const IMMUTABLE_CACHE = "public, max-age=31536000, immutable";
-function jsonResponse(status, body) {
+function isMissingFileError(error) {
+	return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+function createReloadWatcher(distDir, onReload, backend) {
+	const triggerPath = join(distDir, ".reload-trigger");
+	let watcher = null;
+	let poller = null;
+	let closed = false;
+	let pending = [];
+	const notify = () => {
+		onReload();
+		const batch = pending;
+		pending = [];
+		for (const p of batch) p.resolve();
+	};
+	const nextReload = () => {
+		if (closed) return Promise.reject(/* @__PURE__ */ new Error("watcher closed"));
+		return new Promise((resolve, reject) => {
+			pending.push({
+				resolve,
+				reject
+			});
+		});
+	};
+	const closeAll = () => {
+		closed = true;
+		const batch = pending;
+		pending = [];
+		const err = /* @__PURE__ */ new Error("watcher closed");
+		for (const p of batch) p.reject(err);
+	};
+	const stopWatcher = () => {
+		watcher?.close();
+		watcher = null;
+	};
+	const stopPoller = () => {
+		poller?.close();
+		poller = null;
+	};
+	const startPolling = () => {
+		if (closed || poller) return;
+		poller = backend.setPoll(() => {
+			if (!backend.fileExists(triggerPath)) return;
+			stopPoller();
+			notify();
+			startWatchingFile();
+		}, 50);
+	};
+	const startWatchingFile = () => {
+		if (closed) return;
+		try {
+			watcher = backend.watchFile(triggerPath, () => notify(), (error) => {
+				stopWatcher();
+				if (!closed && isMissingFileError(error)) startPolling();
+			});
+		} catch (error) {
+			stopWatcher();
+			if (isMissingFileError(error)) {
+				startPolling();
+				return;
+			}
+			throw error;
+		}
+	};
+	startWatchingFile();
 	return {
-		status,
-		headers: JSON_HEADER,
-		body
+		close() {
+			stopWatcher();
+			stopPoller();
+			closeAll();
+		},
+		nextReload
 	};
 }
-function errorResponse(status, code, message) {
-	return jsonResponse(status, new SeamError(code, message).toJSON());
+function watchReloadTrigger(distDir, onReload) {
+	return createReloadWatcher(distDir, onReload, nodeReloadWatcherBackend);
 }
-async function handleStaticAsset(assetPath, staticDir) {
-	if (assetPath.includes("..")) return errorResponse(403, "VALIDATION_ERROR", "Forbidden");
-	const filePath = join(staticDir, assetPath);
-	try {
-		const content = await readFile(filePath, "utf-8");
-		const contentType = MIME_TYPES[extname(filePath)] || "application/octet-stream";
+//#endregion
+//#region src/page/build-loader.ts
+function normalizeParamConfig(value) {
+	return typeof value === "string" ? { from: value } : value;
+}
+function buildLoaderFn(config) {
+	return (params, searchParams) => {
+		const input = {};
+		if (config.params) for (const [key, raw_mapping] of Object.entries(config.params)) {
+			const mapping = normalizeParamConfig(raw_mapping);
+			const raw = mapping.from === "query" ? searchParams?.get(key) ?? void 0 : params[key];
+			if (raw !== void 0) input[key] = mapping.type === "int" ? Number(raw) : raw;
+		}
 		return {
-			status: 200,
-			headers: {
-				"Content-Type": contentType,
-				"Cache-Control": IMMUTABLE_CACHE
-			},
-			body: content
+			procedure: config.procedure,
+			input
 		};
-	} catch {
-		return errorResponse(404, "NOT_FOUND", "Asset not found");
-	}
+	};
 }
-/** Format a single SSE data event */
-function sseDataEvent(data) {
-	return `event: data\ndata: ${JSON.stringify(data)}\n\n`;
+function buildLoaderFns(configs) {
+	const fns = {};
+	for (const [key, config] of Object.entries(configs)) fns[key] = buildLoaderFn(config);
+	return fns;
 }
-/** Format an SSE data event with a sequence id (for streams) */
-function sseDataEventWithId(data, id) {
-	return `event: data\nid: ${id}\ndata: ${JSON.stringify(data)}\n\n`;
+function resolveTemplatePath(entry, defaultLocale) {
+	if (entry.template) return entry.template;
+	if (entry.templates) {
+		const locale = defaultLocale ?? Object.keys(entry.templates)[0];
+		const path = entry.templates[locale];
+		if (!path) throw new Error(`No template for locale "${locale}"`);
+		return path;
+	}
+	throw new Error("Manifest entry has neither 'template' nor 'templates'");
 }
-/** Format an SSE error event */
-function sseErrorEvent(code, message, transient = false) {
-	return `event: error\ndata: ${JSON.stringify({
-		code,
-		message,
-		transient
-	})}\n\n`;
+/** Load all locale templates for a manifest entry, keyed by locale */
+function loadLocaleTemplates(entry, distDir) {
+	if (!entry.templates) return void 0;
+	const result = {};
+	for (const [locale, relPath] of Object.entries(entry.templates)) result[locale] = readFileSync(join(distDir, relPath), "utf-8");
+	return result;
 }
-/** Format an SSE complete event */
-function sseCompleteEvent() {
-	return "event: complete\ndata: {}\n\n";
+/** Resolve parent chain for a layout, returning outer-to-inner order */
+function resolveLayoutChain(layoutId, layoutEntries, getTemplates) {
+	const chain = [];
+	let currentId = layoutId;
+	while (currentId) {
+		const entry = layoutEntries[currentId];
+		if (!entry) break;
+		const { template, localeTemplates } = getTemplates(currentId, entry);
+		chain.push({
+			id: currentId,
+			template,
+			localeTemplates,
+			loaders: buildLoaderFns(entry.loaders ?? {})
+		});
+		currentId = entry.parent;
+	}
+	chain.reverse();
+	return chain;
 }
-function formatSseError(error) {
-	if (error instanceof SeamError) return sseErrorEvent(error.code, error.message);
-	return sseErrorEvent("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error");
+/** Create a proxy object that lazily reads locale templates from disk */
+function makeLocaleTemplateGetters(templates, distDir) {
+	const obj = {};
+	for (const [locale, relPath] of Object.entries(templates)) {
+		const fullPath = join(distDir, relPath);
+		Object.defineProperty(obj, locale, {
+			get: () => readFileSync(fullPath, "utf-8"),
+			enumerable: true
+		});
+	}
+	return obj;
 }
-const DEFAULT_HEARTBEAT_MS$1 = 21e3;
-const DEFAULT_SSE_IDLE_MS = 3e4;
-async function* withSseLifecycle(inner, opts) {
-	const heartbeatMs = opts?.heartbeatInterval ?? DEFAULT_HEARTBEAT_MS$1;
-	const idleMs = opts?.sseIdleTimeout ?? DEFAULT_SSE_IDLE_MS;
-	const idleEnabled = idleMs > 0;
-	const queue = [];
-	let resolve = null;
+/** Merge i18n_keys from route + layout chain into a single list */
+function mergeI18nKeys(route, layoutEntries) {
+	const keys = [];
+	if (route.layout) {
+		let currentId = route.layout;
+		while (currentId) {
+			const entry = layoutEntries[currentId];
+			if (!entry) break;
+			if (entry.i18n_keys) keys.push(...entry.i18n_keys);
+			currentId = entry.parent;
+		}
+	}
+	if (route.i18n_keys) keys.push(...route.i18n_keys);
+	return keys.length > 0 ? keys : void 0;
+}
+/** Detect public-root directory from production build output */
+function detectBuiltPublicDir(distDir) {
+	const publicRootDir = join(distDir, "public-root");
+	return existsSync(publicRootDir) ? publicRootDir : void 0;
+}
+/** Detect source public/ directory for dev mode. */
+function detectDevPublicDir(distDir) {
+	const explicitDir = process.env.SEAM_PUBLIC_DIR;
+	if (explicitDir && existsSync(explicitDir)) return explicitDir;
+	const sourcePublicDir = join(distDir, "..", "..", "public");
+	return existsSync(sourcePublicDir) ? sourcePublicDir : void 0;
+}
+/** Load all build artifacts (pages, rpcHashMap, i18n) in one call */
+function loadBuild(distDir) {
+	return {
+		pages: loadBuildOutput(distDir),
+		rpcHashMap: loadRpcHashMap(distDir),
+		i18n: loadI18nMessages(distDir),
+		publicDir: detectBuiltPublicDir(distDir)
+	};
+}
+/** Load all build artifacts with lazy template getters (for dev mode) */
+function loadBuildDev(distDir) {
+	return {
+		pages: loadBuildOutputDev(distDir),
+		rpcHashMap: loadRpcHashMap(distDir),
+		i18n: loadI18nMessages(distDir),
+		publicDir: detectDevPublicDir(distDir) ?? detectBuiltPublicDir(distDir)
+	};
+}
+/** Load the RPC hash map from build output (returns undefined when obfuscation is off) */
+function loadRpcHashMap(distDir) {
+	const hashMapPath = join(distDir, "rpc-hash-map.json");
+	try {
+		return JSON.parse(readFileSync(hashMapPath, "utf-8"));
+	} catch {
+		return;
+	}
+}
+/** Load i18n config and messages from build output */
+function loadI18nMessages(distDir) {
+	const manifestPath = join(distDir, "route-manifest.json");
+	try {
+		const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
+		if (!manifest.i18n) return null;
+		const mode = manifest.i18n.mode ?? "memory";
+		const cache = manifest.i18n.cache ?? false;
+		const routeHashes = manifest.i18n.route_hashes ?? {};
+		const contentHashes = manifest.i18n.content_hashes ?? {};
+		const messages = {};
+		if (mode === "memory") {
+			const i18nDir = join(distDir, "i18n");
+			for (const locale of manifest.i18n.locales) {
+				const localePath = join(i18nDir, `${locale}.json`);
+				if (existsSync(localePath)) messages[locale] = JSON.parse(readFileSync(localePath, "utf-8"));
+				else messages[locale] = {};
+			}
+		}
+		return {
+			locales: manifest.i18n.locales,
+			default: manifest.i18n.default,
+			mode,
+			cache,
+			routeHashes,
+			contentHashes,
+			messages,
+			distDir: mode === "paged" ? distDir : void 0
+		};
+	} catch {
+		return null;
+	}
+}
+function loadBuildOutput(distDir) {
+	const raw = readFileSync(join(distDir, "route-manifest.json"), "utf-8");
+	const manifest = JSON.parse(raw);
+	const defaultLocale = manifest.i18n?.default;
+	const layoutTemplates = {};
+	const layoutLocaleTemplates = {};
+	const layoutEntries = manifest.layouts ?? {};
+	for (const [id, entry] of Object.entries(layoutEntries)) {
+		layoutTemplates[id] = readFileSync(join(distDir, resolveTemplatePath(entry, defaultLocale)), "utf-8");
+		const lt = loadLocaleTemplates(entry, distDir);
+		if (lt) layoutLocaleTemplates[id] = lt;
+	}
+	const staticDir = join(distDir, "..", "static");
+	const hasStaticDir = existsSync(staticDir);
+	const pages = {};
+	for (const [path, entry] of Object.entries(manifest.routes)) {
+		const template = readFileSync(join(distDir, resolveTemplatePath(entry, defaultLocale)), "utf-8");
+		const loaders = buildLoaderFns(entry.loaders);
+		const layoutChain = entry.layout ? resolveLayoutChain(entry.layout, layoutEntries, (id) => ({
+			template: layoutTemplates[id] ?? "",
+			localeTemplates: layoutLocaleTemplates[id]
+		})) : [];
+		const i18nKeys = mergeI18nKeys(entry, layoutEntries);
+		const page = {
+			template,
+			localeTemplates: loadLocaleTemplates(entry, distDir),
+			loaders,
+			layoutChain,
+			headMeta: entry.head_meta,
+			dataId: manifest.data_id,
+			i18nKeys,
+			pageAssets: entry.assets,
+			projections: entry.projections
+		};
+		if (entry.prerender && hasStaticDir) {
+			page.prerender = true;
+			page.staticDir = staticDir;
+		}
+		pages[path] = page;
+	}
+	return pages;
+}
+/** Load build output with lazy template getters -- templates re-read from disk on each access */
+function loadBuildOutputDev(distDir) {
+	const raw = readFileSync(join(distDir, "route-manifest.json"), "utf-8");
+	const manifest = JSON.parse(raw);
+	const defaultLocale = manifest.i18n?.default;
+	const layoutEntries = manifest.layouts ?? {};
+	const pages = {};
+	for (const [path, entry] of Object.entries(manifest.routes)) {
+		const templatePath = join(distDir, resolveTemplatePath(entry, defaultLocale));
+		const loaders = buildLoaderFns(entry.loaders);
+		const layoutChain = entry.layout ? resolveLayoutChain(entry.layout, layoutEntries, (id, layoutEntry) => {
+			const tmplPath = join(distDir, resolveTemplatePath(layoutEntry, defaultLocale));
+			const def = {
+				template: "",
+				localeTemplates: layoutEntry.templates ? makeLocaleTemplateGetters(layoutEntry.templates, distDir) : void 0
+			};
+			Object.defineProperty(def, "template", {
+				get: () => readFileSync(tmplPath, "utf-8"),
+				enumerable: true
+			});
+			return def;
+		}) : [];
+		const localeTemplates = entry.templates ? makeLocaleTemplateGetters(entry.templates, distDir) : void 0;
+		const i18nKeys = mergeI18nKeys(entry, layoutEntries);
+		const page = {
+			template: "",
+			localeTemplates,
+			loaders,
+			layoutChain,
+			headMeta: entry.head_meta,
+			dataId: manifest.data_id,
+			i18nKeys,
+			pageAssets: entry.assets,
+			projections: entry.projections
+		};
+		Object.defineProperty(page, "template", {
+			get: () => readFileSync(templatePath, "utf-8"),
+			enumerable: true
+		});
+		pages[path] = page;
+	}
+	return pages;
+}
+//#endregion
+//#region src/http-sse.ts
+const SSE_HEADER = {
+	"Content-Type": "text/event-stream",
+	"Cache-Control": "no-cache",
+	Connection: "keep-alive"
+};
+const DEFAULT_HEARTBEAT_MS$1 = 8e3;
+const DEFAULT_SSE_IDLE_MS = 12e3;
+function getSseHeaders() {
+	return SSE_HEADER;
+}
+function sseDataEvent(data) {
+	return `event: data\ndata: ${JSON.stringify(data)}\n\n`;
+}
+function sseDataEventWithId(data, id) {
+	return `event: data\nid: ${id}\ndata: ${JSON.stringify(data)}\n\n`;
+}
+function sseErrorEvent(code, message, transient = false) {
+	return `event: error\ndata: ${JSON.stringify({
+		code,
+		message,
+		transient
+	})}\n\n`;
+}
+function sseCompleteEvent() {
+	return "event: complete\ndata: {}\n\n";
+}
+function formatSseError(error) {
+	if (error instanceof SeamError) return sseErrorEvent(error.code, error.message);
+	return sseErrorEvent("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error");
+}
+async function* withSseLifecycle(inner, opts) {
+	const heartbeatMs = opts?.heartbeatInterval ?? DEFAULT_HEARTBEAT_MS$1;
+	const idleMs = opts?.sseIdleTimeout ?? DEFAULT_SSE_IDLE_MS;
+	const idleEnabled = idleMs > 0;
+	const queue = [];
+	let resolve = null;
 	const signal = () => {
 		if (resolve) {
 			resolve();
@@ -1399,6 +1764,7 @@ async function* withSseLifecycle(inner, opts) {
 		queue.push({ type: "heartbeat" });
 		signal();
 	}, heartbeatMs);
+	queue.push({ type: "heartbeat" });
 	resetIdle();
 	(async () => {
 		try {
@@ -1433,9 +1799,10 @@ async function* withSseLifecycle(inner, opts) {
 		if (idleTimer) clearTimeout(idleTimer);
 	}
 }
-async function* sseStream(router, name, input, rawCtx) {
+async function* sseStream(router, name, input, rawCtx, lastEventId) {
 	try {
-		for await (const value of router.handleSubscription(name, input, rawCtx)) yield sseDataEvent(value);
+		let seq = 0;
+		for await (const value of router.handleSubscription(name, input, rawCtx, lastEventId)) yield sseDataEventWithId(value, seq++);
 		yield sseCompleteEvent();
 	} catch (error) {
 		yield formatSseError(error);
@@ -1454,120 +1821,147 @@ async function* sseStreamForStream(router, name, input, signal, rawCtx) {
 		yield formatSseError(error);
 	}
 }
-async function handleBatchHttp(req, router, hashToName, rawCtx) {
-	let body;
-	try {
-		body = await req.body();
-	} catch {
-		return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
+function buildHashLookup(hashMap) {
+	if (!hashMap) return null;
+	const map = new Map(Object.entries(hashMap.procedures).map(([n, h]) => [h, n]));
+	map.set("seam.i18n.query", "seam.i18n.query");
+	return map;
+}
+function createDevReloadResponse(devState, sseOptions) {
+	const controller = new AbortController();
+	async function* devStream() {
+		yield ": connected\n\n";
+		const aborted = new Promise((_, reject) => {
+			controller.signal.addEventListener("abort", () => reject(/* @__PURE__ */ new Error("aborted")), { once: true });
+		});
+		try {
+			while (!controller.signal.aborted) {
+				await Promise.race([new Promise((r) => {
+					devState.resolvers.add(r);
+				}), aborted]);
+				yield "data: reload\n\n";
+			}
+		} catch {}
 	}
-	if (!body || typeof body !== "object" || !Array.isArray(body.calls)) return errorResponse(400, "VALIDATION_ERROR", "Batch request must have a 'calls' array");
-	const calls = body.calls.map((c) => ({
-		procedure: typeof c.procedure === "string" ? hashToName?.get(c.procedure) ?? c.procedure : "",
-		input: c.input ?? {}
-	}));
-	return jsonResponse(200, {
-		ok: true,
-		data: await router.handleBatch(calls, rawCtx)
-	});
+	return {
+		status: 200,
+		headers: {
+			...SSE_HEADER,
+			"X-Accel-Buffering": "no"
+		},
+		stream: withSseLifecycle(devStream(), {
+			...sseOptions,
+			sseIdleTimeout: 0
+		}),
+		onCancel: () => controller.abort()
+	};
 }
-/** Resolve hash -> original name when obfuscation is active. Accepts both hashed and raw names. */
-function resolveHashName(hashToName, name) {
-	if (!hashToName) return name;
-	return hashToName.get(name) ?? name;
+//#endregion
+//#region src/mime.ts
+const MIME_TYPES = {
+	".js": "application/javascript",
+	".mjs": "application/javascript",
+	".css": "text/css",
+	".html": "text/html",
+	".json": "application/json",
+	".svg": "image/svg+xml",
+	".png": "image/png",
+	".jpg": "image/jpeg",
+	".jpeg": "image/jpeg",
+	".gif": "image/gif",
+	".woff": "font/woff",
+	".woff2": "font/woff2",
+	".ttf": "font/ttf",
+	".ico": "image/x-icon",
+	".webp": "image/webp",
+	".txt": "text/plain",
+	".xml": "application/xml",
+	".webmanifest": "application/manifest+json",
+	".map": "application/json",
+	".ts": "application/javascript",
+	".tsx": "application/javascript"
+};
+//#endregion
+//#region src/http-response.ts
+const JSON_HEADER = { "Content-Type": "application/json" };
+const PUBLIC_CACHE = "public, max-age=3600";
+const IMMUTABLE_CACHE = "public, max-age=31536000, immutable";
+const TEXT_ENCODINGS = new Set([
+	"application/javascript",
+	"application/json",
+	"application/manifest+json",
+	"application/xml",
+	"image/svg+xml"
+]);
+function normalizeBinaryBody(body) {
+	if (body instanceof Uint8Array) return body;
+	if (body instanceof ArrayBuffer) return new Uint8Array(body);
+	return new Uint8Array(body.buffer, body.byteOffset, body.byteLength);
+}
+function isTextContentType(contentType) {
+	const mime = contentType.split(";", 1)[0]?.trim().toLowerCase() ?? "";
+	return mime.startsWith("text/") || TEXT_ENCODINGS.has(mime);
+}
+async function readResponseBody(filePath, contentType) {
+	const content = await readFile(filePath);
+	return isTextContentType(contentType) ? content.toString("utf-8") : content;
 }
-async function handleProcedurePost(req, router, name, rawCtx, sseOptions) {
-	let body;
+function jsonResponse(status, body) {
+	return {
+		status,
+		headers: JSON_HEADER,
+		body
+	};
+}
+function errorResponse(status, code, message) {
+	return jsonResponse(status, new SeamError(code, message).toJSON());
+}
+async function handleStaticAsset(assetPath, staticDir) {
+	if (assetPath.includes("..")) return errorResponse(403, "VALIDATION_ERROR", "Forbidden");
+	const filePath = join(staticDir, assetPath);
 	try {
-		body = await req.body();
+		const contentType = MIME_TYPES[extname(filePath)] || "application/octet-stream";
+		const content = await readResponseBody(filePath, contentType);
+		return {
+			status: 200,
+			headers: {
+				"Content-Type": contentType,
+				"Cache-Control": IMMUTABLE_CACHE
+			},
+			body: content
+		};
 	} catch {
-		return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
+		return errorResponse(404, "NOT_FOUND", "Asset not found");
 	}
-	if (router.getKind(name) === "stream") {
-		const controller = new AbortController();
+}
+async function handlePublicFile(pathname, publicDir) {
+	if (pathname.includes("..")) return null;
+	const filePath = join(publicDir, pathname);
+	try {
+		const contentType = MIME_TYPES[extname(filePath)] || "application/octet-stream";
+		const content = await readResponseBody(filePath, contentType);
 		return {
 			status: 200,
-			headers: SSE_HEADER,
-			stream: withSseLifecycle(sseStreamForStream(router, name, body, controller.signal, rawCtx), sseOptions),
-			onCancel: () => controller.abort()
+			headers: {
+				"Content-Type": contentType,
+				"Cache-Control": PUBLIC_CACHE
+			},
+			body: content
 		};
+	} catch {
+		return null;
 	}
-	if (router.getKind(name) === "upload") {
-		if (!req.file) return errorResponse(400, "VALIDATION_ERROR", "Upload requires multipart/form-data");
-		const file = await req.file();
-		if (!file) return errorResponse(400, "VALIDATION_ERROR", "Upload requires file in multipart body");
-		const result = await router.handleUpload(name, body, file, rawCtx);
-		return jsonResponse(result.status, result.body);
-	}
-	const result = await router.handle(name, body, rawCtx);
-	return jsonResponse(result.status, result.body);
-}
-function createHttpHandler(router, opts) {
-	const effectiveHashMap = opts?.rpcHashMap ?? router.rpcHashMap;
-	const hashToName = effectiveHashMap ? new Map(Object.entries(effectiveHashMap.procedures).map(([n, h]) => [h, n])) : null;
-	if (hashToName) hashToName.set("__seam_i18n_query", "__seam_i18n_query");
-	const batchHash = effectiveHashMap?.batch ?? null;
-	const hasCtx = router.hasContext();
-	return async (req) => {
-		const url = new URL(req.url, "http://localhost");
-		const { pathname } = url;
-		const rawCtx = hasCtx ? buildRawContext(router.ctxConfig, req.header, url) : void 0;
-		if (req.method === "GET" && pathname === MANIFEST_PATH) {
-			if (effectiveHashMap) return errorResponse(403, "FORBIDDEN", "Manifest disabled");
-			return jsonResponse(200, router.manifest());
-		}
-		if (pathname.startsWith(PROCEDURE_PREFIX)) {
-			const rawName = pathname.slice(17);
-			if (!rawName) return errorResponse(404, "NOT_FOUND", "Empty procedure name");
-			if (req.method === "POST") {
-				if (rawName === "_batch" || batchHash && rawName === batchHash) return handleBatchHttp(req, router, hashToName, rawCtx);
-				return handleProcedurePost(req, router, resolveHashName(hashToName, rawName), rawCtx, opts?.sseOptions);
-			}
-			if (req.method === "GET") {
-				const name = resolveHashName(hashToName, rawName);
-				const rawInput = url.searchParams.get("input");
-				let input;
-				try {
-					input = rawInput ? JSON.parse(rawInput) : {};
-				} catch {
-					return errorResponse(400, "VALIDATION_ERROR", "Invalid input query parameter");
-				}
-				return {
-					status: 200,
-					headers: SSE_HEADER,
-					stream: withSseLifecycle(sseStream(router, name, input, rawCtx), opts?.sseOptions)
-				};
-			}
-		}
-		if (req.method === "GET" && pathname.startsWith(PAGE_PREFIX) && router.hasPages) {
-			const pagePath = "/" + pathname.slice(12);
-			const headers = req.header ? {
-				url: req.url,
-				cookie: req.header("cookie") ?? void 0,
-				acceptLanguage: req.header("accept-language") ?? void 0
-			} : void 0;
-			const result = await router.handlePage(pagePath, headers, rawCtx);
-			if (result) return {
-				status: result.status,
-				headers: HTML_HEADER,
-				body: result.html
-			};
-		}
-		if (req.method === "GET" && pathname.startsWith(STATIC_PREFIX) && opts?.staticDir) return handleStaticAsset(pathname.slice(14), opts.staticDir);
-		if (opts?.fallback) return opts.fallback(req);
-		return errorResponse(404, "NOT_FOUND", "Not found");
-	};
 }
 function serialize(body) {
-	return typeof body === "string" ? body : JSON.stringify(body);
+	if (typeof body === "string") return body;
+	if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) return normalizeBinaryBody(body);
+	return JSON.stringify(body);
 }
-/** Consume an async stream chunk-by-chunk; return false from write to stop early. */
 async function drainStream(stream, write) {
 	try {
 		for await (const chunk of stream) if (write(chunk) === false) break;
 	} catch {}
 }
-/** Convert an HttpResponse to a Web API Response (for adapters using fetch-compatible runtimes) */
 function toWebResponse(result) {
 	if ("stream" in result) {
 		const stream = result.stream;
@@ -1590,234 +1984,147 @@ function toWebResponse(result) {
 		});
 	}
 	return new Response(serialize(result.body), {
-		status: result.status,
-		headers: result.headers
-	});
-}
-
-//#endregion
-//#region src/page/build-loader.ts
-function normalizeParamConfig(value) {
-	return typeof value === "string" ? { from: value } : value;
-}
-function buildLoaderFn(config) {
-	return (params, searchParams) => {
-		const input = {};
-		if (config.params) for (const [key, raw_mapping] of Object.entries(config.params)) {
-			const mapping = normalizeParamConfig(raw_mapping);
-			const raw = mapping.from === "query" ? searchParams?.get(key) ?? void 0 : params[key];
-			if (raw !== void 0) input[key] = mapping.type === "int" ? Number(raw) : raw;
-		}
-		return {
-			procedure: config.procedure,
-			input
-		};
-	};
-}
-function buildLoaderFns(configs) {
-	const fns = {};
-	for (const [key, config] of Object.entries(configs)) fns[key] = buildLoaderFn(config);
-	return fns;
-}
-function resolveTemplatePath(entry, defaultLocale) {
-	if (entry.template) return entry.template;
-	if (entry.templates) {
-		const locale = defaultLocale ?? Object.keys(entry.templates)[0];
-		const path = entry.templates[locale];
-		if (!path) throw new Error(`No template for locale "${locale}"`);
-		return path;
-	}
-	throw new Error("Manifest entry has neither 'template' nor 'templates'");
-}
-/** Load all locale templates for a manifest entry, keyed by locale */
-function loadLocaleTemplates(entry, distDir) {
-	if (!entry.templates) return void 0;
-	const result = {};
-	for (const [locale, relPath] of Object.entries(entry.templates)) result[locale] = readFileSync(join(distDir, relPath), "utf-8");
-	return result;
-}
-/** Resolve parent chain for a layout, returning outer-to-inner order */
-function resolveLayoutChain(layoutId, layoutEntries, getTemplates) {
-	const chain = [];
-	let currentId = layoutId;
-	while (currentId) {
-		const entry = layoutEntries[currentId];
-		if (!entry) break;
-		const { template, localeTemplates } = getTemplates(currentId, entry);
-		chain.push({
-			id: currentId,
-			template,
-			localeTemplates,
-			loaders: buildLoaderFns(entry.loaders ?? {})
-		});
-		currentId = entry.parent;
-	}
-	chain.reverse();
-	return chain;
-}
-/** Create a proxy object that lazily reads locale templates from disk */
-function makeLocaleTemplateGetters(templates, distDir) {
-	const obj = {};
-	for (const [locale, relPath] of Object.entries(templates)) {
-		const fullPath = join(distDir, relPath);
-		Object.defineProperty(obj, locale, {
-			get: () => readFileSync(fullPath, "utf-8"),
-			enumerable: true
-		});
-	}
-	return obj;
-}
-/** Merge i18n_keys from route + layout chain into a single list */
-function mergeI18nKeys(route, layoutEntries) {
-	const keys = [];
-	if (route.layout) {
-		let currentId = route.layout;
-		while (currentId) {
-			const entry = layoutEntries[currentId];
-			if (!entry) break;
-			if (entry.i18n_keys) keys.push(...entry.i18n_keys);
-			currentId = entry.parent;
-		}
-	}
-	if (route.i18n_keys) keys.push(...route.i18n_keys);
-	return keys.length > 0 ? keys : void 0;
-}
-/** Load all build artifacts (pages, rpcHashMap, i18n) in one call */
-function loadBuild(distDir) {
-	return {
-		pages: loadBuildOutput(distDir),
-		rpcHashMap: loadRpcHashMap(distDir),
-		i18n: loadI18nMessages(distDir)
-	};
+		status: result.status,
+		headers: result.headers
+	});
 }
-/** Load all build artifacts with lazy template getters (for dev mode) */
-function loadBuildDev(distDir) {
+//#endregion
+//#region src/http.ts
+const PROCEDURE_PREFIX = "/_seam/procedure/";
+const PAGE_PREFIX = "/_seam/page/";
+const DATA_PREFIX = "/_seam/data/";
+const STATIC_PREFIX = "/_seam/static/";
+const MANIFEST_PATH = "/_seam/manifest.json";
+const DEV_RELOAD_PATH = "/_seam/dev/reload";
+const HTML_HEADER = { "Content-Type": "text/html; charset=utf-8" };
+function getPageRequestHeaders(req) {
+	if (!req.header) return void 0;
 	return {
-		pages: loadBuildOutputDev(distDir),
-		rpcHashMap: loadRpcHashMap(distDir),
-		i18n: loadI18nMessages(distDir)
+		url: req.url,
+		cookie: req.header("cookie") ?? void 0,
+		acceptLanguage: req.header("accept-language") ?? void 0
 	};
 }
-/** Load the RPC hash map from build output (returns undefined when obfuscation is off) */
-function loadRpcHashMap(distDir) {
-	const hashMapPath = join(distDir, "rpc-hash-map.json");
+async function handleBatchHttp(req, router, hashToName, rawCtx) {
+	let body;
 	try {
-		return JSON.parse(readFileSync(hashMapPath, "utf-8"));
+		body = await req.body();
 	} catch {
-		return;
+		return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
 	}
+	if (!body || typeof body !== "object" || !Array.isArray(body.calls)) return errorResponse(400, "VALIDATION_ERROR", "Batch request must have a 'calls' array");
+	const calls = body.calls.map((c) => ({
+		procedure: typeof c.procedure === "string" ? hashToName?.get(c.procedure) ?? c.procedure : "",
+		input: c.input ?? {}
+	}));
+	return jsonResponse(200, {
+		ok: true,
+		data: await router.handleBatch(calls, rawCtx)
+	});
 }
-/** Load i18n config and messages from build output */
-function loadI18nMessages(distDir) {
-	const manifestPath = join(distDir, "route-manifest.json");
+function resolveHashName(hashToName, name) {
+	if (!hashToName) return name;
+	return hashToName.get(name) ?? name;
+}
+async function handleProcedurePost(req, router, name, rawCtx, sseOptions) {
+	let body;
 	try {
-		const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
-		if (!manifest.i18n) return null;
-		const mode = manifest.i18n.mode ?? "memory";
-		const cache = manifest.i18n.cache ?? false;
-		const routeHashes = manifest.i18n.route_hashes ?? {};
-		const contentHashes = manifest.i18n.content_hashes ?? {};
-		const messages = {};
-		if (mode === "memory") {
-			const i18nDir = join(distDir, "i18n");
-			for (const locale of manifest.i18n.locales) {
-				const localePath = join(i18nDir, `${locale}.json`);
-				if (existsSync(localePath)) messages[locale] = JSON.parse(readFileSync(localePath, "utf-8"));
-				else messages[locale] = {};
-			}
-		}
-		return {
-			locales: manifest.i18n.locales,
-			default: manifest.i18n.default,
-			mode,
-			cache,
-			routeHashes,
-			contentHashes,
-			messages,
-			distDir: mode === "paged" ? distDir : void 0
-		};
+		body = await req.body();
 	} catch {
-		return null;
-	}
-}
-function loadBuildOutput(distDir) {
-	const raw = readFileSync(join(distDir, "route-manifest.json"), "utf-8");
-	const manifest = JSON.parse(raw);
-	const defaultLocale = manifest.i18n?.default;
-	const layoutTemplates = {};
-	const layoutLocaleTemplates = {};
-	const layoutEntries = manifest.layouts ?? {};
-	for (const [id, entry] of Object.entries(layoutEntries)) {
-		layoutTemplates[id] = readFileSync(join(distDir, resolveTemplatePath(entry, defaultLocale)), "utf-8");
-		const lt = loadLocaleTemplates(entry, distDir);
-		if (lt) layoutLocaleTemplates[id] = lt;
+		return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
 	}
-	const pages = {};
-	for (const [path, entry] of Object.entries(manifest.routes)) {
-		const template = readFileSync(join(distDir, resolveTemplatePath(entry, defaultLocale)), "utf-8");
-		const loaders = buildLoaderFns(entry.loaders);
-		const layoutChain = entry.layout ? resolveLayoutChain(entry.layout, layoutEntries, (id) => ({
-			template: layoutTemplates[id] ?? "",
-			localeTemplates: layoutLocaleTemplates[id]
-		})) : [];
-		const i18nKeys = mergeI18nKeys(entry, layoutEntries);
-		pages[path] = {
-			template,
-			localeTemplates: loadLocaleTemplates(entry, distDir),
-			loaders,
-			layoutChain,
-			headMeta: entry.head_meta,
-			dataId: manifest.data_id,
-			i18nKeys,
-			pageAssets: entry.assets,
-			projections: entry.projections
+	if (router.getKind(name) === "stream") {
+		const controller = new AbortController();
+		return {
+			status: 200,
+			headers: getSseHeaders(),
+			stream: withSseLifecycle(sseStreamForStream(router, name, body, controller.signal, rawCtx), sseOptions),
+			onCancel: () => controller.abort()
 		};
 	}
-	return pages;
+	if (router.getKind(name) === "upload") {
+		if (!req.file) return errorResponse(400, "VALIDATION_ERROR", "Upload requires multipart/form-data");
+		const file = await req.file();
+		if (!file) return errorResponse(400, "VALIDATION_ERROR", "Upload requires file in multipart body");
+		const result = await router.handleUpload(name, body, file, rawCtx);
+		return jsonResponse(result.status, result.body);
+	}
+	const result = await router.handle(name, body, rawCtx);
+	return jsonResponse(result.status, result.body);
 }
-/** Load build output with lazy template getters -- templates re-read from disk on each access */
-function loadBuildOutputDev(distDir) {
-	const raw = readFileSync(join(distDir, "route-manifest.json"), "utf-8");
-	const manifest = JSON.parse(raw);
-	const defaultLocale = manifest.i18n?.default;
-	const layoutEntries = manifest.layouts ?? {};
-	const pages = {};
-	for (const [path, entry] of Object.entries(manifest.routes)) {
-		const templatePath = join(distDir, resolveTemplatePath(entry, defaultLocale));
-		const loaders = buildLoaderFns(entry.loaders);
-		const layoutChain = entry.layout ? resolveLayoutChain(entry.layout, layoutEntries, (id, layoutEntry) => {
-			const tmplPath = join(distDir, resolveTemplatePath(layoutEntry, defaultLocale));
-			const def = {
-				template: "",
-				localeTemplates: layoutEntry.templates ? makeLocaleTemplateGetters(layoutEntry.templates, distDir) : void 0
+function createHttpHandler(router, opts) {
+	const effectiveHashMap = opts?.rpcHashMap ?? router.rpcHashMap;
+	const hashToName = buildHashLookup(effectiveHashMap);
+	const batchHash = effectiveHashMap?.batch ?? null;
+	const hasCtx = router.hasContext();
+	const devDir = opts?.devBuildDir ?? (process.env.SEAM_DEV === "1" && process.env.SEAM_VITE !== "1" ? process.env.SEAM_OUTPUT_DIR : void 0);
+	const devState = devDir ? { resolvers: /* @__PURE__ */ new Set() } : null;
+	if (devState && devDir) watchReloadTrigger(devDir, () => {
+		try {
+			router.reload(loadBuildDev(devDir));
+		} catch {}
+		const batch = devState.resolvers;
+		devState.resolvers = /* @__PURE__ */ new Set();
+		for (const r of batch) r();
+	});
+	return async (req) => {
+		const url = new URL(req.url, "http://localhost");
+		const { pathname } = url;
+		const rawCtx = hasCtx ? buildRawContext(router.ctxConfig, req.header, url) : void 0;
+		if (req.method === "GET" && pathname === MANIFEST_PATH) {
+			if (effectiveHashMap) return errorResponse(403, "FORBIDDEN", "Manifest disabled");
+			return jsonResponse(200, router.manifest());
+		}
+		if (pathname.startsWith(PROCEDURE_PREFIX)) {
+			const rawName = pathname.slice(17);
+			if (!rawName) return errorResponse(404, "NOT_FOUND", "Empty procedure name");
+			if (req.method === "POST") {
+				if (rawName === "_batch" || batchHash && rawName === batchHash) return handleBatchHttp(req, router, hashToName, rawCtx);
+				return handleProcedurePost(req, router, resolveHashName(hashToName, rawName), rawCtx, opts?.sseOptions);
+			}
+			if (req.method === "GET") {
+				const name = resolveHashName(hashToName, rawName);
+				const rawInput = url.searchParams.get("input");
+				let input;
+				try {
+					input = rawInput ? JSON.parse(rawInput) : {};
+				} catch {
+					return errorResponse(400, "VALIDATION_ERROR", "Invalid input query parameter");
+				}
+				const lastEventId = req.header?.("last-event-id") ?? void 0;
+				return {
+					status: 200,
+					headers: getSseHeaders(),
+					stream: withSseLifecycle(sseStream(router, name, input, rawCtx, lastEventId), opts?.sseOptions)
+				};
+			}
+		}
+		if (req.method === "GET" && pathname.startsWith(PAGE_PREFIX) && router.hasPages) {
+			const pagePath = "/" + pathname.slice(12);
+			const headers = getPageRequestHeaders(req);
+			const result = await router.handlePage(pagePath, headers, rawCtx);
+			if (result) return {
+				status: result.status,
+				headers: HTML_HEADER,
+				body: result.html
 			};
-			Object.defineProperty(def, "template", {
-				get: () => readFileSync(tmplPath, "utf-8"),
-				enumerable: true
-			});
-			return def;
-		}) : [];
-		const localeTemplates = entry.templates ? makeLocaleTemplateGetters(entry.templates, distDir) : void 0;
-		const i18nKeys = mergeI18nKeys(entry, layoutEntries);
-		const page = {
-			template: "",
-			localeTemplates,
-			loaders,
-			layoutChain,
-			dataId: manifest.data_id,
-			i18nKeys,
-			pageAssets: entry.assets,
-			projections: entry.projections
-		};
-		Object.defineProperty(page, "template", {
-			get: () => readFileSync(templatePath, "utf-8"),
-			enumerable: true
-		});
-		pages[path] = page;
-	}
-	return pages;
+		}
+		if (req.method === "GET" && pathname.startsWith(DATA_PREFIX) && router.hasPages) {
+			const pagePath = "/" + pathname.slice(12).replace(/\/$/, "");
+			const dataResult = await router.handlePageData(pagePath);
+			if (dataResult !== null) return jsonResponse(200, dataResult);
+		}
+		if (req.method === "GET" && pathname.startsWith(STATIC_PREFIX) && opts?.staticDir) return handleStaticAsset(pathname.slice(14), opts.staticDir);
+		if (req.method === "GET" && pathname === DEV_RELOAD_PATH && devState) return createDevReloadResponse(devState, opts?.sseOptions);
+		const publicDir = opts?.publicDir ?? router.publicDir;
+		if (req.method === "GET" && publicDir) {
+			const publicResult = await handlePublicFile(pathname, publicDir);
+			if (publicResult) return publicResult;
+		}
+		if (opts?.fallback) return opts.fallback(req);
+		return errorResponse(404, "NOT_FOUND", "Not found");
+	};
 }
-
 //#endregion
 //#region src/subscription.ts
 function fromCallback(setup) {
@@ -1876,10 +2183,9 @@ function fromCallback(setup) {
 	}
 	return generate();
 }
-
 //#endregion
 //#region src/ws.ts
-const DEFAULT_HEARTBEAT_MS = 21e3;
+const DEFAULT_HEARTBEAT_MS = 15e3;
 const DEFAULT_PONG_TIMEOUT_MS = 5e3;
 function sendError(ws, id, code, message) {
 	ws.send(JSON.stringify({
@@ -2020,7 +2326,6 @@ function startChannelWs(router, channelName, channelInput, ws, opts) {
 		}
 	};
 }
-
 //#endregion
 //#region src/proxy.ts
 /** Forward non-seam requests to a dev server (e.g. Vite) */
@@ -2082,64 +2387,7 @@ function createStaticHandler(opts) {
 		}
 	};
 }
-
-//#endregion
-//#region src/dev/reload-watcher.ts
-function watchReloadTrigger(distDir, onReload) {
-	const triggerPath = join(distDir, ".reload-trigger");
-	let watcher = null;
-	let closed = false;
-	let pending = [];
-	const notify = () => {
-		onReload();
-		const batch = pending;
-		pending = [];
-		for (const p of batch) p.resolve();
-	};
-	const nextReload = () => {
-		if (closed) return Promise.reject(/* @__PURE__ */ new Error("watcher closed"));
-		return new Promise((resolve, reject) => {
-			pending.push({
-				resolve,
-				reject
-			});
-		});
-	};
-	const closeAll = () => {
-		closed = true;
-		const batch = pending;
-		pending = [];
-		const err = /* @__PURE__ */ new Error("watcher closed");
-		for (const p of batch) p.reject(err);
-	};
-	try {
-		watcher = watch(triggerPath, () => notify());
-	} catch {
-		const dirWatcher = watch(distDir, (_event, filename) => {
-			if (filename === ".reload-trigger") {
-				dirWatcher.close();
-				watcher = watch(triggerPath, () => notify());
-				notify();
-			}
-		});
-		return {
-			close() {
-				dirWatcher.close();
-				watcher?.close();
-				closeAll();
-			},
-			nextReload
-		};
-	}
-	return {
-		close() {
-			watcher?.close();
-			closeAll();
-		},
-		nextReload
-	};
-}
-
 //#endregion
 export { SeamError, buildRawContext, command, contextHasExtracts, createChannel, createDevProxy, createHttpHandler, createRouter, createSeamRouter, createStaticHandler, defaultStrategies, definePage, drainStream, extract, fromAcceptLanguage, fromCallback, fromCookie, fromUrlPrefix, fromUrlQuery, isLoaderError, loadBuild, loadBuildDev, loadBuildOutput, loadBuildOutputDev, loadI18nMessages, loadRpcHashMap, parseCookieHeader, query, resolveChain, serialize, sseCompleteEvent, sseDataEvent, sseDataEventWithId, sseErrorEvent, startChannelWs, stream, subscription, t, toWebResponse, upload, watchReloadTrigger };
+
 //# sourceMappingURL=index.js.map