@canmi/seam-server 0.5.10 → 0.5.31

package/dist/index.js

@@ -157,6 +157,27 @@ function formatValidationErrors(errors) {
 		return `${e.instancePath.length > 0 ? e.instancePath.join("/") : "(root)"} (schema: ${e.schemaPath.join("/")})`;
 	}).join("; ");
 }
+/** Walk a nested object along a key path, returning undefined if unreachable */
+function walkPath(obj, keys) {
+	let cur = obj;
+	for (const k of keys) {
+		if (cur === null || cur === void 0 || typeof cur !== "object") return void 0;
+		cur = cur[k];
+	}
+	return cur;
+}
+/** Extract structured details from JTD validation errors (best-effort) */
+function formatValidationDetails(errors, schema, data) {
+	return errors.map((e) => {
+		const detail = { path: "/" + e.instancePath.join("/") };
+		const schemaValue = walkPath(schema, e.schemaPath);
+		if (typeof schemaValue === "string") detail.expected = schemaValue;
+		const actualValue = walkPath(data, e.instancePath);
+		if (actualValue !== void 0) detail.actual = typeof actualValue;
+		else if (e.instancePath.length === 0) detail.actual = typeof data;
+		return detail;
+	});
+}
 
 //#endregion
 //#region src/errors.ts
@@ -171,20 +192,24 @@ const DEFAULT_STATUS = {
 var SeamError = class extends Error {
 	code;
 	status;
-	constructor(code, message, status) {
+	details;
+	constructor(code, message, status, details) {
 		super(message);
 		this.code = code;
 		this.status = status ?? DEFAULT_STATUS[code] ?? 500;
+		this.details = details;
 		this.name = "SeamError";
 	}
 	toJSON() {
+		const error = {
+			code: this.code,
+			message: this.message,
+			transient: false
+		};
+		if (this.details) error.details = this.details;
 		return {
 			ok: false,
-			error: {
-				code: this.code,
-				message: this.message,
-				transient: false
-			}
+			error
 		};
 	}
 };
@@ -203,14 +228,40 @@ function parseExtractRule(rule) {
 		key
 	};
 }
-/** Collect all header names needed by the context config */
-function contextExtractKeys(config) {
-	const keys = [];
-	for (const field of Object.values(config)) {
-		const { source, key } = parseExtractRule(field.extract);
-		if (source === "header") keys.push(key);
+/** Check whether any context fields are defined */
+function contextHasExtracts(config) {
+	return Object.keys(config).length > 0;
+}
+/** Parse a Cookie header into key-value pairs */
+function parseCookieHeader(header) {
+	const result = {};
+	for (const pair of header.split(";")) {
+		const idx = pair.indexOf("=");
+		if (idx > 0) result[pair.slice(0, idx).trim()] = pair.slice(idx + 1).trim();
+	}
+	return result;
+}
+/** Build a RawContextMap keyed by config key from request headers, cookies, and query params */
+function buildRawContext(config, headerFn, url) {
+	const raw = {};
+	let cookieCache;
+	for (const [key, field] of Object.entries(config)) {
+		const { source, key: extractKey } = parseExtractRule(field.extract);
+		switch (source) {
+			case "header":
+				raw[key] = headerFn?.(extractKey) ?? null;
+				break;
+			case "cookie":
+				if (!cookieCache) cookieCache = parseCookieHeader(headerFn?.("cookie") ?? "");
+				raw[key] = cookieCache[extractKey] ?? null;
+				break;
+			case "query":
+				raw[key] = url.searchParams.get(extractKey) ?? null;
+				break;
+			default: raw[key] = null;
+		}
 	}
-	return [...new Set(keys)];
+	return raw;
 }
 /**
 * Resolve raw strings into validated context object.
@@ -225,8 +276,7 @@ function resolveContext(config, raw, requestedKeys) {
 	for (const key of requestedKeys) {
 		const field = config[key];
 		if (!field) throw new SeamError("CONTEXT_ERROR", `Context field "${key}" is not defined in router context config`, 400);
-		const { source, key: extractKey } = parseExtractRule(field.extract);
-		const rawValue = raw[source === "header" ? extractKey : extractKey] ?? null;
+		const rawValue = raw[key] ?? null;
 		let value;
 		if (rawValue === null) value = null;
 		else {
@@ -246,6 +296,12 @@ function resolveContext(config, raw, requestedKeys) {
 	}
 	return result;
 }
+/** Syntax sugar for building extract rules; the underlying "source:key" format is unchanged. */
+const extract = {
+	header: (name) => `header:${name}`,
+	cookie: (name) => `cookie:${name}`,
+	query: (name) => `query:${name}`
+};
 
 //#endregion
 //#region src/manifest/index.ts
@@ -292,19 +348,87 @@ function buildManifest(definitions, channels, contextConfig, transportDefaults)
 	return manifest;
 }
 
+//#endregion
+//#region src/page/route-matcher.ts
+function compileRoute(pattern) {
+	return { segments: pattern.split("/").filter(Boolean).map((seg) => {
+		if (seg.startsWith("*")) {
+			const optional = seg.endsWith("?");
+			return {
+				kind: "catch-all",
+				name: optional ? seg.slice(1, -1) : seg.slice(1),
+				optional
+			};
+		}
+		if (seg.startsWith(":")) return {
+			kind: "param",
+			name: seg.slice(1)
+		};
+		return {
+			kind: "static",
+			value: seg
+		};
+	}) };
+}
+function matchRoute(segments, pathParts) {
+	const params = {};
+	for (let i = 0; i < segments.length; i++) {
+		const seg = segments[i];
+		if (seg.kind === "catch-all") {
+			const rest = pathParts.slice(i);
+			if (rest.length === 0 && !seg.optional) return null;
+			params[seg.name] = rest.join("/");
+			return params;
+		}
+		if (i >= pathParts.length) return null;
+		if (seg.kind === "static") {
+			if (seg.value !== pathParts[i]) return null;
+		} else params[seg.name] = pathParts[i];
+	}
+	if (segments.length !== pathParts.length) return null;
+	return params;
+}
+var RouteMatcher = class {
+	routes = [];
+	add(pattern, value) {
+		this.routes.push({
+			pattern,
+			compiled: compileRoute(pattern),
+			value
+		});
+	}
+	match(path) {
+		const parts = path.split("/").filter(Boolean);
+		for (const route of this.routes) {
+			const params = matchRoute(route.compiled.segments, parts);
+			if (params) return {
+				value: route.value,
+				params,
+				pattern: route.pattern
+			};
+		}
+		return null;
+	}
+};
+
 //#endregion
 //#region src/router/handler.ts
-async function handleRequest(procedures, procedureName, rawBody, validateOutput, ctx) {
+async function handleRequest(procedures, procedureName, rawBody, shouldValidateInput = true, validateOutput, ctx) {
 	const procedure = procedures.get(procedureName);
 	if (!procedure) return {
 		status: 404,
 		body: new SeamError("NOT_FOUND", `Procedure '${procedureName}' not found`).toJSON()
 	};
-	const validation = validateInput(procedure.inputSchema, rawBody);
-	if (!validation.valid) return {
-		status: 400,
-		body: new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`).toJSON()
-	};
+	if (shouldValidateInput) {
+		const validation = validateInput(procedure.inputSchema, rawBody);
+		if (!validation.valid) {
+			const details = formatValidationDetails(validation.errors, procedure.inputSchema, rawBody);
+			return {
+				status: 400,
+				body: new SeamError("VALIDATION_ERROR", `Input validation failed for procedure '${procedureName}': ${formatValidationErrors(validation.errors)}`, void 0, details).toJSON()
+			};
+		}
+	}
 	try {
 		const result = await procedure.handler({
 			input: rawBody,
@@ -335,10 +459,10 @@ async function handleRequest(procedures, procedureName, rawBody, validateOutput,
 		};
 	}
 }
-async function handleBatchRequest(procedures, calls, validateOutput, ctxResolver) {
+async function handleBatchRequest(procedures, calls, shouldValidateInput = true, validateOutput, ctxResolver) {
 	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, validateOutput, ctx);
+		const result = await handleRequest(procedures, call.procedure, call.input, shouldValidateInput, validateOutput, ctx);
 		if (result.status === 200) return {
 			ok: true,
 			data: result.body.data
@@ -349,14 +473,20 @@ async function handleBatchRequest(procedures, calls, validateOutput, ctxResolver
 		};
 	})) };
 }
-async function* handleSubscription(subscriptions, name, rawInput, validateOutput, ctx) {
+async function* handleSubscription(subscriptions, name, rawInput, shouldValidateInput = true, validateOutput, ctx, lastEventId) {
 	const sub = subscriptions.get(name);
 	if (!sub) throw new SeamError("NOT_FOUND", `Subscription '${name}' not found`);
-	const validation = validateInput(sub.inputSchema, rawInput);
-	if (!validation.valid) throw new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`);
+	if (shouldValidateInput) {
+		const validation = validateInput(sub.inputSchema, rawInput);
+		if (!validation.valid) {
+			const details = formatValidationDetails(validation.errors, sub.inputSchema, rawInput);
+			throw new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`, void 0, details);
+		}
+	}
 	for await (const value of sub.handler({
 		input: rawInput,
-		ctx: ctx ?? {}
+		ctx: ctx ?? {},
+		lastEventId
 	})) {
 		if (validateOutput) {
 			const outValidation = validateInput(sub.outputSchema, value);
@@ -365,17 +495,22 @@ async function* handleSubscription(subscriptions, name, rawInput, validateOutput
 		yield value;
 	}
 }
-async function handleUploadRequest(uploads, procedureName, rawBody, file, validateOutput, ctx) {
+async function handleUploadRequest(uploads, procedureName, rawBody, file, shouldValidateInput = true, validateOutput, ctx) {
 	const upload = uploads.get(procedureName);
 	if (!upload) return {
 		status: 404,
 		body: new SeamError("NOT_FOUND", `Procedure '${procedureName}' not found`).toJSON()
 	};
-	const validation = validateInput(upload.inputSchema, rawBody);
-	if (!validation.valid) return {
-		status: 400,
-		body: new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`).toJSON()
-	};
+	if (shouldValidateInput) {
+		const validation = validateInput(upload.inputSchema, rawBody);
+		if (!validation.valid) {
+			const details = formatValidationDetails(validation.errors, upload.inputSchema, rawBody);
+			return {
+				status: 400,
+				body: new SeamError("VALIDATION_ERROR", `Input validation failed for procedure '${procedureName}': ${formatValidationErrors(validation.errors)}`, void 0, details).toJSON()
+			};
+		}
+	}
 	try {
 		const result = await upload.handler({
 			input: rawBody,
@@ -407,11 +542,16 @@ async function handleUploadRequest(uploads, procedureName, rawBody, file, valida
 		};
 	}
 }
-async function* handleStream(streams, name, rawInput, validateOutput, ctx) {
+async function* handleStream(streams, name, rawInput, shouldValidateInput = true, validateOutput, ctx) {
 	const stream = streams.get(name);
 	if (!stream) throw new SeamError("NOT_FOUND", `Stream '${name}' not found`);
-	const validation = validateInput(stream.inputSchema, rawInput);
-	if (!validation.valid) throw new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`);
+	if (shouldValidateInput) {
+		const validation = validateInput(stream.inputSchema, rawInput);
+		if (!validation.valid) {
+			const details = formatValidationDetails(validation.errors, stream.inputSchema, rawInput);
+			throw new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(validation.errors)}`, void 0, details);
+		}
+	}
 	for await (const value of stream.handler({
 		input: rawInput,
 		ctx: ctx ?? {}
@@ -424,6 +564,93 @@ async function* handleStream(streams, name, rawInput, validateOutput, ctx) {
 	}
 }
 
+//#endregion
+//#region src/router/categorize.ts
+function resolveKind(name, def) {
+	if ("kind" in def && def.kind) return def.kind;
+	if ("type" in def && def.type) {
+		console.warn(`[seam] "${name}": "type" field in procedure definition is deprecated, use "kind" instead`);
+		return def.type;
+	}
+	return "query";
+}
+/** Split a flat definition map into typed procedure/subscription/stream maps */
+function categorizeProcedures(definitions, contextConfig) {
+	const procedureMap = /* @__PURE__ */ new Map();
+	const subscriptionMap = /* @__PURE__ */ new Map();
+	const streamMap = /* @__PURE__ */ new Map();
+	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 ?? [];
+		if (contextConfig && contextKeys.length > 0) {
+			for (const key of contextKeys) if (!(key in contextConfig)) throw new Error(`Procedure "${name}" references undefined context field "${key}"`);
+		}
+		if (kind === "upload") uploadMap.set(name, {
+			inputSchema: def.input._schema,
+			outputSchema: def.output._schema,
+			contextKeys,
+			handler: def.handler
+		});
+		else if (kind === "stream") streamMap.set(name, {
+			inputSchema: def.input._schema,
+			chunkOutputSchema: def.output._schema,
+			contextKeys,
+			handler: def.handler
+		});
+		else if (kind === "subscription") subscriptionMap.set(name, {
+			inputSchema: def.input._schema,
+			outputSchema: def.output._schema,
+			contextKeys,
+			handler: def.handler
+		});
+		else procedureMap.set(name, {
+			inputSchema: def.input._schema,
+			outputSchema: def.output._schema,
+			contextKeys,
+			handler: def.handler
+		});
+	}
+	return {
+		procedureMap,
+		subscriptionMap,
+		streamMap,
+		uploadMap,
+		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. */
@@ -479,6 +706,10 @@ function applyProjection(data, projections) {
 	if (!projections) return data;
 	const result = {};
 	for (const [key, value] of Object.entries(data)) {
+		if (isLoaderError(value)) {
+			result[key] = value;
+			continue;
+		}
 		const fields = projections[key];
 		if (!fields) result[key] = value;
 		else result[key] = pruneValue(value, fields);
@@ -488,19 +719,58 @@ function applyProjection(data, projections) {
 
 //#endregion
 //#region src/page/handler.ts
-/** Execute loaders, returning keyed results */
-async function executeLoaders(loaders, params, procedures, searchParams) {
+/** 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) {
 	const entries = Object.entries(loaders);
 	const results = await Promise.all(entries.map(async ([key, loader]) => {
 		const { procedure, input } = loader(params, searchParams);
-		const proc = procedures.get(procedure);
-		if (!proc) throw new SeamError("INTERNAL_ERROR", `Procedure '${procedure}' not found`);
-		return [key, await proc.handler({
-			input,
-			ctx: {}
-		})];
+		try {
+			const proc = procedures.get(procedure);
+			if (!proc) throw new SeamError("INTERNAL_ERROR", `Procedure '${procedure}' not found`);
+			if (shouldValidateInput) {
+				const v = validateInput(proc.inputSchema, input);
+				if (!v.valid) throw new SeamError("VALIDATION_ERROR", `Input validation failed: ${formatValidationErrors(v.errors)}`);
+			}
+			const ctx = ctxResolver ? ctxResolver(proc) : {};
+			return {
+				key,
+				result: await proc.handler({
+					input,
+					ctx
+				}),
+				procedure,
+				input
+			};
+		} catch (err) {
+			const code = err instanceof SeamError ? err.code : "INTERNAL_ERROR";
+			const message = err instanceof Error ? err.message : "Unknown error";
+			console.error(`[seam] Loader "${key}" failed:`, err);
+			return {
+				key,
+				result: {
+					__error: true,
+					code,
+					message
+				},
+				procedure,
+				input,
+				error: true
+			};
+		}
 	}));
-	return Object.fromEntries(results);
+	return {
+		data: Object.fromEntries(results.map((r) => [r.key, r.result])),
+		meta: Object.fromEntries(results.map((r) => {
+			const entry = {
+				procedure: r.procedure,
+				input: r.input
+			};
+			if (r.error) entry.error = true;
+			return [r.key, entry];
+		}))
+	};
 }
 /** Select the template for a given locale, falling back to the default template */
 function selectTemplate(defaultTemplate, localeTemplates, locale) {
@@ -518,46 +788,58 @@ function lookupMessages(config, routePattern, locale) {
 	}
 	return config.messages[locale]?.[routeHash] ?? {};
 }
-async function handlePageRequest(page, params, procedures, i18nOpts, searchParams) {
+/** 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, 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)), executeLoaders(page.loaders, params, procedures, searchParams)]);
+		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 t1 = performance.now();
 		const allData = {};
-		for (const result of loaderResults) Object.assign(allData, result);
+		const allMeta = {};
+		for (const { data, meta } of loaderResults) {
+			Object.assign(allData, data);
+			Object.assign(allMeta, meta);
+		}
 		const prunedData = applyProjection(allData, page.projections);
 		let composedTemplate = selectTemplate(page.template, page.localeTemplates, locale);
 		for (let i = layoutChain.length - 1; i >= 0; i--) {
 			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 {
@@ -571,73 +853,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>`
-		};
-	}
-}
-
-//#endregion
-//#region src/page/route-matcher.ts
-function compileRoute(pattern) {
-	return { segments: pattern.split("/").filter(Boolean).map((seg) => {
-		if (seg.startsWith("*")) {
-			const optional = seg.endsWith("?");
-			return {
-				kind: "catch-all",
-				name: optional ? seg.slice(1, -1) : seg.slice(1),
-				optional
-			};
-		}
-		if (seg.startsWith(":")) return {
-			kind: "param",
-			name: seg.slice(1)
-		};
-		return {
-			kind: "static",
-			value: seg
+			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
+			}
 		};
-	}) };
-}
-function matchRoute(segments, pathParts) {
-	const params = {};
-	for (let i = 0; i < segments.length; i++) {
-		const seg = segments[i];
-		if (seg.kind === "catch-all") {
-			const rest = pathParts.slice(i);
-			if (rest.length === 0 && !seg.optional) return null;
-			params[seg.name] = rest.join("/");
-			return params;
-		}
-		if (i >= pathParts.length) return null;
-		if (seg.kind === "static") {
-			if (seg.value !== pathParts[i]) return null;
-		} else params[seg.name] = pathParts[i];
 	}
-	if (segments.length !== pathParts.length) return null;
-	return params;
 }
-var RouteMatcher = class {
-	routes = [];
-	add(pattern, value) {
-		this.routes.push({
-			pattern,
-			compiled: compileRoute(pattern),
-			value
-		});
-	}
-	match(path) {
-		const parts = path.split("/").filter(Boolean);
-		for (const route of this.routes) {
-			const params = matchRoute(route.compiled.segments, parts);
-			if (params) return {
-				value: route.value,
-				params,
-				pattern: route.pattern
-			};
-		}
-		return null;
-	}
-};
 
 //#endregion
 //#region src/resolve.ts
@@ -730,65 +953,14 @@ function defaultStrategies() {
 }
 
 //#endregion
-//#region src/router/categorize.ts
-function resolveKind(name, def) {
-	if ("kind" in def && def.kind) return def.kind;
-	if ("type" in def && def.type) {
-		console.warn(`[seam] "${name}": "type" field in procedure definition is deprecated, use "kind" instead`);
-		return def.type;
-	}
-	return "query";
-}
-/** Split a flat definition map into typed procedure/subscription/stream maps */
-function categorizeProcedures(definitions, contextConfig) {
-	const procedureMap = /* @__PURE__ */ new Map();
-	const subscriptionMap = /* @__PURE__ */ new Map();
-	const streamMap = /* @__PURE__ */ new Map();
-	const uploadMap = /* @__PURE__ */ new Map();
-	const kindMap = /* @__PURE__ */ new Map();
-	for (const [name, def] of Object.entries(definitions)) {
-		const kind = resolveKind(name, def);
-		kindMap.set(name, kind);
-		const contextKeys = def.context ?? [];
-		if (contextConfig && contextKeys.length > 0) {
-			for (const key of contextKeys) if (!(key in contextConfig)) throw new Error(`Procedure "${name}" references undefined context field "${key}"`);
-		}
-		if (kind === "upload") uploadMap.set(name, {
-			inputSchema: def.input._schema,
-			outputSchema: def.output._schema,
-			contextKeys,
-			handler: def.handler
-		});
-		else if (kind === "stream") streamMap.set(name, {
-			inputSchema: def.input._schema,
-			chunkOutputSchema: def.output._schema,
-			contextKeys,
-			handler: def.handler
-		});
-		else if (kind === "subscription") subscriptionMap.set(name, {
-			inputSchema: def.input._schema,
-			outputSchema: def.output._schema,
-			contextKeys,
-			handler: def.handler
-		});
-		else procedureMap.set(name, {
-			inputSchema: def.input._schema,
-			outputSchema: def.output._schema,
-			contextKeys,
-			handler: def.handler
-		});
-	}
-	return {
-		procedureMap,
-		subscriptionMap,
-		streamMap,
-		uploadMap,
-		kindMap
-	};
+//#region src/router/helpers.ts
+/** Resolve a ValidationMode to a boolean flag */
+function resolveValidationMode(mode) {
+	const m = mode ?? "dev";
+	if (m === "always") return true;
+	if (m === "never") return false;
+	return typeof process !== "undefined" && process.env.NODE_ENV !== "production";
 }
-
-//#endregion
-//#region src/router/index.ts
 /** Build the resolve strategy list from options */
 function buildStrategies(opts) {
 	const strategies = opts?.resolve ?? defaultStrategies();
@@ -797,14 +969,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] ?? "",
@@ -831,14 +1005,14 @@ function collectChannelMeta(channels) {
 	}));
 }
 /** Resolve context for a procedure, returning undefined if no context needed */
-function resolveCtxFor(map, name, rawCtx, extractKeys, ctxConfig) {
-	if (!rawCtx || extractKeys.length === 0) return void 0;
+function resolveCtxFor(map, name, rawCtx, ctxConfig) {
+	if (!rawCtx) return void 0;
 	const proc = map.get(name);
 	if (!proc || proc.contextKeys.length === 0) return void 0;
 	return resolveContext(ctxConfig, rawCtx, proc.contextKeys);
 }
 /** Resolve locale and match page route */
-async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strategies, hasUrlPrefix, path, headers) {
+async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strategies, hasUrlPrefix, path, headers, rawCtx, ctxConfig, shouldValidateInput) {
 	let pathLocale = null;
 	let routePath = path;
 	if (hasUrlPrefix && i18nConfig) {
@@ -861,6 +1035,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");
@@ -871,12 +1054,16 @@ async function matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strateg
 		config: i18nConfig,
 		routePattern: match.pattern
 	} : void 0;
-	return handlePageRequest(match.value, match.params, procedureMap, i18nOpts, searchParams);
+	const ctxResolver = rawCtx ? (proc) => {
+		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);
 }
 /** Catch context resolution errors and return them as HandleResult */
-function resolveCtxSafe(map, name, rawCtx, extractKeys, ctxConfig) {
+function resolveCtxSafe(map, name, rawCtx, ctxConfig) {
 	try {
-		return { ctx: resolveCtxFor(map, name, rawCtx, extractKeys, ctxConfig) };
+		return { ctx: resolveCtxFor(map, name, rawCtx, ctxConfig) };
 	} catch (err) {
 		if (err instanceof SeamError) return { error: {
 			status: err.status,
@@ -885,9 +1072,14 @@ function resolveCtxSafe(map, name, rawCtx, extractKeys, ctxConfig) {
 		throw err;
 	}
 }
-function createRouter(procedures, opts) {
+
+//#endregion
+//#region src/router/state.ts
+/** Build all shared state that createRouter methods close over */
+function initRouterState(procedures, opts) {
 	const ctxConfig = opts?.context ?? {};
 	const { procedureMap, subscriptionMap, streamMap, uploadMap, kindMap } = categorizeProcedures(procedures, Object.keys(ctxConfig).length > 0 ? ctxConfig : void 0);
+	const shouldValidateInput = resolveValidationMode(opts?.validation?.input);
 	const shouldValidateOutput = opts?.validateOutput ?? (typeof process !== "undefined" && process.env.NODE_ENV !== "production");
 	const pageMatcher = new RouteMatcher();
 	const pages = opts?.pages;
@@ -895,45 +1087,191 @@ function createRouter(procedures, opts) {
 	const i18nConfig = opts?.i18n ?? null;
 	const { strategies, hasUrlPrefix } = buildStrategies(opts);
 	if (i18nConfig) registerI18nQuery(procedureMap, i18nConfig);
-	const channelsMeta = collectChannelMeta(opts?.channels);
-	const extractKeys = contextExtractKeys(ctxConfig);
 	return {
-		procedures,
-		hasPages: !!pages && Object.keys(pages).length > 0,
-		contextExtractKeys() {
-			return extractKeys;
-		},
-		manifest() {
-			return buildManifest(procedures, channelsMeta, ctxConfig, opts?.transportDefaults);
-		},
+		ctxConfig,
+		procedureMap,
+		subscriptionMap,
+		streamMap,
+		uploadMap,
+		kindMap,
+		shouldValidateInput,
+		shouldValidateOutput,
+		pageMatcher,
+		pages,
+		i18nConfig,
+		strategies,
+		hasUrlPrefix,
+		channelsMeta: collectChannelMeta(opts?.channels),
+		hasCtx: contextHasExtracts(ctxConfig)
+	};
+}
+/** Build request-response methods: handle, handleBatch, handleUpload */
+function buildRpcMethods(state) {
+	return {
 		async handle(procedureName, body, rawCtx) {
-			const { ctx, error } = resolveCtxSafe(procedureMap, procedureName, rawCtx, extractKeys, ctxConfig);
+			const { ctx, error } = resolveCtxSafe(state.procedureMap, procedureName, rawCtx, state.ctxConfig);
 			if (error) return error;
-			return handleRequest(procedureMap, procedureName, body, shouldValidateOutput, ctx);
+			return handleRequest(state.procedureMap, procedureName, body, state.shouldValidateInput, state.shouldValidateOutput, ctx);
 		},
 		handleBatch(calls, rawCtx) {
-			return handleBatchRequest(procedureMap, calls, shouldValidateOutput, rawCtx ? (name) => resolveCtxFor(procedureMap, name, rawCtx, extractKeys, ctxConfig) ?? {} : void 0);
-		},
-		handleSubscription(name, input, rawCtx) {
-			return handleSubscription(subscriptionMap, name, input, shouldValidateOutput, resolveCtxFor(subscriptionMap, name, rawCtx, extractKeys, ctxConfig));
-		},
-		handleStream(name, input, rawCtx) {
-			return handleStream(streamMap, name, input, shouldValidateOutput, resolveCtxFor(streamMap, name, rawCtx, extractKeys, ctxConfig));
+			const ctxResolver = rawCtx ? (name) => resolveCtxFor(state.procedureMap, name, rawCtx, state.ctxConfig) ?? {} : void 0;
+			return handleBatchRequest(state.procedureMap, calls, state.shouldValidateInput, state.shouldValidateOutput, ctxResolver);
 		},
 		async handleUpload(name, body, file, rawCtx) {
-			const { ctx, error } = resolveCtxSafe(uploadMap, name, rawCtx, extractKeys, ctxConfig);
+			const { ctx, error } = resolveCtxSafe(state.uploadMap, name, rawCtx, state.ctxConfig);
 			if (error) return error;
-			return handleUploadRequest(uploadMap, name, body, file, shouldValidateOutput, ctx);
+			return handleUploadRequest(state.uploadMap, name, body, file, state.shouldValidateInput, state.shouldValidateOutput, ctx);
+		}
+	};
+}
+/** 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;
+		},
+		manifest() {
+			return buildManifest(procedures, state.channelsMeta, state.ctxConfig, opts?.transportDefaults);
+		},
+		...buildRpcMethods(state),
+		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, 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);
 		},
 		getKind(name) {
-			return kindMap.get(name) ?? null;
+			return state.kindMap.get(name) ?? null;
 		},
-		handlePage(path, headers) {
-			return matchAndHandlePage(pageMatcher, procedureMap, i18nConfig, strategies, hasUrlPrefix, path, headers);
+		handlePage(path, headers, rawCtx) {
+			return matchAndHandlePage(state.pageMatcher, state.procedureMap, state.i18nConfig, state.strategies, state.hasUrlPrefix, path, headers, rawCtx, state.ctxConfig, state.shouldValidateInput);
+		},
+		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 flat = flattenDefinitions(procedures);
+	const state = initRouterState(flat, opts);
+	return {
+		procedures: flat,
+		rpcHashMap: opts?.rpcHashMap,
+		...buildRouterMethods(state, flat, opts)
+	};
+}
+
+//#endregion
+//#region src/factory.ts
+function query(def) {
+	return {
+		...def,
+		kind: "query"
+	};
+}
+function command(def) {
+	return {
+		...def,
+		kind: "command"
+	};
+}
+function subscription(def) {
+	return {
+		...def,
+		kind: "subscription"
+	};
+}
+function stream(def) {
+	return {
+		...def,
+		kind: "stream"
+	};
+}
+function upload(def) {
+	return {
+		...def,
+		kind: "upload"
+	};
+}
+
+//#endregion
+//#region src/seam-router.ts
+function createSeamRouter(config) {
+	const { context, ...restConfig } = config;
+	const define = {
+		query(def) {
+			return {
+				...def,
+				kind: "query"
+			};
+		},
+		command(def) {
+			return {
+				...def,
+				kind: "command"
+			};
+		},
+		subscription(def) {
+			return {
+				...def,
+				kind: "subscription"
+			};
+		},
+		stream(def) {
+			return {
+				...def,
+				kind: "stream"
+			};
+		},
+		upload(def) {
+			return {
+				...def,
+				kind: "upload"
+			};
+		}
+	};
+	function router(procedures, extraOpts) {
+		return createRouter(procedures, {
+			...restConfig,
+			context,
+			...extraOpts
+		});
+	}
+	return {
+		router,
+		define
+	};
+}
+
 //#endregion
 //#region src/channel.ts
 /** Merge channel-level and message-level JTD properties schemas */
@@ -1044,6 +1382,7 @@ const MIME_TYPES = {
 //#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 JSON_HEADER = { "Content-Type": "application/json" };
@@ -1102,13 +1441,78 @@ function sseErrorEvent(code, message, transient = false) {
 function sseCompleteEvent() {
 	return "event: complete\ndata: {}\n\n";
 }
-async function* sseStream(router, name, input, rawCtx) {
+function formatSseError(error) {
+	if (error instanceof SeamError) return sseErrorEvent(error.code, error.message);
+	return sseErrorEvent("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error");
+}
+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;
+	const signal = () => {
+		if (resolve) {
+			resolve();
+			resolve = null;
+		}
+	};
+	let idleTimer = null;
+	const resetIdle = () => {
+		if (!idleEnabled) return;
+		if (idleTimer) clearTimeout(idleTimer);
+		idleTimer = setTimeout(() => {
+			queue.push({ type: "idle" });
+			signal();
+		}, idleMs);
+	};
+	const heartbeatTimer = setInterval(() => {
+		queue.push({ type: "heartbeat" });
+		signal();
+	}, heartbeatMs);
+	resetIdle();
+	(async () => {
+		try {
+			for await (const chunk of inner) {
+				queue.push({
+					type: "data",
+					value: chunk
+				});
+				resetIdle();
+				signal();
+			}
+		} catch {}
+		queue.push({ type: "done" });
+		signal();
+	})();
 	try {
-		for await (const value of router.handleSubscription(name, input, rawCtx)) yield sseDataEvent(value);
+		for (;;) {
+			while (queue.length === 0) await new Promise((r) => {
+				resolve = r;
+			});
+			const item = queue.shift();
+			if (!item) continue;
+			if (item.type === "data") yield item.value;
+			else if (item.type === "heartbeat") yield ": heartbeat\n\n";
+			else if (item.type === "idle") {
+				yield sseCompleteEvent();
+				return;
+			} else return;
+		}
+	} finally {
+		clearInterval(heartbeatTimer);
+		if (idleTimer) clearTimeout(idleTimer);
+	}
+}
+async function* sseStream(router, name, input, rawCtx, lastEventId) {
+	try {
+		let seq = 0;
+		for await (const value of router.handleSubscription(name, input, rawCtx, lastEventId)) yield sseDataEventWithId(value, seq++);
 		yield sseCompleteEvent();
 	} catch (error) {
-		if (error instanceof SeamError) yield sseErrorEvent(error.code, error.message);
-		else yield sseErrorEvent("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error");
+		yield formatSseError(error);
 	}
 }
 async function* sseStreamForStream(router, name, input, signal, rawCtx) {
@@ -1121,8 +1525,7 @@ async function* sseStreamForStream(router, name, input, signal, rawCtx) {
 		for await (const value of gen) yield sseDataEventWithId(value, seq++);
 		yield sseCompleteEvent();
 	} catch (error) {
-		if (error instanceof SeamError) yield sseErrorEvent(error.code, error.message);
-		else yield sseErrorEvent("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error");
+		yield formatSseError(error);
 	}
 }
 async function handleBatchHttp(req, router, hashToName, rawCtx) {
@@ -1142,22 +1545,49 @@ async function handleBatchHttp(req, router, hashToName, rawCtx) {
 		data: await router.handleBatch(calls, rawCtx)
 	});
 }
-/** Resolve hash -> original name when obfuscation is active. Returns null on miss. */
+/** 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) ?? null;
+	return hashToName.get(name) ?? name;
+}
+async function handleProcedurePost(req, router, name, rawCtx, sseOptions) {
+	let body;
+	try {
+		body = await req.body();
+	} catch {
+		return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
+	}
+	if (router.getKind(name) === "stream") {
+		const controller = new AbortController();
+		return {
+			status: 200,
+			headers: SSE_HEADER,
+			stream: withSseLifecycle(sseStreamForStream(router, name, body, controller.signal, rawCtx), sseOptions),
+			onCancel: () => controller.abort()
+		};
+	}
+	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 hashToName = opts?.rpcHashMap ? new Map(Object.entries(opts.rpcHashMap.procedures).map(([n, h]) => [h, n])) : null;
-	if (hashToName) hashToName.set("__seam_i18n_query", "__seam_i18n_query");
-	const batchHash = opts?.rpcHashMap?.batch ?? null;
-	const ctxExtractKeys = router.contextExtractKeys();
+	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 = ctxExtractKeys.length > 0 && req.header ? Object.fromEntries(ctxExtractKeys.map((k) => [k, req.header?.(k) ?? null])) : void 0;
+		const rawCtx = hasCtx ? buildRawContext(router.ctxConfig, req.header, url) : void 0;
 		if (req.method === "GET" && pathname === MANIFEST_PATH) {
-			if (opts?.rpcHashMap) return errorResponse(403, "FORBIDDEN", "Manifest disabled");
+			if (effectiveHashMap) return errorResponse(403, "FORBIDDEN", "Manifest disabled");
 			return jsonResponse(200, router.manifest());
 		}
 		if (pathname.startsWith(PROCEDURE_PREFIX)) {
@@ -1165,36 +1595,10 @@ function createHttpHandler(router, opts) {
 			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);
-				const name = resolveHashName(hashToName, rawName);
-				if (!name) return errorResponse(404, "NOT_FOUND", "Not found");
-				let body;
-				try {
-					body = await req.body();
-				} catch {
-					return errorResponse(400, "VALIDATION_ERROR", "Invalid JSON body");
-				}
-				if (router.getKind(name) === "stream") {
-					const controller = new AbortController();
-					return {
-						status: 200,
-						headers: SSE_HEADER,
-						stream: sseStreamForStream(router, name, body, controller.signal, rawCtx),
-						onCancel: () => controller.abort()
-					};
-				}
-				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);
+				return handleProcedurePost(req, router, resolveHashName(hashToName, rawName), rawCtx, opts?.sseOptions);
 			}
 			if (req.method === "GET") {
 				const name = resolveHashName(hashToName, rawName);
-				if (!name) return errorResponse(404, "NOT_FOUND", "Not found");
 				const rawInput = url.searchParams.get("input");
 				let input;
 				try {
@@ -1202,10 +1606,11 @@ function createHttpHandler(router, opts) {
 				} catch {
 					return errorResponse(400, "VALIDATION_ERROR", "Invalid input query parameter");
 				}
+				const lastEventId = req.header?.("last-event-id") ?? void 0;
 				return {
 					status: 200,
 					headers: SSE_HEADER,
-					stream: sseStream(router, name, input, rawCtx)
+					stream: withSseLifecycle(sseStream(router, name, input, rawCtx, lastEventId), opts?.sseOptions)
 				};
 			}
 		}
@@ -1216,13 +1621,18 @@ function createHttpHandler(router, opts) {
 				cookie: req.header("cookie") ?? void 0,
 				acceptLanguage: req.header("accept-language") ?? void 0
 			} : void 0;
-			const result = await router.handlePage(pagePath, headers);
+			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(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 (opts?.fallback) return opts.fallback(req);
 		return errorResponse(404, "NOT_FOUND", "Not found");
@@ -1267,10 +1677,14 @@ function toWebResponse(result) {
 
 //#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, mapping] of Object.entries(config.params)) {
+		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;
 		}
@@ -1348,6 +1762,22 @@ function mergeI18nKeys(route, layoutEntries) {
 	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)
+	};
+}
+/** Load all build artifacts with lazy template getters (for dev mode) */
+function loadBuildDev(distDir) {
+	return {
+		pages: loadBuildOutputDev(distDir),
+		rpcHashMap: loadRpcHashMap(distDir),
+		i18n: loadI18nMessages(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");
@@ -1402,6 +1832,8 @@ function loadBuildOutput(distDir) {
 		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");
@@ -1411,7 +1843,7 @@ function loadBuildOutput(distDir) {
 			localeTemplates: layoutLocaleTemplates[id]
 		})) : [];
 		const i18nKeys = mergeI18nKeys(entry, layoutEntries);
-		pages[path] = {
+		const page = {
 			template,
 			localeTemplates: loadLocaleTemplates(entry, distDir),
 			loaders,
@@ -1422,6 +1854,11 @@ function loadBuildOutput(distDir) {
 			pageAssets: entry.assets,
 			projections: entry.projections
 		};
+		if (entry.prerender && hasStaticDir) {
+			page.prerender = true;
+			page.staticDir = staticDir;
+		}
+		pages[path] = page;
 	}
 	return pages;
 }
@@ -1529,7 +1966,8 @@ function fromCallback(setup) {
 
 //#endregion
 //#region src/ws.ts
-const DEFAULT_HEARTBEAT_MS = 3e4;
+const DEFAULT_HEARTBEAT_MS = 21e3;
+const DEFAULT_PONG_TIMEOUT_MS = 5e3;
 function sendError(ws, id, code, message) {
 	ws.send(JSON.stringify({
 		id,
@@ -1541,6 +1979,60 @@ function sendError(ws, id, code, message) {
 		}
 	}));
 }
+/** Validate uplink message fields and channel scope */
+function parseUplink(ws, data, channelName) {
+	let msg;
+	try {
+		msg = JSON.parse(data);
+	} catch {
+		sendError(ws, null, "VALIDATION_ERROR", "Invalid JSON");
+		return null;
+	}
+	if (!msg.id || typeof msg.id !== "string") {
+		sendError(ws, null, "VALIDATION_ERROR", "Missing 'id' field");
+		return null;
+	}
+	if (!msg.procedure || typeof msg.procedure !== "string") {
+		sendError(ws, msg.id, "VALIDATION_ERROR", "Missing 'procedure' field");
+		return null;
+	}
+	const prefix = channelName + ".";
+	if (!msg.procedure.startsWith(prefix) || msg.procedure === `${channelName}.events`) {
+		sendError(ws, msg.id, "VALIDATION_ERROR", `Procedure '${msg.procedure}' is not a command of channel '${channelName}'`);
+		return null;
+	}
+	return msg;
+}
+/** Dispatch validated uplink command through the router */
+function dispatchUplink(router, ws, msg, channelInput) {
+	const mergedInput = {
+		...channelInput,
+		...msg.input ?? {}
+	};
+	(async () => {
+		try {
+			const result = await router.handle(msg.procedure, mergedInput);
+			if (result.status === 200) {
+				const envelope = result.body;
+				ws.send(JSON.stringify({
+					id: msg.id,
+					ok: true,
+					data: envelope.data
+				}));
+			} else {
+				const envelope = result.body;
+				ws.send(JSON.stringify({
+					id: msg.id,
+					ok: false,
+					error: envelope.error
+				}));
+			}
+		} catch (err) {
+			const message = err instanceof Error ? err.message : "Unknown error";
+			sendError(ws, msg.id, "INTERNAL_ERROR", message);
+		}
+	})();
+}
 /**
 * Start a WebSocket session for a channel.
 *
@@ -1549,9 +2041,24 @@ function sendError(ws, id, code, message) {
 */
 function startChannelWs(router, channelName, channelInput, ws, opts) {
 	const heartbeatMs = opts?.heartbeatInterval ?? DEFAULT_HEARTBEAT_MS;
+	const pongTimeoutMs = opts?.pongTimeout ?? DEFAULT_PONG_TIMEOUT_MS;
 	let closed = false;
+	let pongTimer = null;
 	const heartbeatTimer = setInterval(() => {
-		if (!closed) ws.send(JSON.stringify({ heartbeat: true }));
+		if (closed) return;
+		ws.send(JSON.stringify({ heartbeat: true }));
+		if (ws.ping) {
+			ws.ping();
+			if (pongTimer) clearTimeout(pongTimer);
+			pongTimer = setTimeout(() => {
+				if (!closed) {
+					closed = true;
+					clearInterval(heartbeatTimer);
+					iter.return?.(void 0);
+					ws.close?.();
+				}
+			}, pongTimeoutMs);
+		}
 	}, heartbeatMs);
 	const iter = router.handleSubscription(`${channelName}.events`, channelInput)[Symbol.asyncIterator]();
 	(async () => {
@@ -1582,58 +2089,20 @@ function startChannelWs(router, channelName, channelInput, ws, opts) {
 	return {
 		onMessage(data) {
 			if (closed) return;
-			let msg;
-			try {
-				msg = JSON.parse(data);
-			} catch {
-				sendError(ws, null, "VALIDATION_ERROR", "Invalid JSON");
-				return;
-			}
-			if (!msg.id || typeof msg.id !== "string") {
-				sendError(ws, null, "VALIDATION_ERROR", "Missing 'id' field");
-				return;
-			}
-			if (!msg.procedure || typeof msg.procedure !== "string") {
-				sendError(ws, msg.id, "VALIDATION_ERROR", "Missing 'procedure' field");
-				return;
-			}
-			const prefix = channelName + ".";
-			if (!msg.procedure.startsWith(prefix) || msg.procedure === `${channelName}.events`) {
-				sendError(ws, msg.id, "VALIDATION_ERROR", `Procedure '${msg.procedure}' is not a command of channel '${channelName}'`);
-				return;
+			const msg = parseUplink(ws, data, channelName);
+			if (msg) dispatchUplink(router, ws, msg, channelInput);
+		},
+		onPong() {
+			if (pongTimer) {
+				clearTimeout(pongTimer);
+				pongTimer = null;
 			}
-			const mergedInput = {
-				...channelInput,
-				...msg.input ?? {}
-			};
-			(async () => {
-				try {
-					const result = await router.handle(msg.procedure, mergedInput);
-					if (result.status === 200) {
-						const envelope = result.body;
-						ws.send(JSON.stringify({
-							id: msg.id,
-							ok: true,
-							data: envelope.data
-						}));
-					} else {
-						const envelope = result.body;
-						ws.send(JSON.stringify({
-							id: msg.id,
-							ok: false,
-							error: envelope.error
-						}));
-					}
-				} catch (err) {
-					const message = err instanceof Error ? err.message : "Unknown error";
-					sendError(ws, msg.id, "INTERNAL_ERROR", message);
-				}
-			})();
 		},
 		close() {
 			if (closed) return;
 			closed = true;
 			clearInterval(heartbeatTimer);
+			if (pongTimer) clearTimeout(pongTimer);
 			iter.return?.(void 0);
 		}
 	};
@@ -1759,5 +2228,5 @@ function watchReloadTrigger(distDir, onReload) {
 }
 
 //#endregion
-export { SeamError, createChannel, createDevProxy, createHttpHandler, createRouter, createStaticHandler, defaultStrategies, definePage, drainStream, fromAcceptLanguage, fromCallback, fromCookie, fromUrlPrefix, fromUrlQuery, loadBuildOutput, loadBuildOutputDev, loadI18nMessages, loadRpcHashMap, resolveChain, serialize, sseCompleteEvent, sseDataEvent, sseDataEventWithId, sseErrorEvent, startChannelWs, t, toWebResponse, watchReloadTrigger };
+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