@warlock.js/web 5.0.2 → 5.2.0

package/esm/server/execute-page-request.mjs

@@ -1,13 +1,13 @@
-import { enterSharedScope, sealShared, shared } from "../shared.mjs";
-import { createBufferedResponse, isLoaderShortCircuit } from "./buffered-response.mjs";
-import { connectPageContext, connectPageSharedScope, enterAdditionalSharedScope, requireRunner } from "./page-context.mjs";
-import { matchRoute } from "./match-page-route.mjs";
+import { enterSharedScope, sealShared } from "../shared.mjs";
 import { resolvePageMetadata } from "./resolve-page-metadata.mjs";
+import { connectPageContext, enterAdditionalSharedScope, requireRunner } from "./page-context.mjs";
+import { matchRoute } from "./match-page-route.mjs";
 import { resolveValidationData } from "./resolve-validation-data.mjs";
-import { LEVEL_ORDER, buildErrorRecord, commitBuffers, designateBoundary } from "./settle-page-response.mjs";
+import { LEVEL_ORDER, buildErrorRecord, commitBuffers, createBufferedResponse, createLevelBuffer, designateBoundary, isLoaderShortCircuit } from "./settle-page-response.mjs";
+import { Response } from "@warlock.js/core";
 import { v } from "@warlock.js/seal";
 
-//#region ../web/src/server/execute-page-request.ts
+//#region web/src/server/execute-page-request.ts
 async function executePageRequest(options) {
 	const runner = requireRunner();
 	const [pathname, queryString] = options.url.split("?");
@@ -28,9 +28,9 @@ async function executePageRequest(options) {
 		request,
 		response
 	};
-	return await runner.run(store, async () => {
+	return runner.run(store, async () => {
 		enterSharedScope(store);
-		enterAdditionalSharedScope(store);
+		/* @__PURE__ */ enterAdditionalSharedScope(store);
 		const finish = async (bundle) => options.finish ? await options.finish(bundle) : bundle;
 		const bundle = { route: {
 			name: matched.entry.name,
@@ -47,7 +47,7 @@ async function executePageRequest(options) {
 				});
 			} catch (thrown) {
 				bundle.error = buildErrorRecord(thrown, designateBoundary(level, triple), pathname);
-				bundle.commit = commitBuffers(response, [], 500);
+				response.setStatusCode(500);
 				return finish(bundle);
 			}
 			if (output !== void 0) {
@@ -64,7 +64,7 @@ async function executePageRequest(options) {
 		if (validation?.schema) {
 			const data = resolveValidationData(validation.validating, request);
 			const result = await v.validate(validation.schema, data);
-			if (result.isValid && result.data) request.setValidatedData?.(result.data);
+			if (result.isValid && result.data) request.setValidatedData(result.data);
 			if (!result.isValid) {
 				bundle.shortCircuit = {
 					stage: "validation",
@@ -76,86 +76,85 @@ async function executePageRequest(options) {
 		}
 		const sealedShared = await sealShared(store);
 		bundle.shared = sealedShared;
-		const buffers = LEVEL_ORDER.map((level) => {
-			const { response: bufferedResponse, buffer } = createBufferedResponse();
-			return {
-				level,
-				buffer,
-				bufferedResponse
-			};
-		});
-		const settled = await Promise.allSettled(buffers.map(({ level, bufferedResponse }) => {
-			const loader = triple[level].loader;
-			return (async () => loader ? await loader({
-				request,
-				response: bufferedResponse,
-				shared
-			}) : void 0)();
-		}));
-		let firstError;
-		let firstSignal;
-		function toSignal(value) {
-			return isLoaderShortCircuit(value) ? value : void 0;
-		}
-		for (let index = 0; index < LEVEL_ORDER.length; index++) {
-			const result = settled[index];
-			if (result.status === "rejected") {
-				firstError = {
-					level: LEVEL_ORDER[index],
-					index,
-					error: result.reason
-				};
-				break;
-			}
-			const signal = toSignal(result.value);
-			if (signal) {
-				firstSignal = {
-					level: LEVEL_ORDER[index],
-					index,
-					signal
-				};
-				break;
-			}
-		}
 		const dataKeys = {
 			app: "appData",
 			layout: "layoutData",
 			page: "pageData"
 		};
-		const dataCutoff = firstSignal ? firstSignal.index : LEVEL_ORDER.length;
+		const buffers = {
+			app: createLevelBuffer(),
+			layout: createLevelBuffer(),
+			page: createLevelBuffer()
+		};
+		let signalIndex = -1;
+		let signalKind;
+		let signalThrown;
+		let signalCircuit;
 		for (let index = 0; index < LEVEL_ORDER.length; index++) {
-			const result = settled[index];
-			if (result.status !== "fulfilled") continue;
-			if (firstError && index === firstError.index) continue;
-			if (index > dataCutoff) continue;
-			if (toSignal(result.value)) continue;
-			bundle[dataKeys[LEVEL_ORDER[index]]] = result.value;
+			const level = LEVEL_ORDER[index];
+			const loader = triple[level].loader;
+			if (!loader) continue;
+			let value;
+			try {
+				value = await loader({
+					request,
+					response: createBufferedResponse(buffers[level]),
+					shared: sealedShared
+				});
+			} catch (thrown) {
+				signalIndex = index;
+				signalKind = "throw";
+				signalThrown = thrown;
+				break;
+			}
+			if (value instanceof Response) return value;
+			if (isLoaderShortCircuit(value)) {
+				signalIndex = index;
+				signalKind = "shortCircuit";
+				signalCircuit = value;
+				break;
+			}
+			bundle[dataKeys[level]] = value;
 		}
-		if (firstError) {
-			const boundary = designateBoundary(firstError.level, triple);
-			bundle.error = buildErrorRecord(firstError.error, boundary, pathname);
-			bundle.commit = commitBuffers(response, buffers.slice(0, firstError.index), boundary.boundaryLevel === "app" ? 500 : void 0);
-		} else if (firstSignal) {
+		let committedLevels;
+		/** Set only when a THROW escalated to the app boundary — forces 500. */
+		let forcedStatusCode;
+		if (signalIndex === -1) committedLevels = [...LEVEL_ORDER];
+		else if (signalKind === "throw") {
+			committedLevels = LEVEL_ORDER.slice(0, signalIndex);
+			const boundary = designateBoundary(LEVEL_ORDER[signalIndex], triple);
+			bundle.error = buildErrorRecord(signalThrown, boundary, pathname);
+			if (boundary.boundaryLevel === "app") {
+				response.setStatusCode(500);
+				forcedStatusCode = 500;
+			}
+		} else {
+			committedLevels = LEVEL_ORDER.slice(0, signalIndex + 1);
+			const circuit = signalCircuit;
 			bundle.shortCircuit = {
 				stage: "loaders",
-				level: firstSignal.level,
-				kind: firstSignal.signal.kind,
-				statusCode: firstSignal.signal.statusCode,
-				url: firstSignal.signal.url,
-				body: firstSignal.signal.body
+				level: LEVEL_ORDER[signalIndex],
+				kind: circuit.kind,
+				statusCode: circuit.statusCode,
+				url: circuit.url,
+				body: circuit.body
 			};
-			bundle.commit = commitBuffers(response, buffers.slice(0, firstSignal.index + 1));
-		} else bundle.commit = commitBuffers(response, buffers);
-		if (!bundle.shortCircuit) {
-			const resolved = resolvePageMetadata({
-				metadata: triple.page.metadata,
-				data: bundle.pageData,
-				error: bundle.error?.error,
-				failed: Boolean(bundle.error),
-				shared: sealedShared
-			});
-			bundle.metadata = resolved.metadata;
-			if (resolved.thrown !== void 0) bundle.error = buildErrorRecord(resolved.thrown, designateBoundary("page", triple), bundle.route.path);
+		}
+		bundle.commit = commitBuffers(response, buffers, committedLevels);
+		if (forcedStatusCode !== void 0) bundle.commit.statusCode = forcedStatusCode;
+		if (bundle.shortCircuit) return finish(bundle);
+		const resolved = resolvePageMetadata({
+			metadata: triple.page.metadata,
+			data: bundle.pageData,
+			error: bundle.error?.error,
+			failed: Boolean(bundle.error),
+			shared: sealedShared
+		});
+		bundle.metadata = resolved.metadata;
+		if (resolved.thrown !== void 0) {
+			const boundary = designateBoundary("page", triple);
+			bundle.error = buildErrorRecord(resolved.thrown, boundary, bundle.route.path);
+			if (boundary.boundaryLevel === "app") response.setStatusCode(500);
 		}
 		return finish(bundle);
 	});

package/esm/server/execute-page-request.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"execute-page-request.mjs","names":[],"sources":["../../../../../../../web/src/server/execute-page-request.ts"],"sourcesContent":["import { v } from \"@warlock.js/seal\";\nimport { createBufferedResponse, isLoaderShortCircuit } from \"./buffered-response\";\nimport type { LoaderShortCircuitSignal } from \"./buffered-response\";\nimport { enterSharedScope, sealShared, shared } from \"../shared\";\nimport { enterAdditionalSharedScope, requireRunner } from \"./page-context\";\nimport { matchRoute } from \"./match-page-route\";\nimport { resolvePageMetadata } from \"./resolve-page-metadata\";\nimport { resolveValidationData } from \"./resolve-validation-data\";\nimport {\n  buildErrorRecord,\n  commitBuffers,\n  designateBoundary,\n  LEVEL_ORDER,\n} from \"./settle-page-response\";\nimport type {\n  ExecutePageRequestOptions,\n  PageDataBundle,\n  PageLevelName,\n  PageRouteMatch,\n  PipelineResponse,\n  PipelineStore,\n} from \"./execute-page-request.types\";\n\n/**\n * Pipeline stages 1–8 of a page request; stages 9–10 (render/emit) are the\n * render slice's, and this ends at the DATA BUNDLE.\n *\n * The founding sentence governs the shape — a page route is an ordinary Warlock\n * route whose handler renders React instead of returning JSON — so every stage\n * mirrors what core already does for an API request: core's own ALS store and\n * `run`, core's middleware short-circuit rule (`output !== undefined`), and\n * `validateAll`'s validation with its 422, recorded as a designation because\n * sending is the emit's job.\n *\n * The pieces live beside this file: `page-context.ts` (stage 2 wiring),\n * `match-page-route.ts` (stage 1), `resolve-validation-data.ts` (stage 4),\n * `settle-page-response.ts` (stage 7), `resolve-page-metadata.ts` (stage 8).\n */\n\nexport * from \"./execute-page-request.types\";\nexport { connectPageContext, connectPageSharedScope } from \"./page-context\";\nexport { buildErrorRecord, designateBoundary } from \"./settle-page-response\";\n\nexport async function executePageRequest<TResult = PageDataBundle>(\n  options: ExecutePageRequestOptions<TResult>,\n): Promise<TResult | undefined> {\n  const runner = requireRunner();\n\n  // ── stage 1 · MATCH ─────────────────────────────────────────────────────\n  const [pathname, queryString] = options.url.split(\"?\");\n  const matched = matchRoute(pathname, options.routes);\n\n  if (!matched) return undefined;\n\n  const query = Object.fromEntries(new URLSearchParams(queryString ?? \"\"));\n  const match: PageRouteMatch = { entry: matched.entry, params: matched.params, query };\n  const { triple } = matched.entry;\n\n  const { request, response } = options.createHttp(match);\n\n  // ── stage 2 · CONTEXT ───────────────────────────────────────────────────\n  // Core's own store shape, built by core's own `buildStore` when the runner\n  // carries one. `enterSharedScope` keys the shared target by this exact object.\n  const store: PipelineStore = runner.buildStore\n    ? runner.buildStore({ request, response })\n    : { request, response };\n\n  return await runner.run(store, async () => {\n    enterSharedScope(store);\n    enterAdditionalSharedScope(store);\n\n    const finish = async (bundle: PageDataBundle): Promise<TResult> =>\n      options.finish ? await options.finish(bundle) : (bundle as TResult);\n\n    const bundle: PageDataBundle = {\n      route: {\n        name: matched.entry.name,\n        path: matched.entry.path,\n        params: match.params,\n        query,\n      },\n    };\n\n    // ── stage 3 · MIDDLEWARE ──────────────────────────────────────────────\n    // Sequential, outermost first. Middleware gets the REAL request/response —\n    // it runs alone, before any parallelism — and is the only writer of `shared`.\n    for (const level of LEVEL_ORDER) {\n      for (const middleware of triple[level].middleware ?? []) {\n        let output: unknown;\n\n        try {\n          output = await middleware({ request, response });\n        } catch (thrown) {\n          /*\n            A middleware throw means NOTHING was served: no loaders ran, no\n            buffers exist. The \"a nested boundary keeps the committed status\"\n            rule assumes the page was substantially served, so it cannot apply\n            here — the framework forces 500 whichever level the boundary\n            designates to.\n          */\n          bundle.error = buildErrorRecord(thrown, designateBoundary(level, triple), pathname);\n          bundle.commit = commitBuffers(response, [], 500);\n\n          return finish(bundle);\n        }\n\n        if (output !== undefined) {\n          bundle.shortCircuit = {\n            stage: \"middleware\",\n            level,\n            value: output,\n            statusCode: (response as PipelineResponse & { statusCode?: number }).statusCode,\n          };\n\n          return finish(bundle);\n        }\n      }\n    }\n\n    // ── stage 4 · VALIDATION ──────────────────────────────────────────────\n    // Failure stops before the seal: a 422 designation in the bundle, since\n    // sending is the emit slice's job.\n    const validation = triple.page.validation;\n\n    if (validation?.schema) {\n      const data = resolveValidationData(validation.validating, request);\n      const result = await v.validate(validation.schema, data);\n\n      if (result.isValid && result.data) {\n        request.setValidatedData?.(result.data);\n      }\n\n      if (!result.isValid) {\n        bundle.shortCircuit = { stage: \"validation\", status: 422, errors: result.errors };\n\n        return finish(bundle);\n      }\n    }\n\n    // ── stage 5 · SEAL shared ─────────────────────────────────────────────\n    // From here `shared` is immutable and identical for every reader. The\n    // bundle carries `sealShared`'s RETURN, never a proxy re-read.\n    const sealedShared = await sealShared(store);\n\n    bundle.shared = sealedShared;\n\n    // ── stage 6 · LOADERS ─────────────────────────────────────────────────\n    // Parallel, each with its OWN buffered response. Loaders never read each\n    // other and cannot write `shared` — it is sealed, and a write throws.\n    const buffers = LEVEL_ORDER.map(level => {\n      const { response: bufferedResponse, buffer } = createBufferedResponse();\n\n      return { level, buffer, bufferedResponse };\n    });\n\n    const settled = await Promise.allSettled(\n      buffers.map(({ level, bufferedResponse }) => {\n        const loader = triple[level].loader;\n\n        return (async () =>\n          loader ? await loader({ request, response: bufferedResponse, shared }) : undefined)();\n      }),\n    );\n\n    // ── stage 7 · SETTLE / COMMIT ─────────────────────────────────────────\n    // Walk root→leaf for the first abnormal outcome. A throw discards the\n    // throwing layer's buffer and everything below it, and the framework owns\n    // the status. A redirect/notFound commits the signalling layer's own buffer\n    // and discards its siblings below.\n    let firstError: { level: PageLevelName; index: number; error: unknown } | undefined;\n    let firstSignal:\n      | { level: PageLevelName; index: number; signal: LoaderShortCircuitSignal }\n      | undefined;\n\n    function toSignal(value: unknown) {\n      return isLoaderShortCircuit(value) ? value : undefined;\n    }\n\n    for (let index = 0; index < LEVEL_ORDER.length; index++) {\n      const result = settled[index];\n\n      if (result.status === \"rejected\") {\n        firstError = { level: LEVEL_ORDER[index], index, error: result.reason };\n        break;\n      }\n\n      const signal = toSignal(result.value);\n\n      if (signal) {\n        firstSignal = { level: LEVEL_ORDER[index], index, signal };\n        break;\n      }\n    }\n\n    const dataKeys: Record<PageLevelName, \"appData\" | \"layoutData\" | \"pageData\"> = {\n      app: \"appData\",\n      layout: \"layoutData\",\n      page: \"pageData\",\n    };\n\n    // A throw elsewhere never costs a healthy layer its data. Levels leafward\n    // of a short-circuit go, because they will not render.\n    const dataCutoff = firstSignal ? firstSignal.index : LEVEL_ORDER.length;\n\n    for (let index = 0; index < LEVEL_ORDER.length; index++) {\n      const result = settled[index];\n\n      if (result.status !== \"fulfilled\") continue;\n      if (firstError && index === firstError.index) continue;\n      if (index > dataCutoff) continue;\n      if (toSignal(result.value)) continue;\n\n      bundle[dataKeys[LEVEL_ORDER[index]]] = result.value;\n    }\n\n    if (firstError) {\n      const boundary = designateBoundary(firstError.level, triple);\n\n      bundle.error = buildErrorRecord(firstError.error, boundary, pathname);\n\n      // Commit strictly rootward of the throw. A NESTED boundary keeps the\n      // committed status — the page was substantially served; only the ROOT\n      // boundary forces 5xx.\n      bundle.commit = commitBuffers(\n        response,\n        buffers.slice(0, firstError.index),\n        boundary.boundaryLevel === \"app\" ? 500 : undefined,\n      );\n    } else if (firstSignal) {\n      bundle.shortCircuit = {\n        stage: \"loaders\",\n        level: firstSignal.level,\n        kind: firstSignal.signal.kind,\n        statusCode: firstSignal.signal.statusCode,\n        url: firstSignal.signal.url,\n        body: firstSignal.signal.body,\n      };\n      bundle.commit = commitBuffers(response, buffers.slice(0, firstSignal.index + 1));\n    } else {\n      bundle.commit = commitBuffers(response, buffers);\n    }\n\n    // ── stage 8 · METADATA ────────────────────────────────────────────────\n    // Skipped entirely after a loader short-circuit: a redirect/notFound answer\n    // has no page render to describe.\n    if (!bundle.shortCircuit) {\n      const resolved = resolvePageMetadata({\n        metadata: triple.page.metadata,\n        data: bundle.pageData,\n        error: bundle.error?.error,\n        failed: Boolean(bundle.error),\n        shared: sealedShared,\n      });\n\n      bundle.metadata = resolved.metadata;\n\n      /*\n        The page's own metadata function threw with no earlier error to mask.\n        Record it exactly as a loader throw, so the boundary renders and the\n        framework keeps the status — rather than letting it escape stage 8,\n        where nothing is left to catch it and stage 7's buffers are already\n        committed.\n      */\n      if (resolved.thrown !== undefined) {\n        bundle.error = buildErrorRecord(\n          resolved.thrown,\n          designateBoundary(\"page\", triple),\n          bundle.route.path,\n        );\n      }\n    }\n\n    return finish(bundle);\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"execute-page-request.mjs","names":[],"sources":["C:/Work/Warlock.js/web/src/server/execute-page-request.ts"],"sourcesContent":["import { Response } from \"@warlock.js/core\";\nimport { v } from \"@warlock.js/seal\";\nimport { enterSharedScope, sealShared } from \"../shared\";\nimport { enterAdditionalSharedScope, requireRunner } from \"./page-context\";\nimport { matchRoute } from \"./match-page-route\";\nimport { resolvePageMetadata } from \"./resolve-page-metadata\";\nimport { resolveValidationData } from \"./resolve-validation-data\";\nimport {\n  buildErrorRecord,\n  commitBuffers,\n  createBufferedResponse,\n  createLevelBuffer,\n  designateBoundary,\n  isLoaderShortCircuit,\n  LEVEL_ORDER,\n  type LevelBuffer,\n  type PageResponseCommit,\n} from \"./settle-page-response\";\nimport type {\n  ExecutePageRequestOptions,\n  PageDataBundle,\n  PageLevelName,\n  PageRouteMatch,\n  PipelineStore,\n} from \"./execute-page-request.types\";\n\nexport * from \"./execute-page-request.types\";\nexport { connectPageContext } from \"./page-context\";\nexport {\n  buildErrorRecord,\n  designateBoundary,\n  type BufferedCookie,\n  type BufferedHeader,\n  type LoaderShortCircuitKind,\n  type PageResponseCommit,\n} from \"./settle-page-response\";\n\n/** Widens `PageDataBundle` with the two fields stage 6/7 populate. */\ntype Bundle = PageDataBundle & {\n  commit?: PageResponseCommit;\n  shortCircuit?: PageDataBundle[\"shortCircuit\"] & {\n    kind?: \"redirect\" | \"notFound\";\n    url?: string;\n    body?: unknown;\n  };\n};\n\nexport async function executePageRequest<TResult = PageDataBundle>(\n  options: ExecutePageRequestOptions<TResult>,\n): Promise<TResult | Response | undefined> {\n  const runner = requireRunner();\n  const [pathname, queryString] = options.url.split(\"?\");\n  const matched = matchRoute(pathname, options.routes);\n\n  if (!matched) return undefined;\n\n  const query = Object.fromEntries(new URLSearchParams(queryString ?? \"\"));\n  const match: PageRouteMatch = { entry: matched.entry, params: matched.params, query };\n  const { triple } = matched.entry;\n  const { request, response } = options.createHttp(match);\n  const store: PipelineStore = runner.buildStore\n    ? runner.buildStore({ request, response })\n    : { request, response };\n\n  return runner.run(store, async () => {\n    enterSharedScope(store);\n    enterAdditionalSharedScope(store);\n\n    const finish = async (bundle: PageDataBundle): Promise<TResult> =>\n      options.finish ? await options.finish(bundle) : (bundle as TResult);\n\n    const bundle: Bundle = {\n      route: {\n        name: matched.entry.name,\n        path: matched.entry.path,\n        params: match.params,\n        query,\n      },\n    };\n\n    for (const level of LEVEL_ORDER) {\n      for (const middleware of triple[level].middleware ?? []) {\n        let output: unknown;\n\n        try {\n          output = await middleware({ request, response });\n        } catch (thrown) {\n          bundle.error = buildErrorRecord(thrown, designateBoundary(level, triple), pathname);\n          response.setStatusCode(500);\n          return finish(bundle);\n        }\n\n        if (output !== undefined) {\n          bundle.shortCircuit = {\n            stage: \"middleware\",\n            level,\n            value: output,\n            statusCode: response.statusCode,\n          };\n          return finish(bundle);\n        }\n      }\n    }\n\n    const validation = triple.page.validation;\n\n    if (validation?.schema) {\n      const data = resolveValidationData(validation.validating, request);\n      const result = await v.validate(validation.schema, data);\n\n      if (result.isValid && result.data) {\n        request.setValidatedData(result.data);\n      }\n\n      if (!result.isValid) {\n        bundle.shortCircuit = { stage: \"validation\", status: 422, errors: result.errors };\n        return finish(bundle);\n      }\n    }\n\n    const sealedShared = await sealShared(store);\n    bundle.shared = sealedShared;\n\n    const dataKeys: Record<PageLevelName, \"appData\" | \"layoutData\" | \"pageData\"> = {\n      app: \"appData\",\n      layout: \"layoutData\",\n      page: \"pageData\",\n    };\n\n    // Stage 6 — LOADERS, root to leaf. Every level gets its OWN buffer (never\n    // the live response), and a terminal result or throw prevents every lower\n    // loader from starting.\n    const buffers: Record<PageLevelName, LevelBuffer> = {\n      app: createLevelBuffer(),\n      layout: createLevelBuffer(),\n      page: createLevelBuffer(),\n    };\n\n    let signalIndex = -1;\n    let signalKind: \"throw\" | \"shortCircuit\" | undefined;\n    let signalThrown: unknown;\n    let signalCircuit:\n      | { kind: \"redirect\" | \"notFound\"; statusCode: number; url?: string; body?: unknown }\n      | undefined;\n\n    for (let index = 0; index < LEVEL_ORDER.length; index++) {\n      const level = LEVEL_ORDER[index];\n      const loader = triple[level].loader;\n\n      if (!loader) continue;\n\n      let value: unknown;\n\n      try {\n        value = await loader({\n          request,\n          response: createBufferedResponse(buffers[level]),\n          shared: sealedShared,\n        });\n      } catch (thrown) {\n        signalIndex = index;\n        signalKind = \"throw\";\n        signalThrown = thrown;\n        break;\n      }\n\n      if (value instanceof Response) return value;\n\n      if (isLoaderShortCircuit(value)) {\n        signalIndex = index;\n        signalKind = \"shortCircuit\";\n        signalCircuit = value;\n        break;\n      }\n\n      bundle[dataKeys[level]] = value;\n    }\n\n    let committedLevels: PageLevelName[];\n    /** Set only when a THROW escalated to the app boundary — forces 500. */\n    let forcedStatusCode: number | undefined;\n\n    if (signalIndex === -1) {\n      committedLevels = [...LEVEL_ORDER];\n    } else if (signalKind === \"throw\") {\n      // The throwing level's buffer is discarded; lower levels never ran.\n      committedLevels = LEVEL_ORDER.slice(0, signalIndex);\n\n      const boundary = designateBoundary(LEVEL_ORDER[signalIndex], triple);\n      bundle.error = buildErrorRecord(signalThrown, boundary, pathname);\n\n      if (boundary.boundaryLevel === \"app\") {\n        response.setStatusCode(500);\n        forcedStatusCode = 500;\n      }\n    } else {\n      // Short-circuit: the signalling level's OWN buffer commits too\n      // (inclusive); lower levels never ran.\n      committedLevels = LEVEL_ORDER.slice(0, signalIndex + 1);\n\n      const circuit = signalCircuit!;\n\n      bundle.shortCircuit = {\n        stage: \"loaders\",\n        level: LEVEL_ORDER[signalIndex],\n        kind: circuit.kind,\n        statusCode: circuit.statusCode,\n        url: circuit.url,\n        body: circuit.body,\n      } as unknown as PageDataBundle[\"shortCircuit\"];\n    }\n\n    bundle.commit = commitBuffers(response, buffers, committedLevels);\n\n    // Forced AFTER the fold: an app-boundary escalation forces 500\n    // regardless of what the surviving (rootward) buffers happened to set —\n    // it is the framework's answer, not a loader's.\n    if (forcedStatusCode !== undefined) bundle.commit.statusCode = forcedStatusCode;\n\n    // Stage 8 — METADATA. Skipped entirely for a short-circuit (there is no\n    // page to describe); a throw still runs it, same as before this stage 6/7\n    // rewrite (a boundary still needs a title/robots answer).\n    if (bundle.shortCircuit) {\n      return finish(bundle);\n    }\n\n    const resolved = resolvePageMetadata({\n      metadata: triple.page.metadata,\n      data: bundle.pageData,\n      error: bundle.error?.error,\n      failed: Boolean(bundle.error),\n      shared: sealedShared,\n    });\n\n    bundle.metadata = resolved.metadata;\n\n    if (resolved.thrown !== undefined) {\n      const boundary = designateBoundary(\"page\", triple);\n      bundle.error = buildErrorRecord(resolved.thrown, boundary, bundle.route.path);\n\n      if (boundary.boundaryLevel === \"app\") response.setStatusCode(500);\n    }\n\n    return finish(bundle);\n  });\n}\n"],"mappings":"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"}

package/esm/server/execute-page-request.types.d.mts

@@ -1,67 +1,37 @@
 import { MetadataOutput, PageMetadata } from "../metadata.mjs";
+import { SerializedErrorPageProps } from "../components/document-context.mjs";
 import { SharedStore } from "../shared.mjs";
 import { SharedContext } from "../index.mjs";
-import { WebRequest } from "../context.mjs";
-import { BufferedCookie, BufferedHeader, BufferedWebResponse } from "./buffered-response.mjs";
+import { BufferedResponse } from "./settle-page-response.mjs";
+import { HttpContext, Request, Response } from "@warlock.js/core";
 import { BaseValidator } from "@warlock.js/seal";
 
-//#region ../web/src/server/execute-page-request.types.d.ts
-/** At runtime this IS core's `RequestContextStore` (request-context.ts:10-13). */
+//#region web/src/server/execute-page-request.types.d.ts
 type PipelineStore = SharedStore & {
-  request: unknown;
-  response: unknown;
+  request: Request;
+  response: Response;
 };
-/**
- * Core's `requestContext` satisfies this as-is — `run`/`getStore` are the
- * inherited `Context` delegates and `buildStore` is `RequestContext.buildStore`,
- * the same function core's http path feeds through `contextManager.buildStores`.
- */
 type PageContextRunner = {
   run<T>(store: PipelineStore, callback: () => Promise<T>): Promise<T>;
   getStore(): PipelineStore | undefined;
   buildStore?(payload?: Record<string, any>): PipelineStore;
 };
 type PageLevelName = "app" | "layout" | "page";
+type PipelineMiddleware = (ctx: HttpContext) => unknown | Promise<unknown>;
 /**
- * The request members the pipeline touches, declared explicitly rather than
- * imported from core: `WebRequest` is the loader-facing minimal facade and does
- * not carry the validation sources.
- *
- * `query`/`params` are core's own parses (request.ts:1010,1026) and the ONLY
- * ones the pipeline reads. Stage 4 used to take them from a match object built
- * by re-parsing the URL — `resolve-validation-data.ts` records what that cost.
- */
-type PipelineRequest = WebRequest & {
-  body?: Record<string, unknown>;
-  headers?: Record<string, unknown>;
-  query?: Record<string, unknown>;
-  params?: Record<string, unknown>;
-  setValidatedData?(data: Record<string, unknown>): void;
-};
-/**
- * Standalone rather than based on `WebResponse`: that facade's
- * `redirect`/`notFound` return the branded short-circuit signal, which core's
- * real `Response` never carries — basing this on it would reject the very
- * instances the seam exists to admit.
+ * A loader never sees the live `Response` — stage 6 hands it a per-level
+ * `BufferedResponse` (`execute-page-request.ts`, `createBufferedResponse`),
+ * so its own type says that, rather than the core `Response` a middleware
+ * receives.
  */
-type PipelineResponse = {
-  header(key: string, value: string): PipelineResponse;
-  cookie(name: string, value: unknown, options?: Record<string, unknown>): PipelineResponse;
-  setStatusCode(statusCode: number): PipelineResponse;
-  parse(value: unknown): Promise<unknown>;
-};
-/** Pass-through is `undefined` — core's exact rule (`Request.executeMiddleware`). */
-type PipelineMiddleware = (ctx: {
-  request: PipelineRequest;
-  response: PipelineResponse;
-}) => unknown | Promise<unknown>;
-type PipelineLoader = (ctx: {
-  request: PipelineRequest;
-  response: BufferedWebResponse;
+type PipelineLoaderContext = {
+  request: Request;
+  response: BufferedResponse;
   shared: SharedContext;
-}) => unknown | Promise<unknown>;
-/** The server half of a page/layout/App module. */
+};
+type PipelineLoader = (ctx: PipelineLoaderContext) => unknown | Promise<unknown>;
 type PageTripleModule = {
+  register?: () => unknown;
   route?: string | {
     readonly path: string;
     readonly name?: string;
@@ -72,7 +42,7 @@ type PageTripleModule = {
     validating?: readonly string[];
   };
   loader?: PipelineLoader;
-  metadata?: PageMetadata<PipelineLoader>; /** Runs-twice half — carried through untouched; the render slice consumes them. */
+  metadata?: PageMetadata<PipelineLoader>;
   default?: unknown;
   ErrorBoundary?: unknown;
 };
@@ -91,54 +61,27 @@ type PageRouteMatch = {
   query: Record<string, string>;
 };
 type ExecutePageRequestOptions<TResult = PageDataBundle> = {
-  /** Path + optional query string, e.g. `/products/42?tab=specs`. */url: string;
+  url: string;
   routes: readonly PageRouteEntry[];
-  /**
-   * Construct the Request/Response pair for this match, mirroring core's
-   * `handleRoute` body (router.ts:924-932).
-   */
-  createHttp(match: PageRouteMatch): {
-    request: PipelineRequest;
-    response: PipelineResponse;
-  };
-  /**
-   * The render seam — continues stages 9-10 inside the exact ALS store and
-   * shared scope that middleware and loaders used.
-   */
+  createHttp(match: PageRouteMatch): HttpContext;
   finish?(bundle: PageDataBundle): TResult | Promise<TResult>;
 };
 type PageBoundaryDesignation = {
-  throwingLevel: PageLevelName; /** Nearest boundary at or rootward of the throw; `app` is the terminal fallback. */
+  throwingLevel: PageLevelName;
   boundaryLevel: PageLevelName;
 };
-type PageResponseCommit = {
-  /** Final per-key state, root→leaf: a leafward write wins its key. */headers: BufferedHeader[];
-  cookies: BufferedCookie[];
-  statusCode?: number;
-  committedLevels: PageLevelName[];
-};
 type PageShortCircuit = {
   stage: "middleware";
   level: PageLevelName;
-  value: unknown; /** Captured at stage 3, so `finishRender` stays a pure function of (triple, bundle). */
+  value: unknown;
   statusCode?: number;
 } | {
   stage: "validation";
   status: number;
   errors: unknown;
-} | {
-  stage: "loaders";
-  level: PageLevelName;
-  kind: "redirect" | "notFound";
-  statusCode: number;
-  url?: string;
-  body?: unknown;
 };
-/**
- * What a throw becomes once it enters the bundle. `scrubbed` says whether
- * `error` is the raw thrown value or a production surrogate standing in for it.
- */
 type PageErrorRecord = {
+  /** Never serialized; preserves the actual thrown value for server error.page.tsx. */originalError: unknown;
   error: unknown;
   boundary: PageBoundaryDesignation;
   digest: string;
@@ -149,26 +92,24 @@ type PageDataBundle = {
     name: string;
     path: string;
     params: Record<string, string>;
-    /**
-     * ⚠ Re-parsed from the URL by `match-page-route.ts`, NOT core's parse, so it
-     * is flat and last-wins: `?tags=a&tags=b&filter[status]=active` arrives as
-     * `{ tags: "b", "filter[status]": "active" }`.
-     *
-     * Nothing in `web` reads it — stage 4 was the last consumer. It survives
-     * only as part of this public type and goes away with the second matcher.
-     * **Read `request.query`.**
-     */
     query: Record<string, string>;
   };
   appData?: unknown;
   layoutData?: unknown;
-  pageData?: unknown; /** `sealShared()`'s RETURN — the sealed target, never a proxy re-read. */
+  pageData?: unknown;
   shared?: Readonly<SharedContext>;
   metadata?: MetadataOutput;
-  commit?: PageResponseCommit;
   shortCircuit?: PageShortCircuit;
   error?: PageErrorRecord;
+  /**
+   * Selected only for the framework-owned application error-page terminal —
+   * already the JSON-safe shape (`hydrationErrorPageProps` produces this, not
+   * the raw `ErrorPageProps` an authored `error.page.tsx` renders from during
+   * SSR), because this field's only consumer is the hydration payload
+   * (`build-hydration-payload.ts`), never a component prop.
+   */
+  errorPage?: SerializedErrorPageProps;
 };
 //#endregion
-export { ExecutePageRequestOptions, PageBoundaryDesignation, PageContextRunner, PageDataBundle, PageErrorRecord, PageLevelName, PageResponseCommit, PageRouteEntry, PageRouteMatch, PageShortCircuit, PageTripleModule, PipelineLoader, PipelineMiddleware, PipelineRequest, PipelineResponse, PipelineStore };
+export { ExecutePageRequestOptions, PageBoundaryDesignation, PageContextRunner, PageDataBundle, PageErrorRecord, PageLevelName, PageRouteEntry, PageRouteMatch, PageShortCircuit, PageTripleModule, PipelineLoader, PipelineLoaderContext, PipelineMiddleware, PipelineStore };
 //# sourceMappingURL=execute-page-request.types.d.mts.map

package/esm/server/hydration-client-url.d.mts

@@ -1,4 +1,4 @@
-//#region ../web/src/server/hydration-client-url.d.ts
+//#region web/src/server/hydration-client-url.d.ts
 interface ResolveHydrationClientUrlOptions {
   /** Absolute path to the client build output dir: `<outdir>/client`. */
   clientDir: string;

package/esm/server/hydration-client-url.mjs

@@ -1,9 +1,9 @@
 import { CLIENT_ASSET_URL_PREFIX } from "./client-asset-url-prefix.mjs";
 import { HYDRATION_CLIENT_ENTRY_NAME } from "../vite/hydration-entries.mjs";
-import path from "node:path";
 import { readFileSync } from "node:fs";
+import path from "node:path";
 
-//#region ../web/src/server/hydration-client-url.ts
+//#region web/src/server/hydration-client-url.ts
 /**
 * The ONE runtime manifest read in production: one boot-time JSON
 * lookup of the `hydration` entry in `<clientDir>/.vite/manifest.json`,

package/esm/server/hydration-client-url.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"hydration-client-url.mjs","names":[],"sources":["../../../../../../../web/src/server/hydration-client-url.ts"],"sourcesContent":["/**\n * The ONE runtime manifest read in production: one boot-time JSON\n * lookup of the `hydration` entry in `<clientDir>/.vite/manifest.json`,\n * producing the string `install-page-routes.ts:139` already accepts as\n * `hydrationClientModuleUrl`.\n *\n * NEVER FALLS BACK. Each failure is its own named error so the boot log says\n * which half of the build→runtime handoff broke: a missing\n * file means the client build never ran, malformed JSON means the artifact is\n * corrupt, and a missing entry means the build/runtime entry-name contract\n * drifted. \"Serve without hydration\" is not among the outcomes.\n */\nimport { readFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { HYDRATION_CLIENT_ENTRY_NAME } from \"../vite/hydration-entries\";\nimport { CLIENT_ASSET_URL_PREFIX } from \"./client-asset-url-prefix\";\n\nexport interface ResolveHydrationClientUrlOptions {\n  /** Absolute path to the client build output dir: `<outdir>/client`. */\n  clientDir: string;\n}\n\n/** The manifest file is absent — the client build never ran, or ran elsewhere. */\nexport class WebClientManifestMissingError extends Error {\n  public constructor(manifestPath: string, cause: unknown) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" is missing or unreadable. ` +\n        \"This app was started in production without its `warlock build` client artifacts.\",\n      { cause },\n    );\n    this.name = \"WebClientManifestMissingError\";\n  }\n}\n\n/** The manifest file exists but is not parsable JSON, or is not a JSON object. */\nexport class WebClientManifestMalformedError extends Error {\n  public constructor(manifestPath: string, cause: unknown) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" is not valid JSON object content.`,\n      { cause },\n    );\n    this.name = \"WebClientManifestMalformedError\";\n  }\n}\n\n/**\n * The manifest parses but carries no usable `hydration` entry.\n *\n * The entry name is a shared contract between the build (`build-client.ts`\n * rollup input) and this runtime read; drift fails loudly HERE. Nobody adds a\n * default.\n */\nexport class WebClientManifestEntryMissingError extends Error {\n  public constructor(manifestPath: string, entryName: string) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" has no \"${entryName}\" entry with a \"file\" string. ` +\n        \"The build and runtime hydration entry names have drifted.\",\n    );\n    this.name = \"WebClientManifestEntryMissingError\";\n  }\n}\n\n/**\n * The manifest names an entry file that does NOT live under the asset\n * directory `CLIENT_ASSET_URL_PREFIX` is mounted from.\n *\n * Serving it would 404 — the static route only exposes that one directory —\n * so the artifact is rejected at boot instead of at first page view.\n */\nexport class WebClientAssetPrefixViolationError extends Error {\n  public constructor(manifestPath: string, file: string) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" points its entry at \"${file}\", ` +\n        `which is not under the \"${CLIENT_ASSET_URL_PREFIX}\" asset directory this framework serves. ` +\n        \"This client artifact was not produced by this framework's client build configuration. \" +\n        \"Re-run the client build instead of hand-editing the manifest or the build output.\",\n    );\n    this.name = \"WebClientAssetPrefixViolationError\";\n  }\n}\n\ntype ManifestEntry = { file?: unknown; name?: unknown; isEntry?: unknown };\n\n/**\n * Find the hydration entry in a parsed Vite manifest.\n *\n * VITE KEYS BY SOURCE PATH, NOT BY ENTRY NAME. A rollup input of\n * `{ hydration: \"src/hydration/index.ts\" }` produces the record\n * `\"src/hydration/index.ts\": { name: \"hydration\", isEntry: true, file: \"assets/hydration-<hash>.js\" }`\n * — the name the build and this module share lives in the `name` FIELD, and\n * there is no `\"hydration\"` key at all. Indexing the manifest by\n * {@link HYDRATION_CLIENT_ENTRY_NAME} therefore missed every real manifest and\n * reported an entry-name drift that had not happened.\n *\n * Matching on `isEntry` as well as `name` keeps this unambiguous: a shared\n * chunk can carry a `name` too, and only entries are addressable as a module\n * URL.\n */\nfunction findHydrationEntry(manifest: Record<string, ManifestEntry | undefined>): ManifestEntry | undefined {\n  for (const entry of Object.values(manifest)) {\n    if (\n      entry !== undefined &&\n      typeof entry === \"object\" &&\n      entry.isEntry === true &&\n      entry.name === HYDRATION_CLIENT_ENTRY_NAME\n    ) {\n      return entry;\n    }\n  }\n\n  return undefined;\n}\n\nexport function resolveHydrationClientUrl(options: ResolveHydrationClientUrlOptions): string {\n  const manifestPath = path.join(options.clientDir, \".vite\", \"manifest.json\");\n\n  let raw: string;\n\n  try {\n    raw = readFileSync(manifestPath, \"utf-8\");\n  } catch (error) {\n    throw new WebClientManifestMissingError(manifestPath, error);\n  }\n\n  let parsed: unknown;\n\n  try {\n    parsed = JSON.parse(raw);\n  } catch (error) {\n    throw new WebClientManifestMalformedError(manifestPath, error);\n  }\n\n  if (typeof parsed !== \"object\" || parsed === null || Array.isArray(parsed)) {\n    throw new WebClientManifestMalformedError(\n      manifestPath,\n      new TypeError(\"The manifest root is not a JSON object.\"),\n    );\n  }\n\n  const entry = findHydrationEntry(parsed as Record<string, ManifestEntry | undefined>);\n\n  if (entry === undefined || typeof entry !== \"object\" || typeof entry.file !== \"string\") {\n    throw new WebClientManifestEntryMissingError(manifestPath, HYDRATION_CLIENT_ENTRY_NAME);\n  }\n\n  const url = `/${entry.file}`;\n\n  // The prefix is DERIVED from CLIENT_ASSET_URL_PREFIX, never restated: this\n  // file must not carry a second copy of the literal the constant owns.\n  if (!url.startsWith(`${CLIENT_ASSET_URL_PREFIX}/`)) {\n    throw new WebClientAssetPrefixViolationError(manifestPath, entry.file);\n  }\n\n  // Past this point the returned URL starts with CLIENT_ASSET_URL_PREFIX by\n  // construction — which is exactly what the static-file route mounting\n  // `<clientDir>/assets` at that same imported symbol relies on.\n  return url;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAuBA,IAAa,gCAAb,cAAmD,MAAM;CACvD,AAAO,YAAY,cAAsB,OAAgB;EACvD,MACE,sEAAsE,aAAa,iHAEnF,EAAE,MAAM,CACV;EACA,KAAK,OAAO;CACd;AACF;;AAGA,IAAa,kCAAb,cAAqD,MAAM;CACzD,AAAO,YAAY,cAAsB,OAAgB;EACvD,MACE,sEAAsE,aAAa,sCACnF,EAAE,MAAM,CACV;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;AASA,IAAa,qCAAb,cAAwD,MAAM;CAC5D,AAAO,YAAY,cAAsB,WAAmB;EAC1D,MACE,sEAAsE,aAAa,YAAY,UAAU,wFAE3G;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;AASA,IAAa,qCAAb,cAAwD,MAAM;CAC5D,AAAO,YAAY,cAAsB,MAAc;EACrD,MACE,sEAAsE,aAAa,yBAAyB,KAAK,6BACpF,wBAAwB,iNAGvD;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;;;;;;;;;AAmBA,SAAS,mBAAmB,UAAgF;CAC1G,KAAK,MAAM,SAAS,OAAO,OAAO,QAAQ,GACxC,IACE,UAAU,UACV,OAAO,UAAU,YACjB,MAAM,YAAY,QAClB,MAAM,sBAEN,OAAO;AAKb;AAEA,SAAgB,0BAA0B,SAAmD;CAC3F,MAAM,eAAe,KAAK,KAAK,QAAQ,WAAW,SAAS,eAAe;CAE1E,IAAI;CAEJ,IAAI;EACF,MAAM,aAAa,cAAc,OAAO;CAC1C,SAAS,OAAO;EACd,MAAM,IAAI,8BAA8B,cAAc,KAAK;CAC7D;CAEA,IAAI;CAEJ,IAAI;EACF,SAAS,KAAK,MAAM,GAAG;CACzB,SAAS,OAAO;EACd,MAAM,IAAI,gCAAgC,cAAc,KAAK;CAC/D;CAEA,IAAI,OAAO,WAAW,YAAY,WAAW,QAAQ,MAAM,QAAQ,MAAM,GACvE,MAAM,IAAI,gCACR,8BACA,IAAI,UAAU,yCAAyC,CACzD;CAGF,MAAM,QAAQ,mBAAmB,MAAmD;CAEpF,IAAI,UAAU,UAAa,OAAO,UAAU,YAAY,OAAO,MAAM,SAAS,UAC5E,MAAM,IAAI,mCAAmC,cAAc,2BAA2B;CAGxF,MAAM,MAAM,IAAI,MAAM;CAItB,IAAI,CAAC,IAAI,WAAW,aAA2B,EAAE,GAC/C,MAAM,IAAI,mCAAmC,cAAc,MAAM,IAAI;CAMvE,OAAO;AACT"}
+{"version":3,"file":"hydration-client-url.mjs","names":[],"sources":["C:/Work/Warlock.js/web/src/server/hydration-client-url.ts"],"sourcesContent":["/**\n * The ONE runtime manifest read in production: one boot-time JSON\n * lookup of the `hydration` entry in `<clientDir>/.vite/manifest.json`,\n * producing the string `install-page-routes.ts:139` already accepts as\n * `hydrationClientModuleUrl`.\n *\n * NEVER FALLS BACK. Each failure is its own named error so the boot log says\n * which half of the build→runtime handoff broke: a missing\n * file means the client build never ran, malformed JSON means the artifact is\n * corrupt, and a missing entry means the build/runtime entry-name contract\n * drifted. \"Serve without hydration\" is not among the outcomes.\n */\nimport { readFileSync } from \"node:fs\";\nimport path from \"node:path\";\nimport { HYDRATION_CLIENT_ENTRY_NAME } from \"../vite/hydration-entries\";\nimport { CLIENT_ASSET_URL_PREFIX } from \"./client-asset-url-prefix\";\n\nexport interface ResolveHydrationClientUrlOptions {\n  /** Absolute path to the client build output dir: `<outdir>/client`. */\n  clientDir: string;\n}\n\n/** The manifest file is absent — the client build never ran, or ran elsewhere. */\nexport class WebClientManifestMissingError extends Error {\n  public constructor(manifestPath: string, cause: unknown) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" is missing or unreadable. ` +\n        \"This app was started in production without its `warlock build` client artifacts.\",\n      { cause },\n    );\n    this.name = \"WebClientManifestMissingError\";\n  }\n}\n\n/** The manifest file exists but is not parsable JSON, or is not a JSON object. */\nexport class WebClientManifestMalformedError extends Error {\n  public constructor(manifestPath: string, cause: unknown) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" is not valid JSON object content.`,\n      { cause },\n    );\n    this.name = \"WebClientManifestMalformedError\";\n  }\n}\n\n/**\n * The manifest parses but carries no usable `hydration` entry.\n *\n * The entry name is a shared contract between the build (`build-client.ts`\n * rollup input) and this runtime read; drift fails loudly HERE. Nobody adds a\n * default.\n */\nexport class WebClientManifestEntryMissingError extends Error {\n  public constructor(manifestPath: string, entryName: string) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" has no \"${entryName}\" entry with a \"file\" string. ` +\n        \"The build and runtime hydration entry names have drifted.\",\n    );\n    this.name = \"WebClientManifestEntryMissingError\";\n  }\n}\n\n/**\n * The manifest names an entry file that does NOT live under the asset\n * directory `CLIENT_ASSET_URL_PREFIX` is mounted from.\n *\n * Serving it would 404 — the static route only exposes that one directory —\n * so the artifact is rejected at boot instead of at first page view.\n */\nexport class WebClientAssetPrefixViolationError extends Error {\n  public constructor(manifestPath: string, file: string) {\n    super(\n      `Cannot resolve the hydration client URL: the Vite client manifest \"${manifestPath}\" points its entry at \"${file}\", ` +\n        `which is not under the \"${CLIENT_ASSET_URL_PREFIX}\" asset directory this framework serves. ` +\n        \"This client artifact was not produced by this framework's client build configuration. \" +\n        \"Re-run the client build instead of hand-editing the manifest or the build output.\",\n    );\n    this.name = \"WebClientAssetPrefixViolationError\";\n  }\n}\n\ntype ManifestEntry = { file?: unknown; name?: unknown; isEntry?: unknown };\n\n/**\n * Find the hydration entry in a parsed Vite manifest.\n *\n * VITE KEYS BY SOURCE PATH, NOT BY ENTRY NAME. A rollup input of\n * `{ hydration: \"src/hydration/index.ts\" }` produces the record\n * `\"src/hydration/index.ts\": { name: \"hydration\", isEntry: true, file: \"assets/hydration-<hash>.js\" }`\n * — the name the build and this module share lives in the `name` FIELD, and\n * there is no `\"hydration\"` key at all. Indexing the manifest by\n * {@link HYDRATION_CLIENT_ENTRY_NAME} therefore missed every real manifest and\n * reported an entry-name drift that had not happened.\n *\n * Matching on `isEntry` as well as `name` keeps this unambiguous: a shared\n * chunk can carry a `name` too, and only entries are addressable as a module\n * URL.\n */\nfunction findHydrationEntry(manifest: Record<string, ManifestEntry | undefined>): ManifestEntry | undefined {\n  for (const entry of Object.values(manifest)) {\n    if (\n      entry !== undefined &&\n      typeof entry === \"object\" &&\n      entry.isEntry === true &&\n      entry.name === HYDRATION_CLIENT_ENTRY_NAME\n    ) {\n      return entry;\n    }\n  }\n\n  return undefined;\n}\n\nexport function resolveHydrationClientUrl(options: ResolveHydrationClientUrlOptions): string {\n  const manifestPath = path.join(options.clientDir, \".vite\", \"manifest.json\");\n\n  let raw: string;\n\n  try {\n    raw = readFileSync(manifestPath, \"utf-8\");\n  } catch (error) {\n    throw new WebClientManifestMissingError(manifestPath, error);\n  }\n\n  let parsed: unknown;\n\n  try {\n    parsed = JSON.parse(raw);\n  } catch (error) {\n    throw new WebClientManifestMalformedError(manifestPath, error);\n  }\n\n  if (typeof parsed !== \"object\" || parsed === null || Array.isArray(parsed)) {\n    throw new WebClientManifestMalformedError(\n      manifestPath,\n      new TypeError(\"The manifest root is not a JSON object.\"),\n    );\n  }\n\n  const entry = findHydrationEntry(parsed as Record<string, ManifestEntry | undefined>);\n\n  if (entry === undefined || typeof entry !== \"object\" || typeof entry.file !== \"string\") {\n    throw new WebClientManifestEntryMissingError(manifestPath, HYDRATION_CLIENT_ENTRY_NAME);\n  }\n\n  const url = `/${entry.file}`;\n\n  // The prefix is DERIVED from CLIENT_ASSET_URL_PREFIX, never restated: this\n  // file must not carry a second copy of the literal the constant owns.\n  if (!url.startsWith(`${CLIENT_ASSET_URL_PREFIX}/`)) {\n    throw new WebClientAssetPrefixViolationError(manifestPath, entry.file);\n  }\n\n  // Past this point the returned URL starts with CLIENT_ASSET_URL_PREFIX by\n  // construction — which is exactly what the static-file route mounting\n  // `<clientDir>/assets` at that same imported symbol relies on.\n  return url;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAuBA,IAAa,gCAAb,cAAmD,MAAM;CACvD,AAAO,YAAY,cAAsB,OAAgB;EACvD,MACE,sEAAsE,aAAa,iHAEnF,EAAE,MAAM,CACV;EACA,KAAK,OAAO;CACd;AACF;;AAGA,IAAa,kCAAb,cAAqD,MAAM;CACzD,AAAO,YAAY,cAAsB,OAAgB;EACvD,MACE,sEAAsE,aAAa,sCACnF,EAAE,MAAM,CACV;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;AASA,IAAa,qCAAb,cAAwD,MAAM;CAC5D,AAAO,YAAY,cAAsB,WAAmB;EAC1D,MACE,sEAAsE,aAAa,YAAY,UAAU,wFAE3G;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;AASA,IAAa,qCAAb,cAAwD,MAAM;CAC5D,AAAO,YAAY,cAAsB,MAAc;EACrD,MACE,sEAAsE,aAAa,yBAAyB,KAAK,6BACpF,wBAAwB,iNAGvD;EACA,KAAK,OAAO;CACd;AACF;;;;;;;;;;;;;;;;AAmBA,SAAS,mBAAmB,UAAgF;CAC1G,KAAK,MAAM,SAAS,OAAO,OAAO,QAAQ,GACxC,IACE,UAAU,UACV,OAAO,UAAU,YACjB,MAAM,YAAY,QAClB,MAAM,sBAEN,OAAO;AAKb;AAEA,SAAgB,0BAA0B,SAAmD;CAC3F,MAAM,eAAe,KAAK,KAAK,QAAQ,WAAW,SAAS,eAAe;CAE1E,IAAI;CAEJ,IAAI;EACF,MAAM,aAAa,cAAc,OAAO;CAC1C,SAAS,OAAO;EACd,MAAM,IAAI,8BAA8B,cAAc,KAAK;CAC7D;CAEA,IAAI;CAEJ,IAAI;EACF,SAAS,KAAK,MAAM,GAAG;CACzB,SAAS,OAAO;EACd,MAAM,IAAI,gCAAgC,cAAc,KAAK;CAC/D;CAEA,IAAI,OAAO,WAAW,YAAY,WAAW,QAAQ,MAAM,QAAQ,MAAM,GACvE,MAAM,IAAI,gCACR,8BACA,IAAI,UAAU,yCAAyC,CACzD;CAGF,MAAM,QAAQ,mBAAmB,MAAmD;CAEpF,IAAI,UAAU,UAAa,OAAO,UAAU,YAAY,OAAO,MAAM,SAAS,UAC5E,MAAM,IAAI,mCAAmC,cAAc,2BAA2B;CAGxF,MAAM,MAAM,IAAI,MAAM;CAItB,IAAI,CAAC,IAAI,WAAW,aAA2B,EAAE,GAC/C,MAAM,IAAI,mCAAmC,cAAc,MAAM,IAAI;CAMvE,OAAO;AACT"}

package/esm/server/index.d.mts

@@ -1,13 +1,14 @@
 import { composeRoutePath } from "../routing/compose-route-path.mjs";
-import { connectSharedStore } from "../shared.mjs";
 import { PAYLOAD_SCRIPT_ID, escapePayload } from "../components/document-context.mjs";
-import { BufferedCookie, BufferedHeader, BufferedWebResponse, LOADER_SHORT_CIRCUIT, LoaderShortCircuitSignal, ResponseBuffer, createBufferedResponse, isLoaderShortCircuit } from "./buffered-response.mjs";
-import { ExecutePageRequestOptions, PageBoundaryDesignation, PageContextRunner, PageDataBundle, PageLevelName, PageResponseCommit, PageRouteEntry, PageRouteMatch, PageShortCircuit, PageTripleModule, PipelineLoader, PipelineMiddleware, PipelineStore } from "./execute-page-request.types.mjs";
-import { connectPageContext, connectPageSharedScope } from "./page-context.mjs";
+import { connectSharedStore } from "../shared.mjs";
+import { BufferedCookie, BufferedHeader, LoaderShortCircuitKind, PageResponseCommit } from "./settle-page-response.mjs";
+import { ExecutePageRequestOptions, PageBoundaryDesignation, PageContextRunner, PageDataBundle, PageLevelName, PageRouteEntry, PageRouteMatch, PageShortCircuit, PageTripleModule, PipelineLoader, PipelineMiddleware, PipelineStore } from "./execute-page-request.types.mjs";
+import { connectPageContext } from "./page-context.mjs";
 import { executePageRequest } from "./execute-page-request.mjs";
 import { InstallPageRoutesOptions, InstalledPageRoute, LayoutModuleShape, PageModuleShape, PageRouteExport, installPageRoutes } from "./install-page-routes.mjs";
 import { PageRoutesRegistry, RenderPageOptions, RenderPageRequestOptions, RenderedPage, connectPageRoutes, renderPage, renderPageRequest } from "./render-page.mjs";
 import { PageModuleNotInManifestError, createPageModuleLoader } from "./create-page-module-loader.mjs";
 import { InstallPageRoutesFromManifestOptions, InstalledManifestPageRoute, PageRouteHandlerFactory, installPageRoutesFromManifest } from "./install-page-routes-from-manifest.mjs";
+import { DuplicateNotFoundPageError, NOT_FOUND_PAGE_FILENAME, NOT_FOUND_ROUTE_NAME, NOT_FOUND_ROUTE_PATH, NotFoundPageDeclaresRouteError, NotFoundRouteHandlerOptions, RegisteredRouteShape, UnmatchedRequestKind, acceptsHtmlExplicitly, classifyUnmatchedRequest, createNotFoundRouteHandler, frameworkDefaultNotFoundDocument, isNotFoundPageFile } from "./not-found-page.mjs";
 import { VITE_DIRECT_CSS_QUERY, devStylesheetUrls, productionStylesheetUrls } from "./stylesheet-urls.mjs";
-export { type BufferedCookie, type BufferedHeader, type BufferedWebResponse, type ExecutePageRequestOptions, type InstallPageRoutesFromManifestOptions, type InstallPageRoutesOptions, type InstalledManifestPageRoute, type InstalledPageRoute, LOADER_SHORT_CIRCUIT, type LayoutModuleShape, type LoaderShortCircuitSignal, PAYLOAD_SCRIPT_ID, type PageBoundaryDesignation, type PageContextRunner, type PageDataBundle, type PageLevelName, PageModuleNotInManifestError, type PageModuleShape, type PageResponseCommit, type PageRouteEntry, type PageRouteExport, type PageRouteHandlerFactory, type PageRouteMatch, type PageRoutesRegistry, type PageShortCircuit, type PageTripleModule, type PipelineLoader, type PipelineMiddleware, type PipelineStore, type RenderPageOptions, type RenderPageRequestOptions, type RenderedPage, type ResponseBuffer, VITE_DIRECT_CSS_QUERY, composeRoutePath, connectPageContext, connectPageRoutes, connectPageSharedScope, connectSharedStore, createBufferedResponse, createPageModuleLoader, devStylesheetUrls, escapePayload, executePageRequest, installPageRoutes, installPageRoutesFromManifest, isLoaderShortCircuit, productionStylesheetUrls, renderPage, renderPageRequest };
+export { type BufferedCookie, type BufferedHeader, DuplicateNotFoundPageError, type ExecutePageRequestOptions, type InstallPageRoutesFromManifestOptions, type InstallPageRoutesOptions, type InstalledManifestPageRoute, type InstalledPageRoute, type LayoutModuleShape, type LoaderShortCircuitKind, NOT_FOUND_PAGE_FILENAME, NOT_FOUND_ROUTE_NAME, NOT_FOUND_ROUTE_PATH, NotFoundPageDeclaresRouteError, type NotFoundRouteHandlerOptions, PAYLOAD_SCRIPT_ID, type PageBoundaryDesignation, type PageContextRunner, type PageDataBundle, type PageLevelName, PageModuleNotInManifestError, type PageModuleShape, type PageResponseCommit, type PageRouteEntry, type PageRouteExport, type PageRouteHandlerFactory, type PageRouteMatch, type PageRoutesRegistry, type PageShortCircuit, type PageTripleModule, type PipelineLoader, type PipelineMiddleware, type PipelineStore, type RegisteredRouteShape, type RenderPageOptions, type RenderPageRequestOptions, type RenderedPage, type UnmatchedRequestKind, VITE_DIRECT_CSS_QUERY, acceptsHtmlExplicitly, classifyUnmatchedRequest, composeRoutePath, connectPageContext, connectPageRoutes, connectSharedStore, createNotFoundRouteHandler, createPageModuleLoader, devStylesheetUrls, escapePayload, executePageRequest, frameworkDefaultNotFoundDocument, installPageRoutes, installPageRoutesFromManifest, isNotFoundPageFile, productionStylesheetUrls, renderPage, renderPageRequest };

package/esm/server/index.mjs

@@ -1,13 +1,13 @@
 import { connectSharedStore } from "../shared.mjs";
 import { PAYLOAD_SCRIPT_ID, escapePayload } from "../components/document-context.mjs";
-import { LOADER_SHORT_CIRCUIT, createBufferedResponse, isLoaderShortCircuit } from "./buffered-response.mjs";
-import { connectPageContext, connectPageSharedScope } from "./page-context.mjs";
+import { connectPageContext } from "./page-context.mjs";
 import { executePageRequest } from "./execute-page-request.mjs";
 import { connectPageRoutes, renderPage, renderPageRequest } from "./render-page.mjs";
 import { PageModuleNotInManifestError, createPageModuleLoader } from "./create-page-module-loader.mjs";
 import { composeRoutePath } from "../routing/compose-route-path.mjs";
+import { VITE_DIRECT_CSS_QUERY, devStylesheetUrls, productionStylesheetUrls } from "./stylesheet-urls.mjs";
+import { DuplicateNotFoundPageError, NOT_FOUND_PAGE_FILENAME, NOT_FOUND_ROUTE_NAME, NOT_FOUND_ROUTE_PATH, NotFoundPageDeclaresRouteError, acceptsHtmlExplicitly, classifyUnmatchedRequest, createNotFoundRouteHandler, frameworkDefaultNotFoundDocument, isNotFoundPageFile } from "./not-found-page.mjs";
 import { installPageRoutesFromManifest } from "./install-page-routes-from-manifest.mjs";
 import { installPageRoutes } from "./install-page-routes.mjs";
-import { VITE_DIRECT_CSS_QUERY, devStylesheetUrls, productionStylesheetUrls } from "./stylesheet-urls.mjs";
 
-export { LOADER_SHORT_CIRCUIT, PAYLOAD_SCRIPT_ID, PageModuleNotInManifestError, VITE_DIRECT_CSS_QUERY, composeRoutePath, connectPageContext, connectPageRoutes, connectPageSharedScope, connectSharedStore, createBufferedResponse, createPageModuleLoader, devStylesheetUrls, escapePayload, executePageRequest, installPageRoutes, installPageRoutesFromManifest, isLoaderShortCircuit, productionStylesheetUrls, renderPage, renderPageRequest };
+export { DuplicateNotFoundPageError, NOT_FOUND_PAGE_FILENAME, NOT_FOUND_ROUTE_NAME, NOT_FOUND_ROUTE_PATH, NotFoundPageDeclaresRouteError, PAYLOAD_SCRIPT_ID, PageModuleNotInManifestError, VITE_DIRECT_CSS_QUERY, acceptsHtmlExplicitly, classifyUnmatchedRequest, composeRoutePath, connectPageContext, connectPageRoutes, connectSharedStore, createNotFoundRouteHandler, createPageModuleLoader, devStylesheetUrls, escapePayload, executePageRequest, frameworkDefaultNotFoundDocument, installPageRoutes, installPageRoutesFromManifest, isNotFoundPageFile, productionStylesheetUrls, renderPage, renderPageRequest };

package/esm/server/install-page-routes-from-manifest.d.mts

@@ -1,9 +1,8 @@
 import { PageManifest } from "./page-manifest.mjs";
-import { BufferedCookie } from "./buffered-response.mjs";
 import { PageRouteHandler, PageRouteHandlerOptions } from "./create-page-route-handler.mjs";
-import { Response, Router } from "@warlock.js/core";
+import { Router } from "@warlock.js/core";
 
-//#region ../web/src/server/install-page-routes-from-manifest.d.ts
+//#region web/src/server/install-page-routes-from-manifest.d.ts
 /**
  * How a handler is built for one page. Defaults to `createPageRouteHandler`;
  * taking it as an input keeps this module's own job — reading the manifest and
@@ -11,7 +10,8 @@ import { Response, Router } from "@warlock.js/core";
  */
 type PageRouteHandlerFactory = (options: PageRouteHandlerOptions) => PageRouteHandler;
 type InstalledManifestPageRoute = {
-  /** The composed path the route was registered on. */path: string; /** The resolved route name; shared namespace with API routes. */
+  /** The canonical declared route path, before layout-prefix composition. */declaredPath: string; /** The composed path the route was registered on. */
+  path: string; /** The resolved route name; shared namespace with API routes. */
   name: string; /** The page's manifest `sourceFile`. */
   file: string; /** The layout's manifest `sourceFile`, when the page has one. */
   layoutFile: string | undefined;
@@ -19,9 +19,19 @@ type InstalledManifestPageRoute = {
 type InstallPageRoutesFromManifestOptions = {
   router: Router; /** The table the generated production barrel provided at import time. */
   manifest: PageManifest; /** Browser module loaded after the server-rendered application and payload. */
-  hydrationClientModuleUrl?: string; /** Stylesheet URLs emitted into every page's `<head>`. */
-  stylesheetUrls?: readonly string[]; /** Same helper `dev-server.ts` exports — passed in, never imported. */
-  applyBufferedCookie: (response: Response, cookie: BufferedCookie) => void;
+  hydrationClientModuleUrl?: string;
+  /**
+   * Where the client build wrote its output — `productionStylesheetUrls`'s own
+   * `clientDir` argument, forwarded here rather than pre-read into a flat list:
+   * each registered handler needs its OWN chain
+   * (`[root, ...outer-to-inner matched layouts, page]`, matched by the
+   * manifest's own `sourceFile` ids), not one list shared by every page.
+   *
+   * OPTIONAL for the same reason `PageManifest.clientDir` is: a build that
+   * discovered zero pages emits no client bundle, so there is no directory to
+   * read stylesheets from — and no page that could need one either.
+   */
+  clientDir?: string; /** Same helper `dev-server.ts` exports — passed in, never imported. */
   createHandler?: PageRouteHandlerFactory;
 };
 /**