@voltro/cli 0.30.2 → 0.31.0

package/dist/{start-CTnNvKlk.js → start-CI2QdKy9.js}

@@ -1,4 +1,4 @@
-import { $ as e, C as t, D as n, E as r, G as i, J as a, K as o, L as s, P as c, Q as l, S as u, V as d, W as ee, _ as f, _t as p, a as m, at as h, b as g, c as _, f as v, g as y, gt as b, h as x, ht as S, i as C, it as te, k as w, m as T, o as ne, ot as re, p as ie, pt as E, q as D, r as ae, rt as O, s as k, st as oe, t as A, ut as j, v as M, vt as N, x as P, y as F } from "./inspectMetrics-BM1vrsga.js";
+import { $ as e, C as t, Ct as n, D as r, E as i, G as a, J as o, K as s, L as c, P as l, Q as u, S as d, St as ee, Tt as f, V as p, W as m, _ as h, _t as g, a as _, b as v, bt as y, c as b, dt as te, f as x, ft as S, g as C, h as w, i as T, k as E, m as D, mt as O, o as ne, p as re, pt as k, q as ie, r as A, s as j, t as M, ut as N, v as ae, wt as oe, x as P, y as F } from "./inspectMetrics-BeEAnjqw.js";
 import { A as se, E as I, O as ce, a as le, k as L, m as ue } from "./inspect-BUUjt773.js";
 import { t as de } from "./bootTiming-BdyP9nYw.js";
 import { dirname as fe, extname as pe, join as R, resolve as z } from "node:path";
@@ -205,11 +205,11 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 	}
 	return null;
 }, De = async (e) => {
-	let { provider: n, route: r, params: i, pathname: a, dirs: o, shellTemplate: c, requestHeaders: l, requestUrl: d = "", apiOrigin: ee, apiName: p } = e, { search: h } = t(d), _ = C(ee, l.cookie, { apiName: p }), v = await n.getPage(r.pattern, r.file), b = s(v, r.file), S = b === "spa" && ne(o, r.dirChain).some((e) => e.hasLayout);
-	if (b !== "ssr" && b !== "isr" && !S) return null;
-	let te = ne(o, r.dirChain), w = {}, re = null, ie, E = new AbortController();
+	let { provider: n, route: r, params: i, pathname: a, dirs: o, shellTemplate: s, requestHeaders: l, requestUrl: u = "", apiOrigin: ee, apiName: f } = e, { search: p } = t(u), m = T(ee, l.cookie, { apiName: f }), g = await n.getPage(r.pattern, r.file), y = c(g, r.file), b = y === "spa" && ne(o, r.dirChain).some((e) => e.hasLayout);
+	if (y !== "ssr" && y !== "isr" && !b) return null;
+	let te = ne(o, r.dirChain), x = {}, S = null, E, re = new AbortController();
 	try {
-		(await n.getHelpers()).beginStoreSeeds(), {chain: ie, segmentLoaderData: w} = await m({
+		(await n.getHelpers()).beginStoreSeeds(), {chain: E, segmentLoaderData: x} = await _({
 			entries: te,
 			loadLayout: (e) => n.getLayout(e.dir),
 			loadError: (e) => n.getError(e.dir),
@@ -217,18 +217,18 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			ctx: {
 				params: i,
 				pathname: a,
-				search: h,
-				signal: E.signal,
+				search: p,
+				signal: re.signal,
 				headers: l,
-				query: _
+				query: m
 			}
-		}), typeof v.loader == "function" && !S && (re = await v.loader({
+		}), typeof g.loader == "function" && !b && (S = await g.loader({
 			params: i,
 			pathname: a,
-			search: h,
-			signal: E.signal,
+			search: p,
+			signal: re.signal,
 			headers: l,
-			query: _
+			query: m
 		}));
 	} catch (e) {
 		if (Y(e)) return {
@@ -239,62 +239,62 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		if (X(e)) return { control: "not-found" };
 		throw e;
 	}
-	let D = await n.getHelpers();
-	S || await T({
-		pageMod: v,
+	let k = await n.getHelpers();
+	b || await D({
+		pageMod: g,
 		params: i,
-		query: _,
-		apiName: p,
-		seed: D.seedPreloadedSubscription,
+		query: m,
+		apiName: f,
+		seed: k.seedPreloadedSubscription,
 		onError: ({ tag: e, apiName: t }, n) => J.warn("preload seed failed", {
 			tag: e,
 			apiName: t,
 			pathname: a
 		}, n)
 	});
-	let ae = {
+	let ie = {
 		pattern: r.pattern,
-		Component: v.default,
-		meta: v.meta,
-		loader: v.loader,
-		ErrorBoundary: v.ErrorBoundary,
-		Pending: v.Pending,
-		renderMode: b,
-		chain: ie
-	}, O = {
-		cookies: D.parseCookieHeader(l.cookie),
+		Component: g.default,
+		meta: g.meta,
+		loader: g.loader,
+		ErrorBoundary: g.ErrorBoundary,
+		Pending: g.Pending,
+		renderMode: y,
+		chain: E
+	}, A = {
+		cookies: k.parseCookieHeader(l.cookie),
 		headers: l,
-		url: d
-	}, k = D.i18n?.resolve(l.cookie, l["accept-language"]), A = v.interactive ?? "full";
-	if (S) {
-		let e = g({
-			helpers: D,
+		url: u
+	}, j = k.i18n?.resolve(l.cookie, l["accept-language"]), M = g.interactive ?? "full";
+	if (b) {
+		let e = v({
+			helpers: k,
 			page: r.pattern,
-			interactive: A,
+			interactive: M,
 			delivery: "stream",
 			renderInput: {
-				descriptor: ae,
+				descriptor: ie,
 				params: i,
 				pathname: a,
-				search: h,
-				segmentLoaderData: w,
-				requestContext: O,
-				...k ? {
-					outerWrap: k.outerWrap,
-					locale: k.locale
+				search: p,
+				segmentLoaderData: x,
+				requestContext: A,
+				...j ? {
+					outerWrap: j.outerWrap,
+					locale: j.locale
 				} : {}
 			}
-		}), t = k?.locale ?? O.cookies["voltro:locale"] ?? "en", n = (t) => u({
-			helpers: D,
+		}), t = j?.locale ?? A.cookies["voltro:locale"] ?? "en", n = (t) => d({
+			helpers: k,
 			prepared: e,
 			meta: t,
-			interactive: A
+			interactive: M
 		});
 		if (e.hasDeferred) {
-			let r = y({ shell: c });
+			let r = C({ shell: s });
 			return {
 				renderMode: "spa",
-				stream: (i) => f({
+				stream: (i) => h({
 					res: i,
 					shell: r,
 					htmlLang: t,
@@ -303,7 +303,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 						"x-voltro-rendered-by": "spa"
 					},
 					headInjection: n,
-					render: (t) => D.renderPageToStream({
+					render: (t) => k.renderPageToStream({
 						...e.renderInput,
 						...t
 					}),
@@ -314,47 +314,47 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			};
 		}
 		let o = P({
-			helpers: D,
+			helpers: k,
 			prepared: e
 		});
 		return {
-			html: x(c.replace("<div id=\"root\"></div>", `<div id="root">${o.body}</div>`), n(o.meta)).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${t}"`),
+			html: w(s.replace("<div id=\"root\"></div>", `<div id="root">${o.body}</div>`), n(o.meta)).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${t}"`),
 			renderMode: "spa",
 			revalidateMs: null
 		};
 	}
-	let j = F({
-		helpers: D,
+	let N = F({
+		helpers: k,
 		page: r.pattern,
 		pathname: a,
-		renderMode: b,
-		interactive: A,
-		loaderData: re,
-		segmentLoaderData: w,
-		pageLoaderRan: typeof v.loader == "function"
-	}), M = {
-		descriptor: ae,
+		renderMode: y,
+		interactive: M,
+		loaderData: S,
+		segmentLoaderData: x,
+		pageLoaderRan: typeof g.loader == "function"
+	}), ae = {
+		descriptor: ie,
 		params: i,
 		pathname: a,
-		search: h,
-		loaderData: j.loaderData,
-		segmentLoaderData: j.segmentLoaderData,
-		requestContext: O,
-		...k ? {
-			outerWrap: k.outerWrap,
-			locale: k.locale
+		search: p,
+		loaderData: N.loaderData,
+		segmentLoaderData: N.segmentLoaderData,
+		requestContext: A,
+		...j ? {
+			outerWrap: j.outerWrap,
+			locale: j.locale
 		} : {}
-	}, N = (e) => [
-		D.renderMetaToHtml(e),
-		`<meta name="voltro-interactive" content="${A}" />`,
-		...j.hasDeferred ? [D.renderDeferredRegistryScript()] : [],
-		D.renderRouterStateScript(j.stateInput)
+	}, oe = (e) => [
+		k.renderMetaToHtml(e),
+		`<meta name="voltro-interactive" content="${M}" />`,
+		...N.hasDeferred ? [k.renderDeferredRegistryScript()] : [],
+		k.renderRouterStateScript(N.stateInput)
 	].filter((e) => e.length > 0).join("\n    ");
-	if (b === "ssr" && A === "full" && e.buffered !== !0) {
-		let e = k?.locale ?? O.cookies["voltro:locale"] ?? "en", t = y({ shell: c });
+	if (y === "ssr" && M === "full" && e.buffered !== !0) {
+		let e = j?.locale ?? A.cookies["voltro:locale"] ?? "en", t = C({ shell: s });
 		return {
 			renderMode: "ssr",
-			stream: (n) => f({
+			stream: (n) => h({
 				res: n,
 				shell: t,
 				htmlLang: e,
@@ -362,9 +362,9 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 					"content-type": "text/html; charset=utf-8",
 					"x-voltro-rendered-by": "ssr"
 				},
-				headInjection: N,
-				render: (e) => D.renderPageToStream({
-					...M,
+				headInjection: oe,
+				render: (e) => k.renderPageToStream({
+					...ae,
 					...e
 				}),
 				onShellError: (e) => {
@@ -373,12 +373,12 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			})
 		};
 	}
-	let { html: se, meta: I } = D.renderPageToHtml(M), ce = N(I), le = k?.locale ?? O.cookies["voltro:locale"] ?? "en", L = x(c.replace("<div id=\"root\"></div>", `<div id="root">${se}</div>`), ce).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${le}"`);
-	A === "none" && (L = we(L));
-	let ue = b === "isr" ? oe(v.revalidate) : null;
+	let { html: se, meta: I } = k.renderPageToHtml(ae), ce = oe(I), le = j?.locale ?? A.cookies["voltro:locale"] ?? "en", L = w(s.replace("<div id=\"root\"></div>", `<div id="root">${se}</div>`), ce).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${le}"`);
+	M === "none" && (L = we(L));
+	let ue = y === "isr" ? O(g.revalidate) : null;
 	return {
 		html: L,
-		renderMode: b,
+		renderMode: y,
 		revalidateMs: ue
 	};
 }, $ = (e) => e === "" ? "/" : e, Oe = async (e) => {
@@ -412,19 +412,24 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		async close() {}
 	};
 }, ke = async (t, n) => {
-	let r = await E("vite", () => import("vite")), i = (await import("@vitejs/plugin-react")).default, a = (await import("@tailwindcss/vite")).default, o = await r.createServer({
+	let r = await y("vite", () => import("vite")), i = (await import("@vitejs/plugin-react")).default, a = (await import("@tailwindcss/vite")).default, o = await r.createServer({
 		root: n,
 		envPrefix: "__VOLTRO_VITE_ENV_DISABLED__",
 		plugins: [i(), a()],
-		resolve: { dedupe: ["react", "react-dom"] },
-		ssr: { noExternal: ["react-intl"] },
+		resolve: { dedupe: [
+			"react",
+			"react-dom",
+			"react-intl",
+			"@voltro/i18n"
+		] },
+		ssr: { noExternal: ["react-intl", "@voltro/i18n"] },
 		server: {
 			middlewareMode: !0,
 			hmr: !1
 		},
 		appType: "custom",
 		logLevel: "warn"
-	}), s = R(t, "src", "pages"), c = (e) => e === "" ? s : R(s, e), u = l({
+	}), s = R(t, "src", "pages"), c = (e) => e === "" ? s : R(s, e), l = u({
 		limit: e(),
 		onColdStart: (e) => J.debug("ssr cold-compile start", { id: e }),
 		onColdEnd: (e, { durationMs: t, failed: n }) => J.debug(`ssr cold-compile ${n ? "FAILED" : "end"} ${t}ms`, {
@@ -432,7 +437,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			ms: t,
 			...n ? { failed: !0 } : {}
 		})
-	}), d = (e) => u.load(e, async () => await o.ssrLoadModule(e));
+	}), d = (e) => l.load(e, async () => await o.ssrLoadModule(e));
 	return {
 		kind: "middleware",
 		async getPage(e, t) {
@@ -455,60 +460,60 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		}
 	};
 }, Ae = async (e) => {
-	let t = de(), s = await k(e);
-	if (!s) return {
+	let t = de(), c = await j(e);
+	if (!c) return {
 		ran: !1,
 		exitCode: 0
 	};
-	if (s.type !== "web") return J.error("only web apps are supported by `voltro start`"), {
+	if (c.type !== "web") return J.error("only web apps are supported by `voltro start`"), {
 		ran: !0,
 		exitCode: 1
 	};
-	let { resolved: l } = await j({
-		rawEnv: s.env,
+	let { resolved: u } = await g({
+		rawEnv: c.env,
 		appType: "web",
 		root: e,
 		log: J,
 		generateTypes: !1
-	}), u = l.publicValues;
+	}), d = u.publicValues;
 	t.mark("config");
-	let f = D();
-	ee(f), J.info("booting voltro start", { app: s.name ?? "(unnamed)" });
-	let m = (() => {
+	let h = ie();
+	m(h), J.info("booting voltro start", { app: c.name ?? "(unnamed)" });
+	let _ = (() => {
 		if (process.env.VOLTRO_IS_DASHBOARD === "1" && process.env.VOLTRO_DASHBOARD_PORT) return Number(process.env.VOLTRO_DASHBOARD_PORT);
 		if (process.env.PORT) {
 			let e = Number(process.env.PORT);
 			if (Number.isFinite(e) && e > 0) return e;
 		}
-		return s.port ?? 5173;
-	})(), g = R(e, ".framework"), y = R(g, "dist"), x = R(y, "index.html");
-	if (!await Z(x)) return J.error("no built dist found — run `voltro build` first", { distDir: y }), {
+		return c.port ?? 5173;
+	})(), v = R(e, ".framework"), y = R(v, "dist"), C = R(y, "index.html");
+	if (!await Z(C)) return J.error("no built dist found — run `voltro build` first", { distDir: y }), {
 		ran: !0,
 		exitCode: 1
 	};
-	let C = s.name ?? "unnamed", T = S("web", C, m), E = w(C);
-	await N({
+	let w = c.name ?? "unnamed", T = ee("web", w, _), D = E(w);
+	await f({
 		id: T,
-		name: C,
+		name: w,
 		kind: "web",
-		url: `http://localhost:${m}`,
+		url: `http://localhost:${_}`,
 		pid: process.pid,
 		status: "booting",
-		logFile: E.path
+		logFile: D.path
 	}).catch(() => {});
-	let oe = R(y, "_voltro", "shell.html"), P = await Z(oe) ? await U.readFile(oe, "utf8") : await U.readFile(x, "utf8"), F = await _(e, s), fe = ae(F[0]), pe = F[0]?.name, z, B = null;
+	let O = R(y, "_voltro", "shell.html"), P = await Z(O) ? await U.readFile(O, "utf8") : await U.readFile(C, "utf8"), F = await b(e, c), fe = A(F[0]), pe = F[0]?.name, z, B = null;
 	process.env.SSR_CACHE === "postgres" && process.env.PG_HOST ? (B = new (await (import("pg"))).default.Client({
 		host: process.env.PG_HOST,
 		port: Number(process.env.PG_PORT ?? 5432),
 		user: process.env.PG_USER ?? "app",
 		password: process.env.PG_PASSWORD ?? "app",
 		database: process.env.PG_DATABASE ?? "app"
-	}), await B.connect(), z = be({ client: B }), J.info("isr cache backend: postgres", { table: "voltro_isr_cache" })) : (z = re(), J.info("isr cache backend: memory (per-process)", { hint: "set SSR_CACHE=postgres for persistent storage" })), await ie(e, s, F, u);
-	let { pages: V, dirs: H } = await v(R(e, "src", "pages")), W = Te(V);
+	}), await B.connect(), z = be({ client: B }), J.info("isr cache backend: postgres", { table: "voltro_isr_cache" })) : (z = k(), J.info("isr cache backend: memory (per-process)", { hint: "set SSR_CACHE=postgres for persistent storage" })), await re(e, c, F, d);
+	let { pages: V, dirs: H } = await x(R(e, "src", "pages")), W = Te(V);
 	t.mark("scan");
 	let G = R(y, "server", "ssrEntry.js"), _e = await Z(G);
 	if (!_e && process.env.NODE_ENV === "production") throw J.fatal(`production \`voltro start\` requires a precompiled SSR bundle at ${G} but it is missing. Run \`voltro build\` before serving — production renders from the bundle and never compiles on demand.`), Error(`[voltro start] missing SSR bundle at ${G}`);
-	let K = _e ? await Oe(G) : await ke(e, g);
+	let K = _e ? await Oe(G) : await ke(e, v);
 	J.info(`ssr loader: ${K.kind}`, {
 		kind: K.kind,
 		...K.kind === "middleware" ? { hint: "no pre-built SSR bundle found; run `voltro build` to enable bundle mode" } : {}
@@ -522,7 +527,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		}
 		try {
 			let t = await K.getPage(e.pattern, e.file);
-			q.set(e.pattern, c(t, e.file)), Y++;
+			q.set(e.pattern, l(t, e.file)), Y++;
 		} catch (t) {
 			J.warn("failed to load page metadata", { pattern: e.pattern }, t);
 		}
@@ -545,7 +550,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		regexByPattern: we
 	});
 	await Q.start(), t.mark("cdc");
-	let $ = A(), Ae = V.map((e) => {
+	let $ = M(), Ae = V.map((e) => {
 		let t = q.get(e.pattern);
 		return {
 			pattern: e.pattern,
@@ -570,11 +575,11 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 	})), Me = B ? "postgres" : "memory", Ne = {
 		kind: "web",
 		meta: {
-			name: s.name ?? "(unnamed)",
+			name: c.name ?? "(unnamed)",
 			voltroVersion: xe,
-			port: m,
+			port: _,
 			mode: "start",
-			apis: Object.entries(s.apis ?? {}).map(([e, t]) => {
+			apis: Object.entries(c.apis ?? {}).map(([e, t]) => {
 				let n = {
 					name: e,
 					package: t.package
@@ -602,10 +607,10 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			};
 		},
 		metrics: () => he()
-	}, Pe = async (t, n) => {
-		let r = t.split("?")[0] ?? "/";
-		if (s.name === "voltroDashboard" && r === "/api/dashboard/registry") try {
-			let e = await b();
+	}, Pe = async (t, r) => {
+		let i = t.split("?")[0] ?? "/";
+		if (c.name === "voltroDashboard" && i === "/api/dashboard/registry") try {
+			let e = await n();
 			return {
 				status: 200,
 				headers: { "content-type": "application/json; charset=utf-8" },
@@ -618,7 +623,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				body: `registry read error: ${e.message}`
 			};
 		}
-		if (s.name === "voltroDashboard" && r === "/api/dashboard/config") {
+		if (c.name === "voltroDashboard" && i === "/api/dashboard/config") {
 			let e = process.env.VOLTRO_DASHBOARD_APPS, t = [];
 			if (e && e.trim().length > 0) {
 				let n;
@@ -647,19 +652,19 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				body: JSON.stringify({ apps: t })
 			};
 		}
-		if (r === "/_voltro/inspect/logs") {
-			let e = d(t, i(), n);
+		if (i === "/_voltro/inspect/logs") {
+			let e = p(t, a(), r);
 			return {
 				status: e.status,
 				headers: {
 					"content-type": e.contentType,
-					...I(n.origin)
+					...I(r.origin)
 				},
 				body: e.body
 			};
 		}
-		if (r !== "/_voltro/inspect/stream") {
-			let e = ue(t, Ne, n);
+		if (i !== "/_voltro/inspect/stream") {
+			let e = ue(t, Ne, r);
 			if (e !== null) return {
 				status: e.status,
 				headers: {
@@ -669,14 +674,14 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				body: e.body
 			};
 		}
-		let a = Ee(r, W), o = a ? q.get(a.route.pattern)?.renderMode : void 0, c = o === "ssr" || o === "isr" || (a ? X.has(a.route.pattern) : !1), l = r === "/" ? R(y, "index.html") : R(y, r.replace(/^\//, ""), "index.html");
-		if (!c && await Z(l)) return {
+		let o = Ee(i, W), s = o ? q.get(o.route.pattern)?.renderMode : void 0, l = s === "ssr" || s === "isr" || (o ? X.has(o.route.pattern) : !1), u = i === "/" ? R(y, "index.html") : R(y, i.replace(/^\//, ""), "index.html");
+		if (!l && await Z(u)) return {
 			status: 200,
 			headers: { "content-type": "text/html; charset=utf-8" },
-			body: await U.readFile(l)
+			body: await U.readFile(u)
 		};
-		if (/\.[a-z0-9]+$/i.test(r)) {
-			let e = R(y, r.replace(/^\//, ""));
+		if (/\.[a-z0-9]+$/i.test(i)) {
+			let e = R(y, i.replace(/^\//, ""));
 			if (await Z(e)) {
 				let t = await U.readFile(e);
 				return {
@@ -686,17 +691,17 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				};
 			}
 		}
-		let u = Ee(r, W);
-		if (!u) return {
+		let d = Ee(i, W);
+		if (!d) return {
 			status: 404,
 			headers: { "content-type": "text/plain" },
 			body: "not found"
 		};
-		let ee = q.get(u.route.pattern), p = n["x-tenant"] ?? "anonymous", m = (await K.getHelpers()).i18n?.resolve(n.cookie, n["accept-language"])?.locale, g = O(r, {
-			...ee?.tenantAware ? { tenant: p } : {},
+		let ee = q.get(d.route.pattern), f = r["x-tenant"] ?? "anonymous", m = (await K.getHelpers()).i18n?.resolve(r.cookie, r["accept-language"])?.locale, g = N(i, {
+			...ee?.tenantAware ? { tenant: f } : {},
 			...m ? { locale: m } : {}
 		}), _ = z.get(g), v = Date.now();
-		if (_ && te(_, v)) return f.emit("cache", {
+		if (_ && te(_, v)) return h.emit("cache", {
 			kind: "HIT",
 			key: g,
 			ageMs: v - _.renderedAt
@@ -711,39 +716,39 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			},
 			body: _.html
 		};
-		if (_ && h(_, v)) return f.emit("cache", {
+		if (_ && S(_, v)) return h.emit("cache", {
 			kind: "STALE",
 			key: g,
 			ageMs: v - _.renderedAt
 		}), (async () => {
 			try {
-				let i = await De({
+				let n = await De({
 					provider: K,
 					root: e,
-					route: u.route,
-					params: u.params,
-					pathname: r,
+					route: d.route,
+					params: d.params,
+					pathname: i,
 					dirs: H,
 					shellTemplate: P,
-					requestHeaders: n,
+					requestHeaders: r,
 					apiOrigin: fe,
 					apiName: pe,
 					requestUrl: t,
 					buffered: !0
 				});
-				if (i && "html" in i && i.renderMode === "isr" && i.revalidateMs !== null) {
-					let e = q.get(u.route.pattern)?.staleWhileRevalidateMs ?? 0, t = Date.now();
+				if (n && "html" in n && n.renderMode === "isr" && n.revalidateMs !== null) {
+					let e = q.get(d.route.pattern)?.staleWhileRevalidateMs ?? 0, t = Date.now();
 					z.set(g, {
-						html: i.html,
+						html: n.html,
 						renderedAt: t,
-						expiresAt: t + i.revalidateMs,
-						servableUntil: t + i.revalidateMs + e,
-						revalidateMs: i.revalidateMs,
+						expiresAt: t + n.revalidateMs,
+						servableUntil: t + n.revalidateMs + e,
+						revalidateMs: n.revalidateMs,
 						staleWhileRevalidateMs: e
 					});
 				}
 			} catch (e) {
-				J.warn("background SWR refresh failed", { url: r }, e);
+				J.warn("background SWR refresh failed", { url: i }, e);
 			}
 		})(), {
 			status: 200,
@@ -757,20 +762,20 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			body: _.html
 		};
 		try {
-			let i = await De({
+			let n = await De({
 				provider: K,
 				root: e,
-				route: u.route,
-				params: u.params,
-				pathname: r,
+				route: d.route,
+				params: d.params,
+				pathname: i,
 				dirs: H,
 				shellTemplate: P,
-				requestHeaders: n,
+				requestHeaders: r,
 				apiOrigin: fe,
 				apiName: pe,
 				requestUrl: t
 			});
-			if (!i) return {
+			if (!n) return {
 				status: 200,
 				headers: {
 					"content-type": "text/html; charset=utf-8",
@@ -778,16 +783,16 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				},
 				body: P
 			};
-			if ("stream" in i) return {
+			if ("stream" in n) return {
 				status: 200,
-				headers: { "x-voltro-rendered-by": i.renderMode },
+				headers: { "x-voltro-rendered-by": n.renderMode },
 				body: "",
-				stream: i.stream
+				stream: n.stream
 			};
-			if ("control" in i) return i.control === "redirect" ? {
-				status: i.status,
+			if ("control" in n) return n.control === "redirect" ? {
+				status: n.status,
 				headers: {
-					location: i.location,
+					location: n.location,
 					"x-voltro-rendered-by": "loader-redirect"
 				},
 				body: ""
@@ -801,34 +806,34 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			};
 			let a = {
 				"content-type": "text/html; charset=utf-8",
-				"x-voltro-rendered-by": i.renderMode
+				"x-voltro-rendered-by": n.renderMode
 			};
-			if (i.renderMode === "isr" && i.revalidateMs !== null) {
-				let e = Date.now(), t = q.get(u.route.pattern)?.staleWhileRevalidateMs ?? 0;
+			if (n.renderMode === "isr" && n.revalidateMs !== null) {
+				let e = Date.now(), t = q.get(d.route.pattern)?.staleWhileRevalidateMs ?? 0;
 				z.set(g, {
-					html: i.html,
+					html: n.html,
 					renderedAt: e,
-					expiresAt: e + i.revalidateMs,
-					servableUntil: e + i.revalidateMs + t,
-					revalidateMs: i.revalidateMs,
+					expiresAt: e + n.revalidateMs,
+					servableUntil: e + n.revalidateMs + t,
+					revalidateMs: n.revalidateMs,
 					staleWhileRevalidateMs: t
-				}), a["x-voltro-cache"] = "MISS", a["x-voltro-cache-key"] = g, a["x-voltro-cache-revalidate-ms"] = String(i.revalidateMs), t > 0 && (a["x-voltro-cache-swr-ms"] = String(t)), f.emit("cache", {
+				}), a["x-voltro-cache"] = "MISS", a["x-voltro-cache-key"] = g, a["x-voltro-cache-revalidate-ms"] = String(n.revalidateMs), t > 0 && (a["x-voltro-cache-swr-ms"] = String(t)), h.emit("cache", {
 					kind: "MISS",
 					key: g,
-					revalidateMs: i.revalidateMs,
+					revalidateMs: n.revalidateMs,
 					swrMs: t
 				});
-			} else i.renderMode === "isr" && (a["x-voltro-cache"] = "BYPASS", f.emit("cache", {
+			} else n.renderMode === "isr" && (a["x-voltro-cache"] = "BYPASS", h.emit("cache", {
 				kind: "BYPASS",
 				key: g
 			}));
 			return {
 				status: 200,
 				headers: a,
-				body: i.html
+				body: n.html
 			};
 		} catch (e) {
-			return J.error("render error", { url: r }, e), M(e) ? {
+			return J.error("render error", { url: i }, e), ae(e) ? {
 				status: 500,
 				headers: {
 					"content-type": "text/plain; charset=utf-8",
@@ -844,15 +849,15 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 	}, Fe = !1, Ie = ge(async (e, t) => {
 		let n = e.url ?? "/", r = Date.now(), i = {};
 		for (let [t, n] of Object.entries(e.headers)) n !== void 0 && (i[t.toLowerCase()] = Array.isArray(n) ? n.join(", ") : n);
-		let c = n.split("?")[0] ?? "/", l = (e.method ?? "GET").toUpperCase();
-		if (c === "/internal/liveness") {
+		let a = n.split("?")[0] ?? "/", l = (e.method ?? "GET").toUpperCase();
+		if (a === "/internal/liveness") {
 			t.writeHead(200, {
 				"content-type": "text/plain",
 				"cache-control": "no-store"
 			}), t.end("ok");
 			return;
 		}
-		if (c === "/internal/readiness") {
+		if (a === "/internal/readiness") {
 			let e = Fe ? 200 : 503;
 			t.writeHead(e, {
 				"content-type": "text/plain",
@@ -860,12 +865,12 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			}), t.end(Fe ? "ready" : "not-ready");
 			return;
 		}
-		if (l === "OPTIONS" && c.startsWith("/_voltro/inspect")) {
+		if (l === "OPTIONS" && a.startsWith("/_voltro/inspect")) {
 			let e = I(i.origin);
 			t.writeHead(204, e), t.end();
 			return;
 		}
-		if (s.name === "voltroDashboard" && c === "/api/dashboard/proxy") {
+		if (c.name === "voltroDashboard" && a === "/api/dashboard/proxy") {
 			let r = new URL(n, "http://x").searchParams.get("target");
 			if (!r) {
 				t.writeHead(400, { "content-type": "text/plain" }), t.end("missing ?target=");
@@ -901,7 +906,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			}
 			return;
 		}
-		if (s.name === "voltroDashboard" && c === "/api/dashboard/proxy/stream") {
+		if (c.name === "voltroDashboard" && a === "/api/dashboard/proxy/stream") {
 			let r = new URL(n, "http://x").searchParams.get("target");
 			if (!r) {
 				t.writeHead(400, { "content-type": "text/plain" }), t.end("missing ?target=");
@@ -948,7 +953,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			}
 			return;
 		}
-		if (c === "/_voltro/inspect/stream") {
+		if (a === "/_voltro/inspect/stream") {
 			let n = I(i.origin);
 			if (L()) {
 				t.writeHead(503, {
@@ -975,29 +980,29 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				"x-accel-buffering": "no",
 				...n
 			}), t.flushHeaders(), t.write("retry: 5000\n\n");
-			for (let e of f.buffered()) t.write(o(e));
-			let s = f.subscribe((e) => {
-				t.write(o(e));
+			for (let e of h.buffered()) t.write(s(e));
+			let a = h.subscribe((e) => {
+				t.write(s(e));
 			}), c = setInterval(() => {
-				t.write(a());
+				t.write(o());
 			}, 15e3), l = () => {
-				clearInterval(c), s();
+				clearInterval(c), a();
 			};
 			e.on("close", l), t.on("close", l);
 			return;
 		}
 		try {
 			let e = await Pe(n, i);
-			if (e.stream ? e.stream(t) : (t.writeHead(e.status, e.headers), t.end(e.body)), !c.startsWith("/_voltro/inspect")) {
+			if (e.stream ? e.stream(t) : (t.writeHead(e.status, e.headers), t.end(e.body)), !a.startsWith("/_voltro/inspect")) {
 				let t = Date.now() - r;
-				f.emit("request", {
-					url: c,
+				h.emit("request", {
+					url: a,
 					status: e.status,
 					durationMs: t,
 					renderedBy: e.headers["x-voltro-rendered-by"],
 					cache: e.headers["x-voltro-cache"]
 				});
-				let n = Ee(c, W)?.route.pattern ?? (e.status === 404 ? "<unmatched>" : "<asset>");
+				let n = Ee(a, W)?.route.pattern ?? (e.status === 404 ? "<unmatched>" : "<asset>");
 				$.record({
 					kind: "request",
 					tag: n,
@@ -1009,43 +1014,43 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			t.writeHead(500, { "content-type": "text/plain" }), t.end(`internal error: ${e.message}`);
 		}
 	});
-	await new Promise((e) => Ie.listen(m, "::", e)), Fe = !0, t.mark("ready"), J.info(`listening on http://localhost:${m}`, {
-		port: m,
+	await new Promise((e) => Ie.listen(_, "::", e)), Fe = !0, t.mark("ready"), J.info(`listening on http://localhost:${_}`, {
+		port: _,
 		distDir: y
 	}), J.debug("dynamic + ssr/isr routes resolve via SSR loader");
 	try {
-		await N({
+		await f({
 			id: T,
-			name: C,
+			name: w,
 			kind: "web",
-			url: `http://localhost:${m}`,
+			url: `http://localhost:${_}`,
 			pid: process.pid,
 			status: "live",
-			logFile: E.path
+			logFile: D.path
 		});
-		let t = n(e);
+		let t = r(e);
 		if (t) {
-			let e = await r({ dashboardAppPath: t });
+			let e = await i({ dashboardAppPath: t });
 			e.status === "launched" ? J.info(`dashboard launched at http://localhost:${e.port}`, { port: e.port }) : e.status === "already-running" && J.debug(`dashboard already running on :${e.port}`, { port: e.port });
 		}
 		setInterval(() => {
-			N({
+			f({
 				id: T,
-				name: C,
+				name: w,
 				kind: "web",
-				url: `http://localhost:${m}`,
+				url: `http://localhost:${_}`,
 				pid: process.pid,
 				status: "live",
-				logFile: E.path
+				logFile: D.path
 			}).catch(() => {});
 		}, 1e4).unref();
 	} catch (e) {
 		J.warn("runtime-registry write failed", {}, e);
 	}
 	me({
-		app: s.name ?? "unnamed",
+		app: c.name ?? "unnamed",
 		kind: "web",
-		url: `http://localhost:${m}`,
+		url: `http://localhost:${_}`,
 		bootMs: t.total()
 	});
 	let Le = t.phaseBreakdown();
@@ -1058,7 +1063,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			if (Re = !0, J.info(`received ${e}, shutting down`, { signal: e }), Ie.close(), await Q.stop(), B) try {
 				await B.end();
 			} catch {}
-			await K.close(), await p(T), await E.dispose(), process.exit(0);
+			await K.close(), await oe(T), await D.dispose(), process.exit(0);
 		}
 	};
 	process.on("SIGINT", ze("SIGINT")), process.on("SIGTERM", ze("SIGTERM"));