@voltro/cli 0.57.0 → 0.58.0

package/dist/{webDev-BgdkyjP6.js → webDev-CBN9KkyQ.js}

@@ -1,6 +1,6 @@
 import { n as e } from "./loadEnv-D9nEOClM.js";
 import { t } from "./bootRefusal-pgvDxlrU.js";
-import { A as n, I as r, M as i, O as a, g as o, j as s, o as c } from "./inspect-DZnan87F.js";
+import { A as n, I as r, M as i, O as a, g as o, j as s, o as c } from "./inspect-PcC5J-Dl.js";
 import { r as l } from "./appPort-B_HpJ_ck.js";
 import { M as u, _ as d, c as f, g as p, v as m, y as h } from "./fileConventions-l-RIXbx8.js";
 import { n as g, t as _ } from "./workspaceDeps-RKEkX92S.js";
@@ -86,15 +86,15 @@ ${n.length > 0 ? n : "    // (no public variables declared)"}
 `, i = P(e, "src");
 	await Fe(i, { recursive: !0 }), await q(P(i, "voltro-env.d.ts"), r, "utf8");
 }, ht = async (e, t) => {
-	let n = `${ut}
+	let n = JSON.stringify(t, null, 2), r = `${ut}
 import { __installPublicEnv } from '@voltro/env/public'
 
-export const publicEnvValues = ${JSON.stringify(t, null, 2)} as const
+export const publicEnvValues = ${n} as const
 
 // Set the browser/SSR-shared global the \`publicEnv\` accessor reads.
 __installPublicEnv(publicEnvValues)
 `;
-	await Fe(e, { recursive: !0 }), await q(P(e, "env.public.ts"), n, "utf8");
+	await Fe(e, { recursive: !0 }), await q(P(e, "env.public.ts"), r, "utf8"), await q(P(e, "env.public.json"), `${n}\n`, "utf8");
 }, gt = (e, t) => {
 	let n = new Set(Object.keys(Ae(e) ? e.vars : {})), r = /* @__PURE__ */ new Map();
 	for (let [e, i] of (t ?? []).entries()) {
@@ -1298,7 +1298,7 @@ __installPublicEnv(publicEnvValues)
 		if (!L(a)) continue;
 		let s;
 		try {
-			let { pages: e } = await Uo(a);
+			let { pages: e } = await Wo(a);
 			s = e.map((e) => ({
 				pattern: e.pattern,
 				params: br(e.pattern)
@@ -2546,12 +2546,20 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		} catch {}
 	}
 	return [...t].map((e) => `    <link rel="preconnect" href="${e}" crossorigin />`);
-}, Ao = (e) => e.web?.api?.connect === "lazy" ? ["  connect: 'lazy',"] : [], jo = (e, t) => e.disableDevtools || !t ? [] : ["  ...(Devtools ? { Devtools } : {}),"], Mo = (e) => e.sentry ? ["import { initSentryBrowser } from '@voltro/plugin-sentry/web'"] : [], No = (e) => e.sentry ? [
-	"",
-	"// Browser-side Sentry (frontend half of the deep integration). Errors +",
-	"// browser rpc spans flow to Sentry, sharing the server transactions' trace.",
-	`await initSentryBrowser(${JSON.stringify(e.sentry)})`
-] : [], Po = (e) => e.env ? ["import './env.public'"] : [], Fo = (e) => {
+}, Ao = (e) => e.web?.api?.connect === "lazy" ? ["  connect: 'lazy',"] : [], jo = (e, t) => e.disableDevtools || !t ? [] : ["  ...(Devtools ? { Devtools } : {}),"], Mo = (e, t) => {
+	if (!No(e, t)) return [];
+	let n = ["import { initSentryBrowser } from '@voltro/plugin-sentry/web'"], r = typeof e.sentry == "object" ? e.sentry.optionsFrom : void 0;
+	return r !== void 0 && n.push(`import __sentryOptions from '../${r.replace(/^\.?\//, "")}'`), n;
+}, No = (e, t) => e.sentry !== void 0 || t, Po = (e, t) => {
+	if (!No(e, t)) return [];
+	let { optionsFrom: n, ...r } = e.sentry ?? {};
+	return [
+		"",
+		"// Browser-side Sentry (frontend half of the deep integration). Errors +",
+		"// browser rpc spans flow to Sentry, sharing the server transactions' trace.",
+		n === void 0 ? `await initSentryBrowser(${JSON.stringify(r)})` : `await initSentryBrowser({ ...${JSON.stringify(r)}, ...(await __sentryOptions()) })`
+	];
+}, Fo = (e) => e.env ? ["import './env.public'"] : [], Io = (e) => {
 	let t = [], n = I(e);
 	for (;;) {
 		L(P(n, "pnpm-workspace.yaml")) && t.push(n);
@@ -2560,12 +2568,12 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		n = e;
 	}
 	return t;
-}, Io = re, Lo = (e) => {
+}, Lo = re, Ro = (e) => {
 	if (/\/node_modules\/(?:\.pnpm\/[^/]+\/node_modules\/)?(?:react|react-dom|scheduler)\//.test(e)) return "react";
-}, Ro = /export\s+(?:async\s+)?(?:const|function|let|var)\s+loader\b/, zo = (e) => e.startsWith("(") && e.endsWith(")"), Bo = (e) => e.filter((e) => !zo(e)), Vo = (e) => {
-	let t = e.replace(p, "").split("/").filter(Boolean).filter((e) => !zo(e));
+}, zo = /export\s+(?:async\s+)?(?:const|function|let|var)\s+loader\b/, Bo = (e) => e.startsWith("(") && e.endsWith(")"), Vo = (e) => e.filter((e) => !Bo(e)), Ho = (e) => {
+	let t = e.replace(p, "").split("/").filter(Boolean).filter((e) => !Bo(e));
 	return t.length === 0 ? "/" : "/" + t.join("/");
-}, Ho = (e) => `${e.replace(p, "").split("/").filter(Boolean).map((e) => e.replace(/[()]/g, "").replace(/\[\.\.\./g, "_rest_").replace(/[[\]]/g, "_")).map((e) => e.charAt(0).toUpperCase() + e.slice(1)).join("").replace(/[^A-Za-z0-9_]/g, "_") || "Index"}Page`, $ = (e, t) => e === "" ? `Root${t}` : `${e.split("/").filter(Boolean).map((e) => e.replace(/[()]/g, "").replace(/\[\.\.\./g, "_rest_").replace(/[[\]]/g, "_")).map((e) => e.charAt(0).toUpperCase() + e.slice(1)).join("").replace(/[^A-Za-z0-9_]/g, "_") || "Root"}${t}`, Uo = async (e) => {
+}, Uo = (e) => `${e.replace(p, "").split("/").filter(Boolean).map((e) => e.replace(/[()]/g, "").replace(/\[\.\.\./g, "_rest_").replace(/[[\]]/g, "_")).map((e) => e.charAt(0).toUpperCase() + e.slice(1)).join("").replace(/[^A-Za-z0-9_]/g, "_") || "Index"}Page`, $ = (e, t) => e === "" ? `Root${t}` : `${e.split("/").filter(Boolean).map((e) => e.replace(/[()]/g, "").replace(/\[\.\.\./g, "_rest_").replace(/[[\]]/g, "_")).map((e) => e.charAt(0).toUpperCase() + e.slice(1)).join("").replace(/[^A-Za-z0-9_]/g, "_") || "Root"}${t}`, Wo = async (e) => {
 	let t = [], n = [], r = async (e, i) => {
 		let a = [];
 		try {
@@ -2573,17 +2581,17 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		} catch {
 			return;
 		}
-		let o = a.filter((e) => e.isDirectory()).map((e) => e.name).sort(), s = a.filter((e) => e.isFile() && e.name.endsWith(".tsx") && !Io(e.name)).map((e) => e.name).sort(), c = new Set(s), l = i.join("/");
+		let o = a.filter((e) => e.isDirectory()).map((e) => e.name).sort(), s = a.filter((e) => e.isFile() && e.name.endsWith(".tsx") && !Lo(e.name)).map((e) => e.name).sort(), c = new Set(s), l = i.join("/");
 		if (s.some((e) => d.has(e))) {
 			let t = c.has("layout.tsx"), r = !1;
 			if (t) try {
 				let t = await z.readFile(P(e, "layout.tsx"), "utf8");
-				r = Ro.test(t);
+				r = zo.test(t);
 			} catch {}
 			n.push({
 				dir: l,
 				chain: i,
-				contributesToUrl: i.length === 0 || !zo(i[i.length - 1]),
+				contributesToUrl: i.length === 0 || !Bo(i[i.length - 1]),
 				hasLayout: t,
 				hasLayoutLoader: r,
 				hasError: c.has("error.tsx"),
@@ -2597,8 +2605,8 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			let n = l ? `${l}/${e}` : e;
 			t.push({
 				file: n,
-				pattern: Vo(n),
-				ident: Ho(n),
+				pattern: Ho(n),
+				ident: Uo(n),
 				dirChain: i
 			});
 		}
@@ -2617,14 +2625,14 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		dirs: a,
 		orphanedSpecials: o
 	};
-}, Wo = (e, t) => {
+}, Go = (e, t) => {
 	let n = [];
 	for (let r = 0; r <= t.length; r++) {
 		let i = t.slice(0, r).join("/"), a = e.find((e) => e.dir === i);
 		a && n.push(a);
 	}
 	return n;
-}, Go = async (e) => {
+}, Ko = async (e) => {
 	let { entries: t, loadLayout: n, loadError: r, loadPending: i, ctx: a } = e, o = {};
 	return {
 		chain: await Promise.all(t.map(async (e, t) => {
@@ -2648,10 +2656,10 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		})),
 		segmentLoaderData: o
 	};
-}, Ko = (e) => {
-	let t = Bo(e);
+}, qo = (e) => {
+	let t = Vo(e);
 	return t.length === 0 ? "" : "/" + t.join("/");
-}, qo = [
+}, Jo = [
 	"// Hot-reload bridge: keep SSR-injected <link rel=\"stylesheet\"> tags",
 	"// in sync with Vite's CSS HMR. Without this, edits to .css files",
 	"// only update the JS-injected <style> overlay; the underlying <link>",
@@ -2744,7 +2752,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	"    _vdtErrorStart('Build error')",
 	"  })",
 	"}"
-].join("\n"), Jo = (e) => {
+].join("\n"), Yo = (e) => {
 	let t = [], n = 0, r = e.split("/").filter(Boolean), i = [];
 	for (let e of r) e.startsWith("[[...") && e.endsWith("]]") ? (i.push("(.*)"), t.push(e.slice(5, -2)), n += 2) : e.startsWith("[...") && e.endsWith("]") ? (i.push("(.+)"), t.push(e.slice(4, -1)), n += 3) : e.startsWith("[") && e.endsWith("]") ? (i.push("([^/]+)"), t.push(e.slice(1, -1)), n += 1) : i.push(e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
 	let a = i.join("/");
@@ -2753,8 +2761,8 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		paramNames: t,
 		priority: n
 	};
-}, Yo = (e) => e.map((e) => {
-	let { regex: t, paramNames: n, priority: r } = Jo(e.pattern);
+}, Xo = (e) => e.map((e) => {
+	let { regex: t, paramNames: n, priority: r } = Yo(e.pattern);
 	return {
 		pattern: e.pattern,
 		file: e.file,
@@ -2763,7 +2771,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		paramNames: n,
 		priority: r
 	};
-}).slice().sort((e, t) => e.priority - t.priority), Xo = (e, t) => {
+}).slice().sort((e, t) => e.priority - t.priority), Zo = (e, t) => {
 	for (let n of t) {
 		let t = n.regex.exec(e);
 		if (!t) continue;
@@ -2775,7 +2783,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		};
 	}
 	return null;
-}, Zo = _, Qo = async (e) => {
+}, Qo = _, $o = async (e) => {
 	try {
 		let t = await import(G(P(e, "app.config.ts")).href), n = t.default?.port, r = l({
 			kind: "api",
@@ -2791,7 +2799,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		kind: "api",
 		env: {}
 	}).port };
-}, $o = (e, t) => ({
+}, es = (e, t) => ({
 	name: e,
 	pkg: t.package,
 	browserWsUrl: t.url,
@@ -2799,7 +2807,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	...t.serverUrl ? { serverOrigin: t.serverUrl } : {},
 	...t.headers ? { headers: t.headers } : {},
 	...t.authHeaders ? { hasAuthHeaders: !0 } : {}
-}), es = (e, t, n) => {
+}), ts = (e, t, n) => {
 	let r = t.transport?.wsPath ?? n.wsPath;
 	return {
 		name: e,
@@ -2811,7 +2819,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		...t.headers ? { headers: t.headers } : {},
 		...t.authHeaders ? { hasAuthHeaders: !0 } : {}
 	};
-}, ts = (e) => {
+}, ns = (e) => {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e) {
 		if (n.proxyTarget === void 0) continue;
@@ -2819,43 +2827,43 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		if (e) throw Error(`[voltro] api ${JSON.stringify(n.name)} and ${JSON.stringify(e)} both resolve the same-origin WS path ${JSON.stringify(n.browserWsUrl)}. A custom transport.wsPath must be unique per origin (one api per origin may use a fixed path). Give each a distinct wsPath, or drop the override to use the default /ws/<name>.`);
 		t.set(n.browserWsUrl, n.name);
 	}
-}, ns = async (e, t) => {
+}, rs = async (e, t) => {
 	let n = Object.entries(t.apis ?? {}), r = [];
 	for (let [t, i] of n) {
 		if (i.url) {
-			r.push($o(t, i));
+			r.push(es(t, i));
 			continue;
 		}
-		let n = await Zo(e, i.package);
+		let n = await Qo(e, i.package);
 		if (!n) throw Error(`[voltro dev] api ${JSON.stringify(t)} (package ${JSON.stringify(i.package)}) is not a workspace dep and has no \`url\` set in app.config.ts. External apis need an explicit \`url\` because the framework can't discover their dev port.`);
-		r.push(es(t, i, await Qo(n)));
+		r.push(ts(t, i, await $o(n)));
 	}
-	return ts(r), r;
-}, rs = (e) => {
+	return ns(r), r;
+}, is = (e) => {
 	if (!(!/^wss?:\/\//.test(e) && !/^https?:\/\//.test(e))) try {
 		let t = new URL(e);
 		return t.protocol = t.protocol === "wss:" || t.protocol === "https:" ? "https:" : "http:", `${t.protocol}//${t.host}`;
 	} catch {
 		return;
 	}
-}, is = (e) => `VOLTRO_API_ORIGIN_${e.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`, as = (e) => process.env[is(e)] ?? process.env.VOLTRO_API_ORIGIN, os = (e, t) => {
+}, as = (e) => `VOLTRO_API_ORIGIN_${e.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`, os = (e) => process.env[as(e)] ?? process.env.VOLTRO_API_ORIGIN, ss = (e, t) => {
 	if (!e) return;
-	let n = as(e.name) ?? e.serverOrigin;
+	let n = os(e.name) ?? e.serverOrigin;
 	if (n) {
-		let e = rs(n);
+		let e = is(n);
 		if (e) return e;
 	}
 	if (t?.allowDevProxy && e.proxyTarget) {
-		let t = rs(e.proxyTarget);
+		let t = is(e.proxyTarget);
 		if (t) return t;
 	}
-	if (!e.proxyTarget && /^wss?:\/\//.test(e.browserWsUrl)) return rs(e.browserWsUrl);
-}, ss = (e, t, n) => {
+	if (!e.proxyTarget && /^wss?:\/\//.test(e.browserWsUrl)) return is(e.browserWsUrl);
+}, cs = (e, t, n) => {
 	if (!e) {
 		if (n?.apiName === void 0) return;
 		let e = n.apiName;
 		return async () => {
-			throw Error(`[loader.query] api '${e}' has no server-side origin for SSR. In a split web/api deployment the web pod reaches the api by internal DNS, not the browser's relative wsPath — set ${is(e)} (or VOLTRO_API_ORIGIN, or apis.${e}.serverUrl in app.config.ts) to the api's internal origin, e.g. http://api.<namespace>.svc.cluster.local. The browser transport is unaffected.`);
+			throw Error(`[loader.query] api '${e}' has no server-side origin for SSR. In a split web/api deployment the web pod reaches the api by internal DNS, not the browser's relative wsPath — set ${as(e)} (or VOLTRO_API_ORIGIN, or apis.${e}.serverUrl in app.config.ts) to the api's internal origin, e.g. http://api.<namespace>.svc.cluster.local. The browser transport is unaffected.`);
 		};
 	}
 	return async (r, i) => {
@@ -2878,7 +2886,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			});
 		} catch (t) {
 			let i = t?.cause?.code ?? String(t?.message ?? t);
-			throw Error(`[loader.query] ${r}: could not reach the api at ${e}/rpc (${i}). ${n?.apiName ? `Set ${is(n.apiName)} / VOLTRO_API_ORIGIN` : "Set the api server origin"} to the api's SSR-reachable origin (internal cluster DNS in a split deployment).`, { cause: t });
+			throw Error(`[loader.query] ${r}: could not reach the api at ${e}/rpc (${i}). ${n?.apiName ? `Set ${as(n.apiName)} / VOLTRO_API_ORIGIN` : "Set the api server origin"} to the api's SSR-reachable origin (internal cluster DNS in a split deployment).`, { cause: t });
 		}
 		if (!o.ok) throw Error(`[loader.query] ${r}: HTTP ${o.status} ${await o.text()}`);
 		let s = await o.json();
@@ -2908,7 +2916,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		}
 		if (u) return l;
 	};
-}, cs = (e, t) => {
+}, ls = (e, t) => {
 	let n = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppGroup`, r = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppDescriptors`, i = e.map((e) => `import { appGroup as ${n(e.name)}, appDescriptors as ${r(e.name)} } from '${e.pkg}/rpcGroup'`);
 	e.some((e) => e.hasAuthHeaders) && (i.push(`import __voltroAppConfig from '${t}'`), i.push("const __voltroAuthHeaders = (__voltroAppConfig as { readonly apis?: Record<string, { readonly authHeaders?: () => Record<string, string> | Promise<Record<string, string>> }> }).apis"));
 	let a = (e) => {
@@ -2920,10 +2928,10 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		entryLines: e.map((e) => `    ${JSON.stringify(e.name)}: { ${a(e).join(", ")} },`),
 		providerEntryLines: e.map((e) => `    { name: ${JSON.stringify(e.name)}, ${a(e).join(", ")} },`)
 	};
-}, ls = async (e, t, n, r = {}) => {
+}, us = async (e, t, n, r = {}) => {
 	let i = t.title ?? t.name ?? "app";
 	Gn(e);
-	let a = await Vn(e, t.fonts), o = a === null ? [] : [...a.preloads.map((e) => `    <link rel="preload" as="font" type="font/${e.endsWith(".woff2") ? "woff2" : e.endsWith(".woff") ? "woff" : e.endsWith(".otf") ? "otf" : "ttf"}" href="${e}" crossorigin />`), `    <style data-voltro-fonts>${a.css}</style>`], s = t.theme === "dark" ? " class=\"dark\"" : t.theme === "light" ? " class=\"light\"" : "", c = L(P(e, "node_modules", "@voltro", "devtools", "package.json")) || await Do() !== null, l = t.theme === "system" ? [
+	let a = await Vn(e, t.fonts), o = a === null ? [] : [...a.preloads.map((e) => `    <link rel="preload" as="font" type="font/${e.endsWith(".woff2") ? "woff2" : e.endsWith(".woff") ? "woff" : e.endsWith(".otf") ? "otf" : "ttf"}" href="${e}" crossorigin />`), `    <style data-voltro-fonts>${a.css}</style>`], s = t.theme === "dark" ? " class=\"dark\"" : t.theme === "light" ? " class=\"light\"" : "", c = L(P(e, "node_modules", "@voltro", "devtools", "package.json")) || await Do() !== null, l = L(P(e, "node_modules", "@voltro", "plugin-sentry", "package.json")), u = t.theme === "system" ? [
 		"    <script>",
 		"      (function () {",
 		"        var root = document.documentElement",
@@ -2944,7 +2952,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		"        }",
 		"      })()",
 		"    <\/script>"
-	].join("\n") : "", u = t.timeZone === "viewer" ? [
+	].join("\n") : "", d = t.timeZone === "viewer" ? [
 		"    <script>",
 		"      (function () {",
 		"        try {",
@@ -2956,7 +2964,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		"        } catch (e) {}",
 		"      })()",
 		"    <\/script>"
-	].join("\n") : "", d = [
+	].join("\n") : "", f = [
 		"<!doctype html>",
 		"<!-- GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot. -->",
 		`<html lang="en"${s}>`,
@@ -2967,8 +2975,8 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		"    <link rel=\"icon\" type=\"image/svg+xml\" href=\"/favicon.svg\" />",
 		...ko(n),
 		...o,
-		...l ? [l] : [],
 		...u ? [u] : [],
+		...d ? [d] : [],
 		"  </head>",
 		"  <body>",
 		"    <div id=\"root\"></div>",
@@ -2976,32 +2984,32 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		"  </body>",
 		"</html>",
 		""
-	].join("\n"), f = P(e, "src", "pages"), { pages: p, dirs: m, orphanedSpecials: h } = await Uo(f);
-	await x(f, p);
-	for (let e of h) Q.warn(`src/pages/${e.dir || "."}/ contains ${e.files.join(", ")} but no page.tsx at or below it — ${e.files.length > 1 ? "those files are" : "that file is"} inert. A layout/error/loading/not-found file only applies to routes in its own directory tree; if this is an ordinary component, rename it so it does not read as a route boundary.`);
-	let { imports: g, entryLines: _ } = cs(n, "../app.config"), v, y, ee;
-	if (p.length > 0) {
-		let n = p.map((e) => `  ${JSON.stringify(e.pattern)}: () => import('../src/pages/${e.file}'),`), r = [];
-		for (let e of m) {
+	].join("\n"), p = P(e, "src", "pages"), { pages: m, dirs: h, orphanedSpecials: g } = await Wo(p);
+	await x(p, m);
+	for (let e of g) Q.warn(`src/pages/${e.dir || "."}/ contains ${e.files.join(", ")} but no page.tsx at or below it — ${e.files.length > 1 ? "those files are" : "that file is"} inert. A layout/error/loading/not-found file only applies to routes in its own directory tree; if this is an ordinary component, rename it so it does not read as a route boundary.`);
+	let { imports: _, entryLines: v } = ls(n, "../app.config"), y, ee, b;
+	if (m.length > 0) {
+		let n = m.map((e) => `  ${JSON.stringify(e.pattern)}: () => import('../src/pages/${e.file}'),`), r = [];
+		for (let e of h) {
 			let t = e.dir === "" ? "../src/pages" : `../src/pages/${e.dir}`;
 			e.hasLayout && e.hasLayoutLoader ? r.push(`import * as ${$(e.dir, "Layout")}Mod from '${t}/layout.tsx'`) : e.hasLayout && r.push(`import ${$(e.dir, "Layout")}   from '${t}/layout.tsx'`), e.hasError && r.push(`import ${$(e.dir, "Error")}    from '${t}/error.tsx'`), e.hasPending && r.push(`import ${$(e.dir, "Pending")}  from '${t}/loading.tsx'`), e.hasNotFound && r.push(`import ${$(e.dir, "NotFound")} from '${t}/not-found.tsx'`);
 		}
-		let i = p.map((e) => {
-			let t = Wo(m, e.dirChain).map((e) => {
+		let i = m.map((e) => {
+			let t = Go(h, e.dirChain).map((e) => {
 				let t = [`id: ${JSON.stringify(e.dir || "/")}`], n = JSON.stringify(e.dir);
 				return e.hasLayout && t.push(`Layout:  refs.layouts[${n}]`), e.hasLayoutLoader && t.push(`loader:  refs.layoutLoaders[${n}]`), e.hasError && t.push(`Error:   refs.errors[${n}]`), e.hasPending && t.push(`Pending: refs.pendings[${n}]`), `      { ${t.join(", ")} }`;
 			}).join(",\n");
 			return `    makePageRoute(${JSON.stringify(e.pattern)}, ${t.length > 0 ? `[\n${t},\n    ]` : "undefined"}),`;
-		}), a = m.filter((e) => e.hasNotFound).map((e) => {
-			let t = Ko(e.chain), n = Wo(m, e.chain).map((e) => {
+		}), a = h.filter((e) => e.hasNotFound).map((e) => {
+			let t = qo(e.chain), n = Go(h, e.chain).map((e) => {
 				let t = [`id: ${JSON.stringify(e.dir || "/")}`], n = JSON.stringify(e.dir);
 				return e.hasLayout && t.push(`Layout: refs.layouts[${n}]`), e.hasError && t.push(`Error:  refs.errors[${n}]`), `        { ${t.join(", ")} }`;
 			}).join(",\n"), r = n.length > 0 ? `\n      chain: [\n${n},\n      ],` : "";
 			return `    {\n      prefix: ${JSON.stringify(t)},\n      Component: refs.notFounds[${JSON.stringify(e.dir)}],${r}\n    },`;
-		}), o = [], s = [], l = [], u = [], d = [], f = [];
-		for (let e of m) {
+		}), o = [], s = [], u = [], d = [], f = [], p = [];
+		for (let e of h) {
 			let t = e.dir === "" ? "../src/pages/layout.tsx" : `../src/pages/${e.dir}/layout.tsx`, n = e.dir === "" ? "../src/pages/error.tsx" : `../src/pages/${e.dir}/error.tsx`, r = e.dir === "" ? "../src/pages/loading.tsx" : `../src/pages/${e.dir}/loading.tsx`, i = e.dir === "" ? "../src/pages/not-found.tsx" : `../src/pages/${e.dir}/not-found.tsx`, a = JSON.stringify(e.dir);
-			e.hasLayout && e.hasLayoutLoader ? (s.push(`  ${a}: ${$(e.dir, "Layout")}Mod.default,`), l.push(`  ${a}: ${$(e.dir, "Layout")}Mod.loader,`), o.push({
+			e.hasLayout && e.hasLayoutLoader ? (s.push(`  ${a}: ${$(e.dir, "Layout")}Mod.default,`), u.push(`  ${a}: ${$(e.dir, "Layout")}Mod.loader,`), o.push({
 				relPath: t,
 				kind: "layout",
 				slotKey: e.dir
@@ -3009,37 +3017,37 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 				relPath: t,
 				kind: "layout",
 				slotKey: e.dir
-			})), e.hasError && (u.push(`  ${a}: ${$(e.dir, "Error")},`), o.push({
+			})), e.hasError && (d.push(`  ${a}: ${$(e.dir, "Error")},`), o.push({
 				relPath: n,
 				kind: "error",
 				slotKey: e.dir
-			})), e.hasPending && (d.push(`  ${a}: ${$(e.dir, "Pending")},`), o.push({
+			})), e.hasPending && (f.push(`  ${a}: ${$(e.dir, "Pending")},`), o.push({
 				relPath: r,
 				kind: "pending",
 				slotKey: e.dir
-			})), e.hasNotFound && (f.push(`  ${a}: ${$(e.dir, "NotFound")},`), o.push({
+			})), e.hasNotFound && (p.push(`  ${a}: ${$(e.dir, "NotFound")},`), o.push({
 				relPath: i,
 				kind: "notFound",
 				slotKey: e.dir
 			}));
 		}
-		for (let e of p) o.push({
+		for (let e of m) o.push({
 			relPath: `../src/pages/${e.file}`,
 			kind: "page",
 			slotKey: e.pattern
 		});
-		let h = o.map((e) => `      ${JSON.stringify(e.relPath)},`), b = o.map((e, t) => {
+		let g = o.map((e) => `      ${JSON.stringify(e.relPath)},`), x = o.map((e, t) => {
 			let n = JSON.stringify(e.slotKey);
 			return e.kind === "page" ? `      if (newMods[${t}] && refs.pages[${n}] !== undefined) { refs.pages[${n}] = newMods[${t}]; changed = true }` : `      if (newMods[${t}]?.default) { refs.${e.kind === "layout" ? "layouts" : e.kind === "error" ? "errors" : e.kind === "pending" ? "pendings" : "notFounds"}[${n}] = newMods[${t}].default;${e.kind === "layout" ? ` refs.layoutLoaders[${n}] = newMods[${t}].loader;` : ""} changed = true }`;
-		}), x = t.locales ?? [], S = x.length > 0 && x.every((t) => L(P(e, "src", "locales", `${t}.ts`)) || L(P(e, "src", "locales", `${t}.tsx`))), C = S, w = t.defaultLocale ?? x[0] ?? "en", T = t.router?.viewTransitions === !0 ? " viewTransitions" : "";
-		if (x.length > 0 && !S && Q.info(`i18n: locales [${x.join(", ")}] declared with no src/locales/<code>.ts — using them for <html lang> and the resolved locale only. Add the catalogs to get <I18nProvider> wired, or keep your own i18n stack.`), x.length > 0 && !x.includes(w)) throw Error(`[voltro dev] app.config.ts: defaultLocale '${w}' must be one of locales [${x.join(", ")}]`);
-		let E = C ? [
+		}), S = t.locales ?? [], C = S.length > 0 && S.every((t) => L(P(e, "src", "locales", `${t}.ts`)) || L(P(e, "src", "locales", `${t}.tsx`))), w = C, T = t.defaultLocale ?? S[0] ?? "en", E = t.router?.viewTransitions === !0 ? " viewTransitions" : "";
+		if (S.length > 0 && !C && Q.info(`i18n: locales [${S.join(", ")}] declared with no src/locales/<code>.ts — using them for <html lang> and the resolved locale only. Add the catalogs to get <I18nProvider> wired, or keep your own i18n stack.`), S.length > 0 && !S.includes(T)) throw Error(`[voltro dev] app.config.ts: defaultLocale '${T}' must be one of locales [${S.join(", ")}]`);
+		let D = w ? [
 			"import { I18nProvider } from '@voltro/i18n'",
 			"import { resolveLocale } from '@voltro/i18n/server'",
 			"import { useServerRequest } from '@voltro/web'",
-			...x.map((e) => `import i18nCatalog_${e} from '../src/locales/${e}'`)
+			...S.map((e) => `import i18nCatalog_${e} from '../src/locales/${e}'`)
 		] : [];
-		y = [
+		ee = [
 			"// GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot.",
 			"// Routes + per-page chain + not-found scopes assembled from src/pages/.",
 			"//",
@@ -3076,16 +3084,16 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			...s,
 			"  },",
 			"  layoutLoaders: {",
-			...l,
+			...u,
 			"  },",
 			"  errors: {",
-			...u,
+			...d,
 			"  },",
 			"  pendings: {",
-			...d,
+			...f,
 			"  },",
 			"  notFounds: {",
-			...f,
+			...p,
 			"  },",
 			"  pages: {},",
 			"}",
@@ -3150,17 +3158,17 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			"if (import.meta.hot) {",
 			"  import.meta.hot.accept(",
 			"    [",
-			...h,
+			...g,
 			"    ],",
 			"    (newMods: Array<Record<string, unknown> | undefined>) => {",
 			"      let changed = false",
-			...b,
+			...x,
 			"      if (changed) bump()",
 			"    },",
 			"  )",
 			"}",
 			""
-		].join("\n"), v = [
+		].join("\n"), y = [
 			"// GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot.",
 			"// The app's root component. It exports `App` and NOTHING ELSE: react-refresh",
 			"// only accepts a module whose every export is a component, and a module it",
@@ -3171,16 +3179,16 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			"",
 			"import { useMemo, useSyncExternalStore } from 'react'",
 			"import { Router } from '@voltro/web'",
-			...E,
+			...D,
 			"import { subscribe, getVersion, buildRoutes, buildNotFounds } from './routeTable'",
 			"",
-			...C ? [
-				`// i18n auto-wiring (config.locales = [${x.map((e) => JSON.stringify(e)).join(", ")}]).`,
+			...w ? [
+				`// i18n auto-wiring (config.locales = [${S.map((e) => JSON.stringify(e)).join(", ")}]).`,
 				"const I18N_CATALOGS: Record<string, import('@voltro/i18n').MessageCatalog> = {",
-				...x.map((e) => `  ${JSON.stringify(e)}: i18nCatalog_${e},`),
+				...S.map((e) => `  ${JSON.stringify(e)}: i18nCatalog_${e},`),
 				"}",
-				`const I18N_SUPPORTED: ReadonlyArray<string> = [${x.map((e) => JSON.stringify(e)).join(", ")}]`,
-				`const I18N_DEFAULT = ${JSON.stringify(w)}`,
+				`const I18N_SUPPORTED: ReadonlyArray<string> = [${S.map((e) => JSON.stringify(e)).join(", ")}]`,
+				`const I18N_DEFAULT = ${JSON.stringify(T)}`,
 				"",
 				"// The zone + clock the SERVER decided for this document, read back off",
 				"// <html>. Same contract as <html lang> below and for the same reason:",
@@ -3254,7 +3262,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			"  const v = useSyncExternalStore(subscribe, getVersion, getVersion)",
 			"  const routes = useMemo(() => buildRoutes(), [v])",
 			"  const notFounds = useMemo(() => buildNotFounds(), [v])",
-			...C ? [
+			...w ? [
 				"  const ssr = useServerRequest()",
 				"  const locale = pickI18nLocale(ssr)",
 				"  const messages = I18N_CATALOGS[locale] ?? I18N_CATALOGS[I18N_DEFAULT]!",
@@ -3269,26 +3277,26 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 				"      defaultLocale={I18N_DEFAULT}",
 				"      {...published}",
 				"    >",
-				`      <Router routes={routes} notFounds={notFounds}${T} />`,
+				`      <Router routes={routes} notFounds={notFounds}${E} />`,
 				"    </I18nProvider>",
 				"  )"
-			] : [`  return <Router routes={routes} notFounds={notFounds}${T} />`],
+			] : [`  return <Router routes={routes} notFounds={notFounds}${E} />`],
 			"}",
 			""
-		].join("\n"), ee = [
+		].join("\n"), b = [
 			"// GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot.",
 			"// Entry: imports the generated App component and calls mount() with the",
 			"// resolved apis map. Side-effect only — no local component definitions —",
 			"// so downstream invalidations (user page edits) terminate at app.tsx.",
 			"",
-			...Po(t),
+			...Fo(t),
 			"import { mount } from '@voltro/web'",
-			...g,
+			..._,
 			"import { App } from './app'",
 			"import { preloadCurrentRoute } from './routeTable'",
-			...Mo(t),
+			...Mo(t, l),
 			...Oo(t, c),
-			...No(t),
+			...Po(t, l),
 			"",
 			"// Preload the current route's page chunk BEFORE hydration so the first",
 			"// client render matches the SSG/SSR-prerendered HTML. Without it, a lazy",
@@ -3303,54 +3311,54 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			"",
 			"mount(App, {",
 			"  apis: {",
-			..._,
+			...v,
 			"  },",
 			...jo(t, c),
 			...Ao(t),
 			"})",
 			"",
-			qo
+			Jo
 		].join("\n");
-	} else v = "", y = "", ee = [
+	} else y = "", ee = "", b = [
 		"// GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot.",
 		"// The user's root component lives at ../src/App.tsx; this file imports it",
 		"// and calls mount(). Side-effect only, no component definitions, so the",
 		"// user's component file remains the Fast Refresh boundary.",
 		"",
-		...Po(t),
+		...Fo(t),
 		"import { mount } from '@voltro/web'",
-		...g,
+		..._,
 		"import App from '../src/App'",
-		...Mo(t),
+		...Mo(t, l),
 		...Oo(t, c),
-		...No(t),
+		...Po(t, l),
 		"",
 		"mount(App, {",
 		"  apis: {",
-		..._,
+		...v,
 		"  },",
 		...jo(t, c),
 		...Ao(t),
 		"})",
 		"",
-		qo
+		Jo
 	].join("\n");
-	let b = P(e, ".framework");
-	await z.mkdir(b, { recursive: !0 }), t.env ? await ht(b, r) : await z.rm(P(b, "env.public.ts"), { force: !0 }), await z.writeFile(P(b, "index.html"), d, "utf8"), await z.writeFile(P(b, "main.tsx"), ee, "utf8"), v ? (await z.writeFile(P(b, "app.tsx"), v, "utf8"), await z.writeFile(P(b, "routeTable.ts"), y, "utf8")) : (await z.rm(P(b, "app.tsx"), { force: !0 }), await z.rm(P(b, "routeTable.ts"), { force: !0 }));
-	let S = P(e, ".gitignore"), C = "";
+	let S = P(e, ".framework");
+	await z.mkdir(S, { recursive: !0 }), t.env ? await ht(S, r) : await z.rm(P(S, "env.public.ts"), { force: !0 }), await z.writeFile(P(S, "index.html"), f, "utf8"), await z.writeFile(P(S, "main.tsx"), b, "utf8"), y ? (await z.writeFile(P(S, "app.tsx"), y, "utf8"), await z.writeFile(P(S, "routeTable.ts"), ee, "utf8")) : (await z.rm(P(S, "app.tsx"), { force: !0 }), await z.rm(P(S, "routeTable.ts"), { force: !0 }));
+	let C = P(e, ".gitignore"), w = "";
 	try {
-		C = await z.readFile(S, "utf8");
+		w = await z.readFile(C, "utf8");
 	} catch {}
-	let w = ["/.framework/"], T = new Set(C.split("\n").map((e) => e.trim())), E = w.filter((e) => !T.has(e));
-	if (E.length > 0) {
-		let e = C === "" || C.endsWith("\n") ? "" : "\n";
+	let T = ["/.framework/"], E = new Set(w.split("\n").map((e) => e.trim())), D = T.filter((e) => !E.has(e));
+	if (D.length > 0) {
+		let e = w === "" || w.endsWith("\n") ? "" : "\n";
 		try {
-			await z.appendFile(S, `${e}${E.join("\n")}\n`, "utf8");
+			await z.appendFile(C, `${e}${D.join("\n")}\n`, "utf8");
 		} catch (e) {
-			Q.warn(`could not add ${E.join(", ")} to ${S} — add it by hand so the generated directory stays out of git. The build is unaffected.`, { reason: e?.message ?? String(e) });
+			Q.warn(`could not add ${D.join(", ")} to ${C} — add it by hand so the generated directory stays out of git. The build is unaffected.`, { reason: e?.message ?? String(e) });
 		}
 	}
-}, us = async (e, t) => {
+}, ds = async (e, t) => {
 	try {
 		let n = N(e), r = P(n, "project.json");
 		if (!L(r)) return;
@@ -3363,26 +3371,26 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			projectJson: r
 		});
 	} catch {}
-}, ds = (e) => P(e, ".framework", "dist", "server", "appConfig.js"), fs = async (e, t = {}) => {
-	let n = ds(e), r = t.preferSource !== !0 && L(n) ? n : P(e, "app.config.ts");
+}, fs = (e) => P(e, ".framework", "dist", "server", "appConfig.js"), ps = async (e, t = {}) => {
+	let n = fs(e), r = t.preferSource !== !0 && L(n) ? n : P(e, "app.config.ts");
 	try {
 		let e = (await import(G(r).href)).default;
 		return typeof e == "object" && e && "type" in e && e.type === "web" ? e : null;
 	} catch {
 		return null;
 	}
-}, ps = (e) => {
+}, ms = (e) => {
 	let t = e.restRoutes;
 	if (t !== void 0 && t.length !== 0) return `app.config.ts declares ${t.length} restRoute(s) on a type:'web' app — REST routes mount on the API process and were silently ignored here, so a health probe hitting one gets the SPA shell (200) and a POST gets 404.\n  Move them to the API app's app.config.ts (they mount under the api origin), and call them there;\n  for same-origin paths in front of the web app, terminate them at your ingress/proxy instead.`;
-}, ms = async (t) => {
-	let u = await fs(t, { preferSource: !0 });
+}, hs = async (t) => {
+	let u = await ps(t, { preferSource: !0 });
 	if (!u) return {
 		ran: !1,
 		exitCode: 0
 	};
 	let d = xo(u.health, () => !0);
 	{
-		let e = ps(u);
+		let e = ms(u);
 		if (e !== void 0) return Q.error(`voltro dev (web): refusing to boot — ${e}`), {
 			ran: !0,
 			exitCode: 1
@@ -3391,7 +3399,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	bi();
 	let f = at();
 	Qr(f), Q.info("booting voltro dev (web)", { app: u.name ?? "(unnamed)" }), Vt(t, Q);
-	let p = await ns(t, u);
+	let p = await rs(t, u);
 	for (let e of p) Q.info("api wired", {
 		name: e.name,
 		pkg: e.pkg,
@@ -3410,7 +3418,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		log: Q,
 		generateTypes: !0
 	}), h = m.publicValues;
-	await ls(t, u, p, h), Q.debug("generated framework entry files", { files: [
+	await us(t, u, p, h), Q.debug("generated framework entry files", { files: [
 		"index.html",
 		".framework/main.tsx",
 		...u.env ? [".framework/env.public.ts"] : []
@@ -3431,8 +3439,8 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		pid: process.pid,
 		status: "booting",
 		logFile: w.path
-	}).catch(() => {}), await us(t, x);
-	let { pages: T, dirs: E } = await Uo(P(t, "src", "pages")), D = null, te = u.fonts !== void 0 && u.fonts.length > 0 ? yr({
+	}).catch(() => {}), await ds(t, x);
+	let { pages: T, dirs: E } = await Wo(P(t, "src", "pages")), D = null, te = u.fonts !== void 0 && u.fonts.length > 0 ? yr({
 		root: t,
 		fonts: u.fonts,
 		cache: ee(),
@@ -3446,7 +3454,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		}
 	}) : null, k = {
 		dirs: E,
-		ssrRoutes: Yo(T)
+		ssrRoutes: Xo(T)
 	}, ne = E.map((e) => ({
 		dir: e.dir,
 		hasLayout: e.hasLayout,
@@ -3481,12 +3489,12 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	}, B = P(t, "src", "pages"), V = (e) => e.endsWith(".tsx") && (e === B || e.startsWith(B + "/")), H = (e) => e === B || e.startsWith(B + "/"), fe = async (e) => {
 		try {
 			let n = Date.now();
-			await ls(t, u, p, h);
-			let { pages: r, dirs: i } = await Uo(B);
+			await us(t, u, p, h);
+			let { pages: r, dirs: i } = await Wo(B);
 			await kr({
 				appRoot: t,
 				pages: r
-			}), k.dirs = i, k.ssrRoutes = Yo(r), Q.info("page tree regenerated", {
+			}), k.dirs = i, k.ssrRoutes = Xo(r), Q.info("page tree regenerated", {
 				reason: e,
 				ms: Date.now() - n,
 				routes: k.ssrRoutes.length
@@ -3586,7 +3594,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 				}
 				try {
 					let r = Date.now();
-					await ls(t, e, await ns(t, e)), me = e, n.ws && n.ws.send({
+					await us(t, e, await rs(t, e)), me = e, n.ws && n.ws.send({
 						type: "full-reload",
 						path: "*"
 					}), Q.info("app.config.ts soft-regen", {
@@ -3625,7 +3633,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		async configureServer(e) {
 			let n = [];
 			for (let r of p) {
-				let i = await Zo(t, r.pkg);
+				let i = await Qo(t, r.pkg);
 				if (i) {
 					n.push(i);
 					try {
@@ -4035,12 +4043,12 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 				} catch {}
 			})(), o), c = mn({
 				apiName: p[0]?.name,
-				apiOrigin: os(p[0], { allowDevProxy: !0 }),
+				apiOrigin: ss(p[0], { allowDevProxy: !0 }),
 				loadDescriptors: async () => {
 					let e = p[0];
 					if (e !== void 0) return (await n(`${e.pkg}/rpcGroup`)).appDescriptors;
 				},
-				rpcQuery: (e, t) => ss(os(p[0], { allowDevProxy: !0 }), e, {
+				rpcQuery: (e, t) => cs(ss(p[0], { allowDevProxy: !0 }), e, {
 					apiName: p[0]?.name,
 					headers: t
 				}),
@@ -4094,7 +4102,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 					for (let e of n.setCookies) o.appendHeader("set-cookie", Ha(e));
 				};
 				if (/\.[a-z0-9]+$/i.test(d)) return await h(), c();
-				let g = Xo(d, k.ssrRoutes), _ = !1;
+				let g = Zo(d, k.ssrRoutes), _ = !1;
 				if (!g) {
 					let e = Eo(k.dirs, d);
 					if (e === void 0) return await h(), c();
@@ -4130,7 +4138,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 					}
 				}, C = !1;
 				try {
-					let w = await x("loadPage", async () => await n(P(t, "src", "pages", g.route.file))), T = _ ? "ssr" : y(w, P("src", "pages", g.route.file)), E = Wo(k.dirs, g.route.dirChain), D = T === "spa" && E.some((e) => e.hasLayout), O = w.interactive ?? "full";
+					let w = await x("loadPage", async () => await n(P(t, "src", "pages", g.route.file))), T = _ ? "ssr" : y(w, P("src", "pages", g.route.file)), E = Go(k.dirs, g.route.dirChain), D = T === "spa" && E.some((e) => e.hasLayout), O = w.interactive ?? "full";
 					if (T !== "ssr" && T !== "isr" && !D && O !== "islands") return await h(), c();
 					let ne = {};
 					for (let [e, t] of Object.entries(r.headers ?? {})) typeof t == "string" ? ne[e] = t : Array.isArray(t) && (ne[e] = t.join(", "));
@@ -4147,14 +4155,14 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 					for (let e of A.setCookies) o.appendHeader("set-cookie", Ha(e));
 					for (let [e, t] of Object.entries(A.responseHeaders)) o.setHeader(e, t);
 					if (T === "isr" && A.cspNonce !== void 0) throw Error(`page '${g.route.pattern}' is renderMode 'isr' while middleware.ts mints a cspNonce — an isr render is CACHED and a cached nonce is a lie the browser enforces. Use renderMode 'ssr' for nonce'd pages, or a hash-based CSP for isr.`);
-					let j = T === "isr" ? Ya(A.headers) : A.headers, M = T === "isr" && w.ppr === !0, re = M ? go(j, g.route.pattern) : j, ie = ss(os(p[0], { allowDevProxy: !0 }), j.cookie, {
+					let j = T === "isr" ? Ya(A.headers) : A.headers, M = T === "isr" && w.ppr === !0, re = M ? go(j, g.route.pattern) : j, ie = cs(ss(p[0], { allowDevProxy: !0 }), j.cookie, {
 						apiName: p[0]?.name,
 						headers: j
 					}), ae = new AbortController(), oe = () => ae.abort();
 					o.once("close", oe);
 					let se = null, ce = [], le = {};
 					try {
-						(await n("@voltro/web/ssr")).beginStoreSeeds(), await s(), {chain: ce, segmentLoaderData: le} = await x("loadChain", () => Go({
+						(await n("@voltro/web/ssr")).beginStoreSeeds(), await s(), {chain: ce, segmentLoaderData: le} = await x("loadChain", () => Ko({
 							entries: E,
 							loadLayout: (e) => n(P(t, "src", "pages", e.dir, "layout.tsx")),
 							loadError: (e) => n(P(t, "src", "pages", e.dir, "error.tsx")),
@@ -4255,7 +4263,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 						for (let t of n) await S(t, e, B);
 					});
 					let V = (O === "islands" ? await x("islandsEntry", async () => {
-						let e = cs(p, "../../app.config"), n = (await jn({
+						let e = ls(p, "../../app.config"), n = (await jn({
 							webRoot: t,
 							pages: [{
 								pattern: g.route.pattern,
@@ -4361,7 +4369,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 							let a = m === void 0 ? i : on(i, m);
 							if (M && m === void 0 && typeof w.loader == "function") {
 								o.setHeader("x-voltro-ppr", "shell+holes"), oo(g.route.pattern), o.write(a);
-								let e = ss(os(p[0], { allowDevProxy: !0 }), A.headers.cookie, {
+								let e = cs(ss(p[0], { allowDevProxy: !0 }), A.headers.cookie, {
 									apiName: p[0]?.name,
 									headers: A.headers
 								}), t = new AbortController();
@@ -4421,7 +4429,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	}, Pe = Date.now(), Fe = j.version ?? "?", Ie = await Do(), q = P(t, "node_modules", "@voltro", "ui-shadcn"), J = L(P(q, "package.json")) ? q : null, Le = [], Re = await (async () => {
 		let e = [];
 		for (let n of p) {
-			let r = await Zo(t, n.pkg);
+			let r = await Qo(t, n.pkg);
 			r && e.push(r);
 		}
 		let n = await Da(e);
@@ -4517,7 +4525,7 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 			host: !0,
 			allowedHosts: u.allowedHosts === !0 || [...u.allowedHosts ?? []],
 			proxy: Se,
-			fs: { allow: [t, ...Fo(t)] }
+			fs: { allow: [t, ...Io(t)] }
 		},
 		appType: "spa",
 		cacheDir: P(N, ".vite"),
@@ -4572,8 +4580,8 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 		url: `http://localhost:${x}`,
 		bootMs: Date.now() - Pe
 	}), new Promise(() => {});
-}, hs = async (e) => {
-	let t = await fs(e);
+}, gs = async (e) => {
+	let t = await ps(e);
 	return t ? (Q.child("serve").error("`voltro serve` is the production server for an API app — this is a WEB app.\n\n  production   voltro start .\n  development  voltro dev .\n\nBoth read the artefacts `voltro build` produces. `serve` cannot: it has no\nSSR bundle to render from, and building a second time here would overwrite\nthe one `voltro build` wrote.", {
 		app: t.name ?? "(unnamed)",
 		root: e
@@ -4586,4 +4594,4 @@ The wrapper is what carries \`match\`, and what lets \`voltro doctor\` report wh
 	};
 };
 //#endregion
-export { Qi as $, _o as A, On as At, Ga as B, Bt, ps as C, Gn as Ct, xo as D, En as Dt, So as E, jn as Et, La as F, $t as Ft, ma as G, St as Gt, Ha as H, kt as Ht, Ua as I, Qt as It, ya as J, pt as Jt, pa as K, yt as Kt, Wa as L, Lt, oo as M, un as Mt, Xa as N, mn as Nt, vo as O, kn as Ot, Ya as P, tn as Pt, Zi as Q, st as Qt, Ia as R, zt as Rt, Uo as S, nr as St, Co as T, Rn as Tt, Sa as U, wt as Ut, Fa as V, Vt, _a as W, xt as Wt, Yi as X, ot as Xt, qi as Y, lt as Yt, Xi as Z, at as Zt, es as _, yr as _t, Eo as a, _i as at, hs as b, mr as bt, Go as c, oi as ct, Vo as d, Kr as dt, $i as et, $ as f, qr as ft, $o as g, vr as gt, ns as h, kr as ht, ts as i, Fi as it, go as j, We as jt, yo as k, Tn as kt, ds as l, Qr as lt, fs as m, Pr as mt, os as n, Pi as nt, cs as o, fi as ot, Ho as p, Fr as pt, ha as q, mt as qt, ko as r, Gi as rt, ss as s, ci as st, Ro as t, Ii as tt, Wo as u, Wr as ut, is as v, _r as vt, ls as w, Vn as wt, Lo as x, ar as xt, ms as y, pr as yt, Ra as z, Rt as zt };
+export { Yi as $, ot as $t, xo as A, En as At, Wa as B, Lt as Bt, gs as C, mr as Ct, us as D, Vn as Dt, ms as E, Gn as Et, oo as F, un as Ft, Ha as G, kt as Gt, Ra as H, Rt as Ht, Xa as I, mn as It, ma as J, St as Jt, Sa as K, wt as Kt, Ya as L, tn as Lt, yo as M, Tn as Mt, _o as N, On as Nt, Co as O, Rn as Ot, go as P, We as Pt, qi as Q, lt as Qt, La as R, $t as Rt, hs as S, pr as St, Wo as T, nr as Tt, Ga as U, Bt as Ut, Ia as V, zt as Vt, Fa as W, Vt as Wt, ha as X, mt as Xt, pa as Y, yt as Yt, ya as Z, pt as Zt, ts as _, Pr as _t, Eo as a, Pi as at, Po as b, yr as bt, Ko as c, _i as ct, Ho as d, oi as dt, at as en, Xi as et, $ as f, Qr as ft, es as g, Fr as gt, rs as h, qr as ht, ns as i, Ii as it, vo as j, kn as jt, So as k, jn as kt, fs as l, fi as lt, ps as m, Kr as mt, ss as n, Qi as nt, ls as o, Gi as ot, Uo as p, Wr as pt, _a as q, xt as qt, ko as r, $i as rt, cs as s, Fi as st, zo as t, st as tn, Zi as tt, Go as u, ci as ut, No as v, kr as vt, Ro as w, ar as wt, as as x, _r as xt, Mo as y, vr as yt, Ua as z, Qt as zt };