void 0.22.0 → 0.23.0

package/dist/index.mjs

@@ -1,34 +1,37 @@
 import { n as __toESM } from "./rolldown-runtime-DXIUcv95.mjs";
 import { a as join, l as relative, n as dirname, u as resolve } from "./dist-BVqXeR_h.mjs";
 import { t as require_picocolors } from "./picocolors-BTps1_gs.mjs";
-import { G as resolveWorkerDirName, St as hasDocumentRoutes, V as resolveDistDir, ct as prerenderPagesNode, dt as collectRevalidate, ft as hasRevalidate, mt as SEND_EMAIL_BINDING, ot as generateQueueResolverSource, pt as scanDurableObjectModules, st as prerenderPages, ut as collectPages, wt as resolveAssetRoutingPolicy, xt as hasApiRoutes } from "./deploy-CH-o2CaZ.mjs";
-import { i as resolveProjectPaths, n as readProjectPaths, t as assertNoRootSourceConventionConflicts } from "./project-paths-GgcMozYz.mjs";
-import { n as loadVoidAuthConfig, t as findVoidAuthConfig } from "./config-DPByhVck.mjs";
+import { d as walk, n as FRAMEWORK_SCAN_DIRS, p as applyBindingOverrides, t as DEFAULT_SCAN_DIRS, u as inferBindingsFromSource } from "./plugin-inference-CXWnn79A.mjs";
+import { n as readProjectPaths, t as assertNoRootSourceConventionConflicts } from "./project-paths-GgcMozYz.mjs";
+import { n as loadVoidAuthConfig } from "./config-DPByhVck.mjs";
+import { d as isNodeTarget, m as readConfig, u as getDatabaseDialect } from "./config-Br_JZD6u.mjs";
+import { i as isMemberExpression, n as isIdentifier, r as isLiteral } from "./ast-CPGPjb0V.mjs";
+import { t as isRouteEnabledForEnvironment } from "./parse-filename-CUbj-1MP.mjs";
+import { r as scanQueuesSync, s as scanJobsSync, t as analyzeApplicationSync } from "./application-analysis-BVsVqc11.mjs";
+import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-CF5wvH4w.mjs";
+import { r as hasEmailHandlers } from "./email--tEtMoj_.mjs";
+import { i as resolveLayoutIds } from "./scan-C7okrLyM.mjs";
+import { a as hasSandboxSqliteMigration, c as resolveSandboxConfig, i as assertSandboxNamespaceConfig, l as sandboxContainerConfig, n as DEFAULT_SANDBOX_CLASS_NAME, r as SANDBOX_MIGRATION_TAG } from "./config-C_XRIPx2.mjs";
+import { Ct as hasDocumentRoutes, G as resolveWorkerDirName, St as hasApiRoutes, Tt as resolveAssetRoutingPolicy, V as resolveDistDir, ct as selectNativeVersionMetadataBinding, ft as collectPages, ht as SEND_EMAIL_BINDING, lt as prerenderPages, mt as hasRevalidate, ot as generateQueueResolverSource, pt as collectRevalidate, st as CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV, ut as prerenderPagesNode } from "./deploy-DzAIwqNU.mjs";
 import { r as scopedAccessCredentials } from "./cf-access-DRsQRe6k.mjs";
-import { a as getApiUrl, c as getToken, o as getProxyUrl, u as isStagingMode } from "./auth-DLNN0D3Z.mjs";
+import { a as getApiUrl, c as getToken, o as getProxyUrl, u as isStagingMode } from "./auth-CSkdO2Bb.mjs";
 import { r as ensurePlatformProxyAccess } from "./cf-access-P0iZnu0q.mjs";
 import { i as readDeploymentPlatform, o as readProjectConfig } from "./project-C0Fqu05O.mjs";
-import { d as isNodeTarget, h as resolveBindingNames, m as readConfig, u as getDatabaseDialect } from "./config-Br_JZD6u.mjs";
-import { B as materializeCloudflareConfig, C as readWranglerWebSocketTombstones, D as syncWranglerWebSockets, E as syncWranglerDurableObjects, H as restoreCloudflarePreviewPointer, I as resolveSandboxConfig, L as sandboxContainerConfig, M as SANDBOX_MIGRATION_TAG, N as assertSandboxNamespaceConfig, P as isSandboxEnabled, T as syncWranglerBindings, W as stashCloudflareDeployPointer, a as LIVE_MIGRATION_TAG, d as ensureWranglerNodejsAlsFlag, g as readExistingLiveBindingConfig, h as normalizeWranglerCompatibilityFlags, j as DEFAULT_SANDBOX_CLASS_NAME, l as ensureWranglerCompat, m as nextDurableObjectMigrationTag, p as hasDurableObjectSqliteMigration, u as ensureWranglerCompatibilityDate, w as resolveLiveBindingConfig, y as readWranglerCompat } from "./wrangler-DQF1vKyf.mjs";
+import { a as restoreCloudflarePreviewPointer, r as materializeCloudflareConfig, s as stashCloudflareDeployPointer } from "./cloudflare-config-Bktvwtpf.mjs";
+import { D as syncWranglerDurableObjects, E as syncWranglerBindings, O as syncWranglerWebSockets, T as resolveLiveBindingConfig, _ as readExistingLiveBindingConfig, a as LIVE_MIGRATION_TAG, b as readWranglerCompat, d as ensureWranglerCompatibilityDate, f as ensureWranglerNodejsAlsFlag, g as normalizeWranglerCompatibilityFlags, h as nextDurableObjectMigrationTag, m as hasDurableObjectSqliteMigration, p as findBindingNameOwner, u as ensureWranglerCompat, w as readWranglerWebSocketTombstones } from "./wrangler-7K-bW_DL.mjs";
 import { i as voidWarn, n as voidError, r as voidLog, t as setShowTimestamp } from "./log-ChfPKsVd.mjs";
 import { n as lintDuplicateSources, r as mergeRoutingRules, t as lintDestinationSplats } from "./headers-DWi2IXWx.mjs";
 import { n as ensureProjectTsconfig, r as writeFileIfChanged } from "./project-tsconfig-B8GeM0RM.mjs";
-import { i as isMemberExpression, n as isIdentifier, r as isLiteral } from "./ast-CPGPjb0V.mjs";
-import { i as resolveLayoutIds } from "./scan-4tfN-PSn.mjs";
-import { a as scanJobsSync, i as scanQueuesSync, n as scanRoutePatternsSync, r as scanRoutes, t as scanMiddlewareSync } from "./scan-ClYmX3sa.mjs";
-import { c as inferBindingsFromSource, i as inferProjectBindings, l as walk, n as FRAMEWORK_SCAN_DIRS, r as detectFramework, s as scanWebSocketRoutesSync, t as DEFAULT_SCAN_DIRS } from "./plugin-inference-BMfKRSqE.mjs";
-import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-Bg9OzEEO.mjs";
+import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-2CMnpuW_.mjs";
 import { n as parseDotenvFile } from "./dotenv-VQxupEUv.mjs";
 import { i as generateDbDts, n as generateQueueTypes, r as DRIZZLE_OPERATORS, t as generateRouteTypes } from "./route-types-Clm4WD0B.mjs";
 import { t as discoverSchema } from "./discover-BcPPiF1o.mjs";
 import { _ as parseCapturedMessage, a as DEV_INBOX_ENV_VAR, c as DEV_INBOX_TOKEN_ENV_VAR, f as clearDevBuffer, g as listDevMessages, l as DEV_INBOX_TOKEN_HEADER, m as findDevMessage, n as DEV_INBOX_ACK_VALUE, o as DEV_INBOX_MAX_CAPTURE_BYTES, s as DEV_INBOX_PREFIX, t as DEV_INBOX_ACK_HEADER, u as DEV_INBOX_TOKEN_QUERY, v as pushToDevBuffer, y as registerEmailSink } from "./dev-inbox-P0u4tM8Y.mjs";
 import { t as MagicString } from "./dist-AoCzRTJE.mjs";
 import { n as findEnvFileForPaths, r as generateEnvTypes, t as findEnvFile } from "./env-types-C2_bIk_b.mjs";
-import { y as loadUserEnvFile } from "./env-validation-BB4GkLxn.mjs";
+import { y as loadUserEnvFile } from "./env-validation-BPn7vk-V.mjs";
 import { a as loadLocalEnv, o as resolveRemoteMode, r as findLegacyEnvFiles, s as stripInternalEnvKeys, t as CLIENT_ENV_PREFIX$2 } from "./env-_v349JBd.mjs";
-import { t as isRouteEnabledForEnvironment } from "./parse-filename-DioPHiR9.mjs";
-import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-CF5wvH4w.mjs";
-import { a as scanEmailHandlersSync, r as hasEmailHandlers } from "./email--tEtMoj_.mjs";
+import { n as completeApplicationAnalysis } from "./application-routing-B7QEjqSR.mjs";
 import { n as generateVoidAuthDrizzleSchema, t as generateVoidAuthDatabaseModule } from "./drizzle-Beb2Am5S.mjs";
 import { n as INTERNAL_BINDING_PREFIXES, t as INTERNAL_BINDING_EXACT_NAMES } from "./env-raw-Cx8ElDdj.mjs";
 import { n as defer } from "./defer-YsYDUoii.mjs";
@@ -40,9 +43,66 @@ import { appendSqliteClassMigration } from "@void/deploy-core";
 import { normalizePath, parseSync } from "vite";
 import { timingSafeEqual } from "node:crypto";
 import { homedir } from "node:os";
+import { isDeepStrictEqual } from "node:util";
 import { init, parse } from "es-module-lexer";
-//#region src/pages/dev-css-assets.ts
+import { compilePattern } from "@void/edge";
+//#region src/cloudflare-durable-patch.ts
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+function entries(value, label) {
+	if (value === void 0) return [];
+	if (!Array.isArray(value) || value.some((entry) => !entry || typeof entry !== "object" || Array.isArray(entry))) throw new Error(`Cloudflare ${label} configuration must be an array of objects.`);
+	return value;
+}
+function byIdentity(rows, field, label, unique = false) {
+	const map = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const id = row[field];
+		if (typeof id !== "string" || !id) throw new Error(`Cloudflare ${label} is missing its ${field}.`);
+		const previous = map.get(id);
+		if (previous && unique) throw new Error(`Cloudflare ${label} ${JSON.stringify(id)} is configured more than once.`);
+		if (previous && !isDeepStrictEqual(previous, row)) throw new Error(`Cloudflare ${label} ${JSON.stringify(id)} has conflicting configuration.`);
+		if (!previous) map.set(id, row);
+	}
+	return map;
+}
+/** Finish cumulative feature planning without repeating the Cloudflare plugin's array fallback. */
+function finalizeDurableObjectPatch(resolved, patch, generatedLocalBindings) {
+	const baselineObjects = resolved.durable_objects;
+	const pendingObjects = patch.durable_objects;
+	const baselineBindings = byIdentity(entries(baselineObjects?.bindings, "Durable Object bindings"), "name", "Durable Object binding", true);
+	const pendingBindings = byIdentity(entries(pendingObjects?.bindings, "Durable Object bindings"), "name", "Durable Object binding");
+	const history = entries(resolved.migrations, "Durable Object migrations");
+	const baselineMigrations = byIdentity(history, "tag", "Durable Object migration", true);
+	for (const local of generatedLocalBindings) for (const map of [baselineBindings, pendingBindings]) {
+		const existing = map.get(local.name);
+		if (existing && (existing.class_name !== local.class_name || existing.script_name !== void 0 || existing.environment !== void 0)) throw new Error(`Cloudflare generated Durable Object binding ${JSON.stringify(local.name)} conflicts with its configured identity.`);
+	}
+	if (pendingObjects?.bindings !== void 0) {
+		const additions = [];
+		for (const [name, row] of pendingBindings) {
+			const existing = baselineBindings.get(name);
+			if (existing && !isDeepStrictEqual(existing, row)) throw new Error(`Cloudflare Durable Object binding ${JSON.stringify(name)} has conflicting configuration.`);
+			if (!existing) additions.push(row);
+		}
+		patch.durable_objects = {
+			...pendingObjects,
+			bindings: additions
+		};
+	}
+	if (patch.migrations !== void 0) {
+		const pending = byIdentity(entries(patch.migrations, "Durable Object migrations"), "tag", "Durable Object migration");
+		const additions = [];
+		for (const [tag, row] of pending) {
+			const previous = baselineMigrations.get(tag);
+			if (previous && !isDeepStrictEqual(previous, row)) throw new Error(`Cloudflare Durable Object migration ${JSON.stringify(tag)} has conflicting configuration.`);
+			if (!previous) additions.push(row);
+		}
+		patch.migrations = [...history, ...additions];
+		resolved.migrations = [];
+	}
+}
+//#endregion
+//#region src/pages/dev-css-assets.ts
 const DEV_CSS_ASSET_MODULE_ID = "virtual:void-pages-dev-assets";
 const DEV_CSS_ASSET_ENDPOINT = "/__void/dev/pages-css";
 const DEV_CSS_ASSET_GUARD_HEADER = "X-Void-Dev-Asset-Request";
@@ -723,7 +783,7 @@ function createPrimaryDb(d1) {
 			const migrationsDir = paths.migrationsDir;
 			if (!(existsSync(migrationsDir) && readdirSync(migrationsDir).some((f) => f.endsWith(".sql")))) {
 				if (dialect === "sqlite") {
-					const { getApplicationTables, getMiniflareDatabasePath } = await import("./runner-B8wXwWlo.mjs");
+					const { getApplicationTables, getMiniflareDatabasePath } = await import("./runner-CXA9Fh8h.mjs");
 					if ((await getApplicationTables(getMiniflareDatabasePath(options.localD1PersistRoot ?? join(root, ".void"), options.localD1DatabaseId ?? "local")).catch(() => [])).length > 0) return;
 				}
 				voidWarn(`Schema found but no migrations in ${paths.sourceRelative("db/migrations")}/.\n         \`void db push\` syncs the schema to your local DB without creating migration files.
@@ -2005,7 +2065,7 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 						return;
 					}
 					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { validateMigrations } = await import("./validate-EKmJWxmy.mjs");
+					const { validateMigrations } = await import("./validate-Dq_L3s0S.mjs");
 					const allMigrations = collectMigrations(migrationsDir);
 					const appliedNames = dialect === "mysql" ? await import("./runner-mysql-CEG5JozK.mjs").then((runner) => runner.getMySqlAppliedMigrations(url)) : await import("./runner-pg-Bh4AgZdj.mjs").then((runner) => runner.getPgAppliedMigrations(url));
 					const appliedSet = new Set(appliedNames);
@@ -2018,9 +2078,9 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 					const applied = dialect === "mysql" ? await import("./runner-mysql-CEG5JozK.mjs").then((runner) => runner.runMySqlMigrations(migrationsDir, url)) : await import("./runner-pg-Bh4AgZdj.mjs").then((runner) => runner.runPgMigrations(migrationsDir, url));
 					if (applied.length > 0) voidLog(`Applied ${applied.length} migration(s): ${applied.join(", ")}`);
 				} else if (hasSqlMigrations) {
-					const { runMigrations, getMiniflareDatabasePath, getAppliedMigrations } = await import("./runner-B8wXwWlo.mjs");
+					const { runMigrations, getMiniflareDatabasePath, getAppliedMigrations } = await import("./runner-CXA9Fh8h.mjs");
 					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { validateMigrations } = await import("./validate-EKmJWxmy.mjs");
+					const { validateMigrations } = await import("./validate-Dq_L3s0S.mjs");
 					const dbPath = getMiniflareDatabasePath(persistRoot, databaseId);
 					const allMigrations = collectMigrations(migrationsDir);
 					const appliedRows = await getAppliedMigrations(dbPath);
@@ -2035,7 +2095,7 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 					if (applied.length > 0) voidLog(`Applied ${applied.length} migration(s): ${applied.join(", ")}`);
 				}
 				if (auth?.enabled) {
-					const { runLocalVoidAuthMigrations } = await import("./node-Dt7z256D.mjs");
+					const { runLocalVoidAuthMigrations } = await import("./node-BkyRWRx8.mjs");
 					await runLocalVoidAuthMigrations(root, dialect, persistRoot, databaseId, auth.configPath);
 					voidLog("Applied Better Auth migrations");
 				}
@@ -2326,569 +2386,33 @@ function restartPlugin() {
 	};
 }
 //#endregion
+//#region src/client-asset-manifest.ts
+/** Attach cache provenance to the existing manifest without changing its entry inventory. */
+function stampClientAssetCachePolicy(bundle, manifestPath, headerRules = []) {
+	const asset = bundle[manifestPath];
+	if (asset?.type !== "asset") return;
+	const fingerprinted = /* @__PURE__ */ new Set();
+	const authoredCachePatterns = headerRules.filter((rule) => rule.headers.some(([name]) => name.toLowerCase() === "cache-control")).map((rule) => compilePattern(rule.pattern).regex);
+	for (const item of Object.values(bundle)) if (item.type === "chunk" && typeof item.preliminaryFileName === "string" && item.preliminaryFileName !== item.fileName) {
+		if (!authoredCachePatterns.some((pattern) => pattern.test("/" + item.fileName))) fingerprinted.add(item.fileName);
+	}
+	const manifest = JSON.parse(String(asset.source));
+	for (const entry of Object.values(manifest)) if (entry.file && fingerprinted.has(entry.file)) entry.immutableFiles = [entry.file];
+	else delete entry.immutableFiles;
+	asset.source = JSON.stringify(manifest, null, 2);
+}
+//#endregion
 //#region src/router/compile.ts
-/**
-* Script tag injected into dev HTML to load the binding-hint virtual module.
-* The virtual module (served by restartPlugin) listens for `void:new-binding`
-* HMR events and shows a toast with a click-to-restart action.
-*/
-const BINDING_HINT_SCRIPT = `<script type="module" src="/@id/virtual:void/binding-hint"><\/script>`;
-const DEFAULT_ERROR_PAGE_FONT_STACK = "system-ui, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, \"Helvetica Neue\", Arial, sans-serif";
-const EDGE_MODULE_PATH = fileURLToPath(import.meta.resolve("@void/edge"));
+const ROUTE_URL_PATH = fileURLToPath(import.meta.resolve("#self/runtime/route-url"));
+const ROUTING_RUNTIME_PATH = fileURLToPath(import.meta.resolve("#self/runtime/routing"));
 function pushDefaultErrorPageHelpers(lines, options) {
-	const dev = options.dev === true;
-	lines.push(`const __VOID_ERROR_PAGE_FONT_STACK = ${JSON.stringify(DEFAULT_ERROR_PAGE_FONT_STACK)};`);
-	lines.push(`const __VOID_DEV = ${JSON.stringify(dev)};`);
-	lines.push(`const __VOID_PROJECT_ROOT = ${JSON.stringify(options.projectRoot)};`);
-	lines.push(`const __VOID_HOME_DIR = ${JSON.stringify(options.homeDir)};`);
-	lines.push(`function __voidEscapeHtml(value) {`);
-	lines.push(`  return String(value).replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidShouldServeHtmlErrorPage(request) {`);
-	lines.push(`  if (request.method !== "GET" && request.method !== "HEAD") return false;`);
-	lines.push(`  const url = new URL(request.url);`);
-	lines.push(`  if (url.pathname === "/api" || url.pathname.startsWith("/api/")) return false;`);
-	lines.push(`  if (/\\/[^/]+\\.[^/]+$/.test(url.pathname)) return false;`);
-	lines.push(`  const destination = request.headers.get("sec-fetch-dest");`);
-	lines.push(`  if (destination && destination !== "document" && destination !== "empty") return false;`);
-	lines.push(`  const accept = request.headers.get("accept");`);
-	lines.push(`  return !accept || accept.includes("text/html") || accept.includes("*/*");`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidNormalizeFsPath(value) {`);
-	lines.push(`  return typeof value === "string" ? value.replaceAll("\\\\", "/") : "";`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidIsAbsolutePath(value) {`);
-	lines.push(`  return value.startsWith("/") || /^[A-Za-z]:\\//.test(value);`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidDisplayPath(value) {`);
-	lines.push(`  const path = __voidNormalizeFsPath(value);`);
-	lines.push(`  const homeDir = __voidNormalizeFsPath(__VOID_HOME_DIR);`);
-	lines.push(`  const projectRoot = __voidNormalizeFsPath(__VOID_PROJECT_ROOT);`);
-	lines.push(`  if (!path) return "";`);
-	lines.push(`  if (projectRoot && (path === projectRoot || path.startsWith(projectRoot + "/"))) {`);
-	lines.push(`    const suffix = path.slice(projectRoot.length).replace(/^\\/?/, "");`);
-	lines.push(`    return suffix ? "./" + suffix : "./";`);
-	lines.push(`  }`);
-	lines.push(`  if (homeDir && (path === homeDir || path.startsWith(homeDir + "/"))) {`);
-	lines.push(`    const suffix = path.slice(homeDir.length).replace(/^\\/?/, "");`);
-	lines.push(`    return suffix ? "~/" + suffix : "~/";`);
-	lines.push(`  }`);
-	lines.push(`  return path;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidEditorHref(value, line, column) {`);
-	lines.push(`  const path = __voidNormalizeFsPath(value);`);
-	lines.push(`  if (!__voidIsAbsolutePath(path)) return "";`);
-	lines.push(`  return "vscode://file/" + encodeURI(path).replaceAll("#", "%23").replaceAll("?", "%3F") + ":" + String(line) + ":" + String(column);`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidCreateStackFrame(functionName, file, line, column, raw) {`);
-	lines.push(`  const normalizedFile = __voidNormalizeFsPath(file);`);
-	lines.push(`  const lineNumber = Number(line);`);
-	lines.push(`  const columnNumber = Number(column);`);
-	lines.push(`  if (!normalizedFile || !Number.isFinite(lineNumber) || lineNumber <= 0) return null;`);
-	lines.push(`  const safeColumn = Number.isFinite(columnNumber) && columnNumber > 0 ? columnNumber : 1;`);
-	lines.push(`  return {`);
-	lines.push(`    functionName: functionName || "",`);
-	lines.push(`    file: normalizedFile,`);
-	lines.push(`    line: lineNumber,`);
-	lines.push(`    column: safeColumn,`);
-	lines.push(`    displayPath: __voidDisplayPath(normalizedFile),`);
-	lines.push(`    href: __voidEditorHref(normalizedFile, lineNumber, safeColumn),`);
-	lines.push(`    raw: raw || "",`);
-	lines.push(`  };`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidParseFrameLocation(value) {`);
-	lines.push(`  const match = value.match(/^(.*):(\\d+):(\\d+)$/);`);
-	lines.push(`  if (!match) return null;`);
-	lines.push(`  return __voidCreateStackFrame("", match[1], Number(match[2]), Number(match[3]), value);`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidParseStackFrames(stack) {`);
-	lines.push(`  if (!stack) return [];`);
-	lines.push(`  const frames = [];`);
-	lines.push(`  for (const rawLine of stack.split(/\\n+/)) {`);
-	lines.push(`    const line = rawLine.trim();`);
-	lines.push(`    if (!line) continue;`);
-	lines.push(`    let frame = null;`);
-	lines.push(`    let match = line.match(/^at\\s+(?:async\\s+)?(.+?)\\s+\\((.+)\\)$/);`);
-	lines.push(`    if (match) {`);
-	lines.push(`      const location = __voidParseFrameLocation(match[2]);`);
-	lines.push(`      frame = location ? { ...location, functionName: match[1] } : null;`);
-	lines.push(`    } else {`);
-	lines.push(`      match = line.match(/^at\\s+(.+)$/);`);
-	lines.push(`      if (match) {`);
-	lines.push(`        frame = __voidParseFrameLocation(match[1]);`);
-	lines.push(`      } else {`);
-	lines.push(`        match = line.match(/^(.*?)@(.+)$/);`);
-	lines.push(`        if (match) {`);
-	lines.push(`          const location = __voidParseFrameLocation(match[2]);`);
-	lines.push(`          frame = location ? { ...location, functionName: match[1] } : null;`);
-	lines.push(`        }`);
-	lines.push(`      }`);
-	lines.push(`    }`);
-	lines.push(`    if (frame) frames.push({ ...frame, raw: line });`);
-	lines.push(`  }`);
-	lines.push(`  return frames;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidGetStackFrames(error) {`);
-	lines.push(`  if (!(error instanceof Error)) return [];`);
-	lines.push(`  if (!error.stack && typeof Error.captureStackTrace === "function") {`);
-	lines.push(`    try {`);
-	lines.push(`      Error.captureStackTrace(error, __voidGetStackFrames);`);
-	lines.push(`    } catch {`);
-	lines.push(`      // Ignore runtimes that reject captureStackTrace on thrown errors.`);
-	lines.push(`    }`);
-	lines.push(`  }`);
-	lines.push(`  const originalPrepareStackTrace = Error.prepareStackTrace;`);
-	lines.push(`  try {`);
-	lines.push(`    Error.prepareStackTrace = (_, callSites) => callSites;`);
-	lines.push(`    const structured = error.stack;`);
-	lines.push(`    if (Array.isArray(structured)) {`);
-	lines.push(`      const frames = [];`);
-	lines.push(`      for (const callSite of structured) {`);
-	lines.push(`        try {`);
-	lines.push(`          const fileName = callSite.getFileName?.() || callSite.getScriptNameOrSourceURL?.();`);
-	lines.push(`          const line = callSite.getLineNumber?.();`);
-	lines.push(`          const column = callSite.getColumnNumber?.();`);
-	lines.push(`          const functionName = callSite.getFunctionName?.() || callSite.getMethodName?.() || "";`);
-	lines.push(`          const frame = __voidCreateStackFrame(functionName, fileName || "", line, column, String(callSite));`);
-	lines.push(`          if (frame) frames.push(frame);`);
-	lines.push(`        } catch {`);
-	lines.push(`          // Ignore malformed CallSite entries and continue rendering.`);
-	lines.push(`        }`);
-	lines.push(`      }`);
-	lines.push(`      if (frames.length > 0) return frames;`);
-	lines.push(`    }`);
-	lines.push(`  } catch {`);
-	lines.push(`    // Fall through to string parsing.`);
-	lines.push(`  } finally {`);
-	lines.push(`    Error.prepareStackTrace = originalPrepareStackTrace;`);
-	lines.push(`  }`);
-	lines.push(`  return __voidParseStackFrames(typeof error.stack === "string" ? error.stack : "");`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidDescribeThrownValue(value) {`);
-	lines.push(`  if (value instanceof Error) {`);
-	lines.push(`    return {`);
-	lines.push(`      name: value.name || "Error",`);
-	lines.push(`      message: value.message || "",`);
-	lines.push(`      stack: typeof value.stack === "string" ? value.stack : "",`);
-	lines.push(`      frames: __voidGetStackFrames(value),`);
-	lines.push(`    };`);
-	lines.push(`  }`);
-	lines.push(`  if (typeof value === "string") {`);
-	lines.push(`    return { name: "Thrown value", message: value, stack: "", frames: [] };`);
-	lines.push(`  }`);
-	lines.push(`  let message = "";`);
-	lines.push(`  try {`);
-	lines.push(`    if (typeof value === "object" && value !== null) {`);
-	lines.push(`      message = JSON.stringify(value, null, 2) ?? String(value);`);
-	lines.push(`    } else {`);
-	lines.push(`      message = String(value);`);
-	lines.push(`    }`);
-	lines.push(`  } catch {`);
-	lines.push(`    message = String(value);`);
-	lines.push(`  }`);
-	lines.push(`  return { name: "Thrown value", message, stack: "", frames: [] };`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidRenderStack(entry) {`);
-	lines.push(`  if (Array.isArray(entry.frames) && entry.frames.length > 0) {`);
-	lines.push(`    const items = entry.frames.map((frame) => {`);
-	lines.push(`      const name = frame.functionName || "(anonymous)";`);
-	lines.push(`      const location = frame.displayPath + ":" + frame.line + ":" + frame.column;`);
-	lines.push(`      const body = \`<span class="__void-error-frame-function">\${__voidEscapeHtml(name)}</span><span class="__void-error-frame-location">\${__voidEscapeHtml(location)}</span>\`;`);
-	lines.push(`      if (frame.href) {`);
-	lines.push(`        return \`<a class="__void-error-frame" href="\${__voidEscapeHtml(frame.href)}">\${body}</a>\`;`);
-	lines.push(`      }`);
-	lines.push(`      return \`<div class="__void-error-frame is-static">\${body}</div>\`;`);
-	lines.push(`    }).join("");`);
-	lines.push(`    return \`<div class="__void-error-stack"><div class="__void-error-stack-label">Stack trace</div><div class="__void-error-frames">\${items}</div></div>\`;`);
-	lines.push(`  }`);
-	lines.push(`  if (!entry.stack) return "";`);
-	lines.push(`  return \`<div class="__void-error-stack"><div class="__void-error-stack-label">Stack trace</div><pre>\${__voidEscapeHtml(entry.stack)}</pre></div>\`;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidCollectErrorChain(error) {`);
-	lines.push(`  const chain = [];`);
-	lines.push(`  const seen = new Set();`);
-	lines.push(`  let current = error;`);
-	lines.push(`  let depth = 0;`);
-	lines.push(`  while (current != null && depth < 8 && !seen.has(current)) {`);
-	lines.push(`    seen.add(current);`);
-	lines.push(`    const entry = __voidDescribeThrownValue(current);`);
-	lines.push(`    chain.push({`);
-	lines.push(`      label: depth === 0 ? "Error" : "Cause " + depth,`);
-	lines.push(`      ...entry,`);
-	lines.push(`    });`);
-	lines.push(`    current = current instanceof Error ? current.cause : undefined;`);
-	lines.push(`    depth += 1;`);
-	lines.push(`  }`);
-	lines.push(`  if (current != null) {`);
-	lines.push(`    chain.push({`);
-	lines.push(`      label: "Cause " + depth,`);
-	lines.push(`      name: "Truncated",`);
-	lines.push(`      message: "Additional nested causes were omitted.",`);
-	lines.push(`      stack: "",`);
-	lines.push(`      frames: [],`);
-	lines.push(`    });`);
-	lines.push(`  }`);
-	lines.push(`  if (chain.length === 0) {`);
-	lines.push(`    chain.push({`);
-	lines.push(`      label: "Error",`);
-	lines.push(`      name: "Unknown error",`);
-	lines.push(`      message: "No error details were available.",`);
-	lines.push(`      stack: "",`);
-	lines.push(`      frames: [],`);
-	lines.push(`    });`);
-	lines.push(`  }`);
-	lines.push(`  return chain;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidRenderDevErrorOverlay(request, status, title, error) {`);
-	lines.push(`  const chain = __voidCollectErrorChain(error);`);
-	lines.push(`  const errorCountLabel = chain.length + (chain.length === 1 ? " Error" : " Errors");`);
-	lines.push(`  const sections = chain.map((entry, index) => {`);
-	lines.push(`    const heading = entry.name || (index === 0 ? title : "Cause");`);
-	lines.push(`    const message = entry.message || title;`);
-	lines.push(`    const stack = __voidRenderStack(entry);`);
-	lines.push(`    if (index === 0) {`);
-	lines.push(`      return \`<section class="__void-error-section is-root"><p class="__void-error-message">\${__voidEscapeHtml(message)}</p>\${stack}</section>\`;`);
-	lines.push(`    }`);
-	lines.push(`    return \`<section class="__void-error-section"><div class="__void-error-kicker">\${__voidEscapeHtml(entry.label)}</div><h2>\${__voidEscapeHtml(heading)}</h2><p>\${__voidEscapeHtml(message)}</p>\${stack}</section>\`;`);
-	lines.push(`  }).join("");`);
-	lines.push(`  return \`<style>`);
-	lines.push(`    .__void-error-overlay {`);
-	lines.push(`      position: fixed;`);
-	lines.push(`      inset: 0;`);
-	lines.push(`      z-index: 2147483647;`);
-	lines.push(`      pointer-events: none;`);
-	lines.push(`      font-family: \${__VOID_ERROR_PAGE_FONT_STACK};`);
-	lines.push(`      color: #f5f5f5;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-backdrop {`);
-	lines.push(`      position: absolute;`);
-	lines.push(`      inset: 0;`);
-	lines.push(`      background: rgba(10, 10, 10, 0.52);`);
-	lines.push(`      backdrop-filter: blur(4px);`);
-	lines.push(`      transition: opacity 180ms ease;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-panel {`);
-	lines.push(`      position: absolute;`);
-	lines.push(`      inset: auto auto 24px 24px;`);
-	lines.push(`      inline-size: min(760px, calc(100vw - 48px));`);
-	lines.push(`      max-block-size: min(80dvh, 920px);`);
-	lines.push(`      overflow: auto;`);
-	lines.push(`      pointer-events: auto;`);
-	lines.push(`      border-radius: 32px;`);
-	lines.push(`      corner-shape: squircle;`);
-	lines.push(`      border: 1px solid rgba(255, 255, 255, 0.14);`);
-	lines.push(`      background: linear-gradient(180deg, rgba(24, 24, 27, 0.98), rgba(9, 9, 11, 0.98));`);
-	lines.push(`      box-shadow: 0 24px 80px rgba(0, 0, 0, 0.45);`);
-	lines.push(`      padding: 12px 16px;`);
-	lines.push(`      transition: transform 180ms ease, opacity 180ms ease;`);
-	lines.push(`      transform-origin: bottom left;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-close {`);
-	lines.push(`      position: absolute;`);
-	lines.push(`      inset: 12px 12px auto auto;`);
-	lines.push(`      inline-size: 36px;`);
-	lines.push(`      block-size: 36px;`);
-	lines.push(`      border: 0;`);
-	lines.push(`      border-radius: 999px;`);
-	lines.push(`      background: rgba(255, 255, 255, 0.08);`);
-	lines.push(`      color: #fafafa;`);
-	lines.push(`      cursor: pointer;`);
-	lines.push(`      display: grid;`);
-	lines.push(`      place-items: center;`);
-	lines.push(`      padding: 0;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-close:hover {`);
-	lines.push(`      background: rgba(255, 255, 255, 0.14);`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-close svg {`);
-	lines.push(`      inline-size: 16px;`);
-	lines.push(`      block-size: 16px;`);
-	lines.push(`      display: block;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-minimized {`);
-	lines.push(`      position: absolute;`);
-	lines.push(`      inset: auto auto 24px 24px;`);
-	lines.push(`      pointer-events: none;`);
-	lines.push(`      opacity: 0;`);
-	lines.push(`      transform: scale(0.92);`);
-	lines.push(`      transform-origin: bottom left;`);
-	lines.push(`      border: 1px solid rgba(248, 113, 113, 0.35);`);
-	lines.push(`      border-radius: 32px;`);
-	lines.push(`      corner-shape: squircle;`);
-	lines.push(`      background: rgba(24, 24, 27, 0.96);`);
-	lines.push(`      color: #fca5a5;`);
-	lines.push(`      padding: 12px 8px;`);
-	lines.push(`      box-shadow: 0 18px 36px rgba(0, 0, 0, 0.28);`);
-	lines.push(`      cursor: pointer;`);
-	lines.push(`      font: 700 13px/1 \${__VOID_ERROR_PAGE_FONT_STACK};`);
-	lines.push(`      letter-spacing: 0.04em;`);
-	lines.push(`      text-transform: uppercase;`);
-	lines.push(`      transition: transform 180ms ease, opacity 180ms ease;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-header {`);
-	lines.push(`      display: flex;`);
-	lines.push(`      flex-direction: column;`);
-	lines.push(`      gap: 6px;`);
-	lines.push(`      margin-block-end: 0;`);
-	lines.push(`      padding-right: 52px;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-status {`);
-	lines.push(`      margin: 0;`);
-	lines.push(`      color: #fca5a5;`);
-	lines.push(`      font-size: 12px;`);
-	lines.push(`      font-weight: 700;`);
-	lines.push(`      letter-spacing: 0.12em;`);
-	lines.push(`      text-transform: uppercase;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-section {`);
-	lines.push(`      border-top: 1px solid rgba(255, 255, 255, 0.08);`);
-	lines.push(`      padding-top: 16px;`);
-	lines.push(`      margin-top: 16px;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-section.is-root {`);
-	lines.push(`      border-top: 0;`);
-	lines.push(`      padding-top: 0;`);
-	lines.push(`      margin-top: 0;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-message {`);
-	lines.push(`      margin: 0;`);
-	lines.push(`      color: #fff;`);
-	lines.push(`      font-size: 1.7rem;`);
-	lines.push(`      line-height: 1.15;`);
-	lines.push(`      letter-spacing: -0.03em;`);
-	lines.push(`      white-space: pre-wrap;`);
-	lines.push(`      word-break: break-word;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-kicker {`);
-	lines.push(`      margin-bottom: 6px;`);
-	lines.push(`      color: #fda4af;`);
-	lines.push(`      font-size: 12px;`);
-	lines.push(`      font-weight: 700;`);
-	lines.push(`      letter-spacing: 0.08em;`);
-	lines.push(`      text-transform: uppercase;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-section h2 {`);
-	lines.push(`      margin: 0 0 8px;`);
-	lines.push(`      font-size: 1.05rem;`);
-	lines.push(`      color: #fff;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-section p {`);
-	lines.push(`      margin: 0;`);
-	lines.push(`      color: #e4e4e7;`);
-	lines.push(`      white-space: pre-wrap;`);
-	lines.push(`      word-break: break-word;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-stack {`);
-	lines.push(`      margin-top: 18px;`);
-	lines.push(`      border: 1px solid rgba(255, 255, 255, 0.08);`);
-	lines.push(`      border-radius: 32px;`);
-	lines.push(`      background: rgba(255, 255, 255, 0.03);`);
-	lines.push(`      corner-shape: squircle;`);
-	lines.push(`      overflow: hidden;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-stack-label {`);
-	lines.push(`      padding: 12px 14px 10px;`);
-	lines.push(`      color: #f4f4f5;`);
-	lines.push(`      font-size: 12px;`);
-	lines.push(`      font-weight: 700;`);
-	lines.push(`      letter-spacing: 0.08em;`);
-	lines.push(`      text-transform: uppercase;`);
-	lines.push(`      border-bottom: 1px solid rgba(255, 255, 255, 0.08);`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frames {`);
-	lines.push(`      display: flex;`);
-	lines.push(`      flex-direction: column;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame {`);
-	lines.push(`      display: flex;`);
-	lines.push(`      align-items: baseline;`);
-	lines.push(`      justify-content: space-between;`);
-	lines.push(`      gap: 16px;`);
-	lines.push(`      padding: 12px 14px;`);
-	lines.push(`      color: inherit;`);
-	lines.push(`      text-decoration: none;`);
-	lines.push(`      border-top: 1px solid rgba(255, 255, 255, 0.06);`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame:first-child {`);
-	lines.push(`      border-top: 0;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame:hover {`);
-	lines.push(`      background: rgba(255, 255, 255, 0.05);`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame.is-static {`);
-	lines.push(`      cursor: default;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame-function {`);
-	lines.push(`      flex: 1 1 auto;`);
-	lines.push(`      min-width: 0;`);
-	lines.push(`      color: #fafafa;`);
-	lines.push(`      font: 600 12px/1.45 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;`);
-	lines.push(`      white-space: nowrap;`);
-	lines.push(`      overflow: hidden;`);
-	lines.push(`      text-overflow: ellipsis;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-frame-location {`);
-	lines.push(`      flex: 0 1 52%;`);
-	lines.push(`      min-width: 0;`);
-	lines.push(`      color: #fda4af;`);
-	lines.push(`      font: 500 12px/1.45 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;`);
-	lines.push(`      text-align: right;`);
-	lines.push(`      white-space: nowrap;`);
-	lines.push(`      overflow: hidden;`);
-	lines.push(`      text-overflow: ellipsis;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-section pre {`);
-	lines.push(`      margin: 0;`);
-	lines.push(`      padding: 12px 14px;`);
-	lines.push(`      overflow: auto;`);
-	lines.push(`      color: #e4e4e7;`);
-	lines.push(`      font: 500 12px/1.6 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;`);
-	lines.push(`      white-space: pre-wrap;`);
-	lines.push(`      word-break: break-word;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-overlay.is-minimized .__void-error-backdrop {`);
-	lines.push(`      opacity: 0;`);
-	lines.push(`      pointer-events: none;`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-overlay.is-minimized .__void-error-panel {`);
-	lines.push(`      opacity: 0;`);
-	lines.push(`      pointer-events: none;`);
-	lines.push(`      transform: scale(0.92);`);
-	lines.push(`    }`);
-	lines.push(`    .__void-error-overlay.is-minimized .__void-error-minimized {`);
-	lines.push(`      opacity: 1;`);
-	lines.push(`      pointer-events: auto;`);
-	lines.push(`      transform: scale(1);`);
-	lines.push(`    }`);
-	lines.push(`    @media (max-width: 720px) {`);
-	lines.push(`      .__void-error-panel {`);
-	lines.push(`        inset: auto 12px 12px 12px;`);
-	lines.push(`        inline-size: auto;`);
-	lines.push(`        max-block-size: min(70dvh, 920px);`);
-	lines.push(`        padding: 16px;`);
-	lines.push(`      }`);
-	lines.push(`      .__void-error-minimized {`);
-	lines.push(`        inset: auto auto 12px 12px;`);
-	lines.push(`      }`);
-	lines.push(`      .__void-error-frame {`);
-	lines.push(`        flex-direction: column;`);
-	lines.push(`        align-items: flex-start;`);
-	lines.push(`      }`);
-	lines.push(`      .__void-error-frame-location {`);
-	lines.push(`        text-align: left;`);
-	lines.push(`      }`);
-	lines.push(`    }`);
-	lines.push(`  </style>`);
-	lines.push(`<aside class="__void-error-overlay" data-void-error-overlay role="dialog" aria-label="Void dev error overlay"><div class="__void-error-backdrop" data-void-error-backdrop></div><section class="__void-error-panel"><button type="button" class="__void-error-close" data-void-error-close aria-label="Minimize error overlay"><svg viewBox="0 0 16 16" aria-hidden="true" focusable="false"><path d="M3.757 3.757 12.243 12.243M12.243 3.757 3.757 12.243" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round"/></svg></button><header class="__void-error-header"><p class="__void-error-status">\${__voidEscapeHtml(String(status) + ": " + title)}</p></header>\${sections}</section><button type="button" class="__void-error-minimized" data-void-error-toggle aria-label="Show dev error overlay" aria-expanded="true">\${__voidEscapeHtml(errorCountLabel)}</button><script>(function(){const script=document.currentScript;if(!(script instanceof HTMLScriptElement))return;const root=script.closest("[data-void-error-overlay]");if(!(root instanceof HTMLElement))return;const backdrop=root.querySelector("[data-void-error-backdrop]");const closeButton=root.querySelector("[data-void-error-close]");const toggle=root.querySelector("[data-void-error-toggle]");const setMinimized=(minimized)=>{root.classList.toggle("is-minimized", minimized);if(toggle instanceof HTMLElement)toggle.setAttribute("aria-expanded", minimized ? "false" : "true");};if(backdrop instanceof HTMLElement)backdrop.addEventListener("click",()=>setMinimized(true));if(closeButton instanceof HTMLElement)closeButton.addEventListener("click",()=>setMinimized(true));if(toggle instanceof HTMLElement)toggle.addEventListener("click",()=>setMinimized(false));})();<\/script></aside>\`;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidInjectDevErrorOverlay(html, overlay) {`);
-	lines.push(`  return /<\\/body\\s*>/i.test(html) ? html.replace(/<\\/body\\s*>/i, overlay + "</body>") : html + overlay;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidGetErrorAssetCss(error) {`);
-	lines.push(`  const tags = error && (typeof error === "object" || typeof error === "function") ? error.__voidPageAssetTags : null;`);
-	lines.push(`  return tags && typeof tags.css === "string" ? tags.css : "";`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidInjectErrorAssetCss(html, css) {`);
-	lines.push(`  if (!css) return html;`);
-	lines.push(`  return /<\\/head\\s*>/i.test(html) ? html.replace(/<\\/head\\s*>/i, css + "</head>") : css + html;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidRenderErrorPage(request, status, title, error) {`);
-	lines.push(`  const heading = status + ": " + title;`);
-	lines.push(`  const prefix = status + ": ";`);
-	lines.push(`  const overlay = __VOID_DEV && status === 500 && error ? __voidRenderDevErrorOverlay(request, status, title, error) : "";`);
-	lines.push(`  return \`<!doctype html>`);
-	lines.push(`<html lang="en">`);
-	lines.push(`  <head>`);
-	lines.push(`    <meta charset="utf-8">`);
-	lines.push(`    <meta name="viewport" content="width=device-width, initial-scale=1">`);
-	lines.push(`    <title>\${__voidEscapeHtml(heading)}</title>`);
-	lines.push(`    \${__voidGetErrorAssetCss(error)}`);
-	lines.push(`    <style>`);
-	lines.push(`      :root {`);
-	lines.push(`        color-scheme: light dark;`);
-	lines.push(`        font-family: \${__VOID_ERROR_PAGE_FONT_STACK};`);
-	lines.push(`        background: #f5f5f5;`);
-	lines.push(`        color: #171717;`);
-	lines.push(`      }`);
-	lines.push(`      * { box-sizing: border-box; }`);
-	lines.push(`      body {`);
-	lines.push(`        margin: 0;`);
-	lines.push(`        min-block-size: 100dvh;`);
-	lines.push(`        display: grid;`);
-	lines.push(`        place-items: center;`);
-	lines.push(`        padding: 24px;`);
-	lines.push(`        background: radial-gradient(circle at top, rgba(255, 255, 255, 0.96), rgba(245, 245, 245, 0.96) 52%), linear-gradient(180deg, #fafafa 0%, #f1f1f1 100%);`);
-	lines.push(`        font: 500 16px/1.5 \${__VOID_ERROR_PAGE_FONT_STACK};`);
-	lines.push(`      }`);
-	lines.push(`      main {`);
-	lines.push(`        inline-size: min(100%, 560px);`);
-	lines.push(`        padding: 32px 36px;`);
-	lines.push(`        border: 1px solid #d4d4d8;`);
-	lines.push(`        border-radius: 32px;`);
-	lines.push(`        corner-shape: squircle;`);
-	lines.push(`        background: rgba(255, 255, 255, 0.88);`);
-	lines.push(`        text-align: center;`);
-	lines.push(`        backdrop-filter: blur(12px);`);
-	lines.push(`      }`);
-	lines.push(`      h1 {`);
-	lines.push(`        margin: 0;`);
-	lines.push(`        font: 400 clamp(1.5rem, 1.2rem + 1vw, 2rem) / 1.1 \${__VOID_ERROR_PAGE_FONT_STACK};`);
-	lines.push(`        letter-spacing: -0.03em;`);
-	lines.push(`      }`);
-	lines.push(`      strong {`);
-	lines.push(`        font-weight: 600;`);
-	lines.push(`      }`);
-	lines.push(`      @media (prefers-color-scheme: dark) {`);
-	lines.push(`        :root {`);
-	lines.push(`          background: #0a0a0a;`);
-	lines.push(`          color: #f5f5f5;`);
-	lines.push(`        }`);
-	lines.push(`        body {`);
-	lines.push(`          background: radial-gradient(circle at top, rgba(38, 38, 38, 0.96), rgba(10, 10, 10, 0.96) 52%), linear-gradient(180deg, #171717 0%, #0a0a0a 100%);`);
-	lines.push(`        }`);
-	lines.push(`        main {`);
-	lines.push(`          border-color: #27272a;`);
-	lines.push(`          background: rgba(23, 23, 23, 0.88);`);
-	lines.push(`        }`);
-	lines.push(`      }`);
-	lines.push(`    </style>`);
-	lines.push(`  </head>`);
-	lines.push(`  <body>`);
-	lines.push(`    <main>`);
-	lines.push(`      <h1><strong>\${__voidEscapeHtml(prefix)}</strong>\${__voidEscapeHtml(title)}</h1>`);
-	lines.push(`    </main>`);
-	lines.push(`    \${overlay}`);
-	lines.push(`  </body>`);
-	lines.push(`</html>\`;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function __voidCreateErrorResponse(request, status, title, error) {`);
-	lines.push(`  if (!__voidShouldServeHtmlErrorPage(request)) {`);
-	lines.push(`    return new Response(title, { status });`);
-	lines.push(`  }`);
-	lines.push(`  return new Response(request.method === "HEAD" ? null : __voidRenderErrorPage(request, status, title, error), {`);
-	lines.push(`    status,`);
-	lines.push(`    headers: { "content-type": "text/html; charset=utf-8" },`);
-	lines.push(`  });`);
-	lines.push(`}`);
-	lines.push("");
+	lines.push(`const __errorRenderer = __createErrorRenderer(${JSON.stringify({
+		dev: options.dev === true,
+		projectRoot: options.projectRoot,
+		homeDir: options.homeDir
+	})});`);
+	lines.push("const serveCustomErrorPage = __errorRenderer.serveCustomPage;");
+	lines.push("app.onError(__errorRenderer.onError);");
 }
 /**
 * Generate the code for the virtual route table module (virtual:void-routes).
@@ -2903,8 +2427,7 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	const managedDispatch = options.nodeTarget !== true && options.dev !== true && options.managedDispatch === true;
 	lines.push(`import { AsyncLocalStorage } from "node:async_hooks";`);
 	lines.push(`import { Hono } from ${JSON.stringify(options.honoPath)};`);
-	lines.push(`import { convertReturnValue } from ${JSON.stringify(options.responsePath)};`);
-	lines.push(`import { VoidAssetRewriteError as __VoidAssetRewriteError } from ${JSON.stringify(options.handlerPath)};`);
+	lines.push(`import { createRoutingRuntime as __createRoutingRuntime, createHttpRouteHandler as __createHttpRouteHandler, createErrorRenderer as __createErrorRenderer, createPageGetHandler as __createPageGetHandler, createPageMutationHandler as __createPageMutationHandler, createPagesFallback as __createPagesFallback, createModuleLoader as __createModuleLoader, createClientAssetTags as __createClientAssetTags, createManifestLoader as __createManifestLoader, createSsrFallback as __createSsrFallback, createAssetNotFound as __createAssetNotFound } from ${JSON.stringify(ROUTING_RUNTIME_PATH)};`);
 	if (options.nodeTarget) lines.push(`const withRuntimeEnv = (_env, fn) => fn();`);
 	else lines.push(`import { withRuntimeEnv } from ${JSON.stringify(options.runtimeEnvPath)};`);
 	if (auth) {
@@ -2937,9 +2460,6 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push("");
 	}
 	lines.push(`const app = new Hono();`);
-	lines.push(`export const requestContext = new AsyncLocalStorage();`);
-	lines.push("const __voidOriginalUrls = new WeakMap();");
-	lines.push("const __voidFallbackHandled = new WeakSet();");
 	const ASSET_EXTENSIONS = [
 		"png",
 		"jpg",
@@ -2978,81 +2498,15 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		if (m) usedExts.add(m[1].toLowerCase());
 	}
 	const blockedExts = ASSET_EXTENSIONS.filter((e) => !usedExts.has(e));
-	if (blockedExts.length > 0) lines.push(`const __voidAssetRewriteExtRE = /\\.(${blockedExts.join("|")})$/i;`);
-	else lines.push("const __voidAssetRewriteExtRE = /(?!)/;");
-	lines.push(`const __VOID_DEV_ROUTING = ${JSON.stringify(options.dev === true)};`);
-	lines.push("function __voidAnnotateRouting(response, trace) {");
-	lines.push("  if (!__VOID_DEV_ROUTING || !response) return response;");
-	lines.push("  const headers = new Headers(response.headers);");
-	lines.push("  headers.set(\"X-Void-Routing\", trace);");
-	lines.push("  return new Response(response.body, { status: response.status, statusText: response.statusText, headers });");
-	lines.push("}");
-	lines.push("");
-	lines.push("function __voidShouldMarkNoMatch(request) {");
-	lines.push("  const url = new URL(request.url);");
-	lines.push("  if (request.method !== \"GET\" && request.method !== \"HEAD\") return false;");
-	lines.push("  if (url.pathname === \"/api\" || url.pathname.startsWith(\"/api/\")) return false;");
-	lines.push("  if (/\\/[^/]+\\.[^/]+$/.test(url.pathname)) return false;");
-	lines.push("  return true;");
-	lines.push("}");
-	lines.push("function __voidMarkNoMatch(request, response) {");
-	lines.push("  if (!response || response.status !== 404 || !__voidShouldMarkNoMatch(request)) return response;");
-	lines.push("  const headers = new Headers(response.headers);");
-	lines.push("  headers.set(\"X-Void-No-Match\", \"1\");");
-	lines.push("  return new Response(response.body, { status: response.status, statusText: response.statusText, headers });");
-	lines.push("}");
-	lines.push("");
-	ensureMergeQueryHelperEmitted(lines);
-	lines.push("app.use(async (c, next) => {");
-	if (managedDispatch) {
-		lines.push("  if (!__voidOriginalUrls.has(c.req.raw)) {");
-		lines.push("    const __h = c.req.raw.headers.get(\"X-Void-Original-URL\");");
-		lines.push("    if (__h != null) {");
-		lines.push("      try { __voidOriginalUrls.set(c.req.raw, new URL(__h)); } catch {}");
-		lines.push("    }");
-		lines.push("  }");
-	}
-	lines.push("  c.rewrite = (path) => {");
-	lines.push("    if (!path.startsWith(\"/\") || path.startsWith(\"//\")) {");
-	lines.push("      throw new Error(\"c.rewrite() only accepts internal, path-absolute destinations — they must start with a single \\\"/\\\" (a leading \\\"//\\\" parses as protocol-relative and would proxy cross-origin); use fetch() for external URLs\");");
-	lines.push("    }");
-	lines.push("    const __qIdx = path.indexOf(\"?\");");
-	lines.push("    const __hIdx = path.indexOf(\"#\");");
-	lines.push("    const __firstDelim = __qIdx === -1 ? __hIdx : __hIdx === -1 ? __qIdx : Math.min(__qIdx, __hIdx);");
-	lines.push("    const __assetCheckPath = __firstDelim === -1 ? path : path.slice(0, __firstDelim);");
-	lines.push("    if (__voidAssetRewriteExtRE.test(__assetCheckPath)) {");
-	lines.push("      throw new __VoidAssetRewriteError(path);");
-	lines.push("    }");
-	lines.push("    const __pathOnly = __firstDelim === -1 ? path : path.slice(0, __firstDelim);");
-	lines.push("    const __searchOnly = __qIdx === -1 ? \"\" : path.slice(__qIdx, __hIdx === -1 ? path.length : __hIdx);");
-	lines.push("    const rewriteUrl = new URL(c.req.url);");
-	lines.push("    rewriteUrl.pathname = __pathOnly;");
-	lines.push("    if (__searchOnly) rewriteUrl.search = __searchOnly;");
-	lines.push("    const rewriteReq = new Request(rewriteUrl.toString(), c.req.raw);");
-	lines.push("    const __prior = __voidOriginalUrls.get(c.req.raw);");
-	lines.push("    __voidOriginalUrls.set(rewriteReq, __prior ?? new URL(c.req.url));");
-	if (options.nodeTarget) lines.push("    const __rewritePromise = app.fetch(rewriteReq, c.env);");
-	else lines.push("    const __rewritePromise = app.fetch(rewriteReq, c.env, c.executionCtx);");
-	lines.push("    if (!__VOID_DEV_ROUTING) return __rewritePromise;");
-	lines.push("    return __rewritePromise.then((res) => __voidAnnotateRouting(res, \"c.rewrite -> \" + path + \" (middleware)\"));");
-	lines.push("  };");
-	lines.push("  const __origRedirect = c.redirect.bind(c);");
-	lines.push("  c.redirect = (location, status) => {");
-	lines.push("    if (typeof location === \"string\" && location.startsWith(\"/\") && !location.startsWith(\"//\")) {");
-	lines.push("      const search = new URL(c.req.raw.url).search;");
-	lines.push("      return __origRedirect(__mergeQueryIntoLocation(location, search), status);");
-	lines.push("    }");
-	lines.push("    return __origRedirect(location, status);");
-	lines.push("  };");
-	lines.push("  c.originalUrl = () => __voidOriginalUrls.get(c.req.raw) ?? null;");
-	lines.push("  c.isRewritten = () => __voidOriginalUrls.has(c.req.raw);");
-	lines.push("  await next();");
-	lines.push("});");
-	lines.push("");
-	lines.push("app.use(async (c, next) => {");
-	if (options.nodeTarget) lines.push("  await requestContext.run({ request: c.req.raw }, next);");
-	else lines.push("  await requestContext.run({ request: c.req.raw, executionCtx: c.executionCtx }, next);");
-	lines.push("});");
+	lines.push(`const __routingRuntime = __createRoutingRuntime(app, ${JSON.stringify({
+		dev: options.dev === true,
+		nodeTarget: options.nodeTarget === true,
+		managedDispatch,
+		blockedAssetExtensions: blockedExts
+	})});`);
+	lines.push("export const requestContext = __routingRuntime.requestContext;");
+	lines.push("app.use(__routingRuntime.contextMiddleware);");
+	lines.push("app.use(__routingRuntime.requestMiddleware);");
 	lines.push("");
 	const emitEdgeRules = !managedDispatch;
 	if (emitEdgeRules && options.redirectRules?.length) compileRoutingRulesMiddleware(lines, options.redirectRules, options.dev === true, options.nodeTarget === true);
@@ -3086,30 +2540,15 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	const seenFiles = /* @__PURE__ */ new Set();
 	for (const route of scan.routes) {
 		const filePath = `${routesDir}/${route.filePath}`;
-		const varName = `_mod_${route.filePath.replace(/[^a-zA-Z0-9]/g, "_")}`;
 		const loaderName = `_load_${route.filePath.replace(/[^a-zA-Z0-9]/g, "_")}`;
 		if (!seenFiles.has(route.filePath)) {
 			seenFiles.add(route.filePath);
-			if (options.dev !== true) lines.push(`let ${varName};`);
-			lines.push(`async function ${loaderName}() {`);
-			if (options.dev === true) lines.push(`  return import(${JSON.stringify(filePath)});`);
-			else {
-				lines.push(`  if (!${varName}) ${varName} = await import(${JSON.stringify(filePath)});`);
-				lines.push(`  return ${varName};`);
-			}
-			lines.push(`}`);
+			lines.push(`const ${loaderName} = __createModuleLoader(() => import(${JSON.stringify(filePath)}), ${JSON.stringify(options.dev !== true)});`);
 		}
-		if (route.methods.length === 0) {
-			lines.push(`app.all(${JSON.stringify(route.pattern)}, async (c) => {`);
-			lines.push(`  const mod = await ${loaderName}();`);
-			lines.push(`  return convertReturnValue(await mod.default(c));`);
-			lines.push(`});`);
-		} else for (const method of route.methods) {
+		if (route.methods.length === 0) lines.push(`app.all(${JSON.stringify(route.pattern)}, __createHttpRouteHandler(${loaderName}, "default"));`);
+		else for (const method of route.methods) {
 			const honoMethod = method.toLowerCase();
-			lines.push(`app.${honoMethod}(${JSON.stringify(route.pattern)}, async (c) => {`);
-			lines.push(`  const mod = await ${loaderName}();`);
-			lines.push(`  return convertReturnValue(await mod.${method}(c));`);
-			lines.push(`});`);
+			lines.push(`app.${honoMethod}(${JSON.stringify(route.pattern)}, __createHttpRouteHandler(${loaderName}, ${JSON.stringify(method)}));`);
 		}
 	}
 	lines.push("");
@@ -3120,7 +2559,8 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 				pattern: route.pattern,
 				params: route.params,
 				className: route.className,
-				bindingName: route.bindingName
+				bindingName: route.bindingName,
+				...route.name !== void 0 && { name: route.name }
 			})}, ${auth ? "__voidAuthOptions" : "undefined"}, ${auth ? "__resolveVoidAuthState" : "undefined"});`);
 		}
 		lines.push("");
@@ -3128,10 +2568,12 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 			pattern: route.pattern,
 			params: route.params,
 			className: route.className,
-			bindingName: route.bindingName
+			bindingName: route.bindingName,
+			...route.name !== void 0 && { name: route.name }
 		})))};`);
 		lines.push("");
 	}
+	for (let i = 0; i < webSockets.length; i++) lines.push(`__voidWebSocketRoutes[${i}].key = websocket${i}.key;`);
 	for (const className of options.webSocketTombstones ?? []) lines.push(`export const ${className} = __createWebSocketTombstoneDurableObject(${JSON.stringify(className)});`);
 	if (options.webSocketTombstones?.length) lines.push("");
 	if (options.hasLive) {
@@ -3139,150 +2581,20 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push("");
 	}
 	if (pages && scan.pages.pages.length > 0) compilePageRoutes(lines, scan, pages, options);
+	for (let i = 0; i < webSockets.length; i++) lines.push(`app.all(${JSON.stringify(webSockets[i].pattern)}, (c) => __forwardWebSocketRequest(c.req.raw, c.env, __voidWebSocketRoutes[${i}]));`);
+	if (webSockets.length > 0) lines.push("");
+	if (pages && scan.pages.pages.length > 0) lines.push(`app.notFound(__createPagesFallback({ routing: __routingRuntime, errors: __errorRenderer, assetsDir: ${JSON.stringify(options.assetsDir)}, fallbackRules: ${JSON.stringify(emitEdgeRules && options.fallbackRules?.length ? options.dev ? options.fallbackRules : stripOriginForProd(options.fallbackRules) : void 0)} }));`);
 	compilePrerenderCollector(lines, scan, ssr, options);
 	if (ssr) {
-		const clientEntryUrl = `/${ssr.clientEntryRelativePath}`;
-		lines.push(`const SSR_CLIENT_ENTRY_ID = ${JSON.stringify(ssr.clientEntryRelativePath)};`);
-		lines.push(`const SSR_CLIENT_ENTRY_URL = ${JSON.stringify(clientEntryUrl)};`);
-		lines.push(`let cachedSsrManifest = null;`);
-		lines.push("");
-		lines.push(`function escapeHtml(value) {`);
-		lines.push(`  return String(value).replace(/"/g, "&quot;");`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`function getDevClientTags() {`);
-		lines.push(`  const preloadTags = [\`<script type="module" src="/@vite/client"><\/script>\`];`);
-		lines.push(`  preloadTags.push(\`${BINDING_HINT_SCRIPT}\`);`);
-		if (options.reactRefresh) lines.push(`  preloadTags.push(\`<script type="module">
-import RefreshRuntime from "/@react-refresh";
-RefreshRuntime.injectIntoGlobalHook(window);
-window.$RefreshReg$ = () => {};
-window.$RefreshSig$ = () => (type) => type;
-window.__vite_plugin_react_preamble_installed__ = true;
-<\/script>\`);`);
-		lines.push(`  const bodyTag = \`<script type="module" src="\${escapeHtml(SSR_CLIENT_ENTRY_URL)}"><\/script>\`;`);
-		lines.push(`  return { css: "", preloads: preloadTags.join("\\n"), body: bodyTag };`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`function collectManifestFiles(manifest, entryId) {`);
-		lines.push(`  const seen = new Set();`);
-		lines.push(`  const toVisit = [entryId];`);
-		lines.push(`  while (toVisit.length > 0) {`);
-		lines.push(`    const currentId = toVisit.pop();`);
-		lines.push(`    if (seen.has(currentId)) continue;`);
-		lines.push(`    seen.add(currentId);`);
-		lines.push(`    const chunk = manifest[currentId];`);
-		lines.push(`    if (!chunk || !Array.isArray(chunk.imports)) continue;`);
-		lines.push(`    for (const importedId of chunk.imports) toVisit.push(importedId);`);
-		lines.push(`  }`);
-		lines.push(`  return Array.from(seen);`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`async function loadSsrManifest(request, env) {`);
-		lines.push(`  if (cachedSsrManifest) return cachedSsrManifest;`);
-		lines.push(`  if (typeof globalThis.__VITE_MANIFEST__ === "object" && globalThis.__VITE_MANIFEST__) {`);
-		lines.push(`    cachedSsrManifest = globalThis.__VITE_MANIFEST__;`);
-		lines.push(`    return cachedSsrManifest;`);
-		lines.push(`  }`);
-		lines.push(`  const assets = env?.ASSETS;`);
-		lines.push(`  if (!assets || typeof assets.fetch !== "function") return null;`);
-		lines.push(`  const manifestUrl = new URL("/.vite/manifest.json", request.url);`);
-		lines.push(`  const response = await assets.fetch(new Request(manifestUrl.toString()));`);
-		lines.push(`  if (!response.ok) return null;`);
-		lines.push(`  cachedSsrManifest = await response.json();`);
-		lines.push(`  return cachedSsrManifest;`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`async function getClientAssetTags(request, env) {`);
-		lines.push(`  const manifest = await loadSsrManifest(request, env);`);
-		lines.push(`  if (!manifest || typeof manifest !== "object") {`);
-		lines.push(`    if (!import.meta.env.DEV) return { css: "", preloads: "", body: "" };`);
-		lines.push(`    return getDevClientTags();`);
-		lines.push(`  }`);
-		lines.push(`  const entry = manifest[SSR_CLIENT_ENTRY_ID];`);
-		lines.push(`  if (!entry || typeof entry !== "object" || typeof entry.file !== "string") {`);
-		lines.push(`    return { css: "", preloads: "", body: "" };`);
-		lines.push(`  }`);
-		lines.push(`  const ids = collectManifestFiles(manifest, SSR_CLIENT_ENTRY_ID);`);
-		lines.push(`  const cssFiles = new Set();`);
-		lines.push(`  const preloadFiles = new Set();`);
-		lines.push(`  for (const id of ids) {`);
-		lines.push(`    const chunk = manifest[id];`);
-		lines.push(`    if (!chunk || typeof chunk !== "object") continue;`);
-		lines.push(`    if (Array.isArray(chunk.css)) {`);
-		lines.push(`      for (const cssFile of chunk.css) cssFiles.add(cssFile);`);
-		lines.push(`    }`);
-		lines.push(`    if (id !== SSR_CLIENT_ENTRY_ID && typeof chunk.file === "string") {`);
-		lines.push(`      preloadFiles.add(chunk.file);`);
-		lines.push(`    }`);
-		lines.push(`  }`);
-		lines.push(`  const cssTags = [];`);
-		lines.push(`  for (const cssFile of cssFiles) {`);
-		lines.push(`    cssTags.push(\`<link rel="stylesheet" href="/\${escapeHtml(cssFile)}">\`);`);
-		lines.push(`  }`);
-		lines.push(`  const preloadTags = [];`);
-		lines.push(`  for (const preloadFile of preloadFiles) {`);
-		lines.push(`    preloadTags.push(\`<link rel="modulepreload" href="/\${escapeHtml(preloadFile)}">\`);`);
-		lines.push(`  }`);
-		lines.push(`  const bodyTag = \`<script type="module" src="/\${escapeHtml(entry.file)}"><\/script>\`;`);
-		lines.push(`  return { css: cssTags.join("\\n"), preloads: preloadTags.join("\\n"), body: bodyTag };`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`function shouldHandleSsrRequest(c) {`);
-		lines.push(`  const path = c.req.path;`);
-		lines.push(`  if (path === "/api" || path.startsWith("/api/")) return false;`);
-		lines.push(`  if (/\\/[^/]+\\.[^/]+$/.test(path)) return false;`);
-		lines.push(`  const destination = c.req.header("sec-fetch-dest");`);
-		lines.push(`  if (destination && destination !== "document" && destination !== "empty") return false;`);
-		lines.push(`  return true;`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`async function fetchFromAssets(c) {`);
-		lines.push(`  const assets = c.env?.ASSETS;`);
-		lines.push(`  if (!assets || typeof assets.fetch !== "function") {`);
-		lines.push(`    return __voidMarkNoMatch(c.req.raw, new Response("Not Found", { status: 404 }));`);
-		lines.push(`  }`);
-		lines.push(`  const response = await assets.fetch(c.req.raw);`);
-		lines.push(`  return response.status === 404 ? __voidMarkNoMatch(c.req.raw, new Response("Not Found", { status: 404 })) : response;`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`async function renderSsrResponse(c, mod) {`);
-		lines.push(`  const render = typeof mod.render === "function" ? mod.render : mod.default;`);
-		lines.push(`  if (typeof render !== "function") {`);
-		lines.push(`    throw new Error("ssr: Invalid entry. Export render(c, assetTags).");`);
-		lines.push(`  }`);
-		lines.push(`  const assetTags = await getClientAssetTags(c.req.raw, c.env);`);
-		lines.push(`  return render(c, assetTags);`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`app.notFound(async (c) => {`);
-		if (options.nodeTarget && options.fallbackRules?.length) emitFallbackRulesCheck(lines, options.fallbackRules, options.dev === true, "  ", options.nodeTarget === true);
-		lines.push(`  if (!shouldHandleSsrRequest(c)) {`);
-		if (!options.nodeTarget && emitEdgeRules && options.fallbackRules?.length) {
-			lines.push(`    const __assetRes = await fetchFromAssets(c);`);
-			lines.push(`    if (__assetRes.status !== 404) return __assetRes;`);
-			emitFallbackRulesCheck(lines, options.fallbackRules, options.dev === true, "    ", false);
-			lines.push(`    return __assetRes;`);
-		} else lines.push(`    return fetchFromAssets(c);`);
-		lines.push(`  }`);
-		lines.push(`  const mod = await import(${JSON.stringify(ssr.serverEntryPath)});`);
-		lines.push(`  return renderSsrResponse(c, mod);`);
-		lines.push(`});`);
-		lines.push("");
-	} else if (emitEdgeRules && (options.fallbackRules?.length || !options.nodeTarget && options.headerRules?.length) && !(pages && scan.pages.pages.length > 0)) {
-		lines.push(`app.notFound(async (c) => {`);
-		if (!options.nodeTarget) {
-			lines.push(`  const assets = c.env?.ASSETS;`);
-			lines.push(`  if (assets && typeof assets.fetch === "function") {`);
-			lines.push(`    const __assetRes = await assets.fetch(c.req.raw);`);
-			lines.push(`    if (__assetRes.status !== 404) return __assetRes;`);
-			lines.push(`  }`);
-		}
-		if (options.fallbackRules?.length) emitFallbackRulesCheck(lines, options.fallbackRules, options.dev === true, "  ", options.nodeTarget === true);
-		lines.push(`  return __voidMarkNoMatch(c.req.raw, new Response("Not Found", { status: 404 }));`);
-		lines.push(`});`);
-		lines.push("");
-	}
+		lines.push(`const getClientAssetTags = __createClientAssetTags(${JSON.stringify({
+			entryId: ssr.clientEntryRelativePath,
+			entryUrl: "/" + ssr.clientEntryRelativePath,
+			kind: "ssr",
+			dev: options.dev === true,
+			reactRefresh: options.reactRefresh
+		})});`);
+		lines.push(`app.notFound(__createSsrFallback({ routing: __routingRuntime, nodeTarget: ${JSON.stringify(options.nodeTarget === true)}, assetsDir: ${JSON.stringify(options.assetsDir)}, fallbackRules: ${JSON.stringify(emitEdgeRules && options.fallbackRules?.length ? options.dev ? options.fallbackRules : stripOriginForProd(options.fallbackRules) : void 0)}, load: () => import(${JSON.stringify(ssr.serverEntryPath)}), assets: getClientAssetTags }));`);
+	} else if (emitEdgeRules && (options.fallbackRules?.length || !options.nodeTarget && options.headerRules?.length) && !(pages && scan.pages.pages.length > 0)) lines.push(`app.notFound(__createAssetNotFound({ routing: __routingRuntime, nodeTarget: ${JSON.stringify(options.nodeTarget === true)}, assetsDir: ${JSON.stringify(options.assetsDir)}, fallbackRules: ${JSON.stringify(options.fallbackRules?.length ? options.dev ? options.fallbackRules : stripOriginForProd(options.fallbackRules) : void 0)} }));`);
 	if (scan.jobs.length > 0) {
 		for (let i = 0; i < scan.jobs.length; i++) {
 			const job = scan.jobs[i];
@@ -3617,8 +2929,6 @@ function compilePrerenderCollector(lines, scan, ssr, options) {
 	lines.push("");
 }
 function compilePageRoutes(lines, scan, pages, options) {
-	lines.push(`import { handlePageGet, handlePageMutation } from ${JSON.stringify(pages.protocolPath)};`);
-	lines.push(`import { renderHeadToString, renderHtmlAttrs, renderBodyAttrs } from ${JSON.stringify(pages.headPath)};`);
 	lines.push(`import * as __voidPagesRenderer from "virtual:void-pages-renderer";`);
 	if (options.dev) lines.push(`import { getVoidPagesDevCss } from "virtual:void-pages-dev-assets";`);
 	const hasIslandPages = scan.pages.pages.some((p) => p.renderMode === "island");
@@ -3632,42 +2942,6 @@ function compilePageRoutes(lines, scan, pages, options) {
 	lines.push(`const __voidHeadConfig = ${JSON.stringify(pages.headConfig ?? null)};`);
 	lines.push("");
 	pushDefaultErrorPageHelpers(lines, options);
-	const clientEntryId = pages.clientEntryId;
-	lines.push(`const PAGES_CLIENT_ENTRY_ID = ${JSON.stringify(clientEntryId)};`);
-	lines.push(`const PAGES_CLIENT_ENTRY_URL = ${JSON.stringify("/@id/__x00__" + clientEntryId)};`);
-	lines.push(`let cachedPagesManifest = null;`);
-	lines.push("");
-	lines.push(`function escapeHtmlAttr(value) {`);
-	lines.push(`  return String(value).replace(/"/g, "&quot;");`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`function getPagesDevClientTags() {`);
-	lines.push(`  const preloads = \`<script type="module" src="/@vite/client"><\/script>\\n${BINDING_HINT_SCRIPT}\`;`);
-	lines.push(`  const bodyTag = \`<script type="module" src="\${escapeHtmlAttr(PAGES_CLIENT_ENTRY_URL)}"><\/script>\`;`);
-	lines.push(`  return { css: "", preloads, body: bodyTag };`);
-	lines.push(`}`);
-	lines.push("");
-	if (options.dev) {
-		lines.push(`async function collectVoidDevCss(request, env, kind, componentId, rootPhases) {`);
-		lines.push(`  const devCss = await getVoidPagesDevCss(request, env, { kind, componentId, rootPhases });`);
-		lines.push(`  return Array.isArray(devCss) ? devCss : [];`);
-		lines.push(`}`);
-		lines.push("");
-	}
-	lines.push(`function collectPagesManifestFiles(manifest, entryId) {`);
-	lines.push(`  const seen = new Set();`);
-	lines.push(`  const toVisit = [entryId];`);
-	lines.push(`  for (let index = 0; index < toVisit.length; index++) {`);
-	lines.push(`    const currentId = toVisit[index];`);
-	lines.push(`    if (seen.has(currentId)) continue;`);
-	lines.push(`    seen.add(currentId);`);
-	lines.push(`    const chunk = manifest[currentId];`);
-	lines.push(`    if (!chunk || !Array.isArray(chunk.imports)) continue;`);
-	lines.push(`    for (const importedId of chunk.imports) toVisit.push(importedId);`);
-	lines.push(`  }`);
-	lines.push(`  return Array.from(seen);`);
-	lines.push(`}`);
-	lines.push("");
 	const relPagesDir = pages.pagesDirRelative;
 	const pageCssKeys = {};
 	const pageDevRootPhases = {};
@@ -3701,155 +2975,27 @@ function compilePageRoutes(lines, scan, pages, options) {
 		pageCssKeys[page.componentId] = keys;
 		pageDevRootPhases[page.componentId] = routeRootPhases.filter((phase) => phase.length > 0);
 	}
-	lines.push(`const PAGE_CSS_KEYS = ${JSON.stringify(pageCssKeys)};`);
-	if (options.dev) lines.push(`const PAGE_DEV_ROOT_PHASES = ${JSON.stringify(pageDevRootPhases)};`);
-	lines.push("");
-	lines.push(`function collectRouteCss(manifest, entryId, pageKeys) {`);
-	lines.push(`  const cssFiles = new Set();`);
-	lines.push(`  const visited = new Set();`);
-	lines.push(`  function visit(id) {`);
-	lines.push(`    if (visited.has(id)) return;`);
-	lines.push(`    visited.add(id);`);
-	lines.push(`    const chunk = manifest[id];`);
-	lines.push(`    if (!chunk) return;`);
-	lines.push(`    if (Array.isArray(chunk.css)) {`);
-	lines.push(`      for (const f of chunk.css) cssFiles.add(f);`);
-	lines.push(`    }`);
-	lines.push(`    if (Array.isArray(chunk.imports)) {`);
-	lines.push(`      for (const i of chunk.imports) visit(i);`);
-	lines.push(`    }`);
-	lines.push(`  }`);
-	lines.push(`  visit(entryId);`);
-	lines.push(`  for (const key of pageKeys) {`);
-	lines.push(`    visit(key);`);
-	lines.push(`  }`);
-	lines.push(`  return cssFiles;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`async function loadPagesManifest(request, env) {`);
-	lines.push(`  if (cachedPagesManifest) return cachedPagesManifest;`);
-	lines.push(`  if (typeof globalThis.__VITE_MANIFEST__ === "object" && globalThis.__VITE_MANIFEST__) {`);
-	lines.push(`    cachedPagesManifest = globalThis.__VITE_MANIFEST__;`);
-	lines.push(`    return cachedPagesManifest;`);
-	lines.push(`  }`);
-	lines.push(`  const assets = env?.ASSETS;`);
-	lines.push(`  if (!assets || typeof assets.fetch !== "function") return null;`);
-	lines.push(`  const manifestUrl = new URL("/.vite/manifest.json", request.url);`);
-	lines.push(`  const response = await assets.fetch(new Request(manifestUrl.toString()));`);
-	lines.push(`  if (!response.ok) return null;`);
-	lines.push(`  cachedPagesManifest = await response.json();`);
-	lines.push(`  return cachedPagesManifest;`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`async function getPagesAssetTags(request, env, componentId) {`);
-	lines.push(`  const manifest = await loadPagesManifest(request, env);`);
-	lines.push(`  if (!manifest || typeof manifest !== "object") {`);
-	lines.push(`    if (!import.meta.env.DEV) return { css: "", preloads: "", body: "" };`);
-	if (options.dev) {
-		lines.push(`    const tags = getPagesDevClientTags();`);
-		lines.push(`    return { ...tags, devCss: await collectVoidDevCss(request, env, "pages", componentId, PAGE_DEV_ROOT_PHASES[componentId] || [[PAGES_CLIENT_ENTRY_URL]]) };`);
-	} else lines.push(`    return getPagesDevClientTags();`);
-	lines.push(`  }`);
-	lines.push(`  const entry = manifest[PAGES_CLIENT_ENTRY_ID];`);
-	lines.push(`  if (!entry || typeof entry !== "object" || typeof entry.file !== "string") {`);
-	lines.push(`    return { css: "", preloads: "", body: "" };`);
-	lines.push(`  }`);
-	lines.push(`  const ids = collectPagesManifestFiles(manifest, PAGES_CLIENT_ENTRY_ID);`);
-	lines.push(`  const pageKeys = componentId ? (PAGE_CSS_KEYS[componentId] || []) : [];`);
-	lines.push(`  const cssFiles = collectRouteCss(manifest, PAGES_CLIENT_ENTRY_ID, pageKeys);`);
-	lines.push(`  const preloadFiles = new Set();`);
-	lines.push(`  for (const id of ids) {`);
-	lines.push(`    const chunk = manifest[id];`);
-	lines.push(`    if (!chunk || typeof chunk !== "object") continue;`);
-	lines.push(`    if (id !== PAGES_CLIENT_ENTRY_ID && typeof chunk.file === "string") {`);
-	lines.push(`      preloadFiles.add(chunk.file);`);
-	lines.push(`    }`);
-	lines.push(`  }`);
-	lines.push(`  const cssTags = [];`);
-	lines.push(`  for (const cssFile of cssFiles) {`);
-	lines.push(`    cssTags.push(\`<link rel="stylesheet" href="/\${escapeHtmlAttr(cssFile)}">\`);`);
-	lines.push(`  }`);
-	lines.push(`  const preloadTags = [];`);
-	lines.push(`  for (const preloadFile of preloadFiles) {`);
-	lines.push(`    preloadTags.push(\`<link rel="modulepreload" href="/\${escapeHtmlAttr(preloadFile)}">\`);`);
-	lines.push(`  }`);
-	lines.push(`  const bodyTag = \`<script type="module" src="/\${escapeHtmlAttr(entry.file)}"><\/script>\`;`);
-	lines.push(`  return { css: cssTags.join("\\n"), preloads: preloadTags.join("\\n"), body: bodyTag };`);
-	lines.push(`}`);
-	lines.push("");
-	if (hasIslandPages && pages.islandClientEntryId) {
-		const islandEntryId = pages.islandClientEntryId;
-		lines.push(`const ISLANDS_CLIENT_ENTRY_ID = ${JSON.stringify(islandEntryId)};`);
-		lines.push(`const ISLANDS_CLIENT_ENTRY_URL = ${JSON.stringify("/@id/__x00__" + islandEntryId)};`);
-		if (pages.mdClientEntryId) {
-			lines.push(`const MD_CLIENT_ENTRY_ID = ${JSON.stringify(pages.mdClientEntryId)};`);
-			lines.push(`const MD_CLIENT_ENTRY_URL = ${JSON.stringify("/@id/__x00__" + pages.mdClientEntryId)};`);
-		}
-		lines.push("");
-		lines.push(`function getIslandsDevClientTags() {`);
-		lines.push(`  const preloads = \`<script type="module" src="/@vite/client"><\/script>\\n${BINDING_HINT_SCRIPT}\`;`);
-		lines.push(`  let bodyTag = \`<script type="module" src="\${escapeHtmlAttr(ISLANDS_CLIENT_ENTRY_URL)}"><\/script>\`;`);
-		if (pages.mdClientEntryId) lines.push(`  bodyTag += \`\\n<script type="module" src="\${escapeHtmlAttr(MD_CLIENT_ENTRY_URL)}"><\/script>\`;`);
-		lines.push(`  return { css: "", preloads, body: bodyTag };`);
-		lines.push(`}`);
-		lines.push("");
-		lines.push(`async function getIslandsAssetTags(request, env, componentId) {`);
-		lines.push(`  const manifest = await loadPagesManifest(request, env);`);
-		lines.push(`  if (!manifest || typeof manifest !== "object") {`);
-		lines.push(`    if (!import.meta.env.DEV) return { css: "", preloads: "", body: "" };`);
-		if (options.dev) {
-			lines.push(`    const tags = getIslandsDevClientTags();`);
-			lines.push(`    return { ...tags, devCss: await collectVoidDevCss(request, env, "islands", componentId, PAGE_DEV_ROOT_PHASES[componentId] || [[ISLANDS_CLIENT_ENTRY_URL]]) };`);
-		} else lines.push(`    return getIslandsDevClientTags();`);
-		lines.push(`  }`);
-		lines.push(`  const entry = manifest[ISLANDS_CLIENT_ENTRY_ID];`);
-		lines.push(`  if (!entry || typeof entry !== "object" || typeof entry.file !== "string") {`);
-		lines.push(`    return { css: "", preloads: "", body: "" };`);
-		lines.push(`  }`);
-		lines.push(`  const ids = collectPagesManifestFiles(manifest, ISLANDS_CLIENT_ENTRY_ID);`);
-		if (pages.mdClientEntryId) {
-			lines.push(`  const mdEntry = manifest[MD_CLIENT_ENTRY_ID];`);
-			lines.push(`  if (mdEntry && typeof mdEntry.file === "string") {`);
-			lines.push(`    const mdIds = collectPagesManifestFiles(manifest, MD_CLIENT_ENTRY_ID);`);
-			lines.push(`    for (const mdId of mdIds) ids.push(mdId);`);
-			lines.push(`  }`);
-		}
-		lines.push(`  const pageKeys = componentId ? (PAGE_CSS_KEYS[componentId] || []) : [];`);
-		lines.push(`  const cssFiles = collectRouteCss(manifest, ISLANDS_CLIENT_ENTRY_ID, pageKeys);`);
-		if (pages.mdClientEntryId) {
-			lines.push(`  if (mdEntry && typeof mdEntry.file === "string") {`);
-			lines.push(`    const mdKeys = [];`);
-			lines.push(`    const mdCss = collectRouteCss(manifest, MD_CLIENT_ENTRY_ID, mdKeys);`);
-			lines.push(`    for (const f of mdCss) cssFiles.add(f);`);
-			lines.push(`  }`);
-		}
-		lines.push(`  const preloadFiles = new Set();`);
-		lines.push(`  for (const id of ids) {`);
-		lines.push(`    const chunk = manifest[id];`);
-		lines.push(`    if (!chunk || typeof chunk !== "object") continue;`);
-		const excludeFromPreload = pages.mdClientEntryId ? `id !== ISLANDS_CLIENT_ENTRY_ID && id !== MD_CLIENT_ENTRY_ID` : `id !== ISLANDS_CLIENT_ENTRY_ID`;
-		lines.push(`    if (${excludeFromPreload} && typeof chunk.file === "string") {`);
-		lines.push(`      preloadFiles.add(chunk.file);`);
-		lines.push(`    }`);
-		lines.push(`  }`);
-		lines.push(`  const cssTags = [];`);
-		lines.push(`  for (const cssFile of cssFiles) {`);
-		lines.push(`    cssTags.push(\`<link rel="stylesheet" href="/\${escapeHtmlAttr(cssFile)}">\`);`);
-		lines.push(`  }`);
-		lines.push(`  const preloadTags = [];`);
-		lines.push(`  for (const preloadFile of preloadFiles) {`);
-		lines.push(`    preloadTags.push(\`<link rel="modulepreload" href="/\${escapeHtmlAttr(preloadFile)}">\`);`);
-		lines.push(`  }`);
-		lines.push(`  let bodyTag = \`<script type="module" src="/\${escapeHtmlAttr(entry.file)}"><\/script>\`;`);
-		if (pages.mdClientEntryId) {
-			lines.push(`  if (mdEntry && typeof mdEntry.file === "string") {`);
-			lines.push(`    bodyTag += \`\\n<script type="module" src="/\${escapeHtmlAttr(mdEntry.file)}"><\/script>\`;`);
-			lines.push(`  }`);
-		}
-		lines.push(`  return { css: cssTags.join("\\n"), preloads: preloadTags.join("\\n"), body: bodyTag };`);
-		lines.push(`}`);
-		lines.push("");
-	}
+	lines.push("const __loadPagesManifest = __createManifestLoader();");
+	const assetMetadata = {
+		pageCssKeys,
+		devRootPhases: options.dev ? pageDevRootPhases : void 0,
+		dev: options.dev === true
+	};
+	const devCssOption = options.dev ? ", devCss: getVoidPagesDevCss" : "";
+	lines.push(`const getPagesAssetTags = __createClientAssetTags({ ...${JSON.stringify({
+		...assetMetadata,
+		entryId: pages.clientEntryId,
+		entryUrl: "/@id/__x00__" + pages.clientEntryId,
+		kind: "pages"
+	})}${devCssOption} }, __loadPagesManifest);`);
+	if (hasIslandPages && pages.islandClientEntryId) lines.push(`const getIslandsAssetTags = __createClientAssetTags({ ...${JSON.stringify({
+		...assetMetadata,
+		entryId: pages.islandClientEntryId,
+		entryUrl: "/@id/__x00__" + pages.islandClientEntryId,
+		extraEntryId: pages.mdClientEntryId,
+		extraEntryUrl: pages.mdClientEntryId ? "/@id/__x00__" + pages.mdClientEntryId : void 0,
+		kind: "islands"
+	})}${devCssOption} }, __loadPagesManifest);`);
 	const seenServerFiles = /* @__PURE__ */ new Set();
 	for (const page of scan.pages.pages) {
 		const safeId = page.componentId.replace(/[^a-zA-Z0-9]/g, "_");
@@ -3857,13 +3003,8 @@ function compilePageRoutes(lines, scan, pages, options) {
 		if (page.serverPath) serverImportPath = `${pages.pagesDir}/${page.serverPath}`;
 		if (serverImportPath && !seenServerFiles.has(serverImportPath)) {
 			seenServerFiles.add(serverImportPath);
-			const varName = `_pmod_${safeId}`;
 			const loaderName = `_pload_${safeId}`;
-			lines.push(`let ${varName};`);
-			lines.push(`async function ${loaderName}() {`);
-			lines.push(`  if (!${varName}) ${varName} = await import(${JSON.stringify(serverImportPath)});`);
-			lines.push(`  return ${varName};`);
-			lines.push(`}`);
+			lines.push(`const ${loaderName} = __createModuleLoader(() => import(${JSON.stringify(serverImportPath)}));`);
 		}
 		let mdHeadRef = null;
 		if (!serverImportPath && page.metadata && (page.metadata.title || page.metadata.description)) {
@@ -3879,105 +3020,11 @@ function compilePageRoutes(lines, scan, pages, options) {
 		}
 		const renderer = page.renderMode === "island" ? "renderIslandPage" : "renderPage";
 		const assetTags = page.renderMode === "island" && pages.islandClientEntryId ? "getIslandsAssetTags" : "getPagesAssetTags";
-		const renderOptions = `, ${JSON.stringify({ renderMode: page.renderMode })}`;
-		lines.push(`app.get(${JSON.stringify(page.pattern)}, async (c) => {`);
-		if (serverImportPath) {
-			const loaderName = `_pload_${safeId}`;
-			lines.push(`  const mod = await ${loaderName}();`);
-			lines.push(`  return handlePageGet(mod.loader, mod.head, c, ${JSON.stringify(page.componentId)}, ${renderer}, ${assetTags}, __voidHeadConfig${renderOptions});`);
-		} else {
-			const headArg = mdHeadRef ?? "undefined";
-			lines.push(`  return handlePageGet(undefined, ${headArg}, c, ${JSON.stringify(page.componentId)}, ${renderer}, ${assetTags}, __voidHeadConfig${renderOptions});`);
-		}
-		lines.push(`});`);
-		if (page.methods.includes("action") || page.methods.includes("actions")) {
-			const loaderName = `_pload_${safeId}`;
-			lines.push(`app.on(["POST", "PUT", "PATCH", "DELETE"], ${JSON.stringify(page.pattern)}, async (c) => {`);
-			lines.push(`  const mod = await ${loaderName}();`);
-			if (page.methods.includes("actions")) {
-				lines.push(`  const actionName = new URL(c.req.url).searchParams.keys().next().value;`);
-				lines.push(`  const handler = actionName ? mod.actions?.[actionName] : mod.actions?.default;`);
-				lines.push(`  if (!handler) return new Response("Unknown action" + (actionName ? ": " + actionName : ""), { status: 404 });`);
-			} else lines.push(`  const handler = mod.action;`);
-			lines.push(`  return handlePageMutation(handler, mod.loader, mod.head, c, ${JSON.stringify(page.componentId)}, ${renderer}, ${assetTags}, __voidHeadConfig${renderOptions});`);
-			lines.push(`});`);
-		}
+		const routeOptions = `{ ${serverImportPath ? "load: _pload_" + safeId + ", " : ""}${mdHeadRef ? "head: " + mdHeadRef + ", " : ""}componentId: ${JSON.stringify(page.componentId)}, render: ${renderer}, assets: ${assetTags}, headConfig: __voidHeadConfig, renderOptions: ${JSON.stringify({ renderMode: page.renderMode })} }`;
+		lines.push(`app.get(${JSON.stringify(page.pattern)}, __createPageGetHandler(${routeOptions}));`);
+		if (page.methods.includes("action") || page.methods.includes("actions")) lines.push(`app.on(["POST", "PUT", "PATCH", "DELETE"], ${JSON.stringify(page.pattern)}, __createPageMutationHandler({ ...${routeOptions}, namedActions: ${JSON.stringify(page.methods.includes("actions"))} }));`);
 	}
 	lines.push("");
-	lines.push(`async function fetchPagesAsset(c) {`);
-	lines.push(`  if (c.req.method !== "GET" && c.req.method !== "HEAD") {`);
-	lines.push(`    return new Response("Not Found", { status: 404 });`);
-	lines.push(`  }`);
-	lines.push(`  const assets = c.env?.ASSETS;`);
-	lines.push(`  if (!assets || typeof assets.fetch !== "function") {`);
-	lines.push(`    return __voidMarkNoMatch(c.req.raw, new Response("Not Found", { status: 404 }));`);
-	lines.push(`  }`);
-	lines.push(`  return assets.fetch(c.req.raw);`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`async function serveCustomErrorPage(c, status, fallbackText, error) {`);
-	lines.push(`  try {`);
-	lines.push(`    const assets = c.env?.ASSETS;`);
-	lines.push(`    if (assets && typeof assets.fetch === "function") {`);
-	lines.push(`      const errReq = new Request(new URL("/" + status + ".html", c.req.url));`);
-	lines.push(`      const errRes = await assets.fetch(errReq);`);
-	lines.push(`      if (errRes.ok) {`);
-	lines.push(`        const assetCss = __voidGetErrorAssetCss(error);`);
-	lines.push(`        if (assetCss) {`);
-	lines.push(`          const html = __voidInjectErrorAssetCss(await errRes.text(), assetCss);`);
-	lines.push(`          const body = __VOID_DEV && status === 500 && error && __voidShouldServeHtmlErrorPage(c.req.raw) ? __voidInjectDevErrorOverlay(html, __voidRenderDevErrorOverlay(c.req.raw, status, fallbackText, error)) : html;`);
-	lines.push(`          return new Response(c.req.method === "HEAD" ? null : body, {`);
-	lines.push(`            status,`);
-	lines.push(`            headers: { "content-type": "text/html; charset=utf-8" },`);
-	lines.push(`          });`);
-	lines.push(`        }`);
-	lines.push(`        if (__VOID_DEV && status === 500 && error && __voidShouldServeHtmlErrorPage(c.req.raw)) {`);
-	lines.push(`          const overlay = __voidRenderDevErrorOverlay(c.req.raw, status, fallbackText, error);`);
-	lines.push(`          const html = await errRes.text();`);
-	lines.push(`          return new Response(c.req.method === "HEAD" ? null : __voidInjectDevErrorOverlay(html, overlay), {`);
-	lines.push(`            status,`);
-	lines.push(`            headers: { "content-type": "text/html; charset=utf-8" },`);
-	lines.push(`          });`);
-	lines.push(`        }`);
-	lines.push(`        return new Response(errRes.body, { status, headers: { "content-type": "text/html; charset=utf-8" } });`);
-	lines.push(`      }`);
-	lines.push(`    }`);
-	lines.push(`  } catch {}`);
-	lines.push(`  return __voidCreateErrorResponse(c.req.raw, status, fallbackText, error);`);
-	lines.push(`}`);
-	lines.push("");
-	lines.push(`app.onError((err, c) => {`);
-	lines.push(`  if (err && typeof err === "object" && "getResponse" in err) return err.getResponse();`);
-	lines.push(`  console.error(err);`);
-	lines.push(`  return serveCustomErrorPage(c, 500, "Internal Server Error", err);`);
-	lines.push(`});`);
-	lines.push("");
-	lines.push(`app.notFound(async (c) => {`);
-	lines.push(`  const path = c.req.path;`);
-	lines.push(`  if (path === "/api" || path.startsWith("/api/")) {`);
-	lines.push(`    return c.text("Not Found", 404);`);
-	lines.push(`  }`);
-	lines.push(`  if (c.req.method !== "GET" && c.req.method !== "HEAD") {`);
-	lines.push(`    return c.text("Not Found", 404);`);
-	lines.push(`  }`);
-	lines.push(`  const assetRes = await fetchPagesAsset(c);`);
-	lines.push(`  if (assetRes.status !== 404) return assetRes;`);
-	if (!(options.nodeTarget !== true && options.dev !== true && options.managedDispatch === true) && options.fallbackRules?.length) emitFallbackRulesCheck(lines, options.fallbackRules, options.dev === true, "  ", options.nodeTarget === true);
-	lines.push(`  if (path.includes("/.")) {`);
-	lines.push(`    return serveCustomErrorPage(c, 404, "Not Found");`);
-	lines.push(`  }`);
-	lines.push(`  const lastSeg = path.substring(path.lastIndexOf("/") + 1);`);
-	lines.push(`  if (lastSeg.includes(".")) {`);
-	lines.push(`    return serveCustomErrorPage(c, 404, "Not Found");`);
-	lines.push(`  }`);
-	lines.push(`  if (path !== "/" && path.endsWith("/")) {`);
-	lines.push(`    const url = new URL(c.req.url);`);
-	lines.push(`    url.pathname = path.slice(0, -1);`);
-	lines.push(`    return Response.redirect(url.href, 301);`);
-	lines.push(`  }`);
-	lines.push(`  return __voidMarkNoMatch(c.req.raw, await serveCustomErrorPage(c, 404, "Not Found"));`);
-	lines.push(`});`);
-	lines.push("");
 }
 /**
 * Generate the asset fallthrough helper shared by native Void workers and
@@ -3996,75 +3043,12 @@ function compilePageRoutes(lines, scan, pages, options) {
 * anything other than the SPA shell.
 */
 function compileAssetFallbackHelper(assetsDir = "assets", serveSpaFallback = false, notFound = "none") {
-	const fallthroughCode = serveSpaFallback ? `  // SPA fallback: when HTML-owning features make
-  // assetConfig.not_found_handling = 'none', the asset binding returns 404
-  // instead of falling back to index.html itself. Do that fallback here, after
-  // user routes/middleware have run, so auth gates and OAuth callbacks see the request first.
-  // Pages and SSR apps leave this disabled so intentional HTML 404s stay 404.
-  const accept = request.headers.get("accept") ?? "";
-  if (accept.includes("text/html")) {
-    const indexUrl = new URL("/index.html", request.url);
-    const indexAsset = await env.ASSETS.fetch(new Request(indexUrl, { method: request.method }));
-    if (indexAsset.status === 200) {
-      const res = new Response(indexAsset.body, {
-        status: 200,
-        headers: indexAsset.headers,
-      });
-      res.headers.set("Cache-Control", "no-store");
-      res.headers.set("Content-Type", "text/html; charset=utf-8");
-      return res;
-    }
-  }
-  return response;` : notFound === "404-page" ? `  const accept = request.headers.get("accept") ?? "";
-  const assetContentType = asset.headers.get("content-type") ?? "";
-  if (accept.includes("text/html") && assetContentType.includes("text/html")) {
-    const res = new Response(asset.body, asset);
-    res.headers.set("Cache-Control", "no-store");
-    return res;
-  }
-  return response;` : `  return response;`;
-	return `
-const __voidAssetContentTypes = {
-  ".avif": "image/avif",
-  ".css": "text/css; charset=utf-8",
-  ".gif": "image/gif",
-  ".html": "text/html; charset=utf-8",
-  ".ico": "image/x-icon",
-  ".jpeg": "image/jpeg",
-  ".jpg": "image/jpeg",
-  ".js": "text/javascript; charset=utf-8",
-  ".json": "application/json; charset=utf-8",
-  ".mjs": "text/javascript; charset=utf-8",
-  ".png": "image/png",
-  ".svg": "image/svg+xml",
-  ".txt": "text/plain; charset=utf-8",
-  ".wasm": "application/wasm",
-  ".webp": "image/webp",
-  ".woff": "font/woff",
-  ".woff2": "font/woff2",
-};
-
-async function serveWithAssets(request, env, response) {
-  if (response.status !== 404 || !env.ASSETS || (request.method !== "GET" && request.method !== "HEAD")) return response;
-  const asset = await env.ASSETS.fetch(new Request(request.url, { method: request.method, headers: request.headers }));
-  if (asset.status !== 404) {
-    const res = new Response(asset.body, asset);
-    const pathname = new URL(request.url).pathname;
-    // Directly uploaded assets can reach the binding without a MIME type.
-    if (!res.headers.get("Content-Type")) {
-      const filename = pathname.slice(pathname.lastIndexOf("/") + 1);
-      const contentType = __voidAssetContentTypes[filename.slice(filename.lastIndexOf(".")).toLowerCase()];
-      if (contentType) res.headers.set("Content-Type", contentType);
-    }
-    if (pathname.startsWith(${JSON.stringify("/" + assetsDir + "/")})) {
-      res.headers.set("Cache-Control", "public, max-age=31536000, immutable");
-    } else {
-      res.headers.set("Cache-Control", "no-store");
-    }
-    return res;
-  }
-${fallthroughCode}
-}
+	return `import { createAssetFallback as __createAssetFallback } from ${JSON.stringify(ROUTING_RUNTIME_PATH)};
+const serveWithAssets = __createAssetFallback(${JSON.stringify({
+		assetsDir,
+		serveSpaFallback,
+		notFound
+	})});
 `;
 }
 /**
@@ -4086,7 +3070,7 @@ function deriveEmailRuntimePath(runtimeEnvPath) {
 	return runtimeEnvPath.replace(/_?env(\.[^/]+)?$/, (_m, ext) => "email" + (ext ?? ""));
 }
 function compileWorkerEntry(options = {}) {
-	const { hasQueues = false, remote, assetsDir = "assets", webSocketClasses = [], runtimeEnvPath = "void/_env", runtimeEmailPath, envSchemaModule, sandbox, serveSpaFallback = false, hasEmail = false, live, isr, notFound = "none", durableObjects = [] } = options;
+	const { hasQueues = false, versionMetadataBinding, remote, assetsDir = "assets", webSocketClasses = [], runtimeEnvPath = "void/_env", runtimeEmailPath, envSchemaModule, sandbox, serveSpaFallback = false, hasEmail = false, live, isr, notFound = "none", durableObjects = [] } = options;
 	const remotePath = remote?.remotePath;
 	const remoteBindingNames = JSON.stringify(remote?.bindingNames);
 	const createRemoteEnvCall = `createRemoteEnv(env${remote?.bindingNames ? `, ${remoteBindingNames}` : ""})`;
@@ -4104,88 +3088,24 @@ function compileWorkerEntry(options = {}) {
 	const liveRuntimeImport = hasLive ? `import { __setLiveBindingName } from "void/live";\n` : "";
 	const liveExport = hasLive ? liveClassName === "VoidLiveStreamDurableObject" ? `export { VoidLiveStreamDurableObject };\n__setLiveBindingName(${JSON.stringify(liveBindingName)});\n` : `export { VoidLiveStreamDurableObject as ${liveClassName} };\n__setLiveBindingName(${JSON.stringify(liveBindingName)});\n` : "";
 	const durableObjectImports = durableObjects.map(({ filePath }, index) => `import __voidDurableObject${index} from ${JSON.stringify(filePath)};`).join("\n");
-	const durableObjectExports = durableObjects.map(({ bindingName, className }, index) => `__voidDurableObject${index}.__bind(${JSON.stringify(bindingName)});\nexport const ${className} = __voidDurableObject${index}.class;`).join("\n");
+	const durableObjectExports = durableObjects.map(({ bindingName, className, name }, index) => `__voidDurableObject${index}.__bind(${JSON.stringify(bindingName)}${name !== void 0 ? `, ${JSON.stringify(name)}` : ""});\nexport const ${className} = __voidDurableObject${index}.class;`).join("\n");
 	const runtimeEnvImport = `import { withRuntimeEnv } from ${JSON.stringify(runtimeEnvPath)};\n`;
 	const remoteImport = remote ? `import { createRemoteEnv } from ${JSON.stringify(remote.remotePath)};\n` : "";
 	const envSchemaImport = envSchemaModule ? `import ${JSON.stringify(envSchemaModule.importPath)};\nimport { _validateEnvOnce } from ${JSON.stringify(envSchemaModule.helperPath)};\n` : "";
 	const envValidateCall = envSchemaModule ? "  await _validateEnvOnce(env);\n" : "";
-	const fetchEnvValidateCall = envSchemaModule ? "  if (request.method !== \"POST\" || new URL(request.url).pathname !== \"/__void/prerender-paths\") await _validateEnvOnce(env);\n" : "";
 	const exactNames = isr ? INTERNAL_BINDING_EXACT_NAMES : [];
-	const prefixCheck = [...INTERNAL_BINDING_PREFIXES.map((p) => `prop.startsWith(${JSON.stringify(p)})`), ...exactNames.map((n) => `prop === ${JSON.stringify(n)}`)].join(" || ");
-	const filterBindingsHelper = `
-function __filterInternalBindings(env) {
-  return new Proxy(env, {
-    get(target, prop, receiver) {
-      if (typeof prop === "string" && (${prefixCheck})) return undefined;
-      return Reflect.get(target, prop, receiver);
-    },
-    has(target, prop) {
-      if (typeof prop === "string" && (${prefixCheck})) return false;
-      return Reflect.has(target, prop);
-    },
-    ownKeys(target) {
-      return Reflect.ownKeys(target).filter(
-        (key) => typeof key !== "string" || (${[...INTERNAL_BINDING_PREFIXES.map((p) => `!key.startsWith(${JSON.stringify(p)})`), ...exactNames.map((n) => `key !== ${JSON.stringify(n)}`)].join(" && ")})
-      );
-    },
-    getOwnPropertyDescriptor(target, prop) {
-      if (typeof prop === "string" && (${prefixCheck})) return undefined;
-      return Reflect.getOwnPropertyDescriptor(target, prop);
-    },
-  });
-}
+	const filterBindingsHelper = `import { filterInternalBindings as __filterBindings, createWorkerFetch as __createWorkerFetch } from ${JSON.stringify(ROUTING_RUNTIME_PATH)};
+const __filterInternalBindings = (env) => __filterBindings(env, ${JSON.stringify(INTERNAL_BINDING_PREFIXES)}, ${JSON.stringify(exactNames)});
 `;
 	const assetHelper = compileAssetFallbackHelper(assetsDir, serveSpaFallback, notFound);
 	const isrImport = isr ? `import { handleIsr } from ${JSON.stringify(isr.runtimePath)};\nimport { __VOID_ISR_REVALIDATE, __VOID_ISR_PAGES, __VOID_ISR_PATH_REVALIDATE, __VOID_ISR_DEPLOYMENT_ID } from 'virtual:void-routes';\n` : "";
-	const isrEnvCapture = isr ? `  env.__VOID_ISR_DEPLOYMENT_ID ??= __VOID_ISR_DEPLOYMENT_ID;\n  env.__VOID_ISR_HOST = new URL(request.url).hostname;\n` : "";
 	const isrDeploymentStamp = isr ? `  env.__VOID_ISR_DEPLOYMENT_ID ??= __VOID_ISR_DEPLOYMENT_ID;\n` : "";
-	const renderBlock = isr ? `      const __render = async (req) => serveWithAssets(req, env, await app.fetch(req, userEnv, ctx));
-      if (env.ISR_CACHE && request.headers.get("upgrade")?.toLowerCase() !== "websocket") {
-        const __isr = await handleIsr(request, env, ctx, { revalidate: __VOID_ISR_REVALIDATE, pages: __VOID_ISR_PAGES, pathRevalidate: __VOID_ISR_PATH_REVALIDATE, deploymentId: __VOID_ISR_DEPLOYMENT_ID, queryAllowlist: ${JSON.stringify(isr?.queryAllowlist)} }, __render);
-        if (__isr) return __isr;
-      }
-      return __render(request);` : `      return serveWithAssets(request, env, await app.fetch(request, userEnv, ctx));`;
-	const fetchHandler = remotePath ? `async (request, env, ctx) => {
-${fetchEnvValidateCall}  if (env.__VOID_REMOTE === "1") env = ${createRemoteEnvCall};
-${isrEnvCapture}  return __withRawEnv(env, () => {
-    const userEnv = __filterInternalBindings(env);
-    return withRuntimeEnv(env, async () => {
-      const internal = await __handleInternal(request, env, ctx);
-      if (internal) return internal;
-${renderBlock}
-    });
-  });
-}` : `async (request, env, ctx) => {
-${fetchEnvValidateCall}${isrEnvCapture}  return __withRawEnv(env, () => {
-    const userEnv = __filterInternalBindings(env);
-    return withRuntimeEnv(env, async () => {
-      const internal = await __handleInternal(request, env, ctx);
-      if (internal) return internal;
-${renderBlock}
-    });
-  });
-}`;
-	const internalRouteHelper = `async function __handleInternal(request, env, ctx) {
-  const url = new URL(request.url);
-  ${hasEmail ? `if (url.pathname === "/__void/email/receipt/v1") return __handleEmailReceipt(request, env, ctx);` : ""}
-  // Readiness probe — platform polls this to confirm the worker is live after WfP upload.
-  // Handled here (before app.fetch) so user middleware cannot block it.
-  if (request.method === "GET" && url.pathname === "/__void/ready") {
-    return Response.json({ ready: true });
-  }
-  const routeInternal = await __voidHandleInternalRoute(request, env, ctx);
-  if (routeInternal) return routeInternal;
-  if (request.method !== "POST" || url.pathname !== "/__void/prerender-paths") return null;
-  const __expected = env.__VOID_PROXY_TOKEN;
-  if (__expected) {
-    const __token = request.headers.get("x-void-internal");
-    if (!__token || __token !== __expected) {
-      return Response.json({ error: "unauthorized" }, { status: 401 });
-    }
-  }
-  const paths = await __voidCollectPrerenderPaths(request, env, ctx);
-  return Response.json({ paths });
-}`;
+	const fetchHandler = `__createWorkerFetch({
+    app, assets: serveWithAssets, withRawEnv: __withRawEnv, withRuntimeEnv,
+    filterBindings: __filterInternalBindings,
+    internalRoute: __voidHandleInternalRoute,
+    collectPrerenderPaths: __voidCollectPrerenderPaths${versionMetadataBinding ? ", versionMetadataBinding: " + JSON.stringify(versionMetadataBinding) : ""}${envSchemaModule ? ", validateEnv: _validateEnvOnce" : ""}${remotePath ? ", remoteEnv: (env) => " + createRemoteEnvCall : ""}${hasEmail ? ", emailReceipt: __handleEmailReceipt" : ""}${isr ? ", isr: { deploymentId: __VOID_ISR_DEPLOYMENT_ID, handle: (request, env, ctx, render) => handleIsr(request, env, ctx, { revalidate: __VOID_ISR_REVALIDATE, pages: __VOID_ISR_PAGES, pathRevalidate: __VOID_ISR_PATH_REVALIDATE, deploymentId: __VOID_ISR_DEPLOYMENT_ID, queryAllowlist: " + JSON.stringify(isr.queryAllowlist) + " }, render) }" : ""}
+  })`;
 	const scheduledHandler = remotePath ? `async function handleScheduled(controller, env, ctx) {
 ${envValidateCall}  if (env.__VOID_REMOTE === "1") env = ${createRemoteEnvCall};
 ${isrDeploymentStamp}  const userEnv = __filterInternalBindings(env);
@@ -4253,7 +3173,6 @@ ${hasQueues ? `  async queue(batch) { return __voidQueue(batch, this.env, this.c
   }\n` : ""}}`;
 	if (hasQueues) return `${sandboxImport}${entryImport}${liveRuntimeImport}import app, { scheduled, __voidCollectPrerenderPaths, __voidHandleInternalRoute, __withRawEnv, __processQueue${emailImport}${webSocketClasses.length > 0 ? `, ${webSocketClasses.join(", ")}` : ""}${liveRouteImport} } from 'virtual:void-routes';
 ${durableObjectImports}\n${runtimeEnvImport}${emailProxyImport}${envSchemaImport}${remoteImport}${isrImport}${filterBindingsHelper}${assetHelper}
-${internalRouteHelper}
 ${fetchDeclaration}
 ${scheduledHandler}
 ${emailHandler}
@@ -4286,7 +3205,6 @@ ${durableObjectExports}
 ${entryClass}`;
 	return `${sandboxImport}${entryImport}${liveRuntimeImport}import app, { scheduled, __voidCollectPrerenderPaths, __voidHandleInternalRoute, __withRawEnv${emailImport}${webSocketClasses.length > 0 ? `, ${webSocketClasses.join(", ")}` : ""}${liveRouteImport} } from 'virtual:void-routes';
 ${durableObjectImports}\n${runtimeEnvImport}${emailProxyImport}${envSchemaImport}${remoteImport}${isrImport}${filterBindingsHelper}${assetHelper}
-${internalRouteHelper}
 ${fetchDeclaration}
 ${scheduledHandler}
 ${emailHandler}
@@ -4370,6 +3288,7 @@ export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};`;
 }
 function compileNodeClient(authClientPath) {
 	return `import app, { requestContext } from "virtual:void-routes";
+import { interpolateRouteParams } from ${JSON.stringify(ROUTE_URL_PATH)};
 export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};
 
 export class FetchError extends Error {
@@ -4383,12 +3302,7 @@ export class FetchError extends Error {
 }
 
 export async function fetch(path, options) {
-  let url = path;
-  if (options?.params) {
-    for (const [key, value] of Object.entries(options.params)) {
-      url = url.replace(":" + key, encodeURIComponent(value));
-    }
-  }
+  let url = interpolateRouteParams(path, options?.params);
 
   if (options?.query) {
     const qs = new URLSearchParams(options.query).toString();
@@ -4435,180 +3349,22 @@ export async function fetch(path, options) {
   return data;
 }`;
 }
-/** Import the shared cached routing helpers only for modules that use rules. */
-function ensureCompilePatternEmitted(lines) {
-	if (lines.some((line) => line.includes("compilePattern as __compilePattern"))) return;
-	lines.push(`import { compilePattern as __compilePattern, substituteParams as __substituteParams } from ${JSON.stringify(EDGE_MODULE_PATH)};`);
-	lines.push("const __matchPatternWarned = new Set();");
-	lines.push("function __matchPattern(pattern, pathname) {");
-	lines.push("  try {");
-	lines.push("    return __compilePattern(pattern).regex.test(pathname);");
-	lines.push("  } catch (err) {");
-	lines.push("    if (!__matchPatternWarned.has(pattern)) {");
-	lines.push("      __matchPatternWarned.add(pattern);");
-	lines.push("      console.warn(`[void] failed to compile route pattern ${JSON.stringify(pattern)}: ${err && err.message ? err.message : err}`);");
-	lines.push("    }");
-	lines.push("    return false;");
-	lines.push("  }");
-	lines.push("}");
-	lines.push("");
-}
-function ensureMergeQueryHelperEmitted(lines) {
-	if (lines.some((line) => line.includes("mergeQueryIntoLocation as __mergeQueryIntoLocation"))) return;
-	lines.push(`import { mergeQueryIntoLocation as __mergeQueryIntoLocation } from ${JSON.stringify(EDGE_MODULE_PATH)};`);
-}
-/**
-* Shared body for routing-rule evaluation: match rules in order (last wins),
-* substitute captures into destination, handle rewrite (200) or redirect (3xx).
-* Used by both the pre-pipeline routing middleware and the post-pipeline
-* fallback (notFound) middleware.
-*/
-function emitApplyRoutingRules(lines, rulesVar, indent, nodeTarget, markFallbackHandled = false) {
-	lines.push(`${indent}let matched;`);
-	lines.push(`${indent}for (const rule of ${rulesVar}) {`);
-	lines.push(`${indent}  if (rule.host && rule.host !== requestHost) continue;`);
-	lines.push(`${indent}  let regex;`);
-	lines.push(`${indent}  try {`);
-	lines.push(`${indent}    ({ regex } = __compilePattern(rule.source));`);
-	lines.push(`${indent}  } catch (err) {`);
-	lines.push(`${indent}    if (!__matchPatternWarned.has(rule.source)) {`);
-	lines.push(`${indent}      __matchPatternWarned.add(rule.source);`);
-	lines.push(`${indent}      console.warn(\`[void] skipping routing rule with invalid source \${JSON.stringify(rule.source)}: \${err && err.message ? err.message : err}\`);`);
-	lines.push(`${indent}    }`);
-	lines.push(`${indent}    continue;`);
-	lines.push(`${indent}  }`);
-	lines.push(`${indent}  const m = regex.exec(pathname);`);
-	lines.push(`${indent}  if (m) { matched = { rule, params: m.groups || {} }; break; }`);
-	lines.push(`${indent}}`);
-	lines.push(`${indent}if (matched) {`);
-	lines.push(`${indent}  const dest = __substituteParams(matched.rule.destination, matched.params);`);
-	lines.push(`${indent}  if (matched.rule.status === 200) {`);
-	lines.push(`${indent}    const __qIdx = dest.indexOf("?");`);
-	lines.push(`${indent}    const __pathOnly = __qIdx === -1 ? dest : dest.slice(0, __qIdx);`);
-	lines.push(`${indent}    const __searchOnly = __qIdx === -1 ? "" : dest.slice(__qIdx);`);
-	lines.push(`${indent}    const rewriteUrl = new URL(c.req.url);`);
-	lines.push(`${indent}    rewriteUrl.pathname = __pathOnly;`);
-	lines.push(`${indent}    if (__searchOnly) rewriteUrl.search = __searchOnly;`);
-	lines.push(`${indent}    const rewriteReq = new Request(rewriteUrl.toString(), c.req.raw);`);
-	lines.push(`${indent}    const __prior = __voidOriginalUrls.get(c.req.raw);`);
-	lines.push(`${indent}    __voidOriginalUrls.set(rewriteReq, __prior ?? new URL(c.req.url));`);
-	if (markFallbackHandled) lines.push(`${indent}    __voidFallbackHandled.add(rewriteReq);`);
-	if (nodeTarget) lines.push(`${indent}    const __r = await app.fetch(rewriteReq, c.env);`);
-	else lines.push(`${indent}    const __r = await app.fetch(rewriteReq, c.env, c.executionCtx);`);
-	lines.push(`${indent}    if (!__VOID_DEV_ROUTING) return __r;`);
-	lines.push(`${indent}    const __kind = matched.rule.force === true ? "rewrite" : "fallback";`);
-	lines.push(`${indent}    const __trace = __kind + "[" + matched.rule.source + "] -> " + dest + " (" + (matched.rule.origin || "unknown") + ")";`);
-	lines.push(`${indent}    return __voidAnnotateRouting(__r, __trace);`);
-	lines.push(`${indent}  }`);
-	lines.push(`${indent}  const location = __mergeQueryIntoLocation(dest, new URL(c.req.url).search);`);
-	lines.push(`${indent}  const __redir = c.redirect(location, matched.rule.status);`);
-	lines.push(`${indent}  if (!__VOID_DEV_ROUTING) return __redir;`);
-	lines.push(`${indent}  const __rtrace = "redirect[" + matched.rule.source + "] -> " + dest + " " + matched.rule.status + " (" + (matched.rule.origin || "unknown") + ")";`);
-	lines.push(`${indent}  return __voidAnnotateRouting(__redir, __rtrace);`);
-	lines.push(`${indent}}`);
-}
-/**
-* Strip dev-only `origin` metadata from a rule list before embedding in the
-* generated worker code. Keeps production bundles free of authoring hints.
-*
-* Keep in sync with `stripDevOnlyRuleFields` in `cli/package.ts`. This helper
-* intentionally preserves `force` because the Node/Bun/Deno-target codegen
-* reads it at runtime to label the `X-Void-Routing` trace header as either
-* `rewrite[...]` (force) or `fallback[...]`. The CLI version strips both
-* fields because the deploy manifest never transmits either to the dispatch
-* worker (phase is implied by which bucket the rule ships in).
-*/
 function stripOriginForProd(rules) {
 	return rules.map(({ origin: _origin, ...rest }) => rest);
 }
-/**
-* Emit routing rules middleware — handles both redirects (3xx) and rewrites (200).
-* Last match wins. Rewrites re-dispatch with a guard header to prevent loops.
-* Redirects preserve the request's query string in the Location header.
-*
-* When `dev === true` the per-rule `origin` metadata is preserved in the
-* compiled rule table and a matched rule's trace is emitted on the
-* `X-Void-Routing` response header. In production the origin field is
-* stripped and no trace header is emitted.
-*/
-function compileRoutingRulesMiddleware(lines, rules, dev, nodeTarget) {
-	ensureCompilePatternEmitted(lines);
+function compileRoutingRulesMiddleware(lines, rules, dev, _nodeTarget) {
 	lines.push("// Routing rules: redirects + rewrites (applied before route handlers)");
 	lines.push(`const __routingRules = ${JSON.stringify(dev ? rules : stripOriginForProd(rules))};`);
-	lines.push("app.use(\"*\", async (c, next) => {");
-	lines.push("  if (__voidOriginalUrls.has(c.req.raw)) return next();");
-	lines.push("  const __reqUrl = new URL(c.req.url);");
-	lines.push("  const pathname = __reqUrl.pathname;");
-	lines.push("  const requestHost = __reqUrl.hostname;");
-	emitApplyRoutingRules(lines, "__routingRules", "  ", nodeTarget);
-	if (dev) {
-		lines.push("  await next();");
-		lines.push("  if (__VOID_DEV_ROUTING && c.res && !c.res.headers.has(\"X-Void-Routing\")) {");
-		lines.push("    try { c.res.headers.set(\"X-Void-Routing\", \"pass-through\"); } catch {}");
-		lines.push("  }");
-	} else lines.push("  return next();");
-	lines.push("});");
-	lines.push("");
-}
-/**
-* Emit a fallback-rule check inside Hono's `notFound` hook. Fires only when
-* the pipeline didn't match a route — the "asset-miss / no route matched"
-* phase. Re-dispatches through `app.fetch` on a rule match so the re-dispatched
-* request runs through the full middleware + route stack with
-* `X-Void-Original-URL` set; falls through to the caller's existing notFound
-* body when no rule matches.
-*
-* Indent `indent` so the emitted statements nest cleanly within the caller's
-* block. Expects `__matchPattern`, `__voidOriginalUrls`, `__mergeQueryIntoLocation`,
-* `__substituteParams`, and `__voidAnnotateRouting` to already be in scope —
-* which they are, because `compileRoutingRulesMiddleware` runs earlier in
-* compile order and emits every one of them.
-*/
-function emitFallbackRulesCheck(lines, rules, dev, indent, nodeTarget) {
-	ensureCompilePatternEmitted(lines);
-	const tableMarker = "// Fallback rules (applied on no-match, post-route)";
-	if (!lines.includes(tableMarker)) {
-		lines.push(tableMarker);
-		lines.push(`const __fallbackRules = ${JSON.stringify(dev ? rules : stripOriginForProd(rules))};`);
-		lines.push("");
-	}
-	lines.push(`${indent}if (!__voidFallbackHandled.has(c.req.raw)) {`);
-	lines.push(`${indent}  const __reqUrl = new URL(c.req.url);`);
-	lines.push(`${indent}  const pathname = __reqUrl.pathname;`);
-	lines.push(`${indent}  const requestHost = __reqUrl.hostname;`);
-	emitApplyRoutingRules(lines, "__fallbackRules", `${indent}  `, nodeTarget, true);
-	lines.push(`${indent}}`);
+	lines.push("app.use(\"*\", __routingRuntime.routingMiddleware(__routingRules));");
 }
-/**
-* Emit header middleware — applies matching header rules to every response.
-* All matching rules merge; last match wins for same header name.
-*/
 function compileHeaderMiddleware(lines, rules) {
-	ensureCompilePatternEmitted(lines);
 	lines.push("// Header rules (applied to responses)");
 	lines.push(`const __headerRules = ${JSON.stringify(rules)};`);
-	lines.push("app.use(\"*\", async (c, next) => {");
-	lines.push("  await next();");
-	lines.push("  const pathname = new URL(c.req.url).pathname;");
-	lines.push("  const matched = [];");
-	lines.push("  for (const rule of __headerRules) {");
-	lines.push("    if (__matchPattern(rule.pattern, pathname)) matched.push(...rule.headers);");
-	lines.push("  }");
-	lines.push("  if (matched.length === 0) return;");
-	lines.push("  const headers = new Headers(c.res.headers);");
-	lines.push("  for (const [name, value] of matched) {");
-	lines.push("    headers.set(name, value);");
-	lines.push("  }");
-	lines.push("  c.res = new Response(c.res.body, {");
-	lines.push("    headers,");
-	lines.push("    status: c.res.status,");
-	lines.push("    statusText: c.res.statusText,");
-	lines.push("  });");
-	lines.push("});");
-	lines.push("");
+	lines.push("app.use(\"*\", __routingRuntime.headerMiddleware(__headerRules));");
 }
 function compileWorkerClient(authClientPath) {
 	return `import app, { requestContext } from "virtual:void-routes";
+import { interpolateRouteParams } from ${JSON.stringify(ROUTE_URL_PATH)};
 import { env } from "cloudflare:workers";
 export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};
 
@@ -4623,12 +3379,7 @@ export class FetchError extends Error {
 }
 
 export async function fetch(path, options) {
-  let url = path;
-  if (options?.params) {
-    for (const [key, value] of Object.entries(options.params)) {
-      url = url.replace(":" + key, encodeURIComponent(value));
-    }
-  }
+  let url = interpolateRouteParams(path, options?.params);
 
   if (options?.query) {
     const qs = new URLSearchParams(options.query).toString();
@@ -4734,13 +3485,20 @@ function routingPlugin(root, options) {
 		const dts = generateQueueTypes(scan.queues, queuesDir, outDir);
 		writeFileIfChanged(join(outDir, "queues.d.ts"), dts);
 	}
-	async function rescan() {
-		scan = await scanRoutes(root, {
-			output: options.output,
-			paths,
-			environment: routeEnvironment
-		});
-		authConfigPath = findVoidAuthConfig(root, paths);
+	async function rescan(refresh = false) {
+		let analysis = options.getApplicationAnalysis?.(routeEnvironment, refresh);
+		if (!analysis) {
+			const config = readConfig(root);
+			analysis = analyzeApplicationSync(root, {
+				config: {
+					...config,
+					output: options.output ?? config.output
+				},
+				environment: routeEnvironment
+			});
+		}
+		scan = (await completeApplicationAnalysis(analysis)).scan;
+		authConfigPath = analysis.authConfigPath;
 		const entries = validateSsrEntries(root, paths);
 		ssr = entries ? {
 			serverEntryPath: entries.server.absolutePath,
@@ -4776,8 +3534,6 @@ function routingPlugin(root, options) {
 	}
 	const compileOptions = {
 		honoPath: resolveFile("hono"),
-		responsePath: resolveFile("#self/response"),
-		handlerPath: resolveFile("#self/handler"),
 		runtimeEnvPath: resolveFile("#self/_env"),
 		runtimeEmailPath: resolveFile("#self/email"),
 		emailDir,
@@ -4884,8 +3640,6 @@ function routingPlugin(root, options) {
 		return {
 			pagesDir,
 			pagesDirRelative: relative(root, pagesDir).replaceAll("\\", "/"),
-			protocolPath: resolveFile("#self/pages-protocol"),
-			headPath: resolveFile("#self/pages-head"),
 			clientEntryId: "virtual:void-pages-client",
 			islandClientEntryId: hasIslandPages ? "virtual:void-islands-client" : void 0,
 			mdClientEntryId,
@@ -4935,6 +3689,7 @@ function routingPlugin(root, options) {
 		writeFileIfChanged(join(outDir, "app.ts"), compileNodeApp(options.target, compileOptions.honoPath, getEnvSchemaModule()));
 		writeFileIfChanged(join(outDir, "index.ts"), compileNodeServer(options.target));
 	} else writeFileIfChanged(join(outDir, "entry.ts"), compileWorkerEntry({
+		versionMetadataBinding: options.getVersionMetadataBinding?.(),
 		remote,
 		webSocketClasses: options.websocketTombstones,
 		runtimeEnvPath: compileOptions.runtimeEnvPath,
@@ -4956,6 +3711,7 @@ function routingPlugin(root, options) {
 			resolvedConfig = config;
 			authClientPath = resolveAuthClientPath(config);
 			compileOptions.dev = config.command === "serve";
+			compileOptions.assetsDir = config.build.assetsDir;
 			compileOptions.reactRefresh = config.plugins.some((plugin) => plugin.name === "vite:react-babel" || plugin.name === "vite:react-refresh" || plugin.name === "vite:react-swc");
 			const resolvedPublicDir = config.publicDir && config.publicDir.length > 0 ? config.publicDir : null;
 			if (resolvedPublicDir !== publicDir) {
@@ -4984,12 +3740,19 @@ function routingPlugin(root, options) {
 				}
 			}) } };
 			const entries = validateSsrEntries(root, paths);
-			if (!entries || env.command !== "build") return;
+			if (env.command !== "build") return;
 			return { build: {
-				manifest: true,
-				rollupOptions: { input: entries.client.absolutePath }
+				manifest: entries ? true : _.build?.manifest ?? true,
+				...entries ? { rollupOptions: { input: entries.client.absolutePath } } : {}
 			} };
 		},
+		generateBundle: {
+			order: "post",
+			handler(_output, bundle) {
+				const manifest = this.environment.config.build.manifest;
+				if (this.environment.name === "client" && manifest) stampClientAssetCachePolicy(bundle, typeof manifest === "string" ? manifest : ".vite/manifest.json", compileOptions.headerRules);
+			}
+		},
 		async buildStart() {
 			await rescan();
 			if (options.target && (scan?.websockets?.length ?? 0) > 0) throw new Error("routing: WebSocket routes require the default Cloudflare target.");
@@ -5001,7 +3764,7 @@ function routingPlugin(root, options) {
 				const migrationsDir = paths.migrationsDir;
 				if (existsSync(migrationsDir) || compileOptions.auth) {
 					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { buildMigrationPlanBundle } = await import("./plan-DpuOr14e.mjs");
+					const { buildMigrationPlanBundle } = await import("./plan-D1Q5rf-r.mjs");
 					const migrations = existsSync(migrationsDir) ? collectMigrations(migrationsDir) : [];
 					const dialect = getDatabaseDialect(readConfig(root));
 					compileOptions.migrationHandlerPath = resolveFile(dialect === "postgresql" ? "#self/runtime/migration-handler-pg" : dialect === "mysql" ? "#self/runtime/migration-handler-mysql" : "#self/runtime/migration-handler");
@@ -5026,6 +3789,7 @@ function routingPlugin(root, options) {
 					queryAllowlist: buildConfig.routing?.revalidateQueryAllowlist
 				} : void 0;
 				writeFileIfChanged(join(outDir, "entry.ts"), compileWorkerEntry({
+					versionMetadataBinding: options.getVersionMetadataBinding?.(),
 					hasQueues: scan.queues.length > 0,
 					remote,
 					assetsDir: resolvedConfig?.build.assetsDir,
@@ -5080,7 +3844,7 @@ function routingPlugin(root, options) {
 				const sourceConventionChanged = isInDirectory(normalizedPath, normalizedRoutesDir) || isInDirectory(normalizedPath, normalizedMiddlewareDir) || isInDirectory(normalizedPath, normalizedJobsDir) || isInDirectory(normalizedPath, normalizedQueuesDir) || isInDirectory(normalizedPath, normalizedEmailDir) || isInDirectory(normalizedPath, normalizedPagesDir) || isPotentialAuthConfigPath(normalizedPath) || isPotentialEnvFilePath(normalizedPath);
 				if (!sourceConventionChanged && !isInDirectory(normalizedPath, normalizedSsrDir) && !isPotentialEnvFilePath(normalizedPath)) return;
 				if (!sourceConventionChanged && isInDirectory(normalizedPath, normalizedSsrDir) && !ssrEntryAbsPaths.has(normalizedPath)) return;
-				await rescan();
+				await rescan(true);
 				resolveAuthCompileOptions();
 				if (event !== "change" && options.onDevAssetRoutingPolicyChange?.(resolveCurrentAssetRoutingPolicy()) === true) {
 					await devServer.restart();
@@ -5093,6 +3857,7 @@ function routingPlugin(root, options) {
 					writeFileIfChanged(join(outDir, "app.ts"), compileNodeApp(options.target, compileOptions.honoPath, getEnvSchemaModule()));
 					writeFileIfChanged(join(outDir, "index.ts"), compileNodeServer(options.target));
 				} else writeFileIfChanged(join(outDir, "entry.ts"), compileWorkerEntry({
+					versionMetadataBinding: options.getVersionMetadataBinding?.(),
 					hasQueues: scan.queues.length > 0,
 					remote,
 					assetsDir: resolvedConfig?.build.assetsDir,
@@ -5572,7 +4337,7 @@ function readVoidDevCredentials(root) {
 */
 async function runAiSetupPrompt(root, token, apiUrl, server) {
 	const { select, text, isCancel, log } = await import("./dist-BuDuKZJv.mjs");
-	const { PlatformClient } = await import("./client-Czz8o5jP.mjs");
+	const { PlatformClient } = await import("./client-Cu7jWiF1.mjs");
 	const { attachSelectedPlatform, writeProjectConfig } = await import("./project-BuUwfj6f.mjs");
 	const { inferDefaultSlug } = await import("./resolve-project-DtbidV4y.mjs");
 	const client = new PlatformClient(token, apiUrl);
@@ -5601,7 +4366,7 @@ async function runAiSetupPrompt(root, token, apiUrl, server) {
 	let slug;
 	if (result === "__create__") {
 		const { validateProjectSlug } = await import("./project-slug-DofjTFd-.mjs");
-		const { createProjectWithSlugRetry } = await import("./create-project-DdoqwFLF.mjs");
+		const { createProjectWithSlugRetry } = await import("./create-project-Boczwj5r.mjs");
 		let created;
 		try {
 			created = await createProjectWithSlugRetry(client, inferDefaultSlug(root), async (defaultSlug) => {
@@ -5687,15 +4452,26 @@ function voidPlugin(options) {
 			}
 		}
 	};
-	const paths = resolveProjectPaths(root, config);
+	let application = analyzeApplicationSync(root, { config });
+	const { paths, dialect, bindingNames, authConfigPath } = application;
+	const analyses = /* @__PURE__ */ new Map([[void 0, application]]);
+	const getApplicationAnalysis = (environment, refresh = false) => {
+		let result = refresh ? void 0 : analyses.get(environment);
+		if (!result) {
+			result = analyzeApplicationSync(root, {
+				config,
+				environment
+			});
+			analyses.set(environment, result);
+		}
+		application = result;
+		return result;
+	};
 	let routeEnvironment = "prod";
 	assertNoRootSourceConventionConflicts(paths);
-	const dialect = getDatabaseDialect(config);
-	const detected = detectFramework(root);
+	const detected = application.framework;
 	const framework = detected?.class === "a" ? detected.name : void 0;
 	const scanDirs = config.inference?.scanDirs ?? (detected ? FRAMEWORK_SCAN_DIRS : void 0);
-	const inferenceOptions = config.inference?.bindings ? { bindings: config.inference.bindings } : void 0;
-	const bindingNames = resolveBindingNames(config.inference?.bindings);
 	const frameworkOwnsCloudflareRuntime = detected !== void 0 && (detected.class === "b" || detected.class === "c");
 	const localD1PersistRoot = frameworkOwnsCloudflareRuntime ? join(root, ".wrangler", "state") : options?.persistTo ?? join(root, ".void");
 	const localD1 = resolveLocalD1Target(root, {
@@ -5703,22 +4479,13 @@ function voidPlugin(options) {
 		persistRoot: localD1PersistRoot
 	});
 	writeLocalD1PersistState(root, !isNodeTarget(config.target) && !frameworkOwnsCloudflareRuntime ? options?.persistTo : void 0);
-	const inferredBindings = inferProjectBindings(root, {
-		...inferenceOptions,
-		paths
-	}, scanDirs);
-	const sandboxEnabled = isSandboxEnabled(config);
-	let bindings = sandboxEnabled ? {
-		...inferredBindings,
-		needsSandbox: true
-	} : inferredBindings;
+	let bindings = application.bindings;
 	const sandboxConfig = bindings.needsSandbox ? resolveSandboxConfig(config, root) : void 0;
-	const authConfigPath = findVoidAuthConfig(root, paths);
-	let authEnabled = bindings.needsAuth || authConfigPath !== null || config.auth !== void 0;
+	let authEnabled = application.authEnabled;
 	if (detected && authEnabled) throw new Error("auth: Void-managed Better Auth is only supported in Void apps. Use Better Auth's official integration for this framework instead.");
 	if (detected && bindings.needsSandbox) throw new Error("sandbox: Cloudflare Sandboxes are currently supported in Void apps only.");
 	if (detected && bindings.needsLive) throw new Error("live: void/live is currently supported in Void apps only.");
-	const hasInboundEmail = hasEmailHandlers(scanEmailHandlersSync(paths.sourceRoot));
+	const hasInboundEmail = hasEmailHandlers(application.email);
 	if (detected && hasInboundEmail) throw new Error("email: inbound email handlers are only supported in Void apps. Remove the email/ directory — `sendEmail` from void/email keeps working.");
 	const STUB_PREFIX = "\0void-client-stub:";
 	const SERVER_ONLY_STUBS = {
@@ -5795,9 +4562,9 @@ function voidPlugin(options) {
 			if (name !== "client") return { optimizeDeps: { exclude: ["void"] } };
 		}
 	};
-	const queues = framework ? [] : scanQueuesSync(root, paths.queuesDir);
-	const websocketRoutes = framework ? [] : scanWebSocketRoutesSync(root, paths);
-	const durableObjects = scanDurableObjectModules(root);
+	const queues = framework ? [] : application.queues;
+	const websocketRoutes = framework ? [] : application.allWebsockets;
+	const durableObjects = application.durableObjects;
 	if (detected && durableObjects.length > 0) throw new Error("durable: durable-objects/ is currently supported in Void apps only, not framework adapter mode.");
 	for (const module of durableObjects) {
 		const websocketCollision = websocketRoutes.find((route) => route.bindingName === module.bindingName || route.className === module.className);
@@ -5846,7 +4613,7 @@ function voidPlugin(options) {
 			if (command !== "serve") return;
 			if (syncWranglerBindings(root, {
 				...bindings,
-				needsD1: dialect === "sqlite" && bindings.needsD1
+				needsD1: dialect === "sqlite" && application.needsDatabase
 			}, {
 				bindingNames,
 				...directCloudflareDestination && bindings.needsAI ? { directCloudflareAi: { gateway: config.ai?.gateway } } : {},
@@ -5922,12 +4689,13 @@ function voidPlugin(options) {
 	}
 	const remoteMode = resolveRemoteMode(config.remote);
 	const workerConfig = {};
-	const jobs = scanJobsSync(root, paths.cronsDir);
+	const jobs = application.jobs;
 	if (jobs.length > 0) workerConfig.triggers = { crons: [...new Set(jobs.flatMap((job) => job.crons))] };
 	let envSchemaFacts;
 	let assetRouting;
 	if (config.worker?.vars) workerConfig.vars = { ...config.worker.vars };
 	let viteCommand = "build";
+	let versionMetadataBinding;
 	const wranglerCompat = isNodeTarget(config.target) ? void 0 : readWranglerCompat(root, config);
 	if (wranglerCompat) {
 		workerConfig.compatibility_date = wranglerCompat.compatibilityDate;
@@ -5965,7 +4733,7 @@ function voidPlugin(options) {
 		}
 		const d1Name = bindingNames?.d1 ?? "DB";
 		const d1 = [];
-		if (dialect === "sqlite" && (bindings.needsD1 || authEnabled) && !hasBinding(resolved.d1_databases, d1Name)) d1.push({
+		if (dialect === "sqlite" && application.needsDatabase && !hasBinding(resolved.d1_databases, d1Name)) d1.push({
 			binding: d1Name,
 			database_name: "default",
 			database_id: "local"
@@ -6082,7 +4850,7 @@ function voidPlugin(options) {
 			resolved.containers = [];
 			const currentMigrations = result.migrations ?? resolved.migrations;
 			const existingMigrations = Array.isArray(currentMigrations) ? currentMigrations : [];
-			if (!existingMigrations.some((migration) => migration.tag === "void-sandbox-v2" || migration.new_sqlite_classes?.includes(sandboxConfig.className))) result.migrations = [...existingMigrations, {
+			if (!hasSandboxSqliteMigration(existingMigrations, sandboxConfig.className)) result.migrations = [...existingMigrations, {
 				tag: SANDBOX_MIGRATION_TAG,
 				new_sqlite_classes: [sandboxConfig.className]
 			}];
@@ -6124,6 +4892,33 @@ function voidPlugin(options) {
 				result.vars = vars;
 			}
 		}
+		versionMetadataBinding = selectNativeVersionMetadataBinding(resolved, {
+			nativeBuild: viteCommand === "build" && process.env["VOID_CLOUDFLARE_DEPLOY_BUILD"] === "1",
+			preserveBindings: process.env[CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV] === "1"
+		});
+		if (versionMetadataBinding) {
+			const owner = findBindingNameOwner(result, "version_metadata", versionMetadataBinding);
+			if (owner) throw new Error(`Cloudflare version metadata binding ${versionMetadataBinding} conflicts with ${owner}.`);
+			if (!resolved.version_metadata) result.version_metadata = { binding: versionMetadataBinding };
+		}
+		finalizeDurableObjectPatch(resolved, result, [
+			...environmentWebsocketRoutes.map((route) => ({
+				name: route.bindingName,
+				class_name: route.className
+			})),
+			...durableObjects.map((module) => ({
+				name: module.bindingName,
+				class_name: module.className
+			})),
+			...bindings.needsSandbox && sandboxConfig ? [{
+				name: sandboxConfig.binding,
+				class_name: sandboxConfig.className
+			}] : [],
+			...shouldEmitLive() && liveConfig ? [{
+				name: liveConfig.bindingName,
+				class_name: liveConfig.className
+			}] : []
+		]);
 		return result;
 	}
 	function applyEnvSchema(facts) {
@@ -6134,16 +4929,9 @@ function voidPlugin(options) {
 		config(userConfig, { command, isPreview }) {
 			viteCommand = command;
 			routeEnvironment = command === "serve" && !isPreview ? "dev" : "prod";
-			const environmentBindings = inferProjectBindings(root, {
-				...inferenceOptions,
-				paths,
-				environment: routeEnvironment
-			}, scanDirs);
-			bindings = sandboxEnabled ? {
-				...environmentBindings,
-				needsSandbox: true
-			} : environmentBindings;
-			authEnabled = bindings.needsAuth || authConfigPath !== null || config.auth !== void 0;
+			application = getApplicationAnalysis(routeEnvironment);
+			bindings = application.bindings;
+			authEnabled = application.authEnabled;
 			if (command === "serve" && directCloudflareDestination && bindings.needsAI) process.env.CLOUDFLARE_AUTH_USE_KEYRING = "true";
 			if (!framework && !isNodeTarget(config.target)) {
 				managedCloudflareBuild = command === "build" && Boolean(process.env.VOID_DEPLOY_PROJECT_ID);
@@ -6222,13 +5010,11 @@ function voidPlugin(options) {
 			}
 		}
 	};
-	const autoDetectBindings = !inferenceOptions;
 	const autoDetectAuth = !authEnabled;
 	const bindingWatchPlugin = {
 		name: "void:binding-watch",
 		apply: "serve",
 		configureServer(server) {
-			if (!autoDetectBindings && !autoDetectAuth) return;
 			const watchDirs = [.../* @__PURE__ */ new Set([...scanDirs ?? DEFAULT_SCAN_DIRS, "src"])].map((d) => join(root, d));
 			let hintShown = false;
 			const check = (path) => {
@@ -6236,16 +5022,14 @@ function voidPlugin(options) {
 				if (!watchDirs.some((d) => path.startsWith(d))) return;
 				try {
 					const code = readFileSync(path, "utf-8");
-					const fileBindings = inferBindingsFromSource(code, path.split("/").pop());
+					const fileBindings = applyBindingOverrides(inferBindingsFromSource(code, path.split("/").pop()), config.inference?.bindings);
 					const newBindings = [];
-					if (autoDetectBindings) {
-						if (fileBindings.needsD1 && !bindings.needsD1) newBindings.push("D1 (void/db)");
-						if (fileBindings.needsKV && !bindings.needsKV) newBindings.push("KV (void/kv)");
-						if (fileBindings.needsR2 && !bindings.needsR2) newBindings.push("R2 (void/storage)");
-						if (fileBindings.needsAI && !bindings.needsAI) newBindings.push("AI (void/ai)");
-						if (fileBindings.needsSandbox && !bindings.needsSandbox) newBindings.push("Sandbox (void/sandbox)");
-						if (fileBindings.needsEmail && !bindings.needsEmail) newBindings.push("Email (void/email)");
-					}
+					if (fileBindings.needsD1 && !bindings.needsD1) newBindings.push("D1 (void/db)");
+					if (fileBindings.needsKV && !bindings.needsKV) newBindings.push("KV (void/kv)");
+					if (fileBindings.needsR2 && !bindings.needsR2) newBindings.push("R2 (void/storage)");
+					if (fileBindings.needsAI && !bindings.needsAI) newBindings.push("AI (void/ai)");
+					if (fileBindings.needsSandbox && !bindings.needsSandbox) newBindings.push("Sandbox (void/sandbox)");
+					if (fileBindings.needsEmail && !bindings.needsEmail) newBindings.push("Email (void/email)");
 					if (autoDetectAuth && fileBindings.needsAuth) newBindings.push("Auth (void/auth)");
 					if (newBindings.length > 0) {
 						hintShown = true;
@@ -6315,14 +5099,14 @@ function voidPlugin(options) {
 			clientStubsPlugin,
 			serverRuntimeOptimizerPlugin,
 			bindingRuntimePlugin(bindingNames),
-			drizzlePlugin(root, false, getDatabaseDialect(config), {
+			drizzlePlugin(root, false, dialect, {
 				d1BindingName: bindingNames?.d1,
 				forceVirtualDb: authEnabled || bindingNames?.d1 !== void 0,
 				localD1DatabaseId: localD1.databaseId,
 				localD1PersistRoot: localD1.persistRoot,
 				redirectDbTypePaths
 			}),
-			migrationPlugin(root, getDatabaseDialect(config), localD1.databaseId, localD1.persistRoot),
+			migrationPlugin(root, dialect, localD1.databaseId, localD1.persistRoot),
 			...vinextCompat ? [vinextCompat] : [],
 			frameworkBuildWrapperPlugin,
 			frameworkTriggersPlugin(root, { devTriggerToken }),
@@ -6358,6 +5142,7 @@ function voidPlugin(options) {
 			envSchemaPlugin(root),
 			...pagesDevCssAssetsPlugin(root, devTriggerToken),
 			routingPlugin(root, {
+				getApplicationAnalysis,
 				isAuthEnabled: () => false,
 				devTriggerToken,
 				headConfig: config.head,
@@ -6377,18 +5162,17 @@ function voidPlugin(options) {
 	if (normalizedFlags && normalizedFlags !== existingFlags) workerConfig.compatibility_flags = normalizedFlags;
 	const ssrEntry = validateSsrEntry(root, paths);
 	const hasPages = existsSync(paths.pagesDir);
-	const hasMiddleware = scanMiddlewareSync(root, paths).length > 0;
 	let assetRoutingPublicDir = join(root, "public");
 	let managedCloudflareBuild = false;
 	function resolveConfiguredAssetRoutingPolicy() {
-		const routePatterns = scanRoutePatternsSync(root, paths, routeEnvironment);
+		const routePatterns = application.routes;
 		const environmentWebsocketRoutes = websocketRoutes.filter((route) => isRouteEnabledForEnvironment(route, routeEnvironment));
 		const policy = resolveAssetRoutingPolicy({
 			isSsr: Boolean(ssrEntry),
 			hasPages,
 			hasApiRoutes: hasApiRoutes(routePatterns) || hasApiRoutes(environmentWebsocketRoutes) || authEnabled,
 			hasDocumentRoutes: hasDocumentRoutes(routePatterns),
-			hasMiddleware,
+			hasMiddleware: application.middleware.length > 0,
 			hasWebSockets: hasDocumentRoutes(environmentWebsocketRoutes),
 			authEnabled,
 			liveEnabled: shouldEmitLive() && liveConfig !== void 0,
@@ -6441,7 +5225,9 @@ function voidPlugin(options) {
 		...bindings.needsSandbox ? [createSandboxSdkResolvePlugin()] : [],
 		...pagesDevCssAssetsPlugin(root, devTriggerToken),
 		routingPlugin(root, {
+			getApplicationAnalysis,
 			isAuthEnabled: () => authEnabled,
+			getVersionMetadataBinding: () => versionMetadataBinding,
 			devTriggerToken,
 			headConfig: config.head,
 			output: config.output,