void 0.27.0 → 1.0.3

package/dist/index.mjs

@@ -1,52 +1,55 @@
 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 { a as join, c as resolve, n as dirname, o as normalize, s as relative } from "./dist-ipQi0Q8y.mjs";
 import { t as require_picocolors } from "./picocolors-BTps1_gs.mjs";
-import { d as staticModuleReferences, f as walk, m as applyBindingOverrides, n as FRAMEWORK_SCAN_DIRS, t as DEFAULT_SCAN_DIRS, u as inferBindingsFromSource } from "./plugin-inference-BlQbOL0P.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-DiowPT80.mjs";
+import { d as walk, l as inferBindingsFromSource, m as applyBindingOverrides, n as FRAMEWORK_SCAN_DIRS, t as DEFAULT_SCAN_DIRS, u as staticModuleReferences } from "./plugin-inference-DsARdQKE.mjs";
+import { n as readProjectPaths, t as assertNoRootSourceConventionConflicts } from "./project-paths-DMvEeSau.mjs";
+import { n as loadVoidAuthConfig } from "./config-D0GY5ItR.mjs";
+import { c as isNodeTarget, d as readConfig, s as getDatabaseDialect } from "./config-Bx_1SpnO.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-DKy02UY0.mjs";
-import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-CMAkqBmU.mjs";
-import { r as hasEmailHandlers } from "./email-d_Aux1vM.mjs";
-import { i as resolveLayoutIds } from "./scan-C3uDzz6J.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-B_ggY-IO.mjs";
-import { G as hasRevalidate, R as CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV, U as collectPages, W as collectRevalidate, _t as hasApiRoutes, et as resolveDistDir, gt as generateQueueResolverSource, it as resolveWorkerDirName, o as prerenderPages, s as prerenderPagesNode, u as SEND_EMAIL_BINDING, vt as hasDocumentRoutes, yt as resolveAssetRoutingPolicy, z as selectNativeVersionMetadataBinding } from "./deploy-Bqe1PYBw.mjs";
-import { i as voidWarn, n as voidError, r as voidLog, t as setShowTimestamp } from "./log-vqY3pqwI.mjs";
-import { n as lintDuplicateSources, r as mergeRoutingRules, t as lintDestinationSplats } from "./headers-DlfR78Nu.mjs";
-import { n as readDeploymentPlatform, r as readProjectConfig } from "./project-BAm2aB6Q.mjs";
-import { a as restoreCloudflarePreviewPointer, r as materializeCloudflareConfig, s as stashCloudflareDeployPointer } from "./cloudflare-config-BmhBv3HV.mjs";
-import { D as syncWranglerBindings, E as resolveLiveBindingConfig, O as syncWranglerDurableObjects, T as readWranglerWebSocketTombstones, a as LIVE_MIGRATION_TAG, d as ensureWranglerCompatibilityDate, f as ensureWranglerNodejsAlsFlag, g as normalizeWranglerCompatibilityFlags, h as nextDurableObjectMigrationTag, k as syncWranglerWebSockets, m as hasDurableObjectSqliteMigration, p as findBindingNameOwner, u as ensureWranglerCompat, v as readExistingLiveBindingConfig, x as readWranglerCompat } from "./wrangler-D9KTuqnv.mjs";
-import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-ga5O_idV.mjs";
-import { n as scopedAccessCredentials } from "./cf-access-TWNzXltp.mjs";
-import { r as ensurePlatformProxyAccess } from "./cf-access-BcIBSKqG.mjs";
-import { a as getApiUrl, c as getToken, o as getProxyUrl } from "./auth-Dn2vw-SG.mjs";
-import { d as printSuccess } from "./output-C50ag2r3.mjs";
-import { n as ensureProjectTsconfig, r as writeFileIfChanged } from "./project-tsconfig-CVJhNMxs.mjs";
-import { i as generateDbDts, n as generateQueueTypes, r as DRIZZLE_OPERATORS, t as generateRouteTypes } from "./route-types-CbtsIeFn.mjs";
-import { t as discoverSchema } from "./discover-CkCYv9T_.mjs";
-import { _ as listDevMessages, a as DEV_INBOX_ENV_VAR, b as registerEmailSink, c as DEV_INBOX_TOKEN_ENV_VAR, h as findDevMessage, l as DEV_INBOX_TOKEN_HEADER, n as DEV_INBOX_ACK_VALUE, o as DEV_INBOX_MAX_CAPTURE_BYTES, p as clearDevBuffer, s as DEV_INBOX_PREFIX, t as DEV_INBOX_ACK_HEADER, u as DEV_INBOX_TOKEN_QUERY, v as parseCapturedMessage, y as pushToDevBuffer } from "./dev-inbox-CK-UuPob.mjs";
+import { a as hasSandboxSqliteMigration, c as sandboxContainerConfig, i as assertSandboxNamespaceConfig, n as DEFAULT_SANDBOX_CLASS_NAME, p as scanJobsSync, r as SANDBOX_MIGRATION_TAG, s as resolveSandboxConfig, t as analyzeApplicationSync, u as scanQueuesSync } from "./application-analysis-AB_YYWgH.mjs";
+import { a as validateSsrEntries, n as SSR_SERVER_ENTRY_RELATIVE_PATHS, o as validateSsrEntry, t as SSR_CLIENT_ENTRY_RELATIVE_PATHS } from "./entry-ehmBvs5w.mjs";
+import { r as hasEmailHandlers } from "./email-BcjSyAL0.mjs";
 import { t as MagicString } from "./dist-Cegxq8gs.mjs";
-import { n as scanWranglerDotenvKeys } from "./dotenv-BfU6eqFt.mjs";
-import { a as isClientEnvKey, c as resolveRemoteMode, i as findReservedEnvKeys, n as LOCAL_ENV_FILE, o as loadLocalEnv, r as findLegacyEnvFiles, s as reservedEnvKeysMessage } from "./env-BxocywBB.mjs";
-import { n as findEnvFileForPaths, r as generateEnvTypes, t as findEnvFile } from "./env-types-CwXgeMgL.mjs";
-import { y as loadUserEnvFile } from "./env-validation-Dxdx_5wo.mjs";
-import { n as INTERNAL_BINDING_PREFIXES, t as INTERNAL_BINDING_EXACT_NAMES } from "./env-raw-jZpP5n47.mjs";
-import { n as completeApplicationAnalysis } from "./application-routing-DQyUh_5S.mjs";
+import { i as resolveLayoutIds } from "./scan-C0BMdmEd.mjs";
+import { a as resolveDistDir, c as hasDocumentRoutes, n as collectRevalidate, o as resolveWorkerDirName, r as hasRevalidate, s as hasApiRoutes, t as collectPages, u as resolveAssetRoutingPolicy } from "./isr-config-fZaJJ8t7.mjs";
+import { i as voidWarn, n as voidError, r as voidLog, t as setShowTimestamp } from "./log-vqY3pqwI.mjs";
+import { n as mergeRoutingRules, t as lintRoutingPhases } from "./headers-Di1FsD3e.mjs";
+import { n as readDeploymentPlatform, r as readProjectConfig } from "./project-rqDnVsJN.mjs";
+import { a as restoreCloudflarePreviewPointer, r as materializeCloudflareConfig, s as stashCloudflareDeployPointer } from "./cloudflare-config-DV60XFFK.mjs";
+import { D as syncWranglerBindings, E as resolveLiveBindingConfig, O as syncWranglerDurableObjects, T as readWranglerWebSocketTombstones, a as LIVE_MIGRATION_TAG, d as ensureWranglerCompatibilityDate, f as ensureWranglerNodejsAlsFlag, g as normalizeWranglerCompatibilityFlags, h as nextDurableObjectMigrationTag, k as syncWranglerWebSockets, m as hasDurableObjectSqliteMigration, p as findBindingNameOwner, u as ensureWranglerCompat, v as readExistingLiveBindingConfig, x as readWranglerCompat } from "./wrangler-BYs07Rxy.mjs";
+import { n as writeLocalD1PersistState, t as resolveLocalD1Target } from "./local-d1-BxvQYEFi.mjs";
+import { n as scopedAccessCredentials } from "./cf-access-BM9G0lhO.mjs";
+import { n as ensurePlatformProxyAccess } from "./cf-access-CWP4avfP.mjs";
+import { a as getApiUrl, c as getToken, o as getProxyUrl } from "./auth-B6iOCjKI.mjs";
+import { m as printSuccess } from "./output-Ba6ZbrzY.mjs";
+import { r as writeFileIfChanged } from "./project-tsconfig-bveqhlYA.mjs";
+import { n as drizzlePlugin, t as generateQueueResolverSource } from "./dispatch-DrTTk8Xg.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 } from "./dev-inbox-Rd6j_8vM.mjs";
+import { n as scanWranglerDotenvKeys } from "./dotenv-CNazY3-w.mjs";
+import { a as isClientEnvKey, c as resolveRemoteMode, i as findReservedEnvKeys, n as LOCAL_ENV_FILE, o as loadLocalEnv, r as findLegacyEnvFiles, s as reservedEnvKeysMessage } from "./env-BJjULvL0.mjs";
+import { n as findEnvFileForPaths, r as generateEnvTypes, t as findEnvFile } from "./env-types-DS2_y4X8.mjs";
+import { t as loadUserEnvFile } from "./load-user-env-DD5qveNU.mjs";
+import { n as INTERNAL_BINDING_PREFIXES, t as INTERNAL_BINDING_EXACT_NAMES } from "./env-raw-D74P4ebM.mjs";
+import { t as ASSET_EXTENSIONS } from "./routing-assets-VkrKIbxE.mjs";
+import { r as selectNativeVersionMetadataBinding, t as CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV } from "./version-metadata-DIrqEHQo.mjs";
+import { f as prerenderPages, n as SEND_EMAIL_BINDING, p as prerenderPagesNode } from "./email-cloudflare-DfG6UEMm.mjs";
 import { r as defer } from "./validation-error-Dg9Recn1.mjs";
-import { i as safeJsonStringify } from "./protocol-CfaUwNs8.mjs";
+import { i as safeJsonStringify } from "./protocol-RNP0u7UY.mjs";
+import { n as completeApplicationAnalysis } from "./application-routing-L7V-TFhZ.mjs";
 import { n as generateVoidAuthDrizzleSchema, t as generateVoidAuthDatabaseModule } from "./drizzle-CF84FOVM.mjs";
-import { a as defineMiddleware, c as defineScheduled, i as defineHead, n as basicAuth, o as defineQueue, r as defineHandler, s as defineRender, t as VoidAssetRewriteError } from "./handler-BHAn2fZJ.mjs";
-import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, rmSync, statSync, writeFileSync, writeSync } from "node:fs";
+import { n as generateQueueTypes, t as generateRouteTypes } from "./route-types-BZi26DVS.mjs";
+import { a as defineMiddleware, c as defineScheduled, i as defineHead, n as basicAuth, o as defineQueue, r as defineHandler, s as defineRender, t as VoidAssetRewriteError } from "./handler-BZ1t7-Rv.mjs";
+import module, { builtinModules, createRequire } from "node:module";
+import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync, writeSync } from "node:fs";
 import { cloudflare } from "@cloudflare/vite-plugin";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { loadEnv, normalizePath, parseSync, resolveEnvPrefix } from "vite";
+import { defaultServerConditions, loadEnv, normalizePath, parseSync, resolveEnvPrefix } from "vite";
 import { appendSqliteClassMigration } from "@void/deploy-core";
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { homedir } from "node:os";
 import { isDeepStrictEqual, parseEnv } from "node:util";
-import { compilePattern } from "@void/edge";
+import { compilePattern, matchPattern } from "@void/edge";
 //#region src/pages/dev-css-assets.ts
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 const DEV_CSS_ASSET_MODULE_ID = "virtual:void-pages-dev-assets";
@@ -139,11 +142,6 @@ function createOrderedEdgeStore(root) {
 			version++;
 			for (const key of aliasesForId(importer)) byKey.set(key, edges);
 		},
-		deleteForId(id) {
-			let deleted = false;
-			for (const key of aliasesForId(id)) deleted = byKey.delete(key) || deleted;
-			if (deleted) version++;
-		},
 		getForNode(node) {
 			const keys = [node.url, node.id].filter((value) => typeof value === "string");
 			for (const key of keys) {
@@ -491,11 +489,11 @@ function readVoidDevCredentials(root) {
 * block the server. On completion, writes project.json and restarts the server.
 */
 async function runAiSetupPrompt(root, token, apiUrl, server) {
-	const { select, text, isCancel, log } = await import("./dist-Bx1z6Eva.mjs");
-	const { PlatformClient } = await import("./client-tso2OfcG.mjs");
-	const { attachSelectedPlatform, writeProjectConfig } = await import("./project-DedqCp59.mjs");
-	const { inferDefaultSlug } = await import("./resolve-project-BIeYs9Cw.mjs");
-	const client = new PlatformClient(token, apiUrl);
+	const { select, text, isCancel, log } = await import("./dist-CfgIkieS.mjs");
+	const { PlatformClient } = await import("./client-B60PwCC4.mjs");
+	const { attachSelectedPlatform, writeProjectConfig } = await import("./project-zdB3fs9G.mjs");
+	const { inferDefaultSlug } = await import("./resolve-project-PnhzMtY6.mjs");
+	const client = new PlatformClient(token, { apiUrl });
 	let projects;
 	try {
 		projects = await client.listProjects();
@@ -520,8 +518,8 @@ async function runAiSetupPrompt(root, token, apiUrl, server) {
 	let projectId;
 	let slug;
 	if (result === "__create__") {
-		const { validateProjectSlug } = await import("./project-slug-DofjTFd-.mjs");
-		const { createProjectWithSlugRetry } = await import("./create-project-qFDC45zg.mjs");
+		const { validateProjectSlug } = await import("./project-slug-6cyz8E7k.mjs");
+		const { createProjectWithSlugRetry } = await import("./create-project-B-ewF_Af.mjs");
 		let created;
 		try {
 			created = await createProjectWithSlugRetry(client, inferDefaultSlug(root), async (defaultSlug) => {
@@ -546,7 +544,7 @@ async function runAiSetupPrompt(root, token, apiUrl, server) {
 		projectId = project.id;
 		slug = project.slug;
 	}
-	writeProjectConfig(root, attachSelectedPlatform(root, {
+	writeProjectConfig(root, attachSelectedPlatform({
 		projectId,
 		slug
 	}, client.apiUrl));
@@ -555,7 +553,7 @@ async function runAiSetupPrompt(root, token, apiUrl, server) {
 }
 //#endregion
 //#region src/plugin-binding-runtime.ts
-const envModuleResolved$1 = fileURLToPath(import.meta.resolve("#self/_env"));
+const envModuleResolved = fileURLToPath(import.meta.resolve("#self/_env"));
 const kvModuleResolved = fileURLToPath(import.meta.resolve("void/kv"));
 const storageModuleResolved = fileURLToPath(import.meta.resolve("void/storage"));
 const VIRTUAL_KV_ID = "\0virtual:void-kv";
@@ -576,7 +574,7 @@ function bindingRuntimePlugin(bindingNames) {
 			filter: { id: /^\0virtual:void-(?:kv|storage)$/ },
 			handler(id) {
 				if (id === VIRTUAL_KV_ID) return `
-import { requireRuntimeBinding } from ${JSON.stringify(envModuleResolved$1)};
+import { requireRuntimeBinding } from ${JSON.stringify(envModuleResolved)};
 import { createKV } from ${JSON.stringify(kvModuleResolved)};
 
 const namespace = new Proxy({}, {
@@ -591,7 +589,7 @@ export { createKV };
 export const kv = createKV(namespace);
 `;
 				if (id === VIRTUAL_STORAGE_ID) return `
-import { requireRuntimeBinding } from ${JSON.stringify(envModuleResolved$1)};
+import { requireRuntimeBinding } from ${JSON.stringify(envModuleResolved)};
 export { createStorage } from ${JSON.stringify(storageModuleResolved)};
 
 export const storage = new Proxy({}, {
@@ -699,6 +697,19 @@ function isViteBuildOrPreview() {
 	const subcommand = process.argv[2];
 	return subcommand === "build" || subcommand === "preview";
 }
+/**
+* Point Cloudflare remote bindings opened in this process at the login from
+* `void connect` and `void cloudflare login`. The Cloudflare Vite plugin and
+* Wrangler's platform proxy authenticate remote bindings here, in dev, preview
+* and build prerendering. They read cf's login only when `CLOUDFLARE_CF_AUTH`
+* is present (any value), and Wrangler's separate login otherwise. The keyring
+* flag selects the encrypted cf profile that Void's login writes. Environment
+* API tokens still take precedence, and the OAuth token stays in the store.
+*/
+function selectVoidCloudflareLogin() {
+	process.env.CLOUDFLARE_CF_AUTH = "true";
+	process.env.CLOUDFLARE_AUTH_USE_KEYRING = "true";
+}
 const DEV_TRIGGER_TOKEN_FILE_MODE = 384;
 /**
 * Persist the dev-trigger token at `<root>/.void/dev-trigger-token` so
@@ -832,15 +843,14 @@ function warnIfPackageJsonIsNotEsm(root) {
 * and framework mode (SvelteKit, Nuxt, Analog, Astro, TanStack Start, React
 * Router, vinext) expose `/__void/scheduled` and `/__void/queue`.
 */
-function devTriggersHintPlugin(root, options) {
-	const { devTriggerToken } = options;
+function devTriggersHintPlugin(root, devTriggerToken) {
 	return {
 		name: "void:dev-triggers-hint",
 		apply: "serve",
 		configureServer(server) {
 			const paths = readProjectPaths(root);
-			const jobs = scanJobsSync(root, paths.cronsDir);
-			const queues = scanQueuesSync(root, paths.queuesDir);
+			const jobs = scanJobsSync(paths.cronsDir);
+			const queues = scanQueuesSync(paths.queuesDir);
 			if (jobs.length === 0 && queues.length === 0) return;
 			afterServerReady(server, () => {
 				const address = server.httpServer?.address();
@@ -866,206 +876,6 @@ function devTriggersHintPlugin(root, options) {
 	};
 }
 //#endregion
-//#region src/plugin-drizzle.ts
-const drizzleD1Resolved = fileURLToPath(import.meta.resolve("drizzle-orm/d1"));
-const drizzleOrmResolved = fileURLToPath(import.meta.resolve("drizzle-orm"));
-const envModuleResolved = fileURLToPath(import.meta.resolve("#self/_env"));
-const drizzleNodePgResolved = fileURLToPath(import.meta.resolve("drizzle-orm/node-postgres"));
-const drizzleMysql2Resolved = fileURLToPath(import.meta.resolve("drizzle-orm/mysql2"));
-const pgResolved = fileURLToPath(import.meta.resolve("pg"));
-const mysql2Resolved = fileURLToPath(import.meta.resolve("mysql2"));
-const VIRTUAL_DB_ID = "\0virtual:void-db";
-const VIRTUAL_SCHEMA_DB_ID = "\0virtual:void-db-schema";
-/**
-* Vite plugin for Drizzle integration.
-*
-* - Intercepts `void/db` imports in SSR/worker environments and serves
-*   a virtual module that creates a Drizzle DB instance, using the user's
-*   schema when present.
-* - Generates `.void/db.d.ts` with proper Drizzle types.
-* - Sets up `@schema` Vite alias for convenient imports when a schema exists.
-* - Updates `.void/tsconfig.json` with TypeScript paths.
-*/
-function drizzlePlugin(root, hasRouteTypes, dialect = "sqlite", options = {}) {
-	const outDir = join(root, ".void");
-	const paths = readProjectPaths(root);
-	const schema = discoverSchema(root, paths);
-	const hasDbRuntime = schema != null || options.forceVirtualDb === true;
-	const d1BindingName = options.d1BindingName ?? "DB";
-	ensureProjectTsconfig(root, hasRouteTypes, hasDbRuntime, schema != null, {
-		redirectDbModule: options.redirectDbTypePaths,
-		paths
-	});
-	if (hasDbRuntime) generateDbDts(outDir, schema ?? null, dialect);
-	let isBuild = false;
-	return {
-		name: "void:drizzle",
-		enforce: "pre",
-		config(_, env) {
-			isBuild = env.command === "build";
-			if (!schema) return;
-			return { resolve: { alias: { "@schema": schema.path } } };
-		},
-		resolveId: {
-			filter: { id: /^(void\/db|@schema|pg$)/ },
-			handler(id, importer) {
-				if (id === "pg" && isBuild && dialect === "postgresql" && importer === VIRTUAL_DB_ID) return pgResolved;
-				if (id === "void/db" && this.environment?.name !== "client") {
-					if (!hasDbRuntime) return;
-					if (schema && importer) {
-						const normalizedImporter = normalizePath(importer);
-						const normalizedSchemaPath = normalizePath(schema.path);
-						if (schema.type === "file" && normalizedImporter === normalizedSchemaPath) return VIRTUAL_SCHEMA_DB_ID;
-						if (schema.type === "directory" && normalizedImporter.startsWith(normalizedSchemaPath)) return VIRTUAL_SCHEMA_DB_ID;
-					}
-					return VIRTUAL_DB_ID;
-				}
-				if (schema && (id === "@schema" || id.startsWith("@schema/"))) {
-					if (id === "@schema") return schema.path;
-					return join(schema.path, id.slice(8));
-				}
-			}
-		},
-		load: {
-			filter: { id: /^\0virtual:void-db(?:-schema)?$/ },
-			handler(id) {
-				if (id === VIRTUAL_SCHEMA_DB_ID) return `
-export { ${DRIZZLE_OPERATORS} } from ${JSON.stringify(drizzleOrmResolved)};
-export const db = {};
-export function createDb() {
-  throw new Error("db: createDb() is unavailable when importing void/db from a schema file.");
-}
-`;
-				const schemaImport = schema ? `import * as schema from ${JSON.stringify(schema.path)};` : "";
-				const drizzleConfig = schema ? dialect === "mysql" ? ", { schema, mode: \"default\" }" : ", { schema }" : "";
-				if (dialect === "mysql") return `
-import { drizzle } from ${JSON.stringify(drizzleMysql2Resolved)};
-import { createPool } from ${JSON.stringify(mysql2Resolved)};
-import { getRuntimeBinding, getRuntimeRequestResource } from ${JSON.stringify(envModuleResolved)};
-${schemaImport}
-export { ${DRIZZLE_OPERATORS} } from ${JSON.stringify(drizzleOrmResolved)};
-
-const _requestResourceKey = {};
-
-function getConnectionString() {
-  const url = getRuntimeBinding("DATABASE_URL");
-  if (url) return url;
-  const hd = getRuntimeBinding("HYPERDRIVE");
-  if (hd?.connectionString) return hd.connectionString;
-  throw new Error("db: MySQL is not configured. Add DATABASE_URL to .env for local dev, or configure Hyperdrive for production.");
-}
-
-function getInstance() {
-  return getRuntimeRequestResource(_requestResourceKey, () => {
-    const pool = createPool({
-      uri: getConnectionString(),
-      connectionLimit: 1,
-      maxIdle: 1,
-      idleTimeout: 1000,
-    });
-    return drizzle(pool${drizzleConfig});
-  });
-}
-
-export const db = new Proxy({}, {
-  get(_, prop) {
-    return Reflect.get(getInstance(), prop);
-  },
-});
-
-export function createDb(connectionString) {
-  return drizzle(connectionString${drizzleConfig});
-}
-`;
-				if (dialect === "postgresql") return `
-import { drizzle } from ${JSON.stringify(drizzleNodePgResolved)};
-import pg from "pg";
-import { getRuntimeBinding, getRuntimeRequestResource } from ${JSON.stringify(envModuleResolved)};
-${schemaImport}
-export { ${DRIZZLE_OPERATORS} } from ${JSON.stringify(drizzleOrmResolved)};
-
-const _requestResourceKey = {};
-
-function getConnectionString() {
-  const url = getRuntimeBinding("DATABASE_URL");
-  if (url) return url;
-  const hd = getRuntimeBinding("HYPERDRIVE");
-  if (hd?.connectionString) return hd.connectionString;
-  throw new Error("db: PostgreSQL is not configured. Add DATABASE_URL to .env for local dev, or configure Hyperdrive for production.");
-}
-
-function getInstance() {
-  return getRuntimeRequestResource(_requestResourceKey, () => {
-    const pool = new pg.Pool({
-      connectionString: getConnectionString(),
-      max: 1,
-      idleTimeoutMillis: 1000,
-    });
-    return drizzle(pool${drizzleConfig});
-  });
-}
-
-export const db = new Proxy({}, {
-  get(_, prop) {
-    return Reflect.get(getInstance(), prop);
-  },
-});
-
-export function createDb(connectionString) {
-  return drizzle(connectionString${drizzleConfig});
-}
-`;
-				return `
-import { drizzle } from ${JSON.stringify(drizzleD1Resolved)};
-import { getRuntimeRequestResource, requireRuntimeBinding } from ${JSON.stringify(envModuleResolved)};
-${schemaImport}
-export { ${DRIZZLE_OPERATORS} } from ${JSON.stringify(drizzleOrmResolved)};
-
-const _requestResourceKey = {};
-
-export const db = new Proxy({}, {
-  get(_, prop) {
-    const instance = getRuntimeRequestResource(
-      _requestResourceKey,
-      () => createDb(requireRuntimeBinding(${JSON.stringify(d1BindingName)})),
-      () => createPrimaryDb(requireRuntimeBinding(${JSON.stringify(d1BindingName)}))
-    );
-    return Reflect.get(instance, prop);
-  },
-});
-
-export function createDb(d1) {
-  return drizzle(d1.withSession("first-unconstrained")${drizzleConfig});
-}
-
-function createPrimaryDb(d1) {
-  return drizzle(d1.withSession("first-primary")${drizzleConfig});
-}
-`;
-			}
-		},
-		async configureServer(server) {
-			if (!schema) return;
-			const migrationsDir = paths.migrationsDir;
-			if (!(existsSync(migrationsDir) && readdirSync(migrationsDir).some((f) => f.endsWith(".sql")))) {
-				if (dialect === "sqlite") {
-					const { getApplicationTables, getMiniflareDatabasePath } = await import("./runner-9wjsSZx-.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.
-         Run \`void db generate\` to create migration files for dev startup and deploy.`);
-			}
-			const watchPath = schema.path;
-			const regenerate = (path) => {
-				if (path === watchPath || schema.type === "directory" && path.startsWith(watchPath)) generateDbDts(outDir, schema, dialect);
-			};
-			server.watcher.on("change", regenerate);
-			server.watcher.on("add", regenerate);
-			server.watcher.on("unlink", regenerate);
-		}
-	};
-}
-//#endregion
 //#region src/plugin-email-dev-inbox.ts
 const SECURITY_HEADERS = {
 	"Cache-Control": "no-store",
@@ -1076,22 +886,11 @@ const SECURITY_HEADERS = {
 };
 function emailDevInboxPlugin(options) {
 	const { devTriggerToken } = options;
-	let unregister;
 	/** `href` for an inbox path that keeps the browser session authorized. */
 	const inboxHref = (path) => `${DEV_INBOX_PREFIX}${path}?${DEV_INBOX_TOKEN_QUERY}=${encodeURIComponent(devTriggerToken)}`;
 	return {
 		name: "void:email-dev-inbox",
 		apply: "serve",
-		buildStart() {
-			if (unregister) return;
-			unregister = registerEmailSink((m) => pushToDevBuffer(m));
-		},
-		buildEnd() {
-			if (unregister) {
-				unregister();
-				unregister = void 0;
-			}
-		},
 		configureServer(server) {
 			const printInboxUrl = () => {
 				const address = server.httpServer?.address();
@@ -1099,7 +898,7 @@ function emailDevInboxPlugin(options) {
 				if (port == null) return;
 				voidLog(`Email inbox: http://localhost:${port}${inboxHref("")}`);
 			};
-			if (server.httpServer) server.httpServer.once("listening", () => setTimeout(printInboxUrl, 100));
+			afterServerReady(server, printInboxUrl);
 			server.middlewares.use(DEV_INBOX_PREFIX, (req, res) => {
 				const url = new URL(req.url ?? "/", "http://localhost");
 				const path = url.pathname;
@@ -1537,38 +1336,24 @@ function pushHit(node, hits) {
 *   • Only folds static member access: `env.FOO` and `env["FOO"]`.
 *     Dynamic access, destructuring, and reassignment fall through to the
 *     runtime Proxy.
-*   • Only folds keys with a known build-time value (build shell or schema
-*     `.default(...)`). Unknown keys are left as-is
+*   • Only folds keys with a known build-time value (build shell, or a schema
+*     `.default(...)` that the env-schema plugin adds). Unknown keys are left as-is
 *     and the Proxy handles them at runtime — no "undefined" shoved in.
 *   • Build-only (`apply: 'build'`). Dev runs through the Proxy so local
 *     `.env` edits take effect without a full rebuild.
 */
 function envClientFoldPlugin() {
 	let loadedEnv = {};
-	const schemaDefaults = {};
-	/** The merged view the transform consults for each key. */
-	function resolveValue(key) {
-		if (key in loadedEnv) return loadedEnv[key];
-		if (key in schemaDefaults) return schemaDefaults[key];
-	}
 	return {
 		name: "void:env-client-fold",
 		apply: "build",
 		enforce: "post",
-		async configResolved(config) {
+		configResolved(config) {
 			loadedEnv = config.env ?? {};
-			try {
-				const mod = await loadEnvPublic();
-				if (mod._hasRegisteredSchema()) {
-					const defaults = mod._getSchemaDefaults();
-					for (const [key, value] of Object.entries(defaults)) if (isClientEnvKey(key) && !(key in loadedEnv)) schemaDefaults[key] = value;
-				}
-			} catch {}
 		},
 		async transform(code, id) {
 			if (this.environment?.name !== "client") return;
 			if (!isVoidEnvScriptCandidate(id, code)) return;
-			if (Object.keys(loadedEnv).length === 0 && Object.keys(schemaDefaults).length === 0) return;
 			let parsed;
 			try {
 				parsed = parseSync(id, code);
@@ -1583,7 +1368,7 @@ function envClientFoldPlugin() {
 			let ms = null;
 			for (const hit of hits) {
 				if (!isClientEnvKey(hit.property)) continue;
-				const value = resolveValue(hit.property);
+				const value = loadedEnv[hit.property];
 				if (value === void 0) continue;
 				if (!ms) ms = new MagicString(code);
 				ms.overwrite(hit.start, hit.end, JSON.stringify(value));
@@ -1791,7 +1576,6 @@ function envSchemaPlugin(root, options = {}) {
 		},
 		async configResolved(config) {
 			command = config.command;
-			await emitSchemaFacts();
 			if (command === "build") stripLocalClientEnv(root, config, processEnvCopiesBefore);
 			await applyClientValuesToViteEnv(config);
 			if (command === "build" && envFile) {
@@ -1813,7 +1597,6 @@ function envSchemaPlugin(root, options = {}) {
 		},
 		async configureServer(server) {
 			if (!envFile) return;
-			await importUserEnv();
 			afterServerReady(server, () => {
 				validateAndWarn();
 			});
@@ -1850,8 +1633,8 @@ function frameworkTriggersDispatchPath(root) {
 */
 function writeFrameworkTriggersDispatch(root, devTriggerToken) {
 	const paths = readProjectPaths(root);
-	const jobs = scanJobsSync(root, paths.cronsDir);
-	const queues = scanQueuesSync(root, paths.queuesDir);
+	const jobs = scanJobsSync(paths.cronsDir);
+	const queues = scanQueuesSync(paths.queuesDir);
 	const target = frameworkTriggersDispatchPath(root);
 	mkdirSync(dirname(target), { recursive: true });
 	writeFileSync(target, generateModule(paths.cronsDir, paths.queuesDir, jobs, queues, devTriggerToken), { mode: DISPATCH_FILE_MODE });
@@ -2026,16 +1809,26 @@ export async function handleDevTrigger(request, env, ctx) {
 }
 `;
 }
-/** Append any missing `lines` to the project's `.gitignore`. */
+/** Append any missing `lines` to the project's `.gitignore` and return the appended ones. */
 function ensureGitignoreLines(root, lines) {
 	const gitignorePath = join(root, ".gitignore");
 	let contents = "";
 	if (existsSync(gitignorePath)) contents = readFileSync(gitignorePath, "utf-8");
 	const existing = new Set(contents.split("\n").map((line) => line.trim()));
 	const missing = lines.filter((line) => !existing.has(line));
-	if (missing.length === 0) return;
+	if (missing.length === 0) return [];
 	const sep = contents.length === 0 || contents.endsWith("\n") ? "" : "\n";
 	writeFileSync(gitignorePath, `${contents}${sep}${missing.join("\n")}\n`);
+	return missing;
+}
+/** Remove `lines` from the project's `.gitignore`, if it still exists. */
+function removeGitignoreLines(root, lines) {
+	const gitignorePath = join(root, ".gitignore");
+	if (lines.length === 0 || !existsSync(gitignorePath)) return;
+	const contents = readFileSync(gitignorePath, "utf-8");
+	const remove = new Set(lines);
+	const next = contents.split("\n").filter((line) => !remove.has(line.trim())).join("\n");
+	if (next !== contents) writeFileSync(gitignorePath, next);
 }
 const NITRO_MIDDLEWARE_FILENAME = "__void-dev-trigger.ts";
 function nitroMiddlewareSource(dispatchPath) {
@@ -2236,6 +2029,17 @@ export const onRequest = defineMiddleware(async (context, next) => {
 });
 `;
 }
+const ASTRO_MIDDLEWARE_CLAIMS = Symbol.for("void.astroDevMiddleware.v1");
+/**
+* The dev servers in this process that use the middleware Void wrote, by file path. Astro restarts
+* the dev server in the same process with a fresh config, so a new plugin instance (from a new
+* copy of this module, too) is set up before the old server closes. Kept on `globalThis` so both
+* see the same claim.
+*/
+function astroMiddlewareClaims() {
+	const store = globalThis;
+	return store[ASTRO_MIDDLEWARE_CLAIMS] ??= /* @__PURE__ */ new Map();
+}
 /**
 * Writes a tiny Astro middleware to the user's project so
 * `/__void/scheduled` and `/__void/queue` are intercepted inside Astro's
@@ -2245,31 +2049,54 @@ export const onRequest = defineMiddleware(async (context, next) => {
 * already has `src/middleware.ts` we don't overwrite it — instead we log a
 * one-shot snippet they can paste into their existing middleware.
 *
-* If we wrote the file we remove it on dev-server close so the user's
-* source tree stays clean.
+* If we wrote the file we remove it when the last dev server using it closes,
+* so the user's source tree stays clean. `src/middleware.ts` belongs to the
+* user, so the `.gitignore` line we add for it is removed too; otherwise a
+* middleware they write later would be silently left out of git.
 */
 function astroDevTriggerInjectPlugin(root) {
 	const middlewarePath = join(root, ASTRO_MIDDLEWARE_RELATIVE);
 	const middlewareDirIndexPath = join(root, "src", "middleware", "index.ts");
-	let wroteFile = false;
+	const claims = astroMiddlewareClaims();
+	/** Whether the dev server being set up now holds the middleware Void wrote. */
 	const ensureFile = () => {
+		const claim = claims.get(middlewarePath);
+		if (claim && existsSync(middlewarePath)) {
+			claim.servers++;
+			return true;
+		}
 		if (existsSync(middlewarePath) || existsSync(middlewareDirIndexPath)) {
 			voidWarn("Astro middleware already exists. To enable /__void/scheduled and /__void/queue,\n         add the Void dev-trigger middleware to your existing onRequest sequence.\n         See https://void.cloud/guide/jobs#local-development.");
-			return;
+			return false;
 		}
 		mkdirSync(dirname(middlewarePath), { recursive: true });
 		writeFileSync(middlewarePath, astroMiddlewareSource(frameworkTriggersDispatchPath(root)));
-		wroteFile = true;
+		if (claim) claim.servers++;
+		else claims.set(middlewarePath, {
+			servers: 1,
+			gitignoreLines: ensureGitignoreLines(root, [ASTRO_MIDDLEWARE_RELATIVE])
+		});
+		return true;
 	};
-	const cleanup = () => {
-		if (wroteFile) rmSync(middlewarePath, { force: true });
+	const release = () => {
+		const claim = claims.get(middlewarePath);
+		if (!claim || --claim.servers > 0) return;
+		claims.delete(middlewarePath);
+		rmSync(middlewarePath, { force: true });
+		removeGitignoreLines(root, claim.gitignoreLines);
 	};
 	return {
 		name: "void:astro-dev-trigger-inject",
 		apply: "serve",
 		configureServer(server) {
-			ensureFile();
-			if (wroteFile) ensureGitignoreLines(root, [ASTRO_MIDDLEWARE_RELATIVE]);
+			if (!ensureFile()) return;
+			let held = true;
+			const cleanup = () => {
+				if (held) {
+					held = false;
+					release();
+				}
+			};
 			server.httpServer?.once("close", cleanup);
 			process.once("exit", cleanup);
 		}
@@ -2285,7 +2112,6 @@ function pushDefaultErrorPageHelpers(lines, options) {
 		projectRoot: options.projectRoot,
 		homeDir: options.homeDir
 	})});`);
-	lines.push("const serveCustomErrorPage = __errorRenderer.serveCustomPage;");
 	lines.push("app.onError(__errorRenderer.onError);");
 }
 /**
@@ -2312,8 +2138,8 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		];
 		if (webSockets.length > 0) authImports.push("resolveVoidAuthState as __resolveVoidAuthStateRuntime");
 		lines.push(`import { ${authImports.join(", ")} } from ${JSON.stringify(auth.authRuntimePath)};`);
-		if (auth.authDatabasePath) lines.push(`import { __voidAuthDatabase } from ${JSON.stringify(auth.authDatabasePath)};`);
-		if (auth.authSchemaPath) lines.push(`import { migrationSchema as __voidAuthMigrationSchema } from ${JSON.stringify(auth.authSchemaPath)};`);
+		lines.push(`import { __voidAuthDatabase } from ${JSON.stringify(auth.authDatabasePath)};`);
+		lines.push(`import { migrationSchema as __voidAuthMigrationSchema } from ${JSON.stringify(auth.authSchemaPath)};`);
 		if (auth.authConfigPath) lines.push(`import __voidAuthConfig from ${JSON.stringify(auth.authConfigPath)};`);
 	}
 	if ((webSockets.length > 0 || options.webSocketTombstones?.length) && options.webSocketRuntimePath) lines.push(`import { createWebSocketDurableObject as __createWebSocketDurableObject, createWebSocketTombstoneDurableObject as __createWebSocketTombstoneDurableObject, forwardWebSocketRequest as __forwardWebSocketRequest } from ${JSON.stringify(options.webSocketRuntimePath)};`);
@@ -2330,39 +2156,10 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	lines.push("");
 	if (auth) {
 		lines.push(`const __voidAuthOptions = { dialect: ${JSON.stringify(auth.dialect)}, providers: ${JSON.stringify(auth.providers)}, userConfig: ${auth.authConfigPath ? "__voidAuthConfig" : "undefined"}, dev: ${JSON.stringify(options.dev === true)} };`);
-		if (webSockets.length > 0) lines.push(`const __resolveVoidAuthState = (request, env, runtime) => __resolveVoidAuthStateRuntime(request, env, runtime${auth.authDatabasePath ? ", __voidAuthDatabase" : ""});`);
+		if (webSockets.length > 0) lines.push("const __resolveVoidAuthState = (request, env, runtime) => __resolveVoidAuthStateRuntime(request, env, runtime, __voidAuthDatabase);");
 		lines.push("");
 	}
 	lines.push(`const app = new Hono();`);
-	const ASSET_EXTENSIONS = [
-		"png",
-		"jpg",
-		"jpeg",
-		"gif",
-		"webp",
-		"avif",
-		"svg",
-		"ico",
-		"css",
-		"js",
-		"mjs",
-		"cjs",
-		"woff",
-		"woff2",
-		"ttf",
-		"otf",
-		"eot",
-		"mp4",
-		"webm",
-		"mp3",
-		"wav",
-		"pdf",
-		"txt",
-		"xml",
-		"json",
-		"wasm",
-		"map"
-	];
 	const routePatterns = [];
 	for (const r of scan.routes) routePatterns.push(r.pattern);
 	if (pages && scan.pages.pages.length > 0) for (const p of scan.pages.pages) routePatterns.push(p.pattern);
@@ -2383,11 +2180,12 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	lines.push("app.use(__routingRuntime.requestMiddleware);");
 	lines.push("");
 	const emitEdgeRules = !managedDispatch;
+	const fallbackRulesJson = JSON.stringify(emitEdgeRules && options.fallbackRules?.length ? options.dev ? options.fallbackRules : stripOriginForProd(options.fallbackRules) : void 0);
 	if (emitEdgeRules && options.redirectRules?.length) compileRoutingRulesMiddleware(lines, options.redirectRules, options.dev === true);
 	if (emitEdgeRules && options.headerRules?.length) compileHeaderMiddleware(lines, options.headerRules);
 	if (auth) {
 		lines.push("app.use(async (c, next) => {");
-		lines.push(`  return runVoidAuthMiddleware(c, next, __voidAuthOptions${auth.authDatabasePath ? ", __voidAuthDatabase" : ""});`);
+		lines.push("  return runVoidAuthMiddleware(c, next, __voidAuthOptions, __voidAuthDatabase);");
 		lines.push("});");
 		lines.push("");
 	}
@@ -2403,11 +2201,11 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	if (webSockets.length > 0) lines.push("");
 	if (auth) {
 		lines.push("app.all(\"/api/auth\", async (c) => {");
-		lines.push(`  return handleVoidAuthRequest(c, __voidAuthOptions${auth.authDatabasePath ? ", __voidAuthDatabase" : ""});`);
+		lines.push("  return handleVoidAuthRequest(c, __voidAuthOptions, __voidAuthDatabase);");
 		lines.push("});");
 		lines.push("");
 		lines.push("app.all(\"/api/auth/*\", async (c) => {");
-		lines.push(`  return handleVoidAuthRequest(c, __voidAuthOptions${auth.authDatabasePath ? ", __voidAuthDatabase" : ""});`);
+		lines.push("  return handleVoidAuthRequest(c, __voidAuthOptions, __voidAuthDatabase);");
 		lines.push("});");
 		lines.push("");
 	}
@@ -2457,7 +2255,7 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 	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)} }));`);
+	if (pages && scan.pages.pages.length > 0) lines.push(`app.notFound(__createPagesFallback({ routing: __routingRuntime, errors: __errorRenderer, assetsDir: ${JSON.stringify(options.assetsDir)}, fallbackRules: ${fallbackRulesJson} }));`);
 	compilePrerenderCollector(lines, scan, ssr, options);
 	if (ssr) {
 		lines.push(`const getClientAssetTags = __createClientAssetTags(${JSON.stringify({
@@ -2467,8 +2265,8 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 			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)} }));`);
+		lines.push(`app.notFound(__createSsrFallback({ routing: __routingRuntime, nodeTarget: ${JSON.stringify(options.nodeTarget === true)}, assetsDir: ${JSON.stringify(options.assetsDir)}, fallbackRules: ${fallbackRulesJson}, 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: ${fallbackRulesJson} }));`);
 	if (scan.jobs.length > 0) {
 		for (let i = 0; i < scan.jobs.length; i++) {
 			const job = scan.jobs[i];
@@ -2502,14 +2300,18 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push("export async function scheduled() {}");
 		lines.push("");
 	}
-	if (scan.jobs.length > 0) {
-		lines.push("const __scheduledHandler = async (c) => {");
+	if (scan.jobs.length > 0 || scan.queues.length > 0) {
+		lines.push("function __voidTriggerUnauthorized(c) {");
 		lines.push("  const __token = c.req.header(\"x-void-internal\");");
 		lines.push("  const __expected = __getRawEnv()?.__VOID_PROXY_TOKEN;");
 		lines.push("  const __devToken = c.req.header(\"x-void-dev-trigger\");");
-		lines.push("  if (__VOID_SERVE ? __devToken !== __VOID_DEV_TRIGGER_TOKEN : __expected ? __token !== __expected : __token !== __VOID_BUILD_KEY) {");
-		lines.push("    return c.json({ error: \"unauthorized\" }, 401);");
-		lines.push("  }");
+		lines.push("  return __VOID_SERVE ? __devToken !== __VOID_DEV_TRIGGER_TOKEN : __expected ? __token !== __expected : __token !== __VOID_BUILD_KEY;");
+		lines.push("}");
+		lines.push("");
+	}
+	if (scan.jobs.length > 0) {
+		lines.push("const __scheduledHandler = async (c) => {");
+		lines.push("  if (__voidTriggerUnauthorized(c)) return c.json({ error: \"unauthorized\" }, 401);");
 		lines.push("  const { cron, scheduledTime } = await c.req.json();");
 		lines.push("  const controller = { cron, scheduledTime, noRetry() {} };");
 		lines.push("  await scheduled(controller, c.env, c.executionCtx);");
@@ -2560,12 +2362,7 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push("}");
 		lines.push("");
 		lines.push("const __queueHandler = async (c) => {");
-		lines.push("  const __token = c.req.header(\"x-void-internal\");");
-		lines.push("  const __expected = __getRawEnv()?.__VOID_PROXY_TOKEN;");
-		lines.push("  const __devToken = c.req.header(\"x-void-dev-trigger\");");
-		lines.push("  if (__VOID_SERVE ? __devToken !== __VOID_DEV_TRIGGER_TOKEN : __expected ? __token !== __expected : __token !== __VOID_BUILD_KEY) {");
-		lines.push("    return c.json({ error: \"unauthorized\" }, 401);");
-		lines.push("  }");
+		lines.push("  if (__voidTriggerUnauthorized(c)) return c.json({ error: \"unauthorized\" }, 401);");
 		lines.push("  const payload = await c.req.json();");
 		lines.push("  const result = await __processQueue(payload, c.env);");
 		lines.push("  return c.json(result);");
@@ -2635,19 +2432,17 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push(`import { createMigrationHandler as __createMigrationHandler } from ${JSON.stringify(options.migrationHandlerPath)};`);
 		lines.push(`const __migrations = ${JSON.stringify(options.migrations)};`);
 		lines.push(`const __migrationPlanBundle = ${JSON.stringify(options.migrationPlanBundle)};`);
-		lines.push(`const __migrationDialect = ${JSON.stringify(options.migrationDialect ?? "sqlite")};`);
 		if (d1BindingName) lines.push(`function __voidGetMigrationEnv() {
   const env = __getRawEnv();
   if (!env || env[${JSON.stringify(d1BindingName)}] == null) return env;
   return { ...env, DB: env[${JSON.stringify(d1BindingName)}] };
 }`);
 		else lines.push("function __voidGetMigrationEnv() { return __getRawEnv(); }");
-		lines.push("function __voidCreateMigrationRequestHandler(request, includeAuthMigrations, includePlanBundle) {");
+		lines.push("function __voidCreateMigrationRequestHandler(includeAuthMigrations, includePlanBundle) {");
 		lines.push("  return __createMigrationHandler(");
 		lines.push("    __voidGetMigrationEnv(),");
 		lines.push("    __migrations,");
-		lines.push("    __migrationDialect,");
-		if (auth) lines.push(`    includeAuthMigrations ? () => runVoidAuthMigrations(new Request(request.url), __voidGetMigrationEnv(), __voidAuthOptions${auth.authSchemaPath ? ", __voidAuthMigrationSchema" : ""}) : undefined,`);
+		if (auth) lines.push("    includeAuthMigrations ? () => runVoidAuthMigrations(__voidGetMigrationEnv(), __voidAuthOptions, __voidAuthMigrationSchema) : undefined,");
 		else lines.push("    undefined,");
 		lines.push("    includePlanBundle ? __migrationPlanBundle : undefined,");
 		lines.push("  );");
@@ -2655,77 +2450,29 @@ function compileRouteTable(scan, routesDir, middlewareDir, jobsDir, queuesDir, s
 		lines.push("export async function __voidHandleInternalRoute(request) {");
 		lines.push("  const url = new URL(request.url);");
 		lines.push("  if (request.method === \"POST\" && url.pathname === \"/__void/migrate\") {");
-		lines.push(`    return __voidCreateMigrationRequestHandler(request, ${auth ? "true" : "false"}, false)(request);`);
+		lines.push(`    return __voidCreateMigrationRequestHandler(${auth ? "true" : "false"}, false)(request);`);
 		lines.push("  }");
 		lines.push("  if (request.method === \"GET\" && url.pathname === \"/__void/migrate/capabilities\") {");
-		lines.push(`    return __voidCreateMigrationRequestHandler(request, ${auth ? "true" : "false"}, true)(request);`);
+		lines.push(`    return __voidCreateMigrationRequestHandler(${auth ? "true" : "false"}, true)(request);`);
 		lines.push("  }");
 		lines.push("  if (request.method === \"POST\" && url.pathname === \"/__void/migrate/app\") {");
-		lines.push("    return __voidCreateMigrationRequestHandler(request, false, true)(request);");
+		lines.push("    return __voidCreateMigrationRequestHandler(false, true)(request);");
 		lines.push("  }");
 		lines.push("  if (request.method === \"GET\" && url.pathname.startsWith(\"/__void/migrate/app/attempt/\")) {");
-		lines.push("    return __voidCreateMigrationRequestHandler(request, false, true)(request);");
+		lines.push("    return __voidCreateMigrationRequestHandler(false, true)(request);");
 		lines.push("  }");
 		if (auth) {
 			lines.push("  if (request.method === \"POST\" && url.pathname === \"/__void/migrate/auth\") {");
-			lines.push("    return __voidCreateMigrationRequestHandler(request, true, true)(request);");
+			lines.push("    return __voidCreateMigrationRequestHandler(true, true)(request);");
 			lines.push("  }");
 		}
 		lines.push("  return null;");
 		lines.push("}");
-		lines.push("app.post(\"/__void/migrate\", async (c) => {");
-		lines.push("  const __voidMigrationHandler = __createMigrationHandler(");
-		lines.push("    __voidGetMigrationEnv(),");
-		lines.push("    __migrations,");
-		lines.push("    __migrationDialect,");
-		if (auth) lines.push(`    () => runVoidAuthMigrations(new Request(c.req.url), __voidGetMigrationEnv(), __voidAuthOptions${auth.authSchemaPath ? ", __voidAuthMigrationSchema" : ""}),`);
-		else lines.push("    undefined,");
-		lines.push("  );");
-		lines.push("  return __voidMigrationHandler(c.req.raw);");
-		lines.push("});");
-		lines.push("app.get(\"/__void/migrate/capabilities\", async (c) => {");
-		lines.push("  const __voidMigrationHandler = __createMigrationHandler(");
-		lines.push("    __voidGetMigrationEnv(),");
-		lines.push("    __migrations,");
-		lines.push("    __migrationDialect,");
-		if (auth) lines.push(`    () => runVoidAuthMigrations(new Request(c.req.url), __voidGetMigrationEnv(), __voidAuthOptions${auth.authSchemaPath ? ", __voidAuthMigrationSchema" : ""}),`);
-		else lines.push("    undefined,");
-		lines.push("    __migrationPlanBundle,");
-		lines.push("  );");
-		lines.push("  return __voidMigrationHandler(c.req.raw);");
-		lines.push("});");
-		lines.push("app.post(\"/__void/migrate/app\", async (c) => {");
-		lines.push("  const __voidMigrationHandler = __createMigrationHandler(");
-		lines.push("    __voidGetMigrationEnv(),");
-		lines.push("    __migrations,");
-		lines.push("    __migrationDialect,");
-		lines.push("    undefined,");
-		lines.push("    __migrationPlanBundle,");
-		lines.push("  );");
-		lines.push("  return __voidMigrationHandler(c.req.raw);");
-		lines.push("});");
-		lines.push("app.get(\"/__void/migrate/app/attempt/:attemptId\", async (c) => {");
-		lines.push("  const __voidMigrationHandler = __createMigrationHandler(");
-		lines.push("    __voidGetMigrationEnv(),");
-		lines.push("    __migrations,");
-		lines.push("    __migrationDialect,");
-		lines.push("    undefined,");
-		lines.push("    __migrationPlanBundle,");
-		lines.push("  );");
-		lines.push("  return __voidMigrationHandler(c.req.raw);");
-		lines.push("});");
-		if (auth) {
-			lines.push("app.post(\"/__void/migrate/auth\", async (c) => {");
-			lines.push("  const __voidMigrationHandler = __createMigrationHandler(");
-			lines.push("    __voidGetMigrationEnv(),");
-			lines.push("    __migrations,");
-			lines.push("    __migrationDialect,");
-			lines.push(`    () => runVoidAuthMigrations(new Request(c.req.url), __voidGetMigrationEnv(), __voidAuthOptions${auth.authSchemaPath ? ", __voidAuthMigrationSchema" : ""}),`);
-			lines.push("    __migrationPlanBundle,");
-			lines.push("  );");
-			lines.push("  return __voidMigrationHandler(c.req.raw);");
-			lines.push("});");
-		}
+		lines.push(`app.post("/__void/migrate", (c) => __voidCreateMigrationRequestHandler(${auth ? "true" : "false"}, false)(c.req.raw));`);
+		lines.push(`app.get("/__void/migrate/capabilities", (c) => __voidCreateMigrationRequestHandler(${auth ? "true" : "false"}, true)(c.req.raw));`);
+		lines.push("app.post(\"/__void/migrate/app\", (c) => __voidCreateMigrationRequestHandler(false, true)(c.req.raw));");
+		lines.push("app.get(\"/__void/migrate/app/attempt/:attemptId\", (c) => __voidCreateMigrationRequestHandler(false, true)(c.req.raw));");
+		if (auth) lines.push("app.post(\"/__void/migrate/auth\", (c) => __voidCreateMigrationRequestHandler(true, true)(c.req.raw));");
 		lines.push("");
 	} else {
 		lines.push("export async function __voidHandleInternalRoute() { return null; }");
@@ -2905,22 +2652,7 @@ function compilePageRoutes(lines, scan, pages, options) {
 	}
 	lines.push("");
 }
-/**
-* Generate the asset fallthrough helper shared by native Void workers and
-* Class A framework wrappers. If the app returns 404, check ASSETS binding
-* for static files and set cache headers. Edge caching of hashed assets
-* happens at the dispatch layer (see design doc 0042).
-*
-* `notFound` is the RESOLVED `assetConfig.not_found_handling` for this build
-* (`resolveAssetRoutingPolicy`), and it decides what happens once the asset
-* binding has also answered 404. It is a separate argument from
-* `serveSpaFallback` because the two are not derived from each other: the
-* common worker-first app runs with `not_found_handling: 'none'` and STILL
-* wants the worker-side shell fallback (that is the whole reason the flag
-* exists). They are mutually exclusive in practice — `resolveAssetRoutingPolicy`
-* clears `workerSpaFallback` whenever an explicit `routing.notFound` asks for
-* anything other than the SPA shell.
-*/
+/** Asset fallthrough shared by native Void workers and Class A framework wrappers. */
 function compileAssetFallbackHelper(assetsDir = "assets", serveSpaFallback = false, notFound = "none") {
 	return `import { createAssetFallback as __createAssetFallback } from ${JSON.stringify(ROUTING_RUNTIME_PATH)};
 const serveWithAssets = __createAssetFallback(${JSON.stringify({
@@ -2930,9 +2662,6 @@ const serveWithAssets = __createAssetFallback(${JSON.stringify({
 	})});
 `;
 }
-function deriveEmailRuntimePath(runtimeEnvPath) {
-	return runtimeEnvPath.replace(/_?env(\.[^/]+)?$/, (_m, ext) => "email" + (ext ?? ""));
-}
 /**
 * Generate the Worker entry module code.
 * Re-exports the Hono app from the virtual module with an asset-serving
@@ -2948,7 +2677,7 @@ function deriveEmailRuntimePath(runtimeEnvPath) {
 * proxy-backed versions.
 */
 function compileWorkerEntry(options = {}) {
-	const { hasQueues = false, versionMetadataBinding, remote, assetsDir = "assets", webSocketClasses = [], runtimeEnvPath = "void/_env", runtimeEmailPath, envSchemaModule, sandbox, serveSpaFallback = false, hasEmail = false, live, dev = false, isr, notFound = "none", durableObjects = [] } = options;
+	const { hasQueues = false, versionMetadataBinding, remote, assetsDir = "assets", webSocketClasses = [], runtimeEnvPath = "void/_env", runtimeEmailPath = "void/email", envSchemaModule, sandbox, serveSpaFallback = false, hasEmail = false, live, dev = false, isr, notFound = "none", durableObjects = [] } = options;
 	const remotePath = remote?.remotePath;
 	const remoteBindingNames = JSON.stringify(remote?.bindingNames);
 	const createRemoteEnvCall = `createRemoteEnv(env${remote?.bindingNames ? `, ${remoteBindingNames}` : ""})`;
@@ -2986,29 +2715,15 @@ const __filterInternalBindings = (env) => __filterBindings(env, ${JSON.stringify
     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);
-  return withRuntimeEnv(env, () => scheduled(controller, userEnv, ctx));
-}` : `async function handleScheduled(controller, env, ctx) {
-${envValidateCall}${isrDeploymentStamp}  const userEnv = __filterInternalBindings(env);
+	const remoteEnvSwap = remotePath ? `  if (env.__VOID_REMOTE === "1") env = ${createRemoteEnvCall};\n` : "";
+	const scheduledHandler = `async function handleScheduled(controller, env, ctx) {
+${envValidateCall}${remoteEnvSwap}${isrDeploymentStamp}  const userEnv = __filterInternalBindings(env);
   return withRuntimeEnv(env, () => scheduled(controller, userEnv, ctx));
 }`;
 	const emailImport = hasEmail ? ", __emailHandler" : "";
-	const emailRuntimePath = runtimeEmailPath ?? deriveEmailRuntimePath(runtimeEnvPath);
-	const emailProxyImport = hasEmail ? `import { createMessageProxy as __createMessageProxy, enactEmailActions as __enactEmailActions, isForwardableEmailMessage as __isForwardableEmailMessage } from ${JSON.stringify(emailRuntimePath)};\nimport { EMAIL_PROTOCOL_VERSION as __EMAIL_PROTOCOL_VERSION, encodeEmailActions as __encodeEmailActions, readEmailEnvelope as __readEmailEnvelope, verifyEmailReceiptThroughProxy as __verifyEmailReceiptThroughProxy } from "void/_email-protocol";\n` : "";
-	const emailHandler = hasEmail ? remotePath ? `async function handleEmail(envelope, env, ctx) {
-${envValidateCall}  if (env.__VOID_REMOTE === "1") env = ${createRemoteEnvCall};
-  const userEnv = __filterInternalBindings(env);
-  const __relayed = typeof envelope.viaDomain === "string" && envelope.viaDomain.length > 0;
-  const __slug = __relayed ? undefined : (typeof env.__VOID_PROJECT_SLUG === "string" && env.__VOID_PROJECT_SLUG.length > 0 ? env.__VOID_PROJECT_SLUG : undefined);
-  const { message, getActions } = __createMessageProxy(envelope, { slug: __slug });
-  await __withRawEnv(env, () => withRuntimeEnv(env, () => __emailHandler(message, userEnv, ctx, { slug: __slug })));
-  const __actions = getActions();
-  if (__isForwardableEmailMessage(envelope)) await __enactEmailActions(envelope, __actions);
-  return __actions;
-}` : `async function handleEmail(envelope, env, ctx) {
-${envValidateCall}  const userEnv = __filterInternalBindings(env);
+	const emailProxyImport = hasEmail ? `import { createMessageProxy as __createMessageProxy, enactEmailActions as __enactEmailActions, isForwardableEmailMessage as __isForwardableEmailMessage } from ${JSON.stringify(runtimeEmailPath)};\nimport { EMAIL_PROTOCOL_VERSION as __EMAIL_PROTOCOL_VERSION, encodeEmailActions as __encodeEmailActions, readEmailEnvelope as __readEmailEnvelope, verifyEmailReceiptThroughProxy as __verifyEmailReceiptThroughProxy } from "void/_email-protocol";\n` : "";
+	const emailHandler = hasEmail ? `async function handleEmail(envelope, env, ctx) {
+${envValidateCall}${remoteEnvSwap}  const userEnv = __filterInternalBindings(env);
   const __relayed = typeof envelope.viaDomain === "string" && envelope.viaDomain.length > 0;
   const __slug = __relayed ? undefined : (typeof env.__VOID_PROJECT_SLUG === "string" && env.__VOID_PROJECT_SLUG.length > 0 ? env.__VOID_PROJECT_SLUG : undefined);
   const { message, getActions } = __createMessageProxy(envelope, { slug: __slug });
@@ -3051,14 +2766,9 @@ ${hasQueues ? `  async queue(batch) { return __voidQueue(batch, this.env, this.c
     }
     await handleEmail(message, this.env, this.ctx);
   }\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}
-${fetchDeclaration}
-${scheduledHandler}
-${emailHandler}
-${emailReceiptHandler}
-async function __voidQueue(batch, env, ctx) {
-${envValidateCall}${remotePath ? `  if (env.__VOID_REMOTE === "1") env = ${createRemoteEnvCall};\n` : ""}${isrDeploymentStamp}  const userEnv = __filterInternalBindings(env);
+	const queueImport = hasQueues ? ", __processQueue" : "";
+	const queueFunction = hasQueues ? `async function __voidQueue(batch, env, ctx) {
+${envValidateCall}${remoteEnvSwap}${isrDeploymentStamp}  const userEnv = __filterInternalBindings(env);
   const messages = [...batch.messages].map(m => ({
     id: m.id, timestamp: m.timestamp.toISOString(),
     body: m.body, attempts: m.attempts,
@@ -3078,18 +2788,14 @@ ${envValidateCall}${remotePath ? `  if (env.__VOID_REMOTE === "1") env = ${creat
   if (!__qr.ok) throw new Error("queue: Handler failed.");
 }
 
-${webSocketClasses.map((name) => `export { ${name} };`).join("\n")}
-${liveExport}
-${sandboxExport}
-${durableObjectExports}
-${entryClass}`;
-	return `${sandboxImport}${entryImport}${liveRuntimeImport}import app, { scheduled, __voidCollectPrerenderPaths, __voidHandleInternalRoute, __withRawEnv${emailImport}${webSocketClasses.length > 0 ? `, ${webSocketClasses.join(", ")}` : ""}${liveRouteImport} } from 'virtual:void-routes';
+` : "";
+	return `${sandboxImport}${entryImport}${liveRuntimeImport}import app, { scheduled, __voidCollectPrerenderPaths, __voidHandleInternalRoute, __withRawEnv${queueImport}${emailImport}${webSocketClasses.length > 0 ? `, ${webSocketClasses.join(", ")}` : ""}${liveRouteImport} } from 'virtual:void-routes';
 ${durableObjectImports}\n${runtimeEnvImport}${emailProxyImport}${envSchemaImport}${remoteImport}${isrImport}${filterBindingsHelper}${assetHelper}
 ${fetchDeclaration}
 ${scheduledHandler}
 ${emailHandler}
 ${emailReceiptHandler}
-${webSocketClasses.map((name) => `export { ${name} };`).join("\n")}
+${queueFunction}${webSocketClasses.map((name) => `export { ${name} };`).join("\n")}
 ${liveExport}
 ${sandboxExport}
 ${durableObjectExports}
@@ -3098,13 +2804,6 @@ ${entryClass}`;
 /**
 * Generate the app module — exports the Hono app with static asset serving.
 * This is the entry imported by `vite preview` and can be used programmatically.
-*
-* When `envSchemaModule` is provided, splices boot-time env validation so it
-* runs on the first request (including the prerender child process spawned
-* by `prerenderPagesNode`). Mirrors `compileWorkerEntry`: a side-effect import
-* registers the schema, and `_validateEnvOnce` throws `EnvValidationError` on
-* bad values. Env source on Node/Bun is `process.env`; on Deno it's
-* `Deno.env.toObject()`.
 */
 function compileNodeApp(target, honoPath, envSchemaModule) {
 	const staticImport = target === "bun" ? `import { serveStatic } from "hono/bun";` : target === "deno" ? `import { serveStatic } from "hono/deno";` : `import { serveStatic } from "@hono/node-server/serve-static";`;
@@ -3158,74 +2857,6 @@ function compileBrowserClient(authClientPath, fetchPath, fetchStreamPath) {
 export { fetchStream, StreamError } from ${JSON.stringify(fetchStreamPath)};
 export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};`;
 }
-/**
-* Generate the server-side fetch client module for non-CF targets.
-* Same as compileWorkerClient but without cloudflare:workers dependency.
-* Calls app.fetch() directly (no HTTP round-trip) with ALS context forwarding.
-*/
-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 {
-  constructor(status, statusText, data) {
-    super(\`fetch: Request failed with status \${status}.\`);
-    this.name = "FetchError";
-    this.status = status;
-    this.statusText = statusText;
-    this.data = data;
-  }
-}
-
-export async function fetch(path, options) {
-  let url = interpolateRouteParams(path, options?.params);
-
-  if (options?.query) {
-    const qs = new URLSearchParams(options.query).toString();
-    if (qs) url += "?" + qs;
-  }
-
-  const method = options?.method ?? "GET";
-  const headers = new Headers(options?.headers);
-
-  const store = requestContext.getStore();
-  if (store?.request) {
-    const outerReq = store.request;
-    if (!headers.has("cookie")) {
-      const cookie = outerReq.headers.get("cookie");
-      if (cookie) headers.set("cookie", cookie);
-    }
-    if (!headers.has("authorization")) {
-      const auth = outerReq.headers.get("authorization");
-      if (auth) headers.set("authorization", auth);
-    }
-  }
-
-  if (options?.body != null && !headers.has("content-type")) {
-    headers.set("content-type", "application/json");
-  }
-
-  const request = new Request("http://localhost" + url, {
-    method,
-    headers,
-    body: options?.body != null ? JSON.stringify(options.body) : undefined,
-  });
-
-  const response = await app.fetch(request);
-
-  if (response.status === 204) return undefined;
-
-  const contentType = response.headers.get("content-type") ?? "";
-  const data = contentType.includes("application/json") ? await response.json() : await response.text();
-
-  if (!response.ok) {
-    throw new FetchError(response.status, response.statusText, data);
-  }
-
-  return data;
-}`;
-}
 function stripOriginForProd(rules) {
 	return rules.map(({ origin: _origin, ...rest }) => rest);
 }
@@ -3239,11 +2870,13 @@ function compileHeaderMiddleware(lines, rules) {
 	lines.push(`const __headerRules = ${JSON.stringify(rules)};`);
 	lines.push("app.use(\"*\", __routingRuntime.headerMiddleware(__headerRules));");
 }
-function compileWorkerClient(authClientPath) {
+/** Generate the server-side fetch client, which calls `app.fetch()` with the current request's credentials. */
+function compileWorkerClient(authClientPath, nodeTarget = false) {
+	const envImport = nodeTarget ? "" : "import { env } from \"cloudflare:workers\";\n";
+	const dispatch = nodeTarget ? "const response = await app.fetch(request);" : "const executionCtx = store?.executionCtx ?? { waitUntil() {}, passThroughOnException() {} };\n  const response = await app.fetch(request, env, executionCtx);";
 	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)};
+${envImport}export { auth, createAuthClient } from ${JSON.stringify(authClientPath)};
 
 export class FetchError extends Error {
   constructor(status, statusText, data) {
@@ -3266,7 +2899,6 @@ export async function fetch(path, options) {
   const method = options?.method ?? "GET";
   const headers = new Headers(options?.headers);
 
-  // Auto-forward cookie and authorization from the outer request via ALS
   const store = requestContext.getStore();
   if (store?.request) {
     const outerReq = store.request;
@@ -3284,15 +2916,13 @@ export async function fetch(path, options) {
     headers.set("content-type", "application/json");
   }
 
-  const request = new Request("http://worker.local" + url, {
+  const request = new Request("${nodeTarget ? "http://localhost" : "http://worker.local"}" + url, {
     method,
     headers,
     body: options?.body != null ? JSON.stringify(options.body) : undefined,
   });
 
-  // Use real executionCtx from ALS if available, otherwise provide a no-op fallback
-  const executionCtx = store?.executionCtx ?? { waitUntil() {}, passThroughOnException() {} };
-  const response = await app.fetch(request, env, executionCtx);
+  ${dispatch}
 
   if (response.status === 204) return undefined;
 
@@ -3317,10 +2947,10 @@ export async function fetch(path, options) {
 * (see `generateClassATriggerWrapper`). Production deploys go through
 * `cli/wrapper.ts` instead.
 */
-function getFrameworkEntry(framework, root, devTriggerToken, notFound) {
+function getFrameworkEntry(framework, root, devTriggerToken, dialect, notFound) {
 	const isBuild = isViteBuildOrPreview();
 	if (!isBuild) writeFrameworkTriggersDispatch(root, devTriggerToken);
-	return generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), isBuild, void 0, notFound);
+	return generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), isBuild, dialect, void 0, notFound);
 }
 /** The framework's own server entry, before our trigger wrapper. */
 function getOriginalFrameworkEntry(framework, root) {
@@ -3337,6 +2967,11 @@ function getOriginalFrameworkEntry(framework, root) {
 * first, dispatches `/__void/{scheduled,queue}` if it matches, and otherwise
 * delegates to the framework's original entry.
 *
+* For PostgreSQL and MySQL, both shapes run the framework inside Void's request scope
+* (`withRuntimeEnv`), as Void's own handlers do, so void/db keeps one client per request. D1 apps
+* keep the framework's own fetch: in a request scope, void/db reads D1 through a replica-capable
+* session instead of the primary.
+*
 * We emit two shapes of the wrapper depending on the Vite command:
 *
 * - Serve: dispatch is dynamically imported and gets a chance to handle
@@ -3349,27 +2984,11 @@ function getOriginalFrameworkEntry(framework, root) {
 * dispatch file (and its transitive user-cron/queue imports + dev token)
 * would still ship in the production bundle.
 */
-function generateClassATriggerWrapper(root, framework, original, isBuild, assetsDir = "assets", notFound) {
+function generateClassATriggerWrapper(root, framework, original, isBuild, dialect, assetsDir = "assets", notFound) {
 	const outDir = join(root, ".void");
 	mkdirSync(outDir, { recursive: true });
 	const wrapperPath = join(outDir, `${framework}-trigger-wrapper.ts`);
-	const body = isBuild ? `// @ts-nocheck — Auto-generated by Void for vite build. Do NOT edit.
-import original from ${JSON.stringify(original)};
-
-export default {
-  ...original,
-  async fetch(request, env, ctx) {
-    return serveWithAssets(request, env, await original.fetch(request, env, ctx));
-  },
-};
-${compileAssetFallbackHelper(assetsDir, false, notFound)}
-` : `// @ts-nocheck — Auto-generated by Void in dev. Do NOT edit.
-import original from ${JSON.stringify(original)};
-
-export default {
-  ...original,
-  async fetch(request, env, ctx) {
-    if (request.method === "POST") {
+	const fetchBody = isBuild ? `    return serveWithAssets(request, env, await original.fetch(request, env, ctx));` : `    if (request.method === "POST") {
       const pathname = new URL(request.url).pathname;
       if (pathname === "/__void/scheduled" || pathname === "/__void/queue") {
         const { handleDevTrigger } = await import(${JSON.stringify(frameworkTriggersDispatchPath(root))});
@@ -3377,10 +2996,23 @@ export default {
         if (response) return response;
       }
     }
-    return original.fetch(request, env, ctx);
-  },
+    return original.fetch(request, env, ctx);`;
+	const scoped = dialect !== "sqlite";
+	const fetchMethod = scoped ? `  fetch(request, env, ctx) {
+    return withRuntimeEnv(env, async () => {
+${fetchBody.replace(/^/gm, "  ")}
+    });
+  },` : `  async fetch(request, env, ctx) {
+${fetchBody}
+  },`;
+	const body = `// @ts-nocheck — Auto-generated by Void ${isBuild ? "for vite build" : "in dev"}. Do NOT edit.
+import original from ${JSON.stringify(original)};
+${scoped ? "import { withRuntimeEnv } from \"void/_env\";\n" : ""}
+export default {
+  ...original,
+${fetchMethod}
 };
-`;
+${isBuild ? `${compileAssetFallbackHelper(assetsDir, false, notFound)}\n` : ""}`;
 	writeFileIfChanged(wrapperPath, body);
 	return wrapperPath;
 }
@@ -3433,10 +3065,207 @@ export default {
 	return entryPath;
 }
 //#endregion
+//#region src/installed-packages.ts
+function readManifest(dir) {
+	try {
+		return JSON.parse(readFileSync(join(dir, "package.json"), "utf8"));
+	} catch {
+		return;
+	}
+}
+/** The directory Node loads `name` from for code in `fromDir`. Ignores `exports`. */
+function findInstalledPackage(name, fromDir) {
+	const pnp = module.findPnpApi?.(fromDir);
+	if (pnp) try {
+		const manifest = pnp.resolveToUnqualified(`${name}/package.json`, `${fromDir}/`);
+		return manifest ? dirname(manifest) : void 0;
+	} catch {
+		return;
+	}
+	for (let dir = fromDir;; dir = dirname(dir)) {
+		const candidate = join(dir, "node_modules", name);
+		if (existsSync(join(candidate, "package.json"))) return realpathSync(candidate);
+		if (dirname(dir) === dir) return;
+	}
+}
+function isVoidPackage(name) {
+	return name === "void" || name.startsWith("@void/");
+}
+/** The `exports` conditions that an import matches in Vite's SSR graph. */
+const IMPORT_CONDITIONS = /* @__PURE__ */ new Set([
+	"node",
+	"import",
+	"module",
+	"default"
+]);
+/**
+* Vite's SSR graph also matches `production` or `development`, as NODE_ENV says. Vite sets
+* NODE_ENV before it runs the plugin hooks that call this.
+*/
+function matchesImport(condition) {
+	const mode = process.env.NODE_ENV === "production" ? "production" : "development";
+	return IMPORT_CONDITIONS.has(condition) || condition === mode;
+}
+/** The target an import picks from an `exports` value: its first matching key, as in Node. */
+function importTarget(value) {
+	if (typeof value === "string") return value;
+	if (Array.isArray(value)) {
+		for (const item of value) {
+			const target = importTarget(item);
+			if (target) return target;
+		}
+		return;
+	}
+	if (!value || typeof value !== "object") return;
+	for (const [key, item] of Object.entries(value)) {
+		const target = matchesImport(key) ? importTarget(item) : void 0;
+		if (target) return target;
+	}
+}
+function isFile(path) {
+	try {
+		return statSync(path).isFile();
+	} catch {
+		return false;
+	}
+}
+/** The file an import of the package loads: `exports` ".", then `module`, then `main`. */
+function findImportEntry(dir, manifest) {
+	const exports = manifest.exports;
+	const entry = importTarget(exports && typeof exports === "object" && Object.keys(exports).some((key) => key.startsWith(".")) ? exports["."] : exports) ?? (typeof manifest.module === "string" ? manifest.module : void 0) ?? (typeof manifest.main === "string" ? manifest.main : "index.js");
+	for (const candidate of [
+		entry,
+		`${entry}.js`,
+		`${entry}/index.js`
+	]) {
+		const file = join(dir, candidate);
+		if (isFile(file)) return file;
+	}
+}
+/** Whether Node loads a `.mjs` or `.js` file in the package as an ES module. */
+function isEsmFile(file, dir, manifest) {
+	if (file.endsWith(".mjs")) return true;
+	if (!file.endsWith(".js")) return false;
+	for (let scope = dirname(file); scope.startsWith(`${dir}/`); scope = dirname(scope)) {
+		const nested = readManifest(scope);
+		if (nested) return nested.type === "module";
+	}
+	return manifest.type === "module";
+}
+/** A dynamic `import()` argument that is a single string literal naming a relative file. */
+const RELATIVE_LITERAL = /^(["'])(\.{1,2}\/[^"']*)\1$/;
+/** The relative files that a module's imports, re-exports and `import()` calls name. */
+function relativeImports(code, parsed) {
+	const specifiers = staticModuleReferences(parsed, code).map((reference) => reference.source);
+	for (const { moduleRequest } of parsed.module.dynamicImports) {
+		const literal = RELATIVE_LITERAL.exec(code.slice(moduleRequest.start, moduleRequest.end));
+		if (literal) specifiers.push(literal[2]);
+	}
+	return specifiers.filter((specifier) => /^\.{1,2}\//.test(specifier));
+}
+/** The most files of one package that the check reads. A package with more stays with Node. */
+const MAX_PACKAGE_MODULES = 2e3;
+/**
+* Vite's SSR module runner evaluates an inlined package as ES modules. The package's import
+* entry and every file it reaches through relative imports must be one. So the ES module
+* wrapper in Node's dual-package guide, or any ES module of the package that imports a
+* CommonJS file, keeps the package with Node.
+*/
+function shipsEsm(packageDir, manifest) {
+	const dir = normalize(packageDir);
+	const entry = findImportEntry(dir, manifest);
+	if (!entry) return false;
+	const files = [entry];
+	const seen = new Set(files);
+	for (const file of files) {
+		if (!isEsmFile(file, dir, manifest)) return false;
+		let code;
+		try {
+			code = readFileSync(file, "utf8");
+		} catch {
+			return false;
+		}
+		const parsed = parseSync(file, code, {
+			lang: "js",
+			sourceType: "module"
+		});
+		if (parsed.errors.length > 0) return false;
+		for (const specifier of relativeImports(code, parsed)) {
+			const next = join(dirname(file), specifier);
+			if (/\.[cm]?js$/.test(next) && !seen.has(next)) {
+				if (seen.size >= MAX_PACKAGE_MODULES) return false;
+				seen.add(next);
+				files.push(next);
+			}
+		}
+	}
+	return true;
+}
+/**
+* Installed ES module packages that list `void` or an `@void/` package as a dependency, among
+* the app's own dependencies and, through them, the packages they depend on (the rule
+* vite-plugin-svelte applies to Svelte libraries). Vite leaves a package in node_modules to Node,
+* whose `void/*` imports then skip Void's plugins: the generated `void/db` and the Node target's
+* guard. Listing these packages in `ssr.noExternal` keeps them in Vite's graph.
+*/
+function findVoidDependentPackages(root) {
+	const app = readManifest(root);
+	if (!app) return [];
+	const found = /* @__PURE__ */ new Set();
+	const seen = /* @__PURE__ */ new Set();
+	const visit = (names, fromDir) => {
+		for (const name of names) {
+			if (isVoidPackage(name)) continue;
+			const dir = findInstalledPackage(name, fromDir);
+			if (!dir || seen.has(dir)) continue;
+			seen.add(dir);
+			const manifest = readManifest(dir);
+			const dependencies = {
+				...manifest?.dependencies,
+				...manifest?.optionalDependencies
+			};
+			if (!manifest || !Object.keys({
+				...dependencies,
+				...manifest.peerDependencies
+			}).some(isVoidPackage) || !shipsEsm(dir, manifest)) continue;
+			found.add(name);
+			visit(Object.keys(dependencies), dir);
+		}
+	};
+	visit(Object.keys({
+		...app.dependencies,
+		...app.devDependencies,
+		...app.optionalDependencies
+	}), root);
+	return [...found].sort();
+}
+/** `name` and every package it depends on, as installed for code in `fromDir`. */
+function findDependencyClosure(name, fromDir) {
+	const found = /* @__PURE__ */ new Set();
+	const seen = /* @__PURE__ */ new Set();
+	const visit = (dependency, from) => {
+		const dir = findInstalledPackage(dependency, from);
+		if (!dir || seen.has(dir)) return;
+		seen.add(dir);
+		found.add(dependency);
+		const manifest = readManifest(dir);
+		for (const next of Object.keys({
+			...manifest?.dependencies,
+			...manifest?.optionalDependencies
+		})) visit(next, dir);
+	};
+	visit(name, fromDir);
+	return [...found].sort();
+}
+//#endregion
 //#region src/plugin-migration.ts
 function readDatabaseUrl(root) {
 	return loadLocalEnv(root).DATABASE_URL;
 }
+/** DATABASE_URL as Better Auth's local migrations read it: the shell before `.env`. */
+function readAuthDatabaseUrl(root) {
+	return (process.env.DATABASE_URL ?? readDatabaseUrl(root)) || void 0;
+}
 /**
 * Vite plugin that runs local migrations on dev server startup.
 * For SQLite/D1: applies migrations to the local miniflare database.
@@ -3450,33 +3279,53 @@ function migrationPlugin(root, dialect, databaseId = "local", persistRoot = join
 			const migrationsDir = readProjectPaths(root).migrationsDir;
 			const hasSqlMigrations = existsSync(migrationsDir);
 			if (!hasSqlMigrations && !auth?.enabled) return;
+			const migrateAuth = async (databaseUrl) => {
+				const { runLocalVoidAuthMigrations } = await import("./node-cPadMgUO.mjs");
+				await runLocalVoidAuthMigrations(root, dialect, persistRoot, databaseId, auth?.configPath, databaseUrl);
+			};
+			const mysqlAuth = dialect === "mysql" && auth?.enabled === true;
+			const logApplied = (applied) => {
+				if (applied.length > 0) voidLog(`Applied ${applied.length} migration(s): ${applied.join(", ")}`);
+			};
 			try {
-				if (hasSqlMigrations && dialect !== "sqlite") {
-					const url = readDatabaseUrl(root);
-					if (!url) {
+				if (dialect !== "sqlite") {
+					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
+					const allMigrations = collectMigrations(migrationsDir);
+					const runFiles = dialect === "mysql" ? allMigrations.length > 0 : hasSqlMigrations;
+					const url = runFiles ? readDatabaseUrl(root) : void 0;
+					const authUrl = mysqlAuth ? readAuthDatabaseUrl(root) : void 0;
+					if (runFiles && !url || mysqlAuth && !authUrl) {
 						afterServerReady(server, () => {
 							console.log();
 							voidError(`DATABASE_URL not found in .env — skipping ${dialect === "mysql" ? "MySQL" : "PostgreSQL"} migrations.`);
 						});
 						return;
 					}
-					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { validateMigrations } = await import("./validate-BJr9LfXy.mjs");
-					const allMigrations = collectMigrations(migrationsDir);
-					const appliedNames = dialect === "mysql" ? await import("./runner-mysql-CkFqZ6CE.mjs").then((runner) => runner.getMySqlAppliedMigrations(url)) : await import("./runner-pg-BGYRFdRp.mjs").then((runner) => runner.getPgAppliedMigrations(url));
-					const appliedSet = new Set(appliedNames);
-					const pending = allMigrations.filter((migration) => !appliedSet.has(migration.name));
-					if (pending.length > 0) try {
-						validateMigrations(pending);
-					} catch (err) {
-						voidWarn(err instanceof Error ? err.message : String(err));
+					const authWithFiles = authUrl !== void 0 && authUrl === url;
+					if (url) {
+						const { validateMigrations } = await import("./validate-BQFdf0Pi.mjs");
+						const appliedNames = dialect === "mysql" ? await import("./runner-mysql-DWwE8jKi.mjs").then((runner) => runner.getMySqlAppliedMigrations(url)) : await import("./runner-pg-_Xncr3H5.mjs").then((runner) => runner.getPgAppliedMigrations(url));
+						const appliedSet = new Set(appliedNames);
+						const pending = allMigrations.filter((migration) => !appliedSet.has(migration.name));
+						if (pending.length > 0) try {
+							validateMigrations(pending);
+						} catch (err) {
+							voidWarn(err instanceof Error ? err.message : String(err));
+						}
+						const applied = dialect === "mysql" ? await import("./runner-mysql-DWwE8jKi.mjs").then((runner) => runner.runMySqlMigrations(migrationsDir, url, authWithFiles ? async (names) => {
+							logApplied(names);
+							await migrateAuth(url);
+						} : void 0)) : await import("./runner-pg-_Xncr3H5.mjs").then((runner) => runner.runPgMigrations(migrationsDir, url));
+						if (!authWithFiles) logApplied(applied);
+					}
+					if (authUrl && !authWithFiles) {
+						const { withMySqlMigrationLockAt } = await import("./runner-mysql-DWwE8jKi.mjs");
+						await withMySqlMigrationLockAt(authUrl, () => migrateAuth(authUrl));
 					}
-					const applied = dialect === "mysql" ? await import("./runner-mysql-CkFqZ6CE.mjs").then((runner) => runner.runMySqlMigrations(migrationsDir, url)) : await import("./runner-pg-BGYRFdRp.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-9wjsSZx-.mjs");
-					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { validateMigrations } = await import("./validate-BJr9LfXy.mjs");
+					const { runMigrations, getMiniflareDatabasePath, getAppliedMigrations } = await import("./runner-So9mYfcm.mjs");
+					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
+					const { validateMigrations } = await import("./validate-BQFdf0Pi.mjs");
 					const dbPath = getMiniflareDatabasePath(persistRoot, databaseId);
 					const allMigrations = collectMigrations(migrationsDir);
 					const appliedRows = await getAppliedMigrations(dbPath);
@@ -3491,8 +3340,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-DJicPvPj.mjs");
-					await runLocalVoidAuthMigrations(root, dialect, persistRoot, databaseId, auth.configPath);
+					if (!mysqlAuth) await migrateAuth();
 					voidLog("Applied Better Auth migrations");
 				}
 			} catch (err) {
@@ -3529,6 +3377,26 @@ function createCloudflareBuiltinsExternalPlugin() {
 		}
 	};
 }
+/**
+* Send a bare `void` import in server code to the handler helpers (`defineScheduled`,
+* `defineQueue`, ...), as Void apps and the cron/queue deploy bundles do. The package entry is the
+* Vite plugin: loaded in a worker environment, it pulls Wrangler into the dependency optimizer.
+*/
+function createBareVoidRedirectPlugin() {
+	let handlerFile;
+	return {
+		name: "void:bare-void-redirect",
+		resolveId: {
+			order: "pre",
+			filter: { id: /^void$/ },
+			handler() {
+				if (this.environment?.config.consumer === "client") return;
+				handlerFile ??= fileURLToPath(import.meta.resolve("#self/handler"));
+				return handlerFile;
+			}
+		}
+	};
+}
 function createDefaultWorkerEnvironmentPlugin() {
 	return {
 		name: "void:default-worker-environment",
@@ -3589,11 +3457,58 @@ function createWranglerCompatPersistPlugin(root, config) {
 		}
 	};
 }
-function createServerRuntimeOptimizerPlugin() {
+const DATABASE_DRIVER_DEPS = {
+	sqlite: [],
+	postgresql: ["void > pg"],
+	mysql: ["void > mysql2"]
+};
+const NODE_BUILTIN = new RegExp(`^(?:node:)?(?:${builtinModules.join("|")})$`);
+const NODE_BUILTIN_REQUIRE_PREFIX = "\0void:node-require:";
+/**
+* The Node built-ins that workerd provides for the given compatibility settings, from the preset
+* the Cloudflare plugin builds Workers with (a dependency of `@cloudflare/vite-plugin`). Before
+* 2025-09-15 the preset fills in parts of `node:process` instead of listing it, but workerd
+* provides that module at every date.
+*/
+async function readWorkerdNodeBuiltins(compat) {
+	const vitePlugin = fileURLToPath(import.meta.resolve("@cloudflare/vite-plugin"));
+	const manifestPath = createRequire(vitePlugin).resolve("@cloudflare/unenv-preset/package.json");
+	const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+	const { getCloudflarePreset } = await import(pathToFileURL(join(dirname(manifestPath), manifest.exports["."].import)).href);
+	const { external } = getCloudflarePreset({
+		compatibilityDate: compat.compatibilityDate,
+		compatibilityFlags: compat.compatibilityFlags ?? []
+	});
+	return /* @__PURE__ */ new Set([...external.map((name) => name.replace(/^node:/, "")), "process"]);
+}
+function createServerRuntimeOptimizerPlugin(dialect, readCompat) {
+	let workerdNodeBuiltins;
 	return {
 		name: "void:server-runtime-optimizer",
-		configEnvironment(name) {
-			if (name !== "client") return { optimizeDeps: { exclude: ["void"] } };
+		configEnvironment(name, environment) {
+			if (name === "client") return;
+			if (!environment.resolve?.conditions?.includes("workerd")) return { optimizeDeps: { exclude: ["void"] } };
+			return { optimizeDeps: {
+				exclude: ["void"],
+				include: ["void > email-validator", ...DATABASE_DRIVER_DEPS[dialect]]
+			} };
+		},
+		resolveId: {
+			order: "pre",
+			filter: { id: NODE_BUILTIN },
+			async handler(id, _importer, options) {
+				if (dialect === "sqlite" || options.kind !== "require-call" || this.environment?.mode !== "build" || !this.environment.config.resolve.conditions.includes("workerd")) return;
+				const name = id.replace(/^node:/, "");
+				workerdNodeBuiltins ??= readWorkerdNodeBuiltins(readCompat());
+				if (!(await workerdNodeBuiltins).has(name)) return;
+				return `${NODE_BUILTIN_REQUIRE_PREFIX}${name}`;
+			}
+		},
+		load: {
+			filter: { id: /^\0void:node-require:/ },
+			handler(id) {
+				return `import builtin from "node:${id.slice(19)}";\nexport { builtin as "module.exports" };\n`;
+			}
 		}
 	};
 }
@@ -3601,6 +3516,17 @@ function createServerRuntimeOptimizerPlugin() {
 //#region src/sveltekit-hooks-transform.ts
 /** Add Void's dev bindings to SvelteKit's generated get_hooks function. */
 function injectSvelteKitHooks(code, id, dispatchPath) {
+	return editGetHooks(code, id, `\n  const { withRuntimeEnv } = await import("void/_env");\n  const { handleDevTrigger } = await import(${JSON.stringify(dispatchPath)});`, "const __origHandle = handle ?? (({ event, resolve }) => resolve(event));\n  handle = async ({ event, resolve }) => {\n    const __voidEnv = event.platform?.env ?? (await import('cloudflare:workers')).env;\n    return withRuntimeEnv(__voidEnv, async () => {\n    const __triggerResp = await handleDevTrigger(event.request, __voidEnv, undefined);\n    if (__triggerResp) return __triggerResp;\n    return __origHandle({ event, resolve });\n    });\n  };\n  ");
+}
+/**
+* Run each request of a SvelteKit build in Void's request scope. `envModule` is the env module
+* void/db imports. Kit prerenders in Node, where `cloudflare:workers` does not load and Kit 3
+* passes no platform, so those requests run outside the scope.
+*/
+function injectSvelteKitBuildHooks(code, id, envModule) {
+	return editGetHooks(code, id, `\n  const { withRuntimeEnv } = await import(${JSON.stringify(envModule)});`, "const __origHandle = handle ?? (({ event, resolve }) => resolve(event));\n  handle = async ({ event, resolve }) => {\n    const __voidEnv = event.platform?.env ??\n      (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers'\n        ? (await import('cloudflare:workers')).env\n        : undefined);\n    return withRuntimeEnv(__voidEnv, () => __origHandle({ event, resolve }));\n  };\n  ");
+}
+function editGetHooks(code, id, prologue, handleWrapper) {
 	if (!code.includes("get_hooks")) return;
 	const hooks = (parseSync(id, code).program.body ?? []).filter((node) => node.type === "ExportNamedDeclaration").map((node) => node.declaration).filter((node) => {
 		const name = node?.id;
@@ -3611,8 +3537,8 @@ function injectSvelteKitHooks(code, id, dispatchPath) {
 	const returns = (body?.body)?.filter((node) => node.type === "ReturnStatement" && node.argument?.type === "ObjectExpression") ?? [];
 	if (body?.type !== "BlockStatement" || body.start === void 0 || returns.length !== 1 || returns[0]?.start === void 0) throw new Error("sveltekit: Expected one object return in generated get_hooks.");
 	const ms = new MagicString(code);
-	ms.appendLeft(body.start + 1, `\n  const { withRuntimeEnv } = await import("void/_env");\n  const { handleDevTrigger } = await import(${JSON.stringify(dispatchPath)});`);
-	ms.appendLeft(returns[0].start, "const __origHandle = handle ?? (({ event, resolve }) => resolve(event));\n  handle = async ({ event, resolve }) => {\n    const __voidEnv = event.platform?.env ?? (await import('cloudflare:workers')).env;\n    return withRuntimeEnv(__voidEnv, async () => {\n    const __triggerResp = await handleDevTrigger(event.request, __voidEnv, undefined);\n    if (__triggerResp) return __triggerResp;\n    return __origHandle({ event, resolve });\n    });\n  };\n  ");
+	ms.appendLeft(body.start + 1, prologue);
+	ms.appendLeft(returns[0].start, handleWrapper);
 	return {
 		code: ms.toString(),
 		map: ms.generateMap({ hires: true })
@@ -3620,8 +3546,13 @@ function injectSvelteKitHooks(code, id, dispatchPath) {
 }
 //#endregion
 //#region src/plugin-framework.ts
+const handlerFile = fileURLToPath(import.meta.resolve("#self/handler"));
+const envModuleFile = fileURLToPath(import.meta.resolve("#self/_env"));
+const voidDir = dirname(fileURLToPath(import.meta.url));
+const ASTRO_SERVER_ENTRY = "@astrojs/cloudflare/entrypoints/server";
+const ASTRO_SCOPED_SERVER_ENTRY = "\0void:astro-server-entry";
 function createFrameworkPlugins(input) {
-	const { localD1, root, directCloudflareDestination, bindings, config, dialect, application, bindingNames, websocketRoutes, sandboxConfig, liveConfig, detected, clientStubsPlugin, serverRuntimeOptimizerPlugin, authEnabled, devTriggerToken, implicitDeployGuard } = input;
+	const { localD1, root, directCloudflareDestination, bindings, config, dialect, application, bindingNames, websocketRoutes, liveConfig, detected, clientStubsPlugin, serverRuntimeOptimizerPlugin, devTriggerToken, implicitDeployGuard } = input;
 	const frameworkPersistRoot = localD1.persistRoot;
 	const syncFrameworkCompat = (compat) => {
 		if (ensureWranglerCompatibilityDate(root, compat.compatibilityDate)) voidLog("Synced compatibility_date to Cloudflare config");
@@ -3630,7 +3561,6 @@ function createFrameworkPlugins(input) {
 		name: "void:wrangler-compat",
 		enforce: "pre",
 		config(_, env) {
-			if (env.command === "serve" && directCloudflareDestination && bindings.needsAI) process.env.CLOUDFLARE_AUTH_USE_KEYRING = "true";
 			syncFrameworkCompat(ensureWranglerCompat(root, config));
 			if (env.command !== "serve") return;
 			if (ensureWranglerNodejsAlsFlag(root)) voidLog("Synced nodejs_als to Cloudflare config");
@@ -3651,7 +3581,6 @@ function createFrameworkPlugins(input) {
 			bindingNames,
 			...directCloudflareDestination && bindings.needsAI ? { directCloudflareAi: { gateway: config.ai?.gateway } } : {},
 			websockets: websocketRoutes,
-			sandbox: sandboxConfig,
 			live: liveConfig
 		})) voidLog("Synced bindings to Cloudflare config");
 	};
@@ -3684,19 +3613,90 @@ function createFrameworkPlugins(input) {
 	const svelteKitHooksInjectPlugin = {
 		name: "void:sveltekit-hooks-inject",
 		apply: "serve",
+		config() {
+			if (detected.class !== "b") return;
+			return { ssr: { noExternal: ["void", ...dialect === "sqlite" ? [] : findVoidDependentPackages(root)] } };
+		},
+		resolveId: {
+			order: "pre",
+			filter: { id: /^void$/ },
+			handler() {
+				if (detected.class !== "b" || this.environment?.name === "client") return;
+				return handlerFile;
+			}
+		},
 		transform(code, id) {
 			if (detected.class !== "b") return;
 			if (!id.includes(".svelte-kit/generated/server/internal") && !id.includes(".svelte-kit/generated/dev/server.js")) return;
 			return injectSvelteKitHooks(code, id, frameworkTriggersDispatchPath(root));
 		}
 	};
+	const astroRequestScopePlugin = detected.name === "astro" && dialect !== "sqlite" ? {
+		name: "void:astro-request-scope",
+		enforce: "pre",
+		resolveId: {
+			filter: { id: /^@astrojs\/cloudflare\/entrypoints\/server(?:\.js)?$/ },
+			handler(_id, importer) {
+				if (importer === ASTRO_SCOPED_SERVER_ENTRY || this.environment?.name === "client") return;
+				return ASTRO_SCOPED_SERVER_ENTRY;
+			}
+		},
+		load: {
+			filter: { id: /^\0void:astro-server-entry$/ },
+			handler() {
+				return `import original from ${JSON.stringify(ASTRO_SERVER_ENTRY)};
+import { withRuntimeEnv } from ${JSON.stringify(envModuleFile)};
+export * from ${JSON.stringify(ASTRO_SERVER_ENTRY)};
+
+export default {
+  ...original,
+  fetch(request, env, ctx) {
+    return withRuntimeEnv(env, () => original.fetch(request, env, ctx));
+  },
+};
+`;
+			}
+		}
+	} : void 0;
+	const svelteKitWorkerBuildPlugin = detected.class === "b" && dialect !== "sqlite" ? {
+		name: "void:sveltekit-worker-build",
+		apply: "build",
+		enforce: "pre",
+		configEnvironment(name, environment) {
+			if (name !== "ssr") return;
+			return {
+				resolve: {
+					conditions: environment.resolve?.conditions ? ["workerd", "worker"] : [
+						"workerd",
+						"worker",
+						...defaultServerConditions
+					],
+					noExternal: [
+						"void",
+						"drizzle-orm",
+						dialect === "mysql" ? "mysql2" : "pg",
+						...findDependencyClosure("drizzle-orm", voidDir),
+						...findDependencyClosure(dialect === "mysql" ? "mysql2" : "pg", voidDir),
+						...findVoidDependentPackages(root)
+					]
+				},
+				build: { rolldownOptions: { platform: "neutral" } }
+			};
+		},
+		transform(code, id) {
+			if (!id.includes(".svelte-kit/generated/server/internal") && !id.includes(".svelte-kit/generated/build/server.js")) return;
+			return injectSvelteKitBuildHooks(code, id, envModuleFile);
+		}
+	} : void 0;
 	return [
 		devTriggerSecretGuardPlugin(),
 		createCloudflareBuiltinsExternalPlugin(),
 		wranglerCompatPlugin,
 		wranglerSyncPlugin,
 		...nuxtVite8WebSocketCompatPlugin ? [nuxtVite8WebSocketCompatPlugin] : [],
+		...astroRequestScopePlugin ? [astroRequestScopePlugin] : [],
 		svelteKitHooksInjectPlugin,
+		...svelteKitWorkerBuildPlugin ? [svelteKitWorkerBuildPlugin] : [],
 		clientStubsPlugin,
 		serverRuntimeOptimizerPlugin,
 		bindingRuntimePlugin(bindingNames),
@@ -3705,19 +3705,17 @@ function createFrameworkPlugins(input) {
 		envClientFoldPlugin(),
 		drizzlePlugin(root, false, dialect, {
 			d1BindingName: bindingNames?.d1,
-			forceVirtualDb: authEnabled || bindingNames?.d1 !== void 0,
+			forceVirtualDb: bindingNames?.d1 !== void 0,
 			localD1DatabaseId: localD1.databaseId,
-			localD1PersistRoot: frameworkPersistRoot
+			localD1PersistRoot: frameworkPersistRoot,
+			nitroBundlesServer: detected.name === "nuxt" || detected.name === "analog"
 		}),
 		migrationPlugin(root, dialect, localD1.databaseId, frameworkPersistRoot, { enabled: false }),
-		devTriggersHintPlugin(root, {
-			framework: true,
-			devTriggerToken
-		}),
+		devTriggersHintPlugin(root, devTriggerToken),
 		frameworkTriggersPlugin(root, { devTriggerToken }),
 		...detected.name === "nuxt" ? [nitroDevTriggerInjectPlugin(root, { serverDir: "server" })] : [],
 		...detected.name === "analog" ? [analogDevTriggerInjectPlugin(root)] : [],
-		...detected.name === "astro" ? [astroDevTriggerInjectPlugin(root)] : [],
+		...detected.name === "astro" ? [createBareVoidRedirectPlugin(), astroDevTriggerInjectPlugin(root)] : [],
 		implicitDeployGuard
 	];
 }
@@ -3790,13 +3788,17 @@ function honoMiddleware(getApp) {
 *    single SSR build for API-only apps
 */
 function nodeTargetPlugin(target) {
+	const unavailable = (id, root, importer) => {
+		const source = importer ? ` Imported by ${relative(root, importer)}.` : "";
+		return /* @__PURE__ */ new Error(`target: '${id}' is not available with target '${target}'. CF bindings require target: "cloudflare".${source}`);
+	};
 	return [{
 		name: "void:node-target",
 		enforce: "pre",
 		resolveId: {
 			filter: { id: CF_ONLY_REGEX },
-			handler(id) {
-				throw new Error(`target: '${id}' is not available with target '${target}'. CF bindings require target: "cloudflare".`);
+			handler(id, importer) {
+				throw unavailable(id, this.environment.config.root, importer);
 			}
 		},
 		renderChunk(code, chunk) {
@@ -3808,8 +3810,13 @@ function nodeTargetPlugin(target) {
 			};
 		},
 		config(_, { command }) {
-			if (command !== "build") return;
 			const root = process.cwd();
+			const ssr = { noExternal: [
+				"void",
+				/^@void\//,
+				...findVoidDependentPackages(root)
+			] };
+			if (command !== "build") return { ssr };
 			const voidDir = join(root, ".void");
 			const ssrBuildOptions = {
 				outDir: "dist/ssr",
@@ -3826,18 +3833,22 @@ function nodeTargetPlugin(target) {
 				}
 			};
 			if (existsSync(readProjectPaths(root).pagesDir)) return {
+				ssr,
 				build: { outDir: "dist/client" },
 				environments: { ssr: { build: ssrBuildOptions } },
 				builder: {}
 			};
-			return { build: {
-				ssr: true,
-				...ssrBuildOptions
-			} };
+			return {
+				ssr,
+				build: {
+					ssr: true,
+					...ssrBuildOptions
+				}
+			};
 		},
 		async buildApp(builder) {
 			await builder.build(builder.environments.ssr);
-			await builder.build(builder.environments.client);
+			if (builder.environments.client) await builder.build(builder.environments.client);
 		},
 		configureServer(server) {
 			server.middlewares.use(honoMiddleware(async () => {
@@ -3855,6 +3866,20 @@ function nodeTargetPlugin(target) {
 				return appPromise;
 			}));
 		}
+	}, {
+		name: "void:node-target-cloudflare-modules",
+		apply: "build",
+		enforce: "pre",
+		resolveId: {
+			filter: { id: /^cloudflare:/ },
+			handler(id, importer, options) {
+				if (options.kind === "dynamic-import") return {
+					id,
+					external: true
+				};
+				throw unavailable(id, this.environment.config.root, importer);
+			}
+		}
 	}];
 }
 //#endregion
@@ -4096,9 +4121,10 @@ 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);
+	const authoredCachePatterns = headerRules.filter((rule) => rule.headers.some(([name]) => name.toLowerCase() === "cache-control")).map((rule) => rule.pattern);
+	for (const pattern of authoredCachePatterns) compilePattern(pattern);
 	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);
+		if (!authoredCachePatterns.some((pattern) => matchPattern(pattern, "/" + 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];
@@ -4148,7 +4174,6 @@ function routingPlugin(root, options) {
 	const normalizedQueuesDir = normalizePath(queuesDir);
 	const normalizedEmailDir = normalizePath(emailDir);
 	const normalizedPagesDir = normalizePath(pagesDir);
-	const normalizedSsrDir = normalizePath(ssrDir);
 	const ssrEntryAbsPaths = new Set([...SSR_SERVER_ENTRY_RELATIVE_PATHS, ...SSR_CLIENT_ENTRY_RELATIVE_PATHS].map((path) => normalizePath(join(ssrDir, path.split("/").pop()))));
 	function hasEmailHandlers() {
 		const email = scan?.email;
@@ -4168,17 +4193,7 @@ function routingPlugin(root, options) {
 		writeFileIfChanged(join(outDir, "queues.d.ts"), dts);
 	}
 	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
-			});
-		}
+		const analysis = options.getApplicationAnalysis(routeEnvironment, refresh);
 		scan = (await completeApplicationAnalysis(analysis)).scan;
 		authConfigPath = analysis.authConfigPath;
 		const entries = validateSsrEntries(root, paths);
@@ -4203,8 +4218,7 @@ function routingPlugin(root, options) {
 	};
 	const remote = options.remoteMode ? {
 		bindingNames: options.bindingNames,
-		remotePath: resolveFile("#self/remote"),
-		envPath: resolveFile("#self/_env")
+		remotePath: resolveFile("#self/remote")
 	} : void 0;
 	function getEnvSchemaModule() {
 		const envFile = findEnvFileForPaths(root, paths);
@@ -4214,10 +4228,10 @@ function routingPlugin(root, options) {
 			helperPath: resolveFile("#self/env")
 		};
 	}
+	const runtimeEmailPath = resolveFile("#self/email");
 	const compileOptions = {
 		honoPath: resolveFile("hono"),
 		runtimeEnvPath: resolveFile("#self/_env"),
-		runtimeEmailPath: resolveFile("#self/email"),
 		emailDir,
 		projectRoot: root,
 		homeDir: homedir(),
@@ -4241,10 +4255,7 @@ function routingPlugin(root, options) {
 			dir: publicDir,
 			routing: options.routing
 		});
-		lintDuplicateSources(merged.redirectRules, "redirects/rewrites (pre-asset)");
-		lintDuplicateSources(merged.fallbackRules, "fallbacks (post-asset)");
-		lintDestinationSplats(merged.redirectRules, "redirects/rewrites (pre-asset)");
-		lintDestinationSplats(merged.fallbackRules, "fallbacks (post-asset)");
+		lintRoutingPhases(merged);
 		compileOptions.headerRules = merged.headerRules.length > 0 ? merged.headerRules : void 0;
 		compileOptions.redirectRules = merged.redirectRules.length > 0 ? merged.redirectRules : void 0;
 		compileOptions.fallbackRules = merged.fallbackRules;
@@ -4260,8 +4271,8 @@ function routingPlugin(root, options) {
 		compileOptions.auth = {
 			authRuntimePath: dialect === "postgresql" ? join(runtimeDir, "better-auth-pg.mjs") : dialect === "mysql" ? join(runtimeDir, "better-auth-mysql.mjs") : join(runtimeDir, "better-auth.mjs"),
 			authConfigPath,
-			authDatabasePath: null,
-			authSchemaPath: null,
+			authDatabasePath: join(outDir, "better-auth-db.ts"),
+			authSchemaPath: join(outDir, "better-auth-schema.ts"),
 			dialect,
 			providers: config.auth?.providers ?? null
 		};
@@ -4277,16 +4288,13 @@ function routingPlugin(root, options) {
 			...resolvedConfig?.command === "serve" ? loadLocalEnv(root) : {},
 			...process.env
 		};
-		const schemaPath = join(outDir, "better-auth-schema.ts");
-		const databasePath = join(outDir, "better-auth-db.ts");
-		writeFileIfChanged(schemaPath, generateVoidAuthDrizzleSchema(authRuntime, env));
-		writeFileIfChanged(databasePath, generateVoidAuthDatabaseModule({
+		const { authSchemaPath, authDatabasePath } = compileOptions.auth;
+		writeFileIfChanged(authSchemaPath, generateVoidAuthDrizzleSchema(authRuntime, env));
+		writeFileIfChanged(authDatabasePath, generateVoidAuthDatabaseModule({
 			dialect: compileOptions.auth.dialect,
-			schemaImportPath: schemaPath,
+			schemaImportPath: authSchemaPath,
 			drizzleAdapterPath
 		}));
-		compileOptions.auth.authSchemaPath = schemaPath;
-		compileOptions.auth.authDatabasePath = databasePath;
 	}
 	let resolvedConfig = null;
 	let isrRevalidate;
@@ -4328,38 +4336,15 @@ function routingPlugin(root, options) {
 			headConfig: options.headConfig
 		};
 	}
-	function shouldServeSpaFallback() {
-		if (!scan) return false;
-		return resolveCurrentAssetRoutingPolicy().workerSpaFallback;
-	}
-	/**
-	* The `not_found_handling` the generated worker entry must agree with. Read
-	* off the SAME resolved policy that produces the wrangler asset config, so
-	* the emitted `serveWithAssets` can never disagree with the platform switch
-	* it is standing in for.
-	*/
-	function currentNotFoundHandling() {
-		return resolveCurrentAssetRoutingPolicy().assetConfig.not_found_handling ?? "none";
-	}
 	function resolveCurrentAssetRoutingPolicy() {
-		if (!scan) return resolveAssetRoutingPolicy({
-			isSsr: Boolean(ssr),
-			hasPages: false,
-			hasApiRoutes: compileOptions.auth !== null,
-			hasDocumentRoutes: false,
-			hasMiddleware: false,
-			hasWebSockets: false,
-			authEnabled: compileOptions.auth !== null,
-			liveEnabled: options.live !== void 0,
-			notFound: options.routing?.notFound
-		});
+		const { pages, routes, websockets = [], middleware } = scan;
 		return resolveAssetRoutingPolicy({
 			isSsr: Boolean(ssr),
-			hasPages: scan.pages.pages.length > 0,
-			hasApiRoutes: hasApiRoutes(scan.routes) || hasApiRoutes(scan.websockets ?? []) || compileOptions.auth !== null,
-			hasDocumentRoutes: hasDocumentRoutes(scan.routes),
-			hasMiddleware: scan.middleware.length > 0,
-			hasWebSockets: hasDocumentRoutes(scan.websockets ?? []),
+			hasPages: pages.pages.length > 0,
+			hasApiRoutes: hasApiRoutes(routes) || hasApiRoutes(websockets) || compileOptions.auth !== null,
+			hasDocumentRoutes: hasDocumentRoutes(routes),
+			hasMiddleware: middleware.length > 0,
+			hasWebSockets: hasDocumentRoutes(websockets),
 			authEnabled: compileOptions.auth !== null,
 			liveEnabled: options.live !== void 0,
 			notFound: options.routing?.notFound
@@ -4377,6 +4362,7 @@ function routingPlugin(root, options) {
 	}
 	/** Write the Cloudflare worker entry from the completed scan. */
 	function writeWorkerEntry(isr) {
+		const policy = resolveCurrentAssetRoutingPolicy();
 		writeFileIfChanged(join(outDir, "entry.ts"), compileWorkerEntry({
 			versionMetadataBinding: options.getVersionMetadataBinding?.(),
 			hasQueues: scan.queues.length > 0,
@@ -4384,15 +4370,15 @@ function routingPlugin(root, options) {
 			assetsDir: resolvedConfig?.build.assetsDir,
 			webSocketClasses: [...(scan.websockets ?? []).map((route) => route.className), ...options.websocketTombstones ?? []],
 			runtimeEnvPath: compileOptions.runtimeEnvPath,
-			runtimeEmailPath: compileOptions.runtimeEmailPath,
+			runtimeEmailPath,
 			envSchemaModule: getEnvSchemaModule(),
 			sandbox: sandboxEntry,
 			hasEmail: hasEmailHandlers(),
-			serveSpaFallback: shouldServeSpaFallback(),
+			serveSpaFallback: policy.workerSpaFallback,
 			live: options.live,
 			dev: compileOptions.dev,
 			isr,
-			notFound: currentNotFoundHandling(),
+			notFound: policy.assetConfig.not_found_handling ?? "none",
 			durableObjects: options.durableObjects
 		}));
 	}
@@ -4404,7 +4390,7 @@ function routingPlugin(root, options) {
 		remote,
 		webSocketClasses: options.websocketTombstones,
 		runtimeEnvPath: compileOptions.runtimeEnvPath,
-		runtimeEmailPath: compileOptions.runtimeEmailPath,
+		runtimeEmailPath,
 		envSchemaModule: getEnvSchemaModule(),
 		sandbox: sandboxEntry,
 		live: options.live,
@@ -4470,14 +4456,13 @@ function routingPlugin(root, options) {
 			if (!options.target) {
 				const migrationsDir = paths.migrationsDir;
 				if (existsSync(migrationsDir) || compileOptions.auth) {
-					const { collectMigrations } = await import("./collect-DLyFDiKW.mjs");
-					const { buildMigrationPlanBundle } = await import("./plan-CH2G51je.mjs");
+					const { collectMigrations } = await import("./collect-Cae8A7Zr.mjs");
+					const { buildMigrationPlanBundle } = await import("./plan-CKX_jWnD.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");
 					compileOptions.migrations = migrations;
 					compileOptions.migrationPlanBundle = dialect === "sqlite" ? buildMigrationPlanBundle(migrations) : void 0;
-					compileOptions.migrationDialect = dialect;
 				}
 			}
 			if (options.target) writeNodeEntries(options.target);
@@ -4511,10 +4496,7 @@ function routingPlugin(root, options) {
 			async handler(id) {
 				const virtualClient = VIRTUAL_CLIENT_RE.exec(id);
 				if (virtualClient?.[1] === "browser") return compileBrowserClient(getClientAuthPath(id), fetchPath, fetchStreamPath);
-				if (virtualClient?.[1] === "worker") {
-					if (options.target) return compileNodeClient(getClientAuthPath(id));
-					return compileWorkerClient(getClientAuthPath(id));
-				}
+				if (virtualClient?.[1] === "worker") return compileWorkerClient(getClientAuthPath(id), Boolean(options.target));
 				if (id !== VIRTUAL_ROUTES_ID) return;
 				if (this?.environment?.name === "client") throw new Error(`${VIRTUAL_ROUTES_ID} is server-only and cannot be loaded by client code.`);
 				if (!scan) await rescan();
@@ -4525,9 +4507,7 @@ function routingPlugin(root, options) {
 			const watcher = devServer.watcher;
 			const handleFileChange = async (path, event) => {
 				const normalizedPath = normalizePath(path);
-				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)) return;
-				if (!sourceConventionChanged && isInDirectory(normalizedPath, normalizedSsrDir) && !ssrEntryAbsPaths.has(normalizedPath)) return;
+				if (!(isInDirectory(normalizedPath, normalizedRoutesDir) || isInDirectory(normalizedPath, normalizedMiddlewareDir) || isInDirectory(normalizedPath, normalizedJobsDir) || isInDirectory(normalizedPath, normalizedQueuesDir) || isInDirectory(normalizedPath, normalizedEmailDir) || isInDirectory(normalizedPath, normalizedPagesDir) || isPotentialAuthConfigPath(normalizedPath) || isPotentialEnvFilePath(normalizedPath)) && !ssrEntryAbsPaths.has(normalizedPath)) return;
 				await rescan(true);
 				resolveAuthCompileOptions();
 				if (event !== "change" && options.onDevAssetRoutingPolicyChange?.(resolveCurrentAssetRoutingPolicy()) === true) {
@@ -4720,13 +4700,12 @@ function mergeWorkerBindings(resolved, input) {
 		bucket_name: "default"
 	}];
 	const resolvedAi = resolved.ai;
-	const resultAi = result.ai;
 	const aiBindingName = resolveWorkersAiBindingName(resolvedAi, bindingNames?.ai);
-	if (viteCommand === "serve" && bindings.needsAI && directCloudflareDestination && !resultAi && typeof resolvedAi === "object" && resolvedAi !== null && "binding" in resolvedAi && typeof resolvedAi.binding === "string") result.ai = {
+	if (viteCommand === "serve" && bindings.needsAI && directCloudflareDestination && typeof resolvedAi === "object" && resolvedAi !== null && "binding" in resolvedAi && typeof resolvedAi.binding === "string") result.ai = {
 		...resolvedAi,
 		remote: true
 	};
-	else if (shouldBindWorkersAi(viteCommand, bindings.needsAI, resolvedAi, resultAi, directCloudflareDestination)) result.ai = {
+	else if (shouldBindWorkersAi(viteCommand, bindings.needsAI, resolvedAi, result.ai, directCloudflareDestination)) result.ai = {
 		binding: aiBindingName,
 		...viteCommand === "serve" && { remote: true }
 	};
@@ -4856,14 +4835,14 @@ function mergeWorkerBindings(resolved, input) {
 			result.vars = vars;
 		}
 	}
-	input.versionMetadataBinding = selectNativeVersionMetadataBinding(resolved, {
+	const versionMetadataBinding = selectNativeVersionMetadataBinding(resolved, {
 		nativeBuild: viteCommand === "build" && process.env["VOID_CLOUDFLARE_DEPLOY_BUILD"] === "1",
 		preserveBindings: process.env[CLOUDFLARE_PRESERVE_BINDINGS_BUILD_ENV] === "1"
 	});
-	if (input.versionMetadataBinding) {
-		const owner = findBindingNameOwner(result, "version_metadata", input.versionMetadataBinding);
-		if (owner) throw new Error(`Cloudflare version metadata binding ${input.versionMetadataBinding} conflicts with ${owner}.`);
-		if (!resolved.version_metadata) result.version_metadata = { binding: input.versionMetadataBinding };
+	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) => ({
@@ -4883,51 +4862,41 @@ function mergeWorkerBindings(resolved, input) {
 			class_name: liveConfig.className
 		}] : []
 	]);
-	return result;
+	return {
+		patch: result,
+		versionMetadataBinding
+	};
 }
 //#endregion
 //#region src/index.ts
 const scheduledPointerCleanups = /* @__PURE__ */ new Set();
 const scheduledPreviewPointerCleanups = /* @__PURE__ */ new Set();
-/**
-* Void plugin — the main entry point.
-*
-* Composes:
-* 1. Routing plugin (file-based routing from routes/ and middleware/)
-* 2. Migration plugin (auto-apply .sql migrations on dev startup)
-* 3. @cloudflare/vite-plugin (workerd runtime, HMR, builds)
-*
-* Binding inference runs synchronously here so results are available
-* before the Cloudflare plugin initializes.
-*
-* The Cloudflare plugin reads Void's generated config and provides it to our
-* config function. Bindings already defined there (with real IDs for
-* production deployment) are preserved — we only add inferred bindings
-* that are missing. This allows `vite build && wrangler deploy` to work
-* for deploying directly to Cloudflare without the Void platform.
-*/
+/** Returns the Vite plugins that build and serve a Void app for its configured target. */
 function voidPlugin(options) {
 	const root = process.cwd();
 	const directCloudflareDestination = readDeploymentPlatform(root) === "cloudflare";
+	if (directCloudflareDestination) selectVoidCloudflareLogin();
 	warnIfPackageJsonIsNotEsm(root);
 	const devTriggerToken = isViteBuildOrPreview() ? crypto.randomUUID() : getOrCreateDevTriggerToken(root);
 	const config = readConfig(root);
 	const projectCloudflareConfigPath = !isNodeTarget(config.target) ? materializeCloudflareConfig(root) : void 0;
 	const cloudflareConfigPath = projectCloudflareConfigPath && existsSync(projectCloudflareConfigPath) ? projectCloudflareConfigPath : void 0;
 	let previewing = false;
+	const restorePreviewPointer = () => {
+		if (!existsSync(join(root, "void.config.ts"))) return;
+		if (restoreCloudflarePreviewPointer(root) && !scheduledPreviewPointerCleanups.has(root)) {
+			scheduledPreviewPointerCleanups.add(root);
+			process.once("exit", () => {
+				rmSync(join(root, ".wrangler", "deploy", "config.json"), { force: true });
+			});
+		}
+	};
 	const implicitDeployGuard = {
 		name: "void:remove-implicit-cloudflare-deploy-pointer",
 		enforce: "pre",
 		config(_config, environment) {
 			previewing = environment.isPreview === true;
-			if (previewing && existsSync(join(root, "void.config.ts"))) {
-				if (restoreCloudflarePreviewPointer(root) && !scheduledPreviewPointerCleanups.has(root)) {
-					scheduledPreviewPointerCleanups.add(root);
-					process.once("exit", () => {
-						rmSync(join(root, ".wrangler", "deploy", "config.json"), { force: true });
-					});
-				}
-			}
+			if (previewing) restorePreviewPointer();
 		},
 		closeBundle() {
 			if (!previewing && existsSync(join(root, "void.config.ts")) && process.env["VOID_CLOUDFLARE_DEPLOY_BUILD"] !== "1") {
@@ -4943,7 +4912,7 @@ function voidPlugin(options) {
 	};
 	let application = analyzeApplicationSync(root, { config });
 	const { paths, dialect, bindingNames, authConfigPath } = application;
-	const analyses = /* @__PURE__ */ new Map([[void 0, application]]);
+	const analyses = /* @__PURE__ */ new Map();
 	const getApplicationAnalysis = (environment, refresh = false) => {
 		let result = refresh ? void 0 : analyses.get(environment);
 		if (!result) {
@@ -4960,6 +4929,7 @@ function voidPlugin(options) {
 	assertNoRootSourceConventionConflicts(paths);
 	const detected = application.framework;
 	const framework = detected?.class === "a" ? detected.name : void 0;
+	if (detected?.name === "astro" && process.argv[2] === "preview") restorePreviewPointer();
 	const scanDirs = config.inference?.scanDirs ?? (detected ? FRAMEWORK_SCAN_DIRS : void 0);
 	const frameworkOwnsCloudflareRuntime = detected !== void 0 && (detected.class === "b" || detected.class === "c");
 	const localD1PersistRoot = frameworkOwnsCloudflareRuntime ? join(root, ".wrangler", "state") : options?.persistTo ?? join(root, ".void");
@@ -4977,7 +4947,7 @@ function voidPlugin(options) {
 	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 clientStubsPlugin = createClientStubsPlugin();
-	const serverRuntimeOptimizerPlugin = createServerRuntimeOptimizerPlugin();
+	const serverRuntimeOptimizerPlugin = createServerRuntimeOptimizerPlugin(dialect, () => readWranglerCompat(root, config));
 	const queues = framework ? [] : application.queues;
 	const websocketRoutes = framework ? [] : application.allWebsockets;
 	const durableObjects = application.durableObjects;
@@ -5014,12 +4984,10 @@ function voidPlugin(options) {
 		application,
 		bindingNames,
 		websocketRoutes,
-		sandboxConfig,
 		liveConfig,
 		detected,
 		clientStubsPlugin,
 		serverRuntimeOptimizerPlugin,
-		authEnabled,
 		devTriggerToken,
 		implicitDeployGuard
 	});
@@ -5044,7 +5012,7 @@ function voidPlugin(options) {
 	const outDir = join(root, ".void");
 	mkdirSync(outDir, { recursive: true });
 	function mergeBindings(resolved) {
-		return mergeWorkerBindings(resolved, {
+		const merged = mergeWorkerBindings(resolved, {
 			websocketRoutes,
 			routeEnvironment,
 			workerConfig,
@@ -5064,14 +5032,10 @@ function voidPlugin(options) {
 			shouldEmitLive,
 			liveConfig,
 			root,
-			remoteMode,
-			get versionMetadataBinding() {
-				return versionMetadataBinding;
-			},
-			set versionMetadataBinding(value) {
-				versionMetadataBinding = value;
-			}
+			remoteMode
 		});
+		versionMetadataBinding = merged.versionMetadataBinding;
+		return merged.patch;
 	}
 	function applyEnvSchema(facts) {
 		envSchemaFacts = facts;
@@ -5084,7 +5048,6 @@ function voidPlugin(options) {
 			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);
 				assetRoutingPublicDir = userConfig.publicDir === false ? null : typeof userConfig.publicDir === "string" ? resolve(root, userConfig.publicDir) : join(root, "public");
@@ -5115,27 +5078,23 @@ function voidPlugin(options) {
 			return watchConfig;
 		},
 		configureServer(server) {
-			const afterReady = (fn) => {
-				if (server.httpServer) server.httpServer.once("listening", () => setTimeout(fn, 100));
-				else fn();
-			};
 			if (remoteMode && (bindings.needsD1 || bindings.needsKV || bindings.needsR2)) {
 				const credentials = readVoidDevCredentials(root);
 				if (credentials.status === "ok") {
 					const lines = [import_picocolors.default.blue("Remote bindings active")];
-					if (bindings.needsD1) lines.push("  DB      \x1B[2m→ remote D1\x1B[22m");
-					if (bindings.needsKV) lines.push("  KV      \x1B[2m→ remote KV\x1B[22m");
-					if (bindings.needsR2) lines.push("  STORAGE \x1B[2m→ remote R2\x1B[22m");
-					afterReady(() => {
+					if (bindings.needsD1) lines.push(`  DB      ${import_picocolors.default.dim("→ remote D1")}`);
+					if (bindings.needsKV) lines.push(`  KV      ${import_picocolors.default.dim("→ remote KV")}`);
+					if (bindings.needsR2) lines.push(`  STORAGE ${import_picocolors.default.dim("→ remote R2")}`);
+					afterServerReady(server, () => {
 						console.log();
 						voidLog(lines.join("\n         "));
 					});
-				} else if (credentials.status === "no-token") afterReady(() => {
+				} else if (credentials.status === "no-token") afterServerReady(server, () => {
 					console.log();
 					voidWarn("Remote mode requires authentication. Run `void account login`, then restart.");
 					voidWarn("Falling back to local bindings.");
 				});
-				else afterReady(() => {
+				else afterServerReady(server, () => {
 					console.log();
 					voidWarn("Remote mode requires a linked project. Run `void project link` first.");
 					voidWarn("Falling back to local bindings.");
@@ -5143,16 +5102,16 @@ function voidPlugin(options) {
 			}
 			if (bindings.needsAI && !directCloudflareDestination) {
 				const credentials = readVoidDevCredentials(root);
-				if (credentials.status === "no-token") afterReady(() => {
+				if (credentials.status === "no-token") afterServerReady(server, () => {
 					console.log();
 					voidWarn("AI requires authentication. Run `void account login`, then restart the dev server.");
 				});
 				else if (credentials.status === "no-project") {
-					if (process.stdin.isTTY) afterReady(() => {
+					if (process.stdin.isTTY) afterServerReady(server, () => {
 						console.log();
 						runAiSetupPrompt(root, credentials.token, credentials.apiUrl, server);
 					});
-					else afterReady(() => {
+					else afterServerReady(server, () => {
 						console.log();
 						voidWarn("AI requires a linked project. Run `void project link` to set one up.");
 					});
@@ -5204,7 +5163,7 @@ function voidPlugin(options) {
 		}
 	};
 	if (framework) {
-		workerConfig.main = getFrameworkEntry(framework, root, devTriggerToken, config.routing?.notFound);
+		workerConfig.main = getFrameworkEntry(framework, root, devTriggerToken, dialect, config.routing?.notFound);
 		let notFoundIgnoredWarned = false;
 		const frameworkBuildWrapperPlugin = {
 			name: "void:framework-build-wrapper",
@@ -5214,7 +5173,7 @@ function voidPlugin(options) {
 					notFoundIgnoredWarned = true;
 					voidWarn(`Void generates no asset routing policy for a ${framework} build, so "routing.notFound" in void.config.ts is not written to the built worker config. During a self-hosted build and direct Cloudflare deployment, it takes effect only if your own Cloudflare config declares a complete \`assets\` policy (\`binding\`, \`directory\`, \`not_found_handling\`, \`run_worker_first\`); otherwise Cloudflare's default applies. Managed \`void deploy\` supplies the policy for you.`);
 				}
-				generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), true, resolved.build.assetsDir, config.routing?.notFound);
+				generateClassATriggerWrapper(root, framework, getOriginalFrameworkEntry(framework, root), true, dialect, resolved.build.assetsDir, config.routing?.notFound);
 			}
 		};
 		const existingFlags = workerConfig.compatibility_flags ?? [];
@@ -5249,6 +5208,7 @@ function voidPlugin(options) {
 		} : void 0;
 		return [
 			createCloudflareBuiltinsExternalPlugin(),
+			createBareVoidRedirectPlugin(),
 			createWorkerEnvironmentSanitizerPlugin([viteEnvironment.name, ...viteEnvironment.childEnvironments ?? []]),
 			createWranglerCompatPersistPlugin(root, config),
 			devTriggerSecretGuardPlugin(),
@@ -5274,10 +5234,7 @@ function voidPlugin(options) {
 			...vinextWorkerEntry ? [vinextWorkerEntry] : [],
 			frameworkBuildWrapperPlugin,
 			frameworkTriggersPlugin(root, { devTriggerToken }),
-			devTriggersHintPlugin(root, {
-				framework: true,
-				devTriggerToken
-			}),
+			devTriggersHintPlugin(root, devTriggerToken),
 			...cloudflare({
 				configPath: cloudflareConfigPath,
 				...inspectorPortOption,
@@ -5311,7 +5268,6 @@ function voidPlugin(options) {
 				isAuthEnabled: () => false,
 				devTriggerToken,
 				headConfig: config.head,
-				output: config.output,
 				prerenderPaths: config.routing?.prerender,
 				target: config.target,
 				routing: config.routing,
@@ -5396,7 +5352,6 @@ function voidPlugin(options) {
 			getVersionMetadataBinding: () => versionMetadataBinding,
 			devTriggerToken,
 			headConfig: config.head,
-			output: config.output,
 			prerenderPaths: config.routing?.prerender,
 			remoteMode,
 			routing: config.routing,
@@ -5425,10 +5380,7 @@ function voidPlugin(options) {
 			configPath: authConfigPath
 		}),
 		prerenderPlugin(root, config),
-		devTriggersHintPlugin(root, {
-			framework: false,
-			devTriggerToken
-		}),
+		devTriggersHintPlugin(root, devTriggerToken),
 		...cloudflare({
 			configPath: cloudflareConfigPath,
 			...inspectorPortOption,