@voltro/cli 0.1.1 → 0.1.3

package/dist/{commands-CfPH2Wf4.js → commands-C0o6Clo9.js}

@@ -4,7 +4,7 @@ import { basename as r, dirname as i, extname as a, isAbsolute as o, join as s,
 import { fileURLToPath as u, pathToFileURL as d } from "node:url";
 import { FetchHttpClient as f, FileSystem as p } from "@effect/platform";
 import { NodeContext as m, NodeRuntime as h } from "@effect/platform-node";
-import { Cause as g, Cron as _, Data as v, Duration as y, Effect as b, Fiber as x, JSONSchema as ee, Layer as S, ManagedRuntime as C, Option as w, Ref as T, Schema as E, Stream as D } from "effect";
+import { Cause as g, Cron as _, Data as v, Duration as y, Effect as b, Fiber as x, JSONSchema as S, Layer as C, ManagedRuntime as w, Option as T, Ref as E, Schema as D, Stream as ee } from "effect";
 import { LoggerLayer as O, addSink as k, ansi as A, createLogger as j, printAppSurface as te, printReadyBlock as ne } from "@voltro/logger";
 import { closeSync as re, existsSync as M, mkdirSync as N, openSync as ie, promises as P, readFileSync as F, readdirSync as ae, statSync as oe, unlinkSync as se, unwatchFile as ce, watchFile as le, writeFileSync as I, writeSync as ue } from "node:fs";
 import { AggregateError as de, AggregateMaintainer as fe, AggregateNotFound as pe, AggregateRegistry as me, AggregateStale as he, AnalyticsSink as ge, Dispatcher as _e, InMemoryDataStore as ve, ReactionRateLimiter as ye, ReplicatedDataStore as L, _voltroScheduleClaimsTable as be, _voltroScheduleRunsTable as xe, _voltroTracesTable as Se, _voltroUndoLogTable as Ce, _voltroWakeupsTable as we, _voltroWorkflowEventDeliveriesTable as Te, _voltroWorkflowEventsTable as Ee, apiKeyManagementRoutes as De, applySoftDeleteScope as Oe, applyTenantScope as ke, applyUndoInvocation as Ae, attachAnalyticsMirror as je, awaitServerListening as Me, bindMutation as Ne, bindStream as Pe, bindSubscription as Fe, buildTracingLayer as Ie, cancelWakeup as Le, compileCron as Re, currentTraceContext as ze, dataStoreApiKeyStore as Be, dataStoreIdempotencyStore as Ve, extractDbCause as He, frameworkApiKeyStrategy as Ue, getConnectionSubject as We, getTimelineRecorder as Ge, isAggregateDefinition as Ke, isScheduleDefinition as qe, isWorkflowEventTriggerDefinition as Je, lastWriteProvenance as Ye, listRetentions as Xe, localityAwareSelector as Ze, makeActionRunner as Qe, makeAdvisoryLockCoordinator as $e, makeApiKeyService as et, makeAsyncKv as tt, makeBufferingSpanProcessor as nt, makeCoordinatedScheduler as rt, makeEffectStoreLayer as it, makeEventsFacade as at, makeLazyWorkflowFacade as ot, makeMutationRunner as st, makePostCommitWorkflowFacade as ct, makeQueryDescriptorProducer as lt, makeSchemaRegistry as ut, makeUndoCapture as dt, makeWorkflowFacade as ft, makeWorkflowFacadeWithCallerContext as pt, makeWorkflowLayers as mt, memoryRywPositionStore as ht, nextFiring as gt, nodeProcessSupervisor as _t, noopAnalytics as vt, noopAnalyticsSpec as yt, noopKv as bt, powerOfTwoSelector as xt, recordSample as St, recordSubscriptionDelivery as Ct, recordTimelineEvent as wt, redisRywPositionStore as Tt, redoUndoInvocation as Et, registerRetention as Dt, registerWakeup as Ot, resolveCurrentRegion as R, resolveSecret as kt, resolveSecretsBackend as At, retentionTtlMsFromEnv as jt, runProvidedEffect as Mt, runReaction as Nt, runSingleNodeOrchestrator as Pt, setSecretsBackend as Ft, singleCoordinator as It, snapshotMetricsSync as Lt, startRpcServer as Rt, startScheduler as zt, sweepRetention as Bt, tracingHttpClientLayer as Vt, undoCaptureEnabled as Ht, undoLogExecutor as Ut, workflowToRpc as Wt, wrapStoreWithMixinBehaviour as Gt } from "@voltro/runtime";
@@ -95,7 +95,7 @@ var ka = [
 		if (r) return r;
 	}
 	return null;
-}, ja = (e = {}) => S.merge(m.layer, O({
+}, ja = (e = {}) => C.merge(m.layer, O({
 	...e.scope ? { defaultScope: e.scope } : {},
 	...e.logger
 })), Ma = async (e, t = {}) => {
@@ -336,17 +336,17 @@ boundary, naming, anti-patterns) before editing.
 			for (let e of t) v.add(e);
 		}
 	}
-	let x = t.plugins ? t.plugins.map(Ka).filter((e) => e !== null) : y ? [...v] : null, ee = a.includes(Ba) ? a.replace(Ba, Xa(c, x, d)) : a, S = [];
-	for (let e of m) S.push(yield* to(n, e, ee, f));
+	let x = t.plugins ? t.plugins.map(Ka).filter((e) => e !== null) : y ? [...v] : null, S = a.includes(Ba) ? a.replace(Ba, Xa(c, x, d)) : a, C = [];
+	for (let e of m) C.push(yield* to(n, e, S, f));
 	u || (yield* Ga(n, s(i, "agent-docs"), s(r, "agent-docs")));
-	let C = new Map((t.appTemplates ?? []).map((e) => [l(e.dir), e.template])), w = (e) => {
-		let t = C.get(l(e));
+	let w = new Map((t.appTemplates ?? []).map((e) => [l(e.dir), e.template])), T = (e) => {
+		let t = w.get(l(e));
 		return t ? Za(t, c, d) : "";
-	}, T = (e, t) => b.forEach(La, (r) => to(n, s(e, r), t, f));
-	for (let e of h) S.push(...yield* T(e, Qa.api(d, _.get(e) ?? null, w(e)))), (yield* Va(n, s(e, "database"))) && S.push(...yield* T(s(e, "database"), Qa.database(d)));
-	for (let e of g) S.push(...yield* T(e, Qa.web(d, w(e))));
-	for (let e of $a) S.push(yield* to(n, s(r, ".claude", "skills", e.name, "SKILL.md"), eo(e, d), f));
-	return { files: S };
+	}, E = (e, t) => b.forEach(La, (r) => to(n, s(e, r), t, f));
+	for (let e of h) C.push(...yield* E(e, Qa.api(d, _.get(e) ?? null, T(e)))), (yield* Va(n, s(e, "database"))) && C.push(...yield* E(s(e, "database"), Qa.database(d)));
+	for (let e of g) C.push(...yield* E(e, Qa.web(d, T(e))));
+	for (let e of $a) C.push(yield* to(n, s(r, ".claude", "skills", e.name, "SKILL.md"), eo(e, d), f));
+	return { files: C };
 }), ro = (e, t = {}) => b.runPromise(no(e, t).pipe(b.provide(m.layer))), io = async (e) => {
 	let t = e.includes("--force"), n = e.find((e) => !e.startsWith("-")) ?? process.cwd();
 	return Ma(b.gen(function* () {
@@ -2424,7 +2424,7 @@ __installPublicEnv(publicEnvValues)
 	} catch {
 		return null;
 	}
-}, al = (e) => e.disableDevtools ? [] : [
+}, al = (e, t) => e.disableDevtools || !t ? [] : [
 	"",
 	"// Dev-only in-page devtools overlay. The `import.meta.env.DEV` guard is a",
 	"// compile-time constant, so prod builds strip this whole `if` block — the",
@@ -2434,7 +2434,7 @@ __installPublicEnv(publicEnvValues)
 	"  await import('@voltro/devtools/styles.css')",
 	"  Devtools = (await import('@voltro/devtools')).VoltroDevtools",
 	"}"
-], ol = (e) => e.disableDevtools ? [] : ["  ...(Devtools ? { Devtools } : {}),"], sl = (e) => e.sentry ? ["import { initSentryBrowser } from '@voltro/plugin-sentry/web'"] : [], cl = (e) => e.sentry ? [
+], ol = (e, t) => e.disableDevtools || !t ? [] : ["  ...(Devtools ? { Devtools } : {}),"], sl = (e) => e.sentry ? ["import { initSentryBrowser } from '@voltro/plugin-sentry/web'"] : [], cl = (e) => e.sentry ? [
 	"",
 	"// Browser-side Sentry (frontend half of the deep integration). Errors +",
 	"// browser rpc spans flow to Sentry, sharing the server transactions' trace.",
@@ -2737,7 +2737,7 @@ __installPublicEnv(publicEnvValues)
 		if (l) return c;
 	};
 }, Fl = async (e, t, n, r = {}) => {
-	let i = t.title ?? t.name ?? "app", a = t.theme === "dark" ? " class=\"dark\"" : t.theme === "light" ? " class=\"light\"" : "", o = t.theme === "system" ? [
+	let i = t.title ?? t.name ?? "app", a = t.theme === "dark" ? " class=\"dark\"" : t.theme === "light" ? " class=\"light\"" : "", o = M(s(e, "node_modules", "@voltro", "devtools", "package.json")) || await il() !== null, c = t.theme === "system" ? [
 		"    <script>",
 		"      (function () {",
 		"        var root = document.documentElement",
@@ -2758,7 +2758,7 @@ __installPublicEnv(publicEnvValues)
 		"        }",
 		"      })()",
 		"    <\/script>"
-	].join("\n") : "", c = [
+	].join("\n") : "", l = [
 		"<!doctype html>",
 		"<!-- GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot. -->",
 		`<html lang="en"${a}>`,
@@ -2767,7 +2767,7 @@ __installPublicEnv(publicEnvValues)
 		"    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />",
 		`    <title>${i}</title>`,
 		"    <link rel=\"icon\" type=\"image/svg+xml\" href=\"/favicon.svg\" />",
-		...o ? [o] : [],
+		...c ? [c] : [],
 		"  </head>",
 		"  <body>",
 		"    <div id=\"root\"></div>",
@@ -2775,64 +2775,64 @@ __installPublicEnv(publicEnvValues)
 		"  </body>",
 		"</html>",
 		""
-	].join("\n"), { pages: l, dirs: u } = await bl(s(e, "src", "pages")), d = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppGroup`, f = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppDescriptors`, p = n.map((e) => `import { appGroup as ${d(e.name)}, appDescriptors as ${f(e.name)} } from '${e.pkg}/rpcGroup'`), m = n.map((e) => {
-		let t = [`group: ${d(e.name)}`];
-		return t.push(`descriptors: ${f(e.name)}`), t.push(`wsUrl: ${JSON.stringify(e.browserWsUrl)}`), e.headers && t.push(`headers: ${JSON.stringify(e.headers)}`), `    ${JSON.stringify(e.name)}: { ${t.join(", ")} },`;
-	}), h, g;
-	if (l.length > 0) {
-		let e = l.map((e) => `  ${JSON.stringify(e.pattern)}: () => import('../src/pages/${e.file}'),`), n = [];
-		for (let e of u) {
+	].join("\n"), { pages: u, dirs: d } = await bl(s(e, "src", "pages")), f = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppGroup`, p = (e) => `${e.replace(/[^a-zA-Z0-9]/g, "_")}AppDescriptors`, m = n.map((e) => `import { appGroup as ${f(e.name)}, appDescriptors as ${p(e.name)} } from '${e.pkg}/rpcGroup'`), h = n.map((e) => {
+		let t = [`group: ${f(e.name)}`];
+		return t.push(`descriptors: ${p(e.name)}`), t.push(`wsUrl: ${JSON.stringify(e.browserWsUrl)}`), e.headers && t.push(`headers: ${JSON.stringify(e.headers)}`), `    ${JSON.stringify(e.name)}: { ${t.join(", ")} },`;
+	}), g, _;
+	if (u.length > 0) {
+		let e = u.map((e) => `  ${JSON.stringify(e.pattern)}: () => import('../src/pages/${e.file}'),`), n = [];
+		for (let e of d) {
 			let t = e.dir === "" ? "../src/pages" : `../src/pages/${e.dir}`;
 			e.hasLayout && e.hasLayoutLoader ? n.push(`import * as ${yl(e.dir, "Layout")}Mod from '${t}/layout.tsx'`) : e.hasLayout && n.push(`import ${yl(e.dir, "Layout")}   from '${t}/layout.tsx'`), e.hasError && n.push(`import ${yl(e.dir, "Error")}    from '${t}/error.tsx'`), e.hasPending && n.push(`import ${yl(e.dir, "Pending")}  from '${t}/loading.tsx'`), e.hasNotFound && n.push(`import ${yl(e.dir, "NotFound")} from '${t}/not-found.tsx'`);
 		}
-		let r = l.map((e) => {
-			let t = xl(u, e.dirChain).map((e) => {
+		let r = u.map((e) => {
+			let t = xl(d, 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"}),`;
-		}), i = u.filter((e) => e.hasNotFound).map((e) => {
-			let t = Sl(e.chain), n = xl(u, e.chain).map((e) => {
+		}), i = d.filter((e) => e.hasNotFound).map((e) => {
+			let t = Sl(e.chain), n = xl(d, 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    },`;
-		}), a = [], o = [], s = [], c = [], d = [], f = [];
-		for (let e of u) {
-			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`, l = JSON.stringify(e.dir);
-			e.hasLayout && e.hasLayoutLoader ? (o.push(`  ${l}: ${yl(e.dir, "Layout")}Mod.default,`), s.push(`  ${l}: ${yl(e.dir, "Layout")}Mod.loader,`), a.push({
+		}), a = [], s = [], c = [], l = [], f = [], p = [];
+		for (let e of d) {
+			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`, o = JSON.stringify(e.dir);
+			e.hasLayout && e.hasLayoutLoader ? (s.push(`  ${o}: ${yl(e.dir, "Layout")}Mod.default,`), c.push(`  ${o}: ${yl(e.dir, "Layout")}Mod.loader,`), a.push({
 				relPath: t,
 				kind: "layout",
 				slotKey: e.dir
-			})) : e.hasLayout && (o.push(`  ${l}: ${yl(e.dir, "Layout")},`), a.push({
+			})) : e.hasLayout && (s.push(`  ${o}: ${yl(e.dir, "Layout")},`), a.push({
 				relPath: t,
 				kind: "layout",
 				slotKey: e.dir
-			})), e.hasError && (c.push(`  ${l}: ${yl(e.dir, "Error")},`), a.push({
+			})), e.hasError && (l.push(`  ${o}: ${yl(e.dir, "Error")},`), a.push({
 				relPath: n,
 				kind: "error",
 				slotKey: e.dir
-			})), e.hasPending && (d.push(`  ${l}: ${yl(e.dir, "Pending")},`), a.push({
+			})), e.hasPending && (f.push(`  ${o}: ${yl(e.dir, "Pending")},`), a.push({
 				relPath: r,
 				kind: "pending",
 				slotKey: e.dir
-			})), e.hasNotFound && (f.push(`  ${l}: ${yl(e.dir, "NotFound")},`), a.push({
+			})), e.hasNotFound && (p.push(`  ${o}: ${yl(e.dir, "NotFound")},`), a.push({
 				relPath: i,
 				kind: "notFound",
 				slotKey: e.dir
 			}));
 		}
-		for (let e of l) a.push({
+		for (let e of u) a.push({
 			relPath: `../src/pages/${e.file}`,
 			kind: "page",
 			slotKey: e.pattern
 		});
-		let _ = a.map((e) => `      ${JSON.stringify(e.relPath)},`), v = a.map((e, t) => {
+		let v = a.map((e) => `      ${JSON.stringify(e.relPath)},`), y = a.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 }`;
-		}), y = t.locales ?? [], b = y.length > 0, x = t.defaultLocale ?? y[0] ?? "en";
-		if (b && !y.includes(x)) throw Error(`[voltro dev] app.config.ts: defaultLocale '${x}' must be one of locales [${y.join(", ")}]`);
-		h = [
+		}), b = t.locales ?? [], x = b.length > 0, S = t.defaultLocale ?? b[0] ?? "en";
+		if (x && !b.includes(S)) throw Error(`[voltro dev] app.config.ts: defaultLocale '${S}' must be one of locales [${b.join(", ")}]`);
+		g = [
 			"// GENERATED BY `voltro dev` — do not edit; will be overwritten on next boot.",
 			"// Routes + per-page chain + not-found scopes assembled from src/pages/.",
 			"// Exported as a single React component so vite-plugin-react treats this file",
@@ -2850,11 +2850,11 @@ __installPublicEnv(publicEnvValues)
 			"",
 			"import { useMemo, useSyncExternalStore } from 'react'",
 			"import { Router, pageRoute, lazyPageRoute, preloadRouteModule, type PageDescriptor, type NotFoundDescriptor } from '@voltro/web'",
-			...b ? [
+			...x ? [
 				"import { I18nProvider } from '@voltro/i18n'",
 				"import { resolveLocale } from '@voltro/i18n/server'",
 				"import { useServerRequest } from '@voltro/web'",
-				...y.map((e) => `import i18nCatalog_${e} from '../src/locales/${e}'`)
+				...b.map((e) => `import i18nCatalog_${e} from '../src/locales/${e}'`)
 			] : [],
 			...n,
 			"",
@@ -2869,19 +2869,19 @@ __installPublicEnv(publicEnvValues)
 			"  pages:         Record<string, unknown>",
 			"} = {",
 			"  layouts: {",
-			...o,
+			...s,
 			"  },",
 			"  layoutLoaders: {",
-			...s,
+			...c,
 			"  },",
 			"  errors: {",
-			...c,
+			...l,
 			"  },",
 			"  pendings: {",
-			...d,
+			...f,
 			"  },",
 			"  notFounds: {",
-			...f,
+			...p,
 			"  },",
 			"  pages: {},",
 			"}",
@@ -2939,13 +2939,13 @@ __installPublicEnv(publicEnvValues)
 			...i,
 			"]",
 			"",
-			...b ? [
-				`// i18n auto-wiring (config.locales = [${y.map((e) => JSON.stringify(e)).join(", ")}]).`,
+			...x ? [
+				`// i18n auto-wiring (config.locales = [${b.map((e) => JSON.stringify(e)).join(", ")}]).`,
 				"const I18N_CATALOGS: Record<string, import('@voltro/i18n').MessageCatalog> = {",
-				...y.map((e) => `  ${JSON.stringify(e)}: i18nCatalog_${e},`),
+				...b.map((e) => `  ${JSON.stringify(e)}: i18nCatalog_${e},`),
 				"}",
-				`const I18N_SUPPORTED: ReadonlyArray<string> = [${y.map((e) => JSON.stringify(e)).join(", ")}]`,
-				`const I18N_DEFAULT = ${JSON.stringify(x)}`,
+				`const I18N_SUPPORTED: ReadonlyArray<string> = [${b.map((e) => JSON.stringify(e)).join(", ")}]`,
+				`const I18N_DEFAULT = ${JSON.stringify(S)}`,
 				"",
 				"const pickI18nLocale = (ssr: ReturnType<typeof useServerRequest>): string => {",
 				"  if (ssr) {",
@@ -2979,7 +2979,7 @@ __installPublicEnv(publicEnvValues)
 			"  const v = useSyncExternalStore(subscribe, getVersion, getVersion)",
 			"  const routes = useMemo(() => buildRoutes(), [v])",
 			"  const notFounds = useMemo(() => buildNotFounds(), [v])",
-			...b ? [
+			...x ? [
 				"  const ssr = useServerRequest()",
 				"  const locale = pickI18nLocale(ssr)",
 				"  const messages = I18N_CATALOGS[locale] ?? I18N_CATALOGS[I18N_DEFAULT]!",
@@ -2994,17 +2994,17 @@ __installPublicEnv(publicEnvValues)
 			"if (import.meta.hot) {",
 			"  import.meta.hot.accept(",
 			"    [",
-			..._,
+			...v,
 			"    ],",
 			"    (newMods: Array<Record<string, unknown> | undefined>) => {",
 			"      let changed = false",
-			...v,
+			...y,
 			"      if (changed) bump()",
 			"    },",
 			"  )",
 			"}",
 			""
-		].join("\n"), g = [
+		].join("\n"), _ = [
 			"// 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 —",
@@ -3012,10 +3012,10 @@ __installPublicEnv(publicEnvValues)
 			"",
 			...ll(t),
 			"import { mount } from '@voltro/web'",
-			...p,
+			...m,
 			"import { App, preloadCurrentRoute } from './app'",
 			...sl(t),
-			...al(t),
+			...al(t, o),
 			...cl(t),
 			"",
 			"// Preload the current route's page chunk BEFORE hydration so the first",
@@ -3031,14 +3031,14 @@ __installPublicEnv(publicEnvValues)
 			"",
 			"mount(App, {",
 			"  apis: {",
-			...m,
+			...h,
 			"  },",
-			...ol(t),
+			...ol(t, o),
 			"})",
 			"",
 			Cl
 		].join("\n");
-	} else h = "", g = [
+	} else g = "", _ = [
 		"// 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",
@@ -3046,30 +3046,30 @@ __installPublicEnv(publicEnvValues)
 		"",
 		...ll(t),
 		"import { mount } from '@voltro/web'",
-		...p,
+		...m,
 		"import App from '../src/App'",
 		...sl(t),
-		...al(t),
+		...al(t, o),
 		...cl(t),
 		"",
 		"mount(App, {",
 		"  apis: {",
-		...m,
+		...h,
 		"  },",
-		...ol(t),
+		...ol(t, o),
 		"})",
 		"",
 		Cl
 	].join("\n");
-	let _ = s(e, ".framework");
-	await P.mkdir(_, { recursive: !0 }), t.env ? await Ro(_, r) : await P.rm(s(_, "env.public.ts"), { force: !0 }), await P.writeFile(s(_, "index.html"), c, "utf8"), await P.writeFile(s(_, "main.tsx"), g, "utf8"), h ? await P.writeFile(s(_, "app.tsx"), h, "utf8") : await P.rm(s(_, "app.tsx"), { force: !0 });
-	let v = s(e, ".gitignore"), y = "";
+	let v = s(e, ".framework");
+	await P.mkdir(v, { recursive: !0 }), t.env ? await Ro(v, r) : await P.rm(s(v, "env.public.ts"), { force: !0 }), await P.writeFile(s(v, "index.html"), l, "utf8"), await P.writeFile(s(v, "main.tsx"), _, "utf8"), g ? await P.writeFile(s(v, "app.tsx"), g, "utf8") : await P.rm(s(v, "app.tsx"), { force: !0 });
+	let y = s(e, ".gitignore"), b = "";
 	try {
-		y = await P.readFile(v, "utf8");
+		b = await P.readFile(y, "utf8");
 	} catch {}
-	let b = ["/.framework/"], x = y.split("\n").filter((e) => e.trim() !== "");
-	for (let e of b) x.includes(e) || x.push(e);
-	await P.writeFile(v, x.join("\n") + "\n", "utf8");
+	let x = ["/.framework/"], S = b.split("\n").filter((e) => e.trim() !== "");
+	for (let e of x) S.includes(e) || S.push(e);
+	await P.writeFile(y, S.join("\n") + "\n", "utf8");
 }, Il = async (e, t) => {
 	try {
 		let n = s(i(e), "project.json");
@@ -3145,7 +3145,7 @@ __installPublicEnv(publicEnvValues)
 		pages: m
 	});
 	_.wrote && K.debug("routes codegen wrote", { path: c(e, _.path) });
-	let v = await import("vite"), y = (await import("@vitejs/plugin-react")).default, b = (await import("@tailwindcss/vite")).default, x = s(e, ".framework"), ee = s(e, "src"), S = /* @__PURE__ */ new Set([
+	let v = await import("vite"), y = (await import("@vitejs/plugin-react")).default, b = (await import("@tailwindcss/vite")).default, x = s(e, ".framework"), S = s(e, "src"), C = /* @__PURE__ */ new Set([
 		".framework",
 		"node_modules",
 		"dist",
@@ -3153,15 +3153,15 @@ __installPublicEnv(publicEnvValues)
 		".vite",
 		".turbo",
 		".cache"
-	]), C = {
+	]), w = {
 		name: "framework:watch-app-sources",
 		async configureServer(t) {
 			try {
-				let n = (await P.readdir(e, { withFileTypes: !0 })).filter((e) => e.isDirectory() && !S.has(e.name));
+				let n = (await P.readdir(e, { withFileTypes: !0 })).filter((e) => e.isDirectory() && !C.has(e.name));
 				for (let r of n) t.watcher.add(s(e, r.name));
-				n.length === 0 && t.watcher.add(ee);
+				n.length === 0 && t.watcher.add(S);
 			} catch {
-				t.watcher.add(ee);
+				t.watcher.add(S);
 			}
 			try {
 				let n = await P.readFile(s(e, "package.json"), "utf8"), r = JSON.parse(n), i = Object.keys({
@@ -3178,11 +3178,11 @@ __installPublicEnv(publicEnvValues)
 				}));
 			} catch {}
 		}
-	}, w = s(e, "src", "pages"), T = (e) => e.endsWith(".tsx") && (e === w || e.startsWith(w + "/")), E = (e) => e === w || e.startsWith(w + "/"), D = async (n) => {
+	}, T = s(e, "src", "pages"), E = (e) => e.endsWith(".tsx") && (e === T || e.startsWith(T + "/")), D = (e) => e === T || e.startsWith(T + "/"), ee = async (n) => {
 		try {
 			let r = Date.now();
 			await Fl(e, t, i, o);
-			let { pages: a } = await bl(w);
+			let { pages: a } = await bl(T);
 			await is({
 				appRoot: e,
 				pages: a
@@ -3200,17 +3200,17 @@ __installPublicEnv(publicEnvValues)
 				r.push(e), n && clearTimeout(n), n = setTimeout(() => {
 					n = null;
 					let e = r.length === 1 ? r[0] : `${r.length} events (${r[0]}, …)`;
-					r.length = 0, D(e);
+					r.length = 0, ee(e);
 				}, 50);
 			};
 			t.watcher.on("add", (t) => {
-				T(t) && i(`add ${c(e, t)}`);
+				E(t) && i(`add ${c(e, t)}`);
 			}), t.watcher.on("unlink", (t) => {
-				T(t) && i(`unlink ${c(e, t)}`);
+				E(t) && i(`unlink ${c(e, t)}`);
 			}), t.watcher.on("addDir", (t) => {
-				E(t) && i(`addDir ${c(e, t)}`);
+				D(t) && i(`addDir ${c(e, t)}`);
 			}), t.watcher.on("unlinkDir", (t) => {
-				E(t) && i(`unlinkDir ${c(e, t)}`);
+				D(t) && i(`unlinkDir ${c(e, t)}`);
 			});
 		}
 	}, k = s(e, "app.config.ts"), A = (e) => {
@@ -3667,12 +3667,12 @@ __installPublicEnv(publicEnvValues)
 						};
 					}))), b = {};
 					for (let [e, t] of Object.entries(n.headers ?? {})) typeof t == "string" ? b[e] = t : Array.isArray(t) && (b[e] = t.join(", "));
-					let x = Pl(Nl(i[0]), b.cookie), ee = null, S = c.loader;
-					if (typeof S == "function") {
+					let x = Pl(Nl(i[0]), b.cookie), S = null, C = c.loader;
+					if (typeof C == "function") {
 						let e = new AbortController(), t = () => e.abort();
 						r.once("close", t);
 						try {
-							ee = await m("loader", () => S({
+							S = await m("loader", () => C({
 								params: u.params,
 								pathname: l,
 								signal: e.signal,
@@ -3683,7 +3683,7 @@ __installPublicEnv(publicEnvValues)
 							r.off("close", t);
 						}
 					}
-					let C = await m("loadSsrHelpers", async () => await t.ssrLoadModule("@voltro/web/ssr")), w = {
+					let w = await m("loadSsrHelpers", async () => await t.ssrLoadModule("@voltro/web/ssr")), T = {
 						pattern: u.route.pattern,
 						Component: c.default,
 						meta: c.meta,
@@ -3692,18 +3692,18 @@ __installPublicEnv(publicEnvValues)
 						Pending: c.Pending,
 						renderMode: _,
 						chain: y
-					}, T = {
-						cookies: C.parseCookieHeader(b.cookie),
+					}, E = {
+						cookies: w.parseCookieHeader(b.cookie),
 						headers: b,
 						url: o
-					}, E = Date.now(), { html: D, meta: O } = C.renderPageToHtml({
-						descriptor: w,
+					}, D = Date.now(), { html: ee, meta: O } = w.renderPageToHtml({
+						descriptor: T,
 						params: u.params,
 						pathname: l,
-						loaderData: ee,
-						requestContext: T
+						loaderData: S,
+						requestContext: E
 					});
-					p.render = Date.now() - E;
+					p.render = Date.now() - D;
 					let k = c.interactive ?? "full", A = [];
 					await m("collectCss", async () => {
 						let t = /* @__PURE__ */ new Set(), n = [
@@ -3719,10 +3719,10 @@ __installPublicEnv(publicEnvValues)
 					});
 					let j = await m("readShell", de), te = await m("transformShell", () => t.transformIndexHtml(o, j)), ne = [
 						A.map((e) => `<link rel="stylesheet" href="${e}?direct" />`).join("\n    "),
-						C.renderMetaToHtml(O),
+						w.renderMetaToHtml(O),
 						`<meta name="voltro-interactive" content="${k}" />`,
-						`<script type="application/json" id="__voltro_state__">${C.serialiseStateForInlining(ee)}<\/script>`
-					].filter((e) => e.length > 0).join("\n    "), re = T.cookies["voltro:locale"], M = te.replace("<div id=\"root\"></div>", `<div id="root">${D}</div>`).replace("</head>", `    ${ne}\n  </head>`).replace(/<html(\s+lang="[^"]*")?/i, re ? `<html lang="${re}"` : "<html lang=\"en\"");
+						`<script type="application/json" id="__voltro_state__">${w.serialiseStateForInlining(S)}<\/script>`
+					].filter((e) => e.length > 0).join("\n    "), re = E.cookies["voltro:locale"], M = te.replace("<div id=\"root\"></div>", `<div id="root">${ee}</div>`).replace("</head>", `    ${ne}\n  </head>`).replace(/<html(\s+lang="[^"]*")?/i, re ? `<html lang="${re}"` : "<html lang=\"en\"");
 					r.statusCode = 200, r.setHeader("content-type", "text/html; charset=utf-8"), r.setHeader("x-voltro-rendered-by", "ssr-dev"), r.end(M);
 					let N = Date.now() - f;
 					d ? (I.add(u.route.pattern), K.info(`ssr compiled ${u.route.pattern} in ${N}ms`, {
@@ -3809,7 +3809,7 @@ __installPublicEnv(publicEnvValues)
 		plugins: [
 			y(),
 			b(),
-			C,
+			w,
 			O,
 			N,
 			F,
@@ -4421,31 +4421,31 @@ __installPublicEnv(publicEnvValues)
 		attempts: n,
 		diagnostics: a
 	};
-}, ou = E.Struct({
-	tag: E.String,
-	kind: E.String,
-	file: E.optional(E.String),
-	source: E.optional(E.Union(E.String, E.Array(E.String))),
-	targets: E.optional(E.Array(E.Struct({
-		table: E.String,
-		op: E.String
+}, ou = D.Struct({
+	tag: D.String,
+	kind: D.String,
+	file: D.optional(D.String),
+	source: D.optional(D.Union(D.String, D.Array(D.String))),
+	targets: D.optional(D.Array(D.Struct({
+		table: D.String,
+		op: D.String
 	}))),
-	binds: E.optional(E.Array(E.String)),
-	requiresScopes: E.optional(E.Array(E.String))
-}), su = E.Struct({
-	tables: E.Array(E.String),
-	procedures: E.Array(ou),
-	scopes: E.optional(E.Array(E.String)),
-	routes: E.optional(E.Array(E.Struct({
-		pattern: E.String,
-		binds: E.Array(E.String),
-		file: E.optional(E.String)
+	binds: D.optional(D.Array(D.String)),
+	requiresScopes: D.optional(D.Array(D.String))
+}), su = D.Struct({
+	tables: D.Array(D.String),
+	procedures: D.Array(ou),
+	scopes: D.optional(D.Array(D.String)),
+	routes: D.optional(D.Array(D.Struct({
+		pattern: D.String,
+		binds: D.Array(D.String),
+		file: D.optional(D.String)
 	})))
-}), cu = E.Struct({
+}), cu = D.Struct({
 	graph: su,
-	artifacts: E.Array(E.Struct({
-		path: E.String,
-		content: E.String
+	artifacts: D.Array(D.Struct({
+		path: D.String,
+		content: D.String
 	}))
 }), lu = (e, t) => {
 	let n = [
@@ -4843,7 +4843,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		cookies: _.parseCookieHeader(s.cookie),
 		headers: s,
 		url: c
-	}, b = _.i18n?.resolve(s.cookie, s["accept-language"]), { html: x, meta: ee } = _.renderPageToHtml({
+	}, b = _.i18n?.resolve(s.cookie, s["accept-language"]), { html: x, meta: S } = _.renderPageToHtml({
 		descriptor: v,
 		params: r,
 		pathname: i,
@@ -4854,17 +4854,17 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 			outerWrap: b.outerWrap,
 			locale: b.locale
 		} : {}
-	}), S = d.interactive ?? "full", C = [
-		_.renderMetaToHtml(ee),
-		`<meta name="voltro-interactive" content="${S}" />`,
+	}), C = d.interactive ?? "full", w = [
+		_.renderMetaToHtml(S),
+		`<meta name="voltro-interactive" content="${C}" />`,
 		`<script type="application/json" id="__voltro_state__">${_.serialiseStateForInlining(h)}<\/script>`
-	].filter((e) => e.length > 0).join("\n    "), w = b?.locale ?? y.cookies["voltro:lang"] ?? "en", T = o.replace("<div id=\"root\"></div>", `<div id="root">${x}</div>`).replace("</head>", `    ${C}\n  </head>`).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${w}"`);
-	S === "none" && (T = Pu(T));
-	let E = f === "isr" ? _c(d.revalidate) : null;
+	].filter((e) => e.length > 0).join("\n    "), T = b?.locale ?? y.cookies["voltro:lang"] ?? "en", E = o.replace("<div id=\"root\"></div>", `<div id="root">${x}</div>`).replace("</head>", `    ${w}\n  </head>`).replace(/<html(\s+lang="[^"]*")?/i, `<html lang="${T}"`);
+	C === "none" && (E = Pu(E));
+	let D = f === "isr" ? _c(d.revalidate) : null;
 	return {
-		html: T,
+		html: E,
 		renderMode: f,
-		revalidateMs: E
+		revalidateMs: D
 	};
 }, Bu = (e) => e === "" ? "/" : e, Vu = async (e) => {
 	let t = await import(d(e).href);
@@ -4978,15 +4978,15 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 		password: process.env.PG_PASSWORD ?? "app",
 		database: process.env.PG_DATABASE ?? "app"
 	}), await y.connect(), v = xu({ client: y }), Du.info("isr cache backend: postgres", { table: "voltro_isr_cache" })) : (v = gc(), Du.info("isr cache backend: memory (per-process)", { hint: "set SSR_CACHE=postgres for persistent storage" })), await Fl(e, t, g, r);
-	let { pages: b, dirs: x } = await bl(s(e, "src", "pages")), ee = Lu(b), S = s(l, "server", "ssrEntry.js"), C = await Fu(S) ? await Vu(S) : await Hu(e, c);
-	Du.info(`ssr loader: ${C.kind}`, {
-		kind: C.kind,
-		...C.kind === "middleware" ? { hint: "no pre-built SSR bundle found; run `voltro build` to enable bundle mode" } : {}
+	let { pages: b, dirs: x } = await bl(s(e, "src", "pages")), S = Lu(b), C = s(l, "server", "ssrEntry.js"), w = await Fu(C) ? await Vu(C) : await Hu(e, c);
+	Du.info(`ssr loader: ${w.kind}`, {
+		kind: w.kind,
+		...w.kind === "middleware" ? { hint: "no pre-built SSR bundle found; run `voltro build` to enable bundle mode" } : {}
 	});
-	let w = /* @__PURE__ */ new Map();
+	let T = /* @__PURE__ */ new Map();
 	for (let e of b) try {
-		let t = await C.getPage(e.pattern, e.file);
-		w.set(e.pattern, {
+		let t = await w.getPage(e.pattern, e.file);
+		T.set(e.pattern, {
 			renderMode: ku(t),
 			tenantAware: t.tenantAware === !0,
 			revalidateMs: _c(t.revalidate),
@@ -5000,19 +5000,19 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 	} catch (t) {
 		Du.warn("failed to load page metadata", { pattern: e.pattern }, t);
 	}
-	Du.info(`registered ${w.size} route(s)`, { count: w.size });
-	let T = /* @__PURE__ */ new Map();
-	for (let [e, t] of w) t.cacheInvalidatesOn.length > 0 && T.set(e, t.cacheInvalidatesOn);
+	Du.info(`registered ${T.size} route(s)`, { count: T.size });
 	let E = /* @__PURE__ */ new Map();
-	for (let e of ee) E.set(e.pattern, e.regex);
-	let D = _u({
+	for (let [e, t] of T) t.cacheInvalidatesOn.length > 0 && E.set(e, t.cacheInvalidatesOn);
+	let D = /* @__PURE__ */ new Map();
+	for (let e of S) D.set(e.pattern, e.regex);
+	let ee = _u({
 		cache: v,
-		tableSubscriptionsByPattern: T,
-		regexByPattern: E
+		tableSubscriptionsByPattern: E,
+		regexByPattern: D
 	});
-	await D.start();
+	await ee.start();
 	let O = Eu(), k = b.map((e) => {
-		let t = w.get(e.pattern);
+		let t = T.get(e.pattern);
 		return {
 			pattern: e.pattern,
 			file: e.file,
@@ -5132,7 +5132,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				body: e.body
 			};
 		}
-		let o = Ru(i, ee), c = o ? w.get(o.route.pattern)?.renderMode : void 0, u = c === "ssr" || c === "isr", d = i === "/" ? s(l, "index.html") : s(l, i.replace(/^\//, ""), "index.html");
+		let o = Ru(i, S), c = o ? T.get(o.route.pattern)?.renderMode : void 0, u = c === "ssr" || c === "isr", d = i === "/" ? s(l, "index.html") : s(l, i.replace(/^\//, ""), "index.html");
 		if (!u && await Fu(d)) return {
 			status: 200,
 			headers: { "content-type": "text/html; charset=utf-8" },
@@ -5149,20 +5149,20 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				};
 			}
 		}
-		let f = Ru(i, ee);
+		let f = Ru(i, S);
 		if (!f) return {
 			status: 404,
 			headers: { "content-type": "text/plain" },
 			body: "not found"
 		};
-		let p = w.get(f.route.pattern), m = r["x-tenant"] ?? "anonymous", g = (await C.getHelpers()).i18n?.resolve(r.cookie, r["accept-language"])?.locale, y = vc(i, {
+		let p = T.get(f.route.pattern), m = r["x-tenant"] ?? "anonymous", g = (await w.getHelpers()).i18n?.resolve(r.cookie, r["accept-language"])?.locale, y = vc(i, {
 			...p?.tenantAware ? { tenant: m } : {},
 			...g ? { locale: g } : {}
-		}), b = v.get(y), S = Date.now();
-		if (b && yc(b, S)) return a.emit("cache", {
+		}), b = v.get(y), C = Date.now();
+		if (b && yc(b, C)) return a.emit("cache", {
 			kind: "HIT",
 			key: y,
-			ageMs: S - b.renderedAt
+			ageMs: C - b.renderedAt
 		}), {
 			status: 200,
 			headers: {
@@ -5170,18 +5170,18 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				"x-voltro-rendered-by": "isr",
 				"x-voltro-cache": "HIT",
 				"x-voltro-cache-key": y,
-				"x-voltro-cache-age-ms": String(S - b.renderedAt)
+				"x-voltro-cache-age-ms": String(C - b.renderedAt)
 			},
 			body: b.html
 		};
-		if (b && bc(b, S)) return a.emit("cache", {
+		if (b && bc(b, C)) return a.emit("cache", {
 			kind: "STALE",
 			key: y,
-			ageMs: S - b.renderedAt
+			ageMs: C - b.renderedAt
 		}), (async () => {
 			try {
 				let t = await zu({
-					provider: C,
+					provider: w,
 					root: e,
 					route: f.route,
 					params: f.params,
@@ -5193,7 +5193,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 					requestUrl: n
 				});
 				if (t && !("control" in t) && t.renderMode === "isr" && t.revalidateMs !== null) {
-					let e = w.get(f.route.pattern)?.staleWhileRevalidateMs ?? 0, n = Date.now();
+					let e = T.get(f.route.pattern)?.staleWhileRevalidateMs ?? 0, n = Date.now();
 					v.set(y, {
 						html: t.html,
 						renderedAt: n,
@@ -5213,13 +5213,13 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				"x-voltro-rendered-by": "isr",
 				"x-voltro-cache": "STALE",
 				"x-voltro-cache-key": y,
-				"x-voltro-cache-age-ms": String(S - b.renderedAt)
+				"x-voltro-cache-age-ms": String(C - b.renderedAt)
 			},
 			body: b.html
 		};
 		try {
 			let t = await zu({
-				provider: C,
+				provider: w,
 				root: e,
 				route: f.route,
 				params: f.params,
@@ -5258,7 +5258,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 				"x-voltro-rendered-by": t.renderMode
 			};
 			if (t.renderMode === "isr" && t.revalidateMs !== null) {
-				let e = Date.now(), n = w.get(f.route.pattern)?.staleWhileRevalidateMs ?? 0;
+				let e = Date.now(), n = T.get(f.route.pattern)?.staleWhileRevalidateMs ?? 0;
 				v.set(y, {
 					html: t.html,
 					renderedAt: e,
@@ -5434,7 +5434,7 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 					renderedBy: e.headers["x-voltro-rendered-by"],
 					cache: e.headers["x-voltro-cache"]
 				});
-				let n = Ru(s, ee)?.route.pattern ?? (e.status === 404 ? "<unmatched>" : "<asset>");
+				let n = Ru(s, S)?.route.pattern ?? (e.status === 404 ? "<unmatched>" : "<asset>");
 				O.record({
 					kind: "request",
 					tag: n,
@@ -5487,10 +5487,10 @@ CREATE INDEX IF NOT EXISTS ${e}_servable_until_idx ON ${e} (servable_until);
 	});
 	let ie = !1, F = (e) => async () => {
 		if (!ie) {
-			if (ie = !0, Du.info(`received ${e}, shutting down`, { signal: e }), N.close(), await D.stop(), y) try {
+			if (ie = !0, Du.info(`received ${e}, shutting down`, { signal: e }), N.close(), await ee.stop(), y) try {
 				await y.end();
 			} catch {}
-			await C.close(), await Mc(f), await p.dispose(), process.exit(0);
+			await w.close(), await Mc(f), await p.dispose(), process.exit(0);
 		}
 	};
 	process.on("SIGINT", F("SIGINT")), process.on("SIGTERM", F("SIGTERM"));
@@ -5738,11 +5738,11 @@ ${a.join("\n\n")}\n`);
 		...u,
 		...f
 	], e);
-	let p = (e) => e.replace(/[^a-zA-Z0-9_$]/g, "_"), m = (e) => `__src_agent_${p(e.name)}`, h = (e) => `__agentRoutes_${p(e.name)}`, g = r.length > 0, _ = r.map((e, t) => `import { ${e.name} as __pe${t} } from '${e.module}'`), v = g ? ", __voltroPluginErrors" : "", y = d.length > 0, b = d.map((e, t) => `import { ${e.name} as __prpc${t} } from '${e.module}'`), x = (e) => e === "query" ? "queryToRpc" : e === "mutation" ? "mutationToRpc" : "actionToRpc", ee = d.map((e, t) => `export const ${md(e.tag)} = ${x(e.kind)}(__prpc${t}${v})`), S = d.map((e) => `  ${md(e.tag)},`), C = d.map((e, t) => `  ${JSON.stringify(e.tag)}: normalizeDescriptor(__prpc${t}),`), w = [...n].sort((e, t) => e.kind === t.kind ? e.rpcTag < t.rpcTag ? -1 : 1 : _d(e.kind) - _d(t.kind)), T = i(t), E = (e) => `__src_${md(e.rpcTag)}`, D = (e) => {
-		let t = `./${c(T, e.file).replace(/\\/g, "/").replace(/\.tsx?$/, "")}`;
-		return `import { ${e.exportName} as ${E(e)} } from '${t}'`;
+	let p = (e) => e.replace(/[^a-zA-Z0-9_$]/g, "_"), m = (e) => `__src_agent_${p(e.name)}`, h = (e) => `__agentRoutes_${p(e.name)}`, g = r.length > 0, _ = r.map((e, t) => `import { ${e.name} as __pe${t} } from '${e.module}'`), v = g ? ", __voltroPluginErrors" : "", y = d.length > 0, b = d.map((e, t) => `import { ${e.name} as __prpc${t} } from '${e.module}'`), x = (e) => e === "query" ? "queryToRpc" : e === "mutation" ? "mutationToRpc" : "actionToRpc", S = d.map((e, t) => `export const ${md(e.tag)} = ${x(e.kind)}(__prpc${t}${v})`), C = d.map((e) => `  ${md(e.tag)},`), w = d.map((e, t) => `  ${JSON.stringify(e.tag)}: normalizeDescriptor(__prpc${t}),`), T = [...n].sort((e, t) => e.kind === t.kind ? e.rpcTag < t.rpcTag ? -1 : 1 : _d(e.kind) - _d(t.kind)), E = i(t), D = (e) => `__src_${md(e.rpcTag)}`, ee = (e) => {
+		let t = `./${c(E, e.file).replace(/\\/g, "/").replace(/\.tsx?$/, "")}`;
+		return `import { ${e.exportName} as ${D(e)} } from '${t}'`;
 	}, O = (e) => {
-		let t = md(e.rpcTag), n = E(e);
+		let t = md(e.rpcTag), n = D(e);
 		return e.kind === "query" ? `export const ${t} = queryToRpc(${n}${v})` : e.kind === "mutation" ? `export const ${t} = mutationToRpc(${n}${v})` : e.kind === "action" ? `export const ${t} = actionToRpc(${n}${v})` : e.kind === "stream" ? `export const ${t} = streamToRpc(${n}${v})` : [
 			`export const ${t} = Rpc.make('${e.rpcTag}', {`,
 			`  payload: ${n}.payloadSchema,`,
@@ -5750,7 +5750,7 @@ ${a.join("\n\n")}\n`);
 			`  error:   ${n}.errorSchema,`,
 			"})"
 		].join("\n");
-	}, k = w.some((e) => e.kind === "workflow"), A = k ? [
+	}, k = T.some((e) => e.kind === "workflow"), A = k ? [
 		"__voltroWorkflowRun",
 		"__voltroWorkflowRuns",
 		"__voltroWorkflowRunSteps",
@@ -5766,14 +5766,14 @@ ${a.join("\n\n")}\n`);
 		"__voltroUndoApply",
 		"__voltroUndoRedo"
 	] : [], te = [
-		...w.map((e) => `  ${md(e.rpcTag)},`),
+		...T.map((e) => `  ${md(e.rpcTag)},`),
 		...a.flatMap((e) => [`  ${md(`${e.name}.send`)},`, `  ${md(`${e.name}.messages`)},`]),
 		...A.map((e) => `  ${e},`),
 		...j.map((e) => `  ${e},`),
-		...S
+		...C
 	].join("\n"), ne = ["queryToRpc"];
-	(w.some((e) => e.kind === "mutation") || d.some((e) => e.kind === "mutation")) && ne.push("mutationToRpc"), (w.some((e) => e.kind === "action") || k || l || d.some((e) => e.kind === "action")) && ne.push("actionToRpc"), w.some((e) => e.kind === "stream") && ne.push("streamToRpc"), k && ne.push("WorkflowRunHandleSchema", "workflowCancelDescriptor", "workflowDomainEventsQueryDescriptor", "workflowEventDeliveriesQueryDescriptor", "workflowResumeDescriptor", "workflowRunEventsQueryDescriptor", "workflowRunQueryDescriptor", "workflowRunsQueryDescriptor", "workflowRunStepsQueryDescriptor", "workflowSignalDescriptor", "workflowUpdateDescriptor"), o && ne.push("mutationToRpc", "undoLogQueryDescriptor", "undoApplyDescriptor", "undoRedoDescriptor"), (w.some((e) => e.kind === "query" || e.kind === "mutation" || e.kind === "action" || e.kind === "stream") || l || k || o || y) && ne.push("normalizeDescriptor");
-	let re = [...new Set(ne)].sort(), M = w.filter((e) => e.kind === "query" || e.kind === "mutation" || e.kind === "action" || e.kind === "stream").map((e) => `  ${JSON.stringify(e.rpcTag)}: normalizeDescriptor(${E(e)}),`), N = a.flatMap((e) => [`  ${JSON.stringify(`${e.name}.send`)}: normalizeDescriptor(${h(e)}.send),`, `  ${JSON.stringify(`${e.name}.messages`)}: normalizeDescriptor(${h(e)}.messages),`]), ie = k ? [
+	(T.some((e) => e.kind === "mutation") || d.some((e) => e.kind === "mutation")) && ne.push("mutationToRpc"), (T.some((e) => e.kind === "action") || k || l || d.some((e) => e.kind === "action")) && ne.push("actionToRpc"), T.some((e) => e.kind === "stream") && ne.push("streamToRpc"), k && ne.push("WorkflowRunHandleSchema", "workflowCancelDescriptor", "workflowDomainEventsQueryDescriptor", "workflowEventDeliveriesQueryDescriptor", "workflowResumeDescriptor", "workflowRunEventsQueryDescriptor", "workflowRunQueryDescriptor", "workflowRunsQueryDescriptor", "workflowRunStepsQueryDescriptor", "workflowSignalDescriptor", "workflowUpdateDescriptor"), o && ne.push("mutationToRpc", "undoLogQueryDescriptor", "undoApplyDescriptor", "undoRedoDescriptor"), (T.some((e) => e.kind === "query" || e.kind === "mutation" || e.kind === "action" || e.kind === "stream") || l || k || o || y) && ne.push("normalizeDescriptor");
+	let re = [...new Set(ne)].sort(), M = T.filter((e) => e.kind === "query" || e.kind === "mutation" || e.kind === "action" || e.kind === "stream").map((e) => `  ${JSON.stringify(e.rpcTag)}: normalizeDescriptor(${D(e)}),`), N = a.flatMap((e) => [`  ${JSON.stringify(`${e.name}.send`)}: normalizeDescriptor(${h(e)}.send),`, `  ${JSON.stringify(`${e.name}.messages`)}: normalizeDescriptor(${h(e)}.messages),`]), ie = k ? [
 		"  \"__voltro.workflow.run\": normalizeDescriptor(workflowRunQueryDescriptor),",
 		"  \"__voltro.workflow.runs\": normalizeDescriptor(workflowRunsQueryDescriptor),",
 		"  \"__voltro.workflow.run.steps\": normalizeDescriptor(workflowRunStepsQueryDescriptor),",
@@ -5788,8 +5788,8 @@ ${a.join("\n\n")}\n`);
 		"  \"__voltro.undo.log\": normalizeDescriptor(undoLogQueryDescriptor),",
 		"  \"__voltro.undo.apply\": normalizeDescriptor(undoApplyDescriptor),",
 		"  \"__voltro.undo.redo\": normalizeDescriptor(undoRedoDescriptor),"
-	] : [], ae = w.filter((e) => e.kind === "workflow").map((e) => `  ${JSON.stringify(e.rpcTag)}: { kind: 'workflow' },`), oe = w.filter((e) => e.kind === "workflow").map((e) => {
-		let t = E(e);
+	] : [], ae = T.filter((e) => e.kind === "workflow").map((e) => `  ${JSON.stringify(e.rpcTag)}: { kind: 'workflow' },`), oe = T.filter((e) => e.kind === "workflow").map((e) => {
+		let t = D(e);
 		return [
 			`  ${JSON.stringify(e.rpcTag)}: {`,
 			"    kind: 'workflow',",
@@ -5801,7 +5801,7 @@ ${a.join("\n\n")}\n`);
 			`    queries: __voltroWorkflowMessages(${t}).queries,`,
 			"  },"
 		].join("\n");
-	}), se = [...w, ...a.map((e) => ({
+	}), se = [...T, ...a.map((e) => ({
 		rpcTag: `agent:${e.name}`,
 		file: e.file
 	}))];
@@ -5816,7 +5816,7 @@ ${a.join("\n\n")}\n`);
 			return `${e.rpcTag}${t}`;
 		}).join("
")).digest("hex").slice(0, 16)}`,
 		"// Source files:",
-		...w.map((t) => `//   - ${c(e, t.file).replace(/\\/g, "/")}`),
+		...T.map((t) => `//   - ${c(e, t.file).replace(/\\/g, "/")}`),
 		...a.map((t) => `//   - ${c(e, t.file).replace(/\\/g, "/")}  (agent)`),
 		"",
 		k ? "import { Rpc, RpcGroup } from '@effect/rpc'" : "import { RpcGroup } from '@effect/rpc'",
@@ -5824,8 +5824,8 @@ ${a.join("\n\n")}\n`);
 		`import { ${re.join(", ")} } from '@voltro/protocol'`,
 		...l ? ["import { agentRouteDescriptors as __voltroAgentRoutes } from '@voltro/ai/agent'"] : [],
 		"",
-		...w.map(D),
-		...a.map((e) => `import { ${e.exportName} as ${m(e)} } from './${c(T, e.file).replace(/\\/g, "/").replace(/\.tsx?$/, "")}'`),
+		...T.map(ee),
+		...a.map((e) => `import { ${e.exportName} as ${m(e)} } from './${c(E, e.file).replace(/\\/g, "/").replace(/\.tsx?$/, "")}'`),
 		...g ? ["", ..._] : [],
 		...y ? ["", ...b] : [],
 		"",
@@ -5871,7 +5871,7 @@ ${a.join("\n\n")}\n`);
 			"} }",
 			""
 		] : [],
-		...w.map(O),
+		...T.map(O),
 		...a.flatMap((e) => [`export const ${md(`${e.name}.send`)} = actionToRpc(${h(e)}.send${v})`, `export const ${md(`${e.name}.messages`)} = queryToRpc(${h(e)}.messages${v})`]),
 		...k ? [
 			"export const __voltroWorkflowRun = queryToRpc(workflowRunQueryDescriptor)",
@@ -5890,7 +5890,7 @@ ${a.join("\n\n")}\n`);
 			"export const __voltroUndoApply = mutationToRpc(undoApplyDescriptor)",
 			"export const __voltroUndoRedo = mutationToRpc(undoRedoDescriptor)"
 		] : [],
-		...ee,
+		...S,
 		"",
 		"export const appGroup = RpcGroup.make(",
 		te,
@@ -5905,7 +5905,7 @@ ${a.join("\n\n")}\n`);
 		...ae,
 		...ie,
 		...P,
-		...C,
+		...w,
 		"} as const",
 		"",
 		"export type AppDescriptors = typeof appDescriptors",
@@ -6581,7 +6581,7 @@ ${a.join("\n\n")}\n`);
 		...i ? { cdcDialect: i } : {}
 	});
 }, kf = async ({ env: e = process.env } = {}) => {
-	let t = C.make(S.mergeAll(Fi.layer, Ii.Default)), n = await t.runPromise(Pi), r = await t.runPromise(Ii), i = (e.CACHE_BACKEND ?? "memory").toLowerCase();
+	let t = w.make(C.mergeAll(Fi.layer, Ii.Default)), n = await t.runPromise(Pi), r = await t.runPromise(Ii), i = (e.CACHE_BACKEND ?? "memory").toLowerCase();
 	return await t.runPromise(r.addSink((e) => n.invalidateTag(e))), {
 		service: n,
 		invalidationBus: r,
@@ -6600,7 +6600,7 @@ ${a.join("\n\n")}\n`);
 			}
 		},
 		cache: {
-			get: (e) => t.runPromise(n.get(e)).then((e) => w.getOrUndefined(e)),
+			get: (e) => t.runPromise(n.get(e)).then((e) => T.getOrUndefined(e)),
 			set: (e, r, i) => t.runPromise(n.set(e, r, i)),
 			setWithTags: (e, r, i) => t.runPromise(n.setWithTags(e, r, i)),
 			remove: (e) => t.runPromise(n.remove(e)),
@@ -6709,15 +6709,15 @@ ${a.join("\n\n")}\n`);
 		take: 1
 	}))[0], a = i?.subject?.tenantId ?? null, o = t.tenantId ?? null;
 	if (i === void 0 || a !== o) throw new Kr({ reason: "not authorized for this workflow run" });
-}, Nf = Vt.pipe(S.provide(f.layer)), Pf = (e) => {
-	let t = S.succeed(Pi, e.cacheService), n = S.succeed(Li, e.kvService), r = [
+}, Nf = Vt.pipe(C.provide(f.layer)), Pf = (e) => {
+	let t = C.succeed(Pi, e.cacheService), n = C.succeed(Li, e.kvService), r = [
 		e.analyticsLayer,
 		t,
 		n,
 		...e.pluginServices,
 		...e.userLayers
 	];
-	return S.mergeAll(...r);
+	return C.mergeAll(...r);
 }, Ff = [
 	mi,
 	gi,
@@ -6729,12 +6729,12 @@ ${a.join("\n\n")}\n`);
 	let r = new Set(t);
 	if (n) for (let e of Ff) r.add(e.name);
 	let i = {};
-	for (let [t, n] of Object.entries(e)) i[t] = r.has(t) ? (e) => n(e).pipe(D.take(1)) : n;
+	for (let [t, n] of Object.entries(e)) i[t] = r.has(t) ? (e) => n(e).pipe(ee.take(1)) : n;
 	return i;
 }, Lf = j({ scope: "voltro:dev:supervisor" }), Rf = /\.generated\./, zf = /\.([cm]?[jt]sx?|json)$/, Bf = (e) => {
 	let t = r(e);
 	return !Rf.test(t) && zf.test(t);
-}, Vf = (e) => e.startsWith("node_modules") || e.startsWith(".framework") || e.startsWith(".turbo") || e.startsWith(".vite") || e.startsWith("dist") || e.startsWith(".git"), Hf = process.env.WATCH_POLL === "1" || process.env.CHOKIDAR_USEPOLLING === "1", Uf = 1e3, Wf = (e) => D.async((t) => {
+}, Vf = (e) => e.startsWith("node_modules") || e.startsWith(".framework") || e.startsWith(".turbo") || e.startsWith(".vite") || e.startsWith("dist") || e.startsWith(".git"), Hf = process.env.WATCH_POLL === "1" || process.env.CHOKIDAR_USEPOLLING === "1", Uf = 1e3, Wf = (e) => ee.async((t) => {
 	let n = l(e), i = (e) => c(n, e), a = Vi(n, {
 		persistent: !0,
 		ignoreInitial: !0,
@@ -6792,17 +6792,17 @@ ${a.join("\n\n")}\n`);
 		watcher: Hf ? "chokidar (polling)" : "chokidar (native)",
 		hint: "WATCH=0 disables, WATCH_DEBUG=1 traces every event, WATCH_POLL=1 for bind-mounts (k8s/Docker)"
 	});
-	let t = yield* T.make(w.none()), n = b.gen(function* () {
+	let t = yield* E.make(T.none()), n = b.gen(function* () {
 		let n = yield* b.fork(Gf(e.root));
-		yield* T.set(t, w.some(n));
+		yield* E.set(t, T.some(n));
 	}), r = b.gen(function* () {
-		let e = yield* T.get(t);
-		yield* w.match(e, {
+		let e = yield* E.get(t);
+		yield* T.match(e, {
 			onNone: () => b.void,
 			onSome: (e) => x.interrupt(e)
-		}), yield* T.set(t, w.none());
+		}), yield* E.set(t, T.none());
 	});
-	return yield* n, yield* Wf(e.root).pipe(D.debounce(y.millis(80)), D.runForEach((e) => b.gen(function* () {
+	return yield* n, yield* Wf(e.root).pipe(ee.debounce(y.millis(80)), ee.runForEach((e) => b.gen(function* () {
 		let t = Date.now();
 		Lf.info("file changed — restarting", { file: e.file }), yield* r, yield* n, Lf.info("restart complete", { ms: Date.now() - t });
 	}))), yield* b.never;
@@ -6821,7 +6821,7 @@ ${a.join("\n\n")}\n`);
 	}), {
 		spec: t,
 		sink: n,
-		layer: S.succeed(ge, n),
+		layer: C.succeed(ge, n),
 		tables: t.tables ?? [],
 		dispose: async () => {
 			t.dispose && await b.runPromise(t.dispose(n).pipe(b.timeout("1200 millis"), b.ignore));
@@ -7430,7 +7430,7 @@ ${a.join("\n\n")}\n`);
 	let r = n ?? 0, i = t === void 0 ? e.length : r + t;
 	return e.slice(r, i);
 }, Fp = (e, t) => {
-	let n = E.decodeUnknownEither(e.output), r = [];
+	let n = D.decodeUnknownEither(e.output), r = [];
 	for (let e = 0; e < t.length; e++) {
 		let i = n(t[e]);
 		if (i._tag === "Left") {
@@ -8132,7 +8132,7 @@ ${a.join("\n\n")}\n`);
 		}
 		let n = e.pluginConfigs?.[t.name];
 		try {
-			let e = E.decodeUnknownSync(t.configSchema)(n);
+			let e = D.decodeUnknownSync(t.configSchema)(n);
 			a.set(t.name, e);
 		} catch (e) {
 			throw Error(`plugin "${t.name}" config failed validation: ${e.message ?? String(e)}`);
@@ -8468,7 +8468,7 @@ ${a.join("\n\n")}\n`);
 }), Im = (e, t) => {
 	let n = [];
 	for (let r of e) typeof r.onWorkflowStep == "function" && n.push(Fm(r.name, r.onWorkflowStep, t));
-	return n.length === 0 ? S.succeed(Un, { interceptor: ((e) => e) }) : S.succeed(Un, { interceptor: ((e, t) => n.reduceRight((e, n) => n(e, t), e)) });
+	return n.length === 0 ? C.succeed(Un, { interceptor: ((e) => e) }) : C.succeed(Un, { interceptor: ((e, t) => n.reduceRight((e, n) => n(e, t), e)) });
 }, Lm = (e) => {
 	if (!e) return;
 	let t = e.workflowName ?? e.tag, n = [];
@@ -8910,10 +8910,10 @@ ${a.join("\n\n")}\n`);
 	onStrategyFailed: ({ strategyId: e, reason: t }) => {
 		J.warn(`auth strategy "${e}" rejected request: ${t}`);
 	}
-}), Ch = (e) => S.succeed(Wr, Wr.of(({ headers: t, clientId: n }) => b.promise(async () => We(n) || e({
+}), Ch = (e) => C.succeed(Wr, Wr.of(({ headers: t, clientId: n }) => b.promise(async () => We(n) || e({
 	headers: t,
 	clientId: n
-})))), wh = S.succeed(Gr, Gr.of(({ clientId: e }) => b.succeed({ clientId: e }))), Th = (e) => {
+})))), wh = C.succeed(Gr, Gr.of(({ clientId: e }) => b.succeed({ clientId: e }))), Th = (e) => {
 	if (g.isCause(e)) return e;
 	if (typeof e != "object" || !e) return;
 	for (let t of Object.getOwnPropertySymbols(e)) if (t.description === "effect/Runtime/FiberFailure/Cause") {
@@ -8926,9 +8926,9 @@ ${a.join("\n\n")}\n`);
 	let t = Th(e);
 	if (t === void 0) return;
 	let n = g.failureOption(t);
-	if (w.isSome(n)) return n.value;
+	if (T.isSome(n)) return n.value;
 	let r = g.dieOption(t);
-	if (w.isSome(r)) return r.value;
+	if (T.isSome(r)) return r.value;
 }, Dh = (e) => {
 	if (e == null) return { message: "unknown error" };
 	let t = Eh(e);
@@ -9355,7 +9355,7 @@ ${a.join("\n\n")}\n`);
 		}
 	}
 	v ||= ht();
-	let b = bg(p.length), x = R(), ee = x && b.length > 0 ? Ze({
+	let b = bg(p.length), x = R(), S = x && b.length > 0 ? Ze({
 		currentRegion: x,
 		replicaRegions: xg(h, b),
 		inner: xt()
@@ -9372,7 +9372,7 @@ ${a.join("\n\n")}\n`);
 		replicationAdapter: m,
 		rywPolicy: g,
 		rywStore: v,
-		replicaSelector: ee
+		replicaSelector: S
 	});
 }, vg = async (e, t, n, r) => {
 	let i = Qi(t?.plugins ?? []), a = n === "postgres" || n === "mysql" || n === "mariadb", o = n === "postgres" ? "LISTEN/NOTIFY" : "binlog CDC";
@@ -9445,20 +9445,20 @@ ${a.join("\n\n")}\n`);
 	});
 	let v = await Uh(i);
 	J.info(`discovered ${v.length} files`, { count: v.length });
-	let y = await Xm(o?.plugins ?? [], o?.name ?? r(i), i), x = (o?.plugins ?? []).flatMap((e) => (e.errorSchemas ?? []).map((e) => e.import)), w = (o?.plugins ?? []).flatMap((e) => (e.rpcClientDescriptors ?? []).map((e) => ({
+	let y = await Xm(o?.plugins ?? [], o?.name ?? r(i), i), x = (o?.plugins ?? []).flatMap((e) => (e.errorSchemas ?? []).map((e) => e.import)), T = (o?.plugins ?? []).flatMap((e) => (e.rpcClientDescriptors ?? []).map((e) => ({
 		tag: e.tag,
 		kind: e.kind,
 		module: e.import.module,
 		name: e.import.name
-	}))), T = await bd({
+	}))), E = await bd({
 		root: i,
 		...y.length > 0 ? { pluginContributions: y } : {},
 		...x.length > 0 ? { pluginErrorImports: x } : {},
-		...w.length > 0 ? { pluginRpcImports: w } : {},
+		...T.length > 0 ? { pluginRpcImports: T } : {},
 		...o?.name === void 0 ? {} : { apiName: o.name }
 	});
-	T ? (J.info("codegen wrote rpcGroup", { path: c(i, T) }), await nd(T)) : J.debug("codegen skipped — no descriptors discovered");
-	let E = gg(o ?? null), D = E === "mariadb" ? "mariadb" : E === "mssql" ? "mssql" : void 0, O = D !== void 0 && (process.env.CDC ?? "1") !== "0", { queries: k, mutations: A, actions: j, streams: re, workflows: M, workflowWorkers: N, eventTriggers: ie, schedules: F, tables: ae, featureMix: oe, tenantScopedTables: se, softDeleteScopedTables: ce } = await sg(v, { cdc: O }), le = M.length > 0 || ie.length > 0, I = await cg(i);
+	E ? (J.info("codegen wrote rpcGroup", { path: c(i, E) }), await nd(E)) : J.debug("codegen skipped — no descriptors discovered");
+	let D = gg(o ?? null), ee = D === "mariadb" ? "mariadb" : D === "mssql" ? "mssql" : void 0, O = ee !== void 0 && (process.env.CDC ?? "1") !== "0", { queries: k, mutations: A, actions: j, streams: re, workflows: M, workflowWorkers: N, eventTriggers: ie, schedules: F, tables: ae, featureMix: oe, tenantScopedTables: se, softDeleteScopedTables: ce } = await sg(v, { cdc: O }), le = M.length > 0 || ie.length > 0, I = await cg(i);
 	Ft(At(I?.secrets)), await zo({
 		rawEnv: I?.env,
 		appType: "api",
@@ -9470,7 +9470,7 @@ ${a.join("\n\n")}\n`);
 		mix: oe,
 		plugins: I?.plugins ?? [],
 		cdc: O,
-		...D ? { cdcDialect: D } : {}
+		...ee ? { cdcDialect: ee } : {}
 	}), ye = I?.analytics?.tables ?? [], L = (() => {
 		let e = new Set(ae.map((e) => e.tableName)), t = [...ae];
 		for (let n of [...ve, ...ye]) {
@@ -9617,7 +9617,7 @@ ${a.join("\n\n")}\n`);
 	let kt = gg(I), jt = process.env.POD_NAME ?? process.env.HOSTNAME ?? `dev-${process.pid}`, Nt, Pt;
 	if (kt !== "memory") {
 		let e = await mg(kt);
-		Nt = C.make(e.makeSqlLayer(lg())), Pt = await Nt.runPromise(z.SqlClient);
+		Nt = w.make(e.makeSqlLayer(lg())), Pt = await Nt.runPromise(z.SqlClient);
 	}
 	let Bt = rt({
 		coordinator: [
@@ -10024,7 +10024,7 @@ ${a.join("\n\n")}\n`);
 		...re.map((e) => ai(e.descriptor, Dr)),
 		...Cr,
 		...Tr
-	], Ar = Vn.make(...Or).middleware(Wr).middleware(Gr), jr = I?.layers ?? [], Mr = (I?.plugins ?? []).map((e) => e.services).filter((e) => e !== void 0), Nr = S.succeed(me, Dn.registry), Pr = S.mergeAll(Pf({
+	], Ar = Vn.make(...Or).middleware(Wr).middleware(Gr), jr = I?.layers ?? [], Mr = (I?.plugins ?? []).map((e) => e.services).filter((e) => e !== void 0), Nr = C.succeed(me, Dn.registry), Pr = C.mergeAll(Pf({
 		analyticsLayer: rn.layer,
 		cacheService: Wt,
 		kvService: $t,
@@ -10058,7 +10058,7 @@ ${a.join("\n\n")}\n`);
 			kv: Qt
 		}, t = qn.outgoing.map((e) => e.descriptor);
 		Lr = Wi(e, async (n) => {
-			let r = Ki.execute(n).pipe(b.provide(Ki.toLayer(Ui(e, { events: t })).pipe(S.provideMerge(Fn))));
+			let r = Ki.execute(n).pipe(b.provide(Ki.toLayer(Ui(e, { events: t })).pipe(C.provideMerge(Fn))));
 			b.runPromise(r).catch((e) => {
 				Gn.error("deliverWebhook workflow crashed", {
 					deliveryId: n.deliveryId,
@@ -10391,7 +10391,7 @@ ${a.join("\n\n")}\n`);
 	}, Hi = [...mt(M, {
 		buildContext: Di,
 		resolveStartContext: Un
-	}, (e, t, n) => Vi(e.definition.name, e.definition, t, n)), ...N], qi = Hi.length > 0 ? S.mergeAll(...Hi) : S.empty, Yi = C.make(qi.pipe(S.provideMerge(Fn)));
+	}, (e, t, n) => Vi(e.definition.name, e.definition, t, n)), ...N], qi = Hi.length > 0 ? C.mergeAll(...Hi) : C.empty, Yi = w.make(qi.pipe(C.provideMerge(Fn)));
 	process.on("beforeExit", () => {
 		Yi.dispose();
 	}), In = M.length > 0 ? ft({
@@ -10428,7 +10428,7 @@ ${a.join("\n\n")}\n`);
 			runPromise: (e) => Yi.runPromise(e)
 		}, e, t)
 	}) : void 0;
-	let Zi = S.mergeAll(Ar.toLayer(Vr), ge, wh), Qi = If(Vr, k.map((e) => e.descriptor.name), le), $i = S.mergeAll(Ar.toLayer(Qi), ge, wh), ea = On, ta = (ea === "postgres" || ea === "mysql" || ea === "mariadb" || ea === "mssql") && (process.env.CDC ?? "1") !== "0";
+	let Zi = C.mergeAll(Ar.toLayer(Vr), ge, wh), Qi = If(Vr, k.map((e) => e.descriptor.name), le), $i = C.mergeAll(Ar.toLayer(Qi), ge, wh), ea = On, ta = (ea === "postgres" || ea === "mysql" || ea === "mariadb" || ea === "mssql") && (process.env.CDC ?? "1") !== "0";
 	if (ea === "postgres" && hf()) {
 		let e = bf({
 			store: R,
@@ -10445,7 +10445,7 @@ ${a.join("\n\n")}\n`);
 	});
 	let ra = (e) => {
 		try {
-			return ee.make(e);
+			return S.make(e);
 		} catch {
 			return;
 		}
@@ -11902,7 +11902,7 @@ ${a.join("\n\n")}\n`);
 			kv: r
 		}, a = _.outgoing.map((e) => e.descriptor);
 		g = Wi(i, async (e) => {
-			let n = Ki.execute(e).pipe(b.provide(Ki.toLayer(Ui(i, { events: a })).pipe(S.provideMerge(t))));
+			let n = Ki.execute(e).pipe(b.provide(Ki.toLayer(Ui(i, { events: a })).pipe(C.provideMerge(t))));
 			b.runPromise(n).catch((t) => {
 				h.error("deliverWebhook workflow crashed", {
 					deliveryId: e.deliveryId,
@@ -11941,34 +11941,34 @@ ${a.join("\n\n")}\n`);
 		...d === void 0 ? {} : { workflowsProxy: d },
 		eventTriggers: e.discovered.eventTriggers ?? [],
 		namespaceIsolationOn: m
-	}), x = S.succeed(me, Hp), ee = (t, n) => {
+	}), x = C.succeed(me, Hp), S = (t, n) => {
 		let r = t.pipe(b.provide(it(n)));
 		return Mt((e.baseLayer ? r.pipe(b.provide(e.baseLayer)) : r).pipe(b.provide(x)));
-	}, w = st({
+	}, T = st({
 		store: e.store,
 		buildContext: (e, t, n) => y(e, t, n),
-		runEffect: ee,
+		runEffect: S,
 		undoCapture: fm()
-	}), T = dm(), E = Qe({
+	}), E = dm(), D = Qe({
 		buildContext: (e) => y(e),
-		runEffect: ee
-	}), D = lt({
+		runEffect: S
+	}), ee = lt({
 		buildContext: (e) => y(e),
 		finalize: (t, n) => Oe(ke(t, e.tenantScopedTables, n.subject.tenantId), e.softDeleteScopedTables),
 		provideEffect: (e, t) => e.pipe(b.provide(it(t)))
 	}), O = {};
-	for (let n of [...e.discovered.queries, ...T.queries]) O[n.descriptor.name] = (e) => Fe(D(n, e), t, `subscription.${n.descriptor.name}`);
-	for (let t of [...e.discovered.mutations, ...T.mutations]) O[t.descriptor.name] = (e) => Ne(async (e, n) => w(t, e, n), e, `mutation.${t.descriptor.name}`);
-	for (let t of e.discovered.actions) O[t.descriptor.name] = (e) => Ne(async (e, n) => E(t, e, n), e, `action.${t.descriptor.name}`);
+	for (let n of [...e.discovered.queries, ...E.queries]) O[n.descriptor.name] = (e) => Fe(ee(n, e), t, `subscription.${n.descriptor.name}`);
+	for (let t of [...e.discovered.mutations, ...E.mutations]) O[t.descriptor.name] = (e) => Ne(async (e, n) => T(t, e, n), e, `mutation.${t.descriptor.name}`);
+	for (let t of e.discovered.actions) O[t.descriptor.name] = (e) => Ne(async (e, n) => D(t, e, n), e, `action.${t.descriptor.name}`);
 	let k = () => `public-${Math.random().toString(36).slice(2, 10)}`, A = [...e.discovered.mutations.filter((e) => e.descriptor.publicApi !== void 0).map((e) => ({
 		descriptor: e.descriptor,
-		invoke: (t, n) => w(e, t, {
+		invoke: (t, n) => T(e, t, {
 			subject: n.subject,
 			traceId: k()
 		})
 	})), ...e.discovered.actions.filter((e) => e.descriptor.publicApi !== void 0).map((e) => ({
 		descriptor: e.descriptor,
-		invoke: (t, n) => E(e, t, {
+		invoke: (t, n) => D(e, t, {
 			subject: n.subject,
 			traceId: k()
 		})
@@ -12025,7 +12025,7 @@ ${a.join("\n\n")}\n`);
 			source: "workflow-rpc"
 		}).start(t.definition.name, e);
 	}, e, `workflow.${t.definition.name}`);
-	f && (O[mi.name] = (e) => Fe(D({
+	f && (O[mi.name] = (e) => Fe(ee({
 		descriptor: mi,
 		executor: (e) => {
 			let t = e.id;
@@ -12041,7 +12041,7 @@ ${a.join("\n\n")}\n`);
 				projection: void 0
 			};
 		}
-	}, e), t, `subscription.${mi.name}`), O[gi.name] = (e) => Fe(D({
+	}, e), t, `subscription.${mi.name}`), O[gi.name] = (e) => Fe(ee({
 		descriptor: gi,
 		executor: (e) => {
 			let t = e, n = [...t.tag === void 0 ? [] : [B("tag", t.tag)], ...t.status === void 0 ? [] : [B("status", t.status)]], r = Number.isFinite(t.limit) && t.limit !== void 0 ? Math.min(Math.max(Math.floor(t.limit), 1), 500) : 100;
@@ -12057,7 +12057,7 @@ ${a.join("\n\n")}\n`);
 				projection: void 0
 			};
 		}
-	}, e), t, `subscription.${gi.name}`), O[hi.name] = (e) => Fe(D({
+	}, e), t, `subscription.${gi.name}`), O[hi.name] = (e) => Fe(ee({
 		descriptor: hi,
 		executor: (e) => {
 			let t = e.runId;
@@ -12073,7 +12073,7 @@ ${a.join("\n\n")}\n`);
 				projection: void 0
 			};
 		}
-	}, e), t, `subscription.${hi.name}`), O[pi.name] = (e) => Fe(D({
+	}, e), t, `subscription.${hi.name}`), O[pi.name] = (e) => Fe(ee({
 		descriptor: pi,
 		executor: (e) => {
 			let t = e.runId;
@@ -12089,7 +12089,7 @@ ${a.join("\n\n")}\n`);
 				projection: void 0
 			};
 		}
-	}, e), t, `subscription.${pi.name}`), O[ui.name] = (e) => Fe(D({
+	}, e), t, `subscription.${pi.name}`), O[ui.name] = (e) => Fe(ee({
 		descriptor: ui,
 		executor: (e) => {
 			let t = e;
@@ -12105,7 +12105,7 @@ ${a.join("\n\n")}\n`);
 				projection: void 0
 			};
 		}
-	}, e), t, `subscription.${ui.name}`), O[di.name] = (e) => Fe(D({
+	}, e), t, `subscription.${ui.name}`), O[di.name] = (e) => Fe(ee({
 		descriptor: di,
 		executor: (e) => {
 			let t = e.eventId;
@@ -12138,8 +12138,8 @@ ${a.join("\n\n")}\n`);
 		...e.discovered.queries.map((e) => ii(e.descriptor)),
 		...e.discovered.mutations.map((e) => ni(e.descriptor)),
 		...e.discovered.actions.map((e) => Jr(e.descriptor)),
-		...T.queries.map((e) => ii(e.descriptor)),
-		...T.mutations.map((e) => ni(e.descriptor)),
+		...E.queries.map((e) => ii(e.descriptor)),
+		...E.mutations.map((e) => ni(e.descriptor)),
 		...(e.discovered.streams ?? []).map((e) => ai(e.descriptor)),
 		...(e.discovered.workflows ?? []).map((e) => Wt(e.definition)),
 		...f ? [
@@ -12154,7 +12154,7 @@ ${a.join("\n\n")}\n`);
 			Jr(_i),
 			Jr(vi)
 		] : []
-	], ie = Vn.make(...N).middleware(Wr).middleware(Gr), P = S.succeed(Wr, Wr.of(({ headers: t, clientId: n }) => b.promise(() => e.resolveSubject(t, n)))), F = S.succeed(Gr, Gr.of(({ clientId: e }) => b.succeed({ clientId: e }))), ae = e.dormancyTenantId ?? "default", oe = e.dormancy === "sleep" ? {
+	], ie = Vn.make(...N).middleware(Wr).middleware(Gr), P = C.succeed(Wr, Wr.of(({ headers: t, clientId: n }) => b.promise(() => e.resolveSubject(t, n)))), F = C.succeed(Gr, Gr.of(({ clientId: e }) => b.succeed({ clientId: e }))), ae = e.dormancyTenantId ?? "default", oe = e.dormancy === "sleep" ? {
 		register: (t, n, r) => Ot(e.store, {
 			tenantId: r ?? ae,
 			kind: "workflow",
@@ -12239,8 +12239,8 @@ ${a.join("\n\n")}\n`);
 			onParentClose: ({ executionId: e, status: t }) => le(e, t),
 			recorder: ce
 		}, n);
-	}), ...e.discovered.workflowWorkers ?? []], de = ue.length > 0 ? S.mergeAll(...ue) : S.empty;
-	((e.discovered.workflows?.length ?? 0) > 0 || (e.discovered.workflowWorkers?.length ?? 0) > 0 || e.scheduleCoordination === "cluster") && e.workflowEngineLayer !== void 0 && (a = C.make(de.pipe(S.provideMerge(e.workflowEngineLayer))), await a.runPromise(b.void), i = (e.discovered.workflows?.length ?? 0) > 0 ? ft({
+	}), ...e.discovered.workflowWorkers ?? []], de = ue.length > 0 ? C.mergeAll(...ue) : C.empty;
+	((e.discovered.workflows?.length ?? 0) > 0 || (e.discovered.workflowWorkers?.length ?? 0) > 0 || e.scheduleCoordination === "cluster") && e.workflowEngineLayer !== void 0 && (a = w.make(de.pipe(C.provideMerge(e.workflowEngineLayer))), await a.runPromise(b.void), i = (e.discovered.workflows?.length ?? 0) > 0 ? ft({
 		workflows: e.discovered.workflows ?? [],
 		runEffect: (e) => a.runPromise(e),
 		rememberStartContext: l,
@@ -12274,7 +12274,7 @@ ${a.join("\n\n")}\n`);
 			runPromise: (e) => a.runPromise(e)
 		}, t, n)
 	}) : void 0);
-	let fe = S.mergeAll(ie.toLayer(O), P, F), pe = If(O, e.discovered.queries.map((e) => e.descriptor.name), f), he = S.mergeAll(ie.toLayer(pe), P, F), ge = e.observability, ve = await Ie({
+	let fe = C.mergeAll(ie.toLayer(O), P, F), pe = If(O, e.discovered.queries.map((e) => e.descriptor.name), f), he = C.mergeAll(ie.toLayer(pe), P, F), ge = e.observability, ve = await Ie({
 		...ge && ge.spanProcessors.length > 0 ? { extraSpanProcessors: ge.spanProcessors } : {},
 		...ge && ge.metricReaders.length > 0 ? { extraMetricReaders: ge.metricReaders } : {},
 		...ge && Object.keys(ge.resourceAttributes).length > 0 ? { resourceAttributes: ge.resourceAttributes } : {},
@@ -12343,7 +12343,7 @@ ${a.join("\n\n")}\n`);
 				}
 				await yp(n.agent, r, {
 					findAgentSend: (t) => e.discovered.actions.find((e) => e.descriptor.name === `${t}.send`),
-					runAction: (e, t, n) => Promise.resolve(E(e, t, n)),
+					runAction: (e, t, n) => Promise.resolve(D(e, t, n)),
 					makeSubject: (e) => Yr(e),
 					now: () => Date.now(),
 					log: t
@@ -12370,7 +12370,7 @@ ${a.join("\n\n")}\n`);
 		...e.analytics === void 0 ? {} : { analytics: e.analytics },
 		...e.aggregateStorage === void 0 ? {} : { storage: e.aggregateStorage },
 		...e.aggregateCoordinator === void 0 ? {} : { coordinator: e.aggregateCoordinator }
-	}), x = S.succeed(me, we.registry)), ye = !0, {
+	}), x = C.succeed(me, we.registry)), ye = !0, {
 		dispatcher: t,
 		server: be,
 		scheduler: o,
@@ -12417,11 +12417,11 @@ ${a.join("\n\n")}\n`);
 	}
 	let _ = ut(m), v = await _g(r, void 0);
 	r?.cache && !process.env.CACHE_BACKEND && (process.env.CACHE_BACKEND = r.cache), r?.cacheRedisUrl && !process.env.CACHE_REDIS_URL && (process.env.CACHE_REDIS_URL = r.cacheRedisUrl), r?.cacheRedisDriver && !process.env.CACHE_REDIS_DRIVER && (process.env.CACHE_REDIS_DRIVER = r.cacheRedisDriver), r?.cacheKeyPrefix && !process.env.CACHE_KEY_PREFIX && (process.env.CACHE_KEY_PREFIX = r.cacheKeyPrefix);
-	let { service: y, invalidationBus: x, snapshotCache: ee, cache: w, backend: T, dispose: E } = await kf({ env: process.env });
-	Y.info(`cache backend resolved: ${T}` + (T === "redis" ? ` (driver ${process.env.CACHE_REDIS_DRIVER ?? "resp"})` : " — in-process, not cross-instance")), v.onChange((e) => {
+	let { service: y, invalidationBus: x, snapshotCache: S, cache: T, backend: E, dispose: D } = await kf({ env: process.env });
+	Y.info(`cache backend resolved: ${E}` + (E === "redis" ? ` (driver ${process.env.CACHE_REDIS_DRIVER ?? "resp"})` : " — in-process, not cross-instance")), v.onChange((e) => {
 		b.runFork(x.publish(e.table));
 	}), r?.kv && !process.env.KV_BACKEND && (process.env.KV_BACKEND = r.kv), r?.kvRedisUrl && !process.env.KV_REDIS_URL && (process.env.KV_REDIS_URL = r.kvRedisUrl), r?.kvKeyPrefix && !process.env.KV_KEY_PREFIX && (process.env.KV_KEY_PREFIX = r.kvKeyPrefix);
-	let { kv: D, service: O } = await tt({ store: v }), k = je({
+	let { kv: ee, service: O } = await tt({ store: v }), k = je({
 		store: v,
 		sink: p.sink,
 		log: Y
@@ -12429,7 +12429,7 @@ ${a.join("\n\n")}\n`);
 		store: v,
 		dialect: i
 	}), j = r?.plugins ?? [], te = process.env.POD_NAME ?? process.env.HOSTNAME ?? `serve-${process.pid}`, ne, re;
-	i !== "memory" && (ne = C.make((await mg(i)).makeSqlLayer(lg())), re = await ne.runPromise(z.SqlClient));
+	i !== "memory" && (ne = w.make((await mg(i)).makeSqlLayer(lg())), re = await ne.runPromise(z.SqlClient));
 	let M = rt({
 		coordinator: [
 			"postgres",
@@ -12485,7 +12485,7 @@ ${a.join("\n\n")}\n`);
 			clientId: -1
 		}),
 		...pe ? { idempotency: pe } : {}
-	}) : [], he = j.map((e) => e.services).filter((e) => e !== void 0), ge = S.mergeAll(Pf({
+	}) : [], he = j.map((e) => e.services).filter((e) => e !== void 0), ge = C.mergeAll(Pf({
 		analyticsLayer: p.layer,
 		cacheService: y,
 		kvService: O,
@@ -12559,9 +12559,9 @@ ${a.join("\n\n")}\n`);
 		aggregateStorage: Pe,
 		aggregateCoordinator: Fe,
 		store: v,
-		kv: D,
-		cache: w,
-		snapshotCache: ee,
+		kv: ee,
+		cache: T,
+		snapshotCache: S,
 		schemaRegistry: _,
 		tenantScopedTables: c.tenantScopedTables,
 		softDeleteScopedTables: c.softDeleteScopedTables,
@@ -12601,7 +12601,7 @@ ${a.join("\n\n")}\n`);
 	});
 	let We = () => {
 		for (let e of N) e.stop();
-		k.detach(), A.stop(), E(), ne?.dispose(), Promise.resolve(F.deactivate()).then(() => oe?.close()).then(() => p.dispose()).then(() => He.close()).then(() => v.close?.()).then(() => process.exit(0));
+		k.detach(), A.stop(), D(), ne?.dispose(), Promise.resolve(F.deactivate()).then(() => oe?.close()).then(() => p.dispose()).then(() => He.close()).then(() => v.close?.()).then(() => process.exit(0));
 	};
 	return process.on("SIGINT", We), process.on("SIGTERM", We), await new Promise(() => {}), 0;
 }, Jg = (e, t) => {
@@ -13045,7 +13045,7 @@ ${a.join("\n\n")}\n`);
 	if (t === void 0) return y_();
 	let r = (process.env.CACHE_BACKEND ?? "memory").toLowerCase();
 	if (r !== "redis" && (t === "flush" || t === "invalidate")) return console.error(`voltro cache ${t}: CACHE_BACKEND=${r} is per-process — the CLI cannot reach the dev server's in-memory cache.`), console.error("  Use CACHE_BACKEND=redis (a shared backend) to flush/invalidate from the CLI."), 1;
-	let i = C.make(Fi.layer);
+	let i = w.make(Fi.layer);
 	try {
 		switch (t) {
 			case "status": {
@@ -16195,7 +16195,7 @@ replicas = 1
 }, Qx = (e) => Or(e, {
 	table: Pr,
 	chunkSize: 500
-}).pipe(D.map((e) => ({
+}).pipe(ee.map((e) => ({
 	key: String(e.key),
 	contentType: String(e.contentType ?? "application/octet-stream"),
 	size: Number(e.size ?? 0)