@voltro/web 0.28.0 → 0.30.0

package/dist/{frameworkBoot-DHdoAwd9.js → frameworkBoot-BkBY6M2s.js}

@@ -2,23 +2,19 @@ import { t as e } from "./globalContext-d4A-ugDg.js";
 import { AppClientsContext as t } from "./hooks.js";
 import { c as n, l as r, r as i, s as a } from "./defaultFallbacks-Fik_Gcjh.js";
 import { useCallback as o, useContext as s, useEffect as c, useRef as l, useState as u, useSyncExternalStore as d } from "react";
-import { Context as f, Layer as p, ManagedRuntime as m } from "effect";
-import * as h from "@effect/platform/Socket";
-import * as g from "@effect/platform/Headers";
-import { RpcClient as _, RpcSerialization as v } from "@effect/rpc";
-import { FrameworkRuntimesProvider as y, RpcErrorBus as b, SubscriptionCache as ee, ssrClientProxy as te, ssrStubHandle as ne, subscribeClientTraces as re } from "@voltro/client";
-import { Fragment as x, jsx as S, jsxs as C } from "react/jsx-runtime";
+import { FrameworkRuntimesProvider as f, buildApiRuntime as p, ssrClientProxy as m, ssrStubHandle as h, subscribeClientTraces as g } from "@voltro/client";
+import { Fragment as ee, jsx as _, jsxs as v } from "react/jsx-runtime";
 //#region src/reconnect.ts
-var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220, E = () => {
+var y = e("reconnect", null), b = () => s(y) ?? (() => {}), x = 150, S = 220, C = () => {
 	let e = d(r, a, a).some((e) => e.kind === "loading" || e.kind === "reconnecting"), [t, n] = u(!1);
 	return c(() => {
 		if (!e) {
 			n(!1);
 			return;
 		}
-		let t = setTimeout(() => n(!0), ae);
+		let t = setTimeout(() => n(!0), x);
 		return () => clearTimeout(t);
-	}, [e]), /* @__PURE__ */ C("div", {
+	}, [e]), /* @__PURE__ */ v("div", {
 		"aria-hidden": "true",
 		"data-voltro-nav-indicator": "",
 		style: {
@@ -29,7 +25,7 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			pointerEvents: "none",
 			opacity: +!!t,
 			transform: t ? "translateY(0) scale(1)" : "translateY(4px) scale(0.96)",
-			transition: `opacity ${T}ms ease, transform ${T}ms ease`,
+			transition: `opacity ${S}ms ease, transform ${S}ms ease`,
 			display: "grid",
 			placeItems: "center",
 			width: 34,
@@ -41,16 +37,16 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			border: "1px solid color-mix(in oklch, canvastext 12%, transparent)",
 			boxShadow: "0 4px 14px color-mix(in oklch, canvastext 16%, transparent)"
 		},
-		children: [/* @__PURE__ */ S("span", { "data-voltro-nav-spinner": "" }), /* @__PURE__ */ S("style", { children: oe })]
+		children: [/* @__PURE__ */ _("span", { "data-voltro-nav-spinner": "" }), /* @__PURE__ */ _("style", { children: te })]
 	});
-}, oe = "\n@keyframes voltroNavSpin { to { transform: rotate(360deg); } }\n[data-voltro-nav-spinner] {\n  width: 16px;\n  height: 16px;\n  border-radius: 50%;\n  border: 2px solid color-mix(in oklch, canvastext 22%, transparent);\n  border-top-color: color-mix(in oklch, canvastext 78%, transparent);\n  animation: voltroNavSpin 0.7s linear infinite;\n}\n@media (prefers-reduced-motion: reduce) {\n  [data-voltro-nav-spinner] { animation-duration: 1.6s; }\n}\n", se = (e) => Math.min(500 * 2 ** Math.min(e - 1, 4), 5e3), ce = 2, D = 2e3, O = () => typeof window < "u" && !1, le = () => typeof window > "u" ? null : `${window.location.origin}/`, ue = 2e4, k = "voltro:wedge-reload-at", de = () => {
+}, te = "\n@keyframes voltroNavSpin { to { transform: rotate(360deg); } }\n[data-voltro-nav-spinner] {\n  width: 16px;\n  height: 16px;\n  border-radius: 50%;\n  border: 2px solid color-mix(in oklch, canvastext 22%, transparent);\n  border-top-color: color-mix(in oklch, canvastext 78%, transparent);\n  animation: voltroNavSpin 0.7s linear infinite;\n}\n@media (prefers-reduced-motion: reduce) {\n  [data-voltro-nav-spinner] { animation-duration: 1.6s; }\n}\n", ne = (e) => Math.min(500 * 2 ** Math.min(e - 1, 4), 5e3), re = 2, w = 2e3, T = () => typeof window < "u" && !1, ie = () => typeof window > "u" ? null : `${window.location.origin}/`, ae = 2e4, E = "voltro:wedge-reload-at", D = () => {
 	try {
-		let e = Number(window.sessionStorage.getItem(k) ?? "0"), t = Date.now();
-		if (t - e < ue) return;
-		window.sessionStorage.setItem(k, String(t));
+		let e = Number(window.sessionStorage.getItem(E) ?? "0"), t = Date.now();
+		if (t - e < ae) return;
+		window.sessionStorage.setItem(E, String(t));
 	} catch {}
 	window.location.reload();
-}, fe = () => ({
+}, O = () => ({
 	resolved: null,
 	retryToken: 0,
 	failureCount: 0,
@@ -58,15 +54,15 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 	reconnectStatusDispose: null,
 	everOpened: !1,
 	healthPollHandle: null
-}), A = (e) => {
+}), k = (e) => {
 	e.healthPollHandle !== null && (clearInterval(e.healthPollHandle), e.healthPollHandle = null);
-}, j = (e) => {
+}, A = (e) => {
 	e.cache.destroy(e.runtime), e.runtime.dispose();
-}, pe = (e) => {
-	let t = e.apis, r = e.buildClient, i = e.onChange, a = e.retryDelayMs ?? se, o = e.stableWindowMs ?? 5e3, s = e.scheduler?.setTimeout ?? ((e, t) => setTimeout(e, t)), c = e.scheduler?.clearTimeout ?? ((e) => {
+}, oe = (e) => {
+	let t = e.apis, r = e.buildClient, i = e.onChange, a = e.retryDelayMs ?? ne, o = e.stableWindowMs ?? 5e3, s = e.scheduler?.setTimeout ?? ((e, t) => setTimeout(e, t)), c = e.scheduler?.clearTimeout ?? ((e) => {
 		clearTimeout(e);
 	}), l = e.scheduler?.queueMicrotask ?? queueMicrotask, u = /* @__PURE__ */ new Map();
-	for (let e of t) u.set(e.name, fe());
+	for (let e of t) u.set(e.name, O());
 	let d = !1, f = /* @__PURE__ */ new Set(), p = (e, t) => {
 		let n = s(() => {
 			f.delete(n), e();
@@ -87,17 +83,17 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			id: `voltro:supervisor:${e.name}`,
 			kind: "reconnecting",
 			label: "Reconnecting…"
-		}), O() && t.everOpened && t.failureCount >= ce && t.healthPollHandle === null) {
-			let e = le();
+		}), T() && t.everOpened && t.failureCount >= re && t.healthPollHandle === null) {
+			let e = ie();
 			e && (t.healthPollHandle = setInterval(() => {
 				fetch(e, {
 					method: "GET",
 					cache: "no-store",
-					signal: AbortSignal.timeout(D)
+					signal: AbortSignal.timeout(w)
 				}).then((e) => {
-					e.status < 500 && de();
+					e.status < 500 && D();
 				}).catch(() => {});
-			}, D));
+			}, w));
 		}
 		p(() => {
 			d || t.retryToken === i && (t.generation += 1, g(e));
@@ -108,7 +104,7 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		if (!t) return;
 		let n = t.generation, i = () => {
 			if (d || t.generation !== n) return;
-			t.everOpened = !0, A(t), t.retryToken++;
+			t.everOpened = !0, k(t), t.retryToken++;
 			let e = t.failureCount;
 			p(() => {
 				d || t.failureCount === e && (t.failureCount = 0);
@@ -119,11 +115,11 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		try {
 			let o = await r(e, n, i, a);
 			if (d || t.generation !== n) {
-				j(o);
+				A(o);
 				return;
 			}
 			let s = t.resolved;
-			t.resolved = o, t.reconnectStatusDispose &&= (t.reconnectStatusDispose(), null), m(), s && j(s);
+			t.resolved = o, t.reconnectStatusDispose &&= (t.reconnectStatusDispose(), null), m(), s && A(s);
 		} catch {
 			if (d || t.generation !== n) return;
 			h(e);
@@ -142,35 +138,35 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 				d = !0;
 				for (let e of f) c(e);
 				f.clear();
-				for (let [, e] of u) e.resolved && j(e.resolved), e.reconnectStatusDispose && e.reconnectStatusDispose(), A(e);
+				for (let [, e] of u) e.resolved && A(e.resolved), e.reconnectStatusDispose && e.reconnectStatusDispose(), k(e);
 				u.clear();
 			}
 		},
 		reconnect: () => {
 			if (!d) for (let e of t) {
 				let t = u.get(e.name);
-				t && (t.retryToken += 1, t.generation += 1, t.failureCount = 0, A(t), g(e));
+				t && (t.retryToken += 1, t.generation += 1, t.failureCount = 0, k(t), g(e));
 			}
 		}
 	});
-}, M = {
+}, j = {
 	log: console.log.bind(console),
 	info: console.info.bind(console),
 	warn: console.warn.bind(console),
 	error: console.error.bind(console),
 	debug: console.debug.bind(console)
-}, me = 200, he = 400, N = 20, P = 1e3, F = (e) => {
+}, se = 200, M = 400, N = 20, P = 1e3, F = (e) => {
 	if (typeof e == "string") return e;
 	if (e === void 0) return "undefined";
 	if (e === null) return "null";
 	if (e instanceof Error) return e.stack ?? e.message;
 	if (typeof e == "object") try {
-		return JSON.stringify(e, I());
+		return JSON.stringify(e, ce());
 	} catch {
 		return Object.prototype.toString.call(e);
 	}
 	return String(e);
-}, I = () => {
+}, ce = () => {
 	let e = /* @__PURE__ */ new WeakSet();
 	return (t, n) => {
 		if (typeof n == "object" && n) {
@@ -179,20 +175,20 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		}
 		return n;
 	};
-}, L = (e, t) => e.length > t ? `${e.slice(0, t)}…` : e, R = /%[sdifoOc]/g, z = (e) => {
+}, I = (e, t) => e.length > t ? `${e.slice(0, t)}…` : e, L = /%[sdifoOc]/g, R = (e) => {
 	if (e.length === 0) return {
 		message: "",
 		rest: []
 	};
 	let t = e[0];
-	if (typeof t != "string" || !R.test(t)) return {
+	if (typeof t != "string" || !L.test(t)) return {
 		message: F(t),
 		rest: e.slice(1)
 	};
-	R.lastIndex = 0;
+	L.lastIndex = 0;
 	let n = 1;
 	return {
-		message: t.replace(R, (t) => {
+		message: t.replace(L, (t) => {
 			if (t === "%c") return n++, "";
 			if (n >= e.length) return t;
 			let r = e[n++];
@@ -214,15 +210,15 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		}),
 		rest: e.slice(n)
 	};
-}, B = (e) => {
-	let t = e.flushAfterMs ?? he, n = `${e.baseUrl.replace(/\/+$/, "")}/_voltro/inspect/clientLog`, r = [], i = null, a = !1, o = () => {
+}, z = (e) => {
+	let t = e.flushAfterMs ?? M, n = `${e.baseUrl.replace(/\/+$/, "")}/_voltro/inspect/clientLog`, r = [], i = null, a = !1, o = () => {
 		if (i !== null && (clearTimeout(i), i = null), r.length === 0) return;
 		let t = r;
 		r = [];
 		let a = {
 			app: e.appName,
 			page: typeof window < "u" ? window.location.pathname : void 0,
-			ua: typeof navigator < "u" ? L(navigator.userAgent, 200) : void 0,
+			ua: typeof navigator < "u" ? I(navigator.userAgent, 200) : void 0,
 			entries: t
 		};
 		try {
@@ -238,11 +234,11 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		i === null && (i = setTimeout(o, t));
 	}, c = (e, t) => {
 		if (a) return;
-		r.length >= me && r.shift();
+		r.length >= se && r.shift();
 		let n = t.find((e) => e instanceof Error), i = t.find((e) => typeof e == "object" && !!e && "componentStack" in e), c = typeof i?.componentStack == "string" ? i.componentStack : void 0, l = t[0] instanceof Error ? {
 			message: t[0].message,
 			rest: t.slice(1)
-		} : z(t), u = L(l.message, P), d = l.rest.filter((e) => e !== n && e !== i).map((e) => L(F(e), P)), f;
+		} : R(t), u = I(l.message, P), d = l.rest.filter((e) => e !== n && e !== i).map((e) => I(F(e), P)), f;
 		n ? (f = n.stack ?? n.message, c && (f += `\n\nComponent stack:${c}`)) : e === "error" && (f = (/* @__PURE__ */ Error()).stack);
 		let p = {
 			ts: Date.now(),
@@ -253,27 +249,27 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		};
 		r.push(p), r.length >= N ? o() : s();
 	}, l = (e) => (...t) => {
-		M[e](...t), c(e, t);
+		j[e](...t), c(e, t);
 	};
 	console.log = l("log"), console.info = l("info"), console.warn = l("warn"), console.error = l("error"), console.debug = l("debug");
 	let u = () => {
 		o();
 	};
 	return typeof window < "u" && (window.addEventListener("beforeunload", u), window.addEventListener("pagehide", u)), { dispose: () => {
-		a = !0, o(), i !== null && (clearTimeout(i), i = null), console.log = M.log, console.info = M.info, console.warn = M.warn, console.error = M.error, console.debug = M.debug, typeof window < "u" && (window.removeEventListener("beforeunload", u), window.removeEventListener("pagehide", u));
+		a = !0, o(), i !== null && (clearTimeout(i), i = null), console.log = j.log, console.info = j.info, console.warn = j.warn, console.error = j.error, console.debug = j.debug, typeof window < "u" && (window.removeEventListener("beforeunload", u), window.removeEventListener("pagehide", u));
 	} };
-}, ge = 500, V = /* @__PURE__ */ new Set(), H = (e) => {
-	if (!V.has(e) && (V.add(e), V.size > ge)) {
+}, B = 500, V = /* @__PURE__ */ new Set(), H = (e) => {
+	if (!V.has(e) && (V.add(e), V.size > B)) {
 		let e = V.values().next().value;
 		e !== void 0 && V.delete(e);
 	}
 }, U = /* @__PURE__ */ new Set(), W = (e) => (U.add(e), () => {
 	U.delete(e);
-}), _e = (e) => {
+}), le = (e) => {
 	for (let t of U) try {
 		t(e);
 	} catch {}
-}, ve = {
+}, ue = {
 	log: "log",
 	info: "info",
 	warn: "warn",
@@ -292,21 +288,21 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			try {
 				let n = JSON.parse(t.data).payload;
 				if (!n || typeof n.message != "string" || n.scope === "client") return;
-				let r = n.level === void 0 ? "log" : ve[n.level], i = n.scope ? ` ${n.scope}` : "";
-				M[r](`%c[server ${e.originLabel}${i}]%c ${n.message}`, G[r], "", ...n.fields ? [n.fields] : []);
+				let r = n.level === void 0 ? "log" : ue[n.level], i = n.scope ? ` ${n.scope}` : "";
+				j[r](`%c[server ${e.originLabel}${i}]%c ${n.message}`, G[r], "", ...n.fields ? [n.fields] : []);
 			} catch {}
 		}), n.addEventListener("trace", (t) => {
 			try {
 				let n = JSON.parse(t.data).payload;
 				if (!n || n.status !== "error" || typeof n.traceId != "string" || !V.has(n.traceId)) return;
 				let r = n.name ?? "span", i = n.statusMessage && n.statusMessage.length > 0 ? n.statusMessage : `${r} failed`;
-				_e({
+				le({
 					traceId: n.traceId,
 					spanName: r,
 					api: e.originLabel,
 					message: i,
 					ts: Date.now()
-				}), M.error(`%c[trace ${e.originLabel}]%c ${r} failed — ${i} (trace ${n.traceId})`, G.error, "");
+				}), j.error(`%c[trace ${e.originLabel}]%c ${r} failed — ${i} (trace ${n.traceId})`, G.error, "");
 			} catch {}
 		}), n.addEventListener("error", () => {
 			n && n.readyState === EventSource.CLOSED && (n = null, !r && i === null && (i = setTimeout(() => {
@@ -325,20 +321,20 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 	muted: "oklch(0.65 0.012 285)",
 	danger: "oklch(0.7 0.21 22)",
 	dangerDim: "oklch(0.5 0.18 22 / 25%)"
-}, J = "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', monospace", ye = "ui-sans-serif, system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif", be = 0, xe = () => {
+}, J = "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', monospace", de = "ui-sans-serif, system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif", fe = 0, pe = () => {
 	let [e, t] = u([]);
 	if (c(() => W((e) => {
 		t((t) => {
 			if (t.some((t) => t.traceId === e.traceId && t.spanName === e.spanName)) return t;
 			let n = [...t, {
 				...e,
-				id: ++be
+				id: ++fe
 			}];
 			return n.length > 4 ? n.slice(n.length - 4) : n;
 		});
 	}), []), e.length === 0) return null;
 	let n = (e) => t((t) => t.filter((t) => t.id !== e));
-	return /* @__PURE__ */ S("div", {
+	return /* @__PURE__ */ _("div", {
 		style: {
 			position: "fixed",
 			right: 16,
@@ -348,17 +344,17 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			flexDirection: "column",
 			gap: 10,
 			maxWidth: 380,
-			fontFamily: ye,
+			fontFamily: de,
 			pointerEvents: "none"
 		},
-		children: e.map((e) => /* @__PURE__ */ S(Se, {
+		children: e.map((e) => /* @__PURE__ */ _(me, {
 			toast: e,
 			onDismiss: () => n(e.id)
 		}, e.id))
 	});
-}, Se = ({ toast: e, onDismiss: t }) => {
+}, me = ({ toast: e, onDismiss: t }) => {
 	let [n, r] = u(!1), a = `voltro logs --trace ${e.traceId}`;
-	return /* @__PURE__ */ C("div", {
+	return /* @__PURE__ */ v("div", {
 		style: {
 			pointerEvents: "auto",
 			background: q.card,
@@ -372,14 +368,14 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			lineHeight: 1.45
 		},
 		children: [
-			/* @__PURE__ */ C("div", {
+			/* @__PURE__ */ v("div", {
 				style: {
 					display: "flex",
 					alignItems: "center",
 					justifyContent: "space-between",
 					gap: 8
 				},
-				children: [/* @__PURE__ */ S("span", {
+				children: [/* @__PURE__ */ _("span", {
 					style: {
 						color: q.danger,
 						fontWeight: 600,
@@ -387,7 +383,7 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 						letterSpacing: .3
 					},
 					children: "⚠ Backend error"
-				}), /* @__PURE__ */ S("button", {
+				}), /* @__PURE__ */ _("button", {
 					onClick: t,
 					"aria-label": "Dismiss",
 					style: {
@@ -402,14 +398,14 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 					children: "×"
 				})]
 			}),
-			/* @__PURE__ */ C("div", {
+			/* @__PURE__ */ v("div", {
 				style: {
 					marginTop: 6,
 					color: q.muted,
 					fontSize: 11.5
 				},
 				children: [
-					/* @__PURE__ */ S("span", {
+					/* @__PURE__ */ _("span", {
 						style: {
 							fontFamily: J,
 							color: q.fg
@@ -417,13 +413,13 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 						children: e.api
 					}),
 					" · ",
-					/* @__PURE__ */ S("span", {
+					/* @__PURE__ */ _("span", {
 						style: { fontFamily: J },
 						children: e.spanName
 					})
 				]
 			}),
-			/* @__PURE__ */ S("div", {
+			/* @__PURE__ */ _("div", {
 				style: {
 					marginTop: 4,
 					color: q.fg,
@@ -431,7 +427,7 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 				},
 				children: e.message
 			}),
-			/* @__PURE__ */ S("button", {
+			/* @__PURE__ */ _("button", {
 				onClick: () => {
 					i(a).then((e) => {
 						e !== "failed" && (r(!0), setTimeout(() => r(!1), 1500));
@@ -456,14 +452,14 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			})
 		]
 	});
-}, Ce = (e) => {
+}, he = (e) => {
 	try {
 		let t = new URL(e);
 		return `${t.protocol === "wss:" ? "https:" : "http:"}//${t.host}`;
 	} catch {
 		return "";
 	}
-}, Y = (e, t) => /^wss?:\/\//i.test(e) || /^https?:\/\//i.test(e) ? Ce(e) : `/_voltro/api/${t}`, we = typeof performance < "u" ? performance.now() : Date.now(), X = () => {
+}, Y = (e, t) => /^wss?:\/\//i.test(e) || /^https?:\/\//i.test(e) ? he(e) : `/_voltro/api/${t}`, ge = typeof performance < "u" ? performance.now() : Date.now(), X = () => {
 	if (typeof window > "u") return !1;
 	try {
 		if (window.localStorage?.getItem("framework_debug") === "1") return !0;
@@ -477,10 +473,10 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 	}.DEV === !0;
 }, Z = (e, ...t) => {
 	if (!X()) return;
-	let n = ((typeof performance < "u" ? performance.now() : Date.now()) - we).toFixed(0).padStart(6, " ");
+	let n = ((typeof performance < "u" ? performance.now() : Date.now()) - ge).toFixed(0).padStart(6, " ");
 	console.log(`[fw ${e} +${n}ms]`, ...t);
-}, Q = 3e3, Te = 0, Ee = (e, t, n, r) => p.succeed(h.WebSocketConstructor, (i, a) => {
-	let o = ++Te;
+}, Q = 3e3, _e = 0, ve = (e, t, n, r) => (i, a) => {
+	let o = ++_e;
 	Z(e, `ws#${o} create gen=${t} url=${i}`);
 	let s = new globalThis.WebSocket(i, a), c = !1, l = !1, u = (e) => {
 		l || (l = !0, r(e));
@@ -498,23 +494,19 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			} catch {}
 		}
 	}, Q), s;
-}), De = async (e, t, n, r) => {
-	class i extends f.Tag(`@voltro/web/AppClient/${e.name}`)() {}
-	let a = _.layerProtocolSocket().pipe(p.provide(v.layerJson), p.provide(h.layerWebSocket(e.wsUrl)), p.provide(Ee(e.name, t, n, r))), o = typeof e.headers == "function" ? await e.headers() : e.headers, s = p.scoped(i, _.make(e.group)).pipe(p.provide(a)), c = o ? p.locallyScoped(_.currentHeaders, g.fromInput(o)) : p.empty;
+}, ye = async (e, t, n, r) => {
 	Z(e.name, `build gen=${t}: making runtime`);
-	let l = m.make(p.merge(s, c));
 	try {
-		let n = await l.runPromise(i);
-		Z(e.name, `build gen=${t}: runtime resolved`);
-		let r = new b();
-		return {
-			runtime: l,
-			client: n,
-			cache: new ee({ errorBus: r }),
-			errorBus: r
-		};
+		let i = await p({
+			name: e.name,
+			wsUrl: e.wsUrl,
+			group: e.group,
+			headers: e.headers,
+			webSocketConstructor: ve(e.name, t, n, r)
+		});
+		return Z(e.name, `build gen=${t}: runtime resolved`), i;
 	} catch (n) {
-		throw Z(e.name, `build gen=${t}: runtime FAILED, disposing`, n.message ?? n), l.dispose(), n;
+		throw Z(e.name, `build gen=${t}: runtime FAILED, disposing`, n.message ?? n), n;
 	}
 }, $ = ({ apis: e, children: n, chrome: r }) => {
 	let [i, a] = u(() => ({
@@ -522,13 +514,13 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 		clients: /* @__PURE__ */ new Map()
 	})), s = l(null), d = o(() => {
 		s.current?.reconnect();
-	}, []), [f, p] = u(!1);
+	}, []), [p, b] = u(!1);
 	c(() => {
-		p(!0);
+		b(!0);
 	}, []), c(() => {
-		let t = pe({
+		let t = oe({
 			apis: e,
-			buildClient: De,
+			buildClient: ye,
 			onChange: (e, t) => {
 				a({
 					clients: e,
@@ -542,7 +534,7 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 	}, [e]), c(() => {
 		if (!X() || typeof window > "u") return;
 		let t = [], n = [], r = e[0]?.name ?? "web";
-		t.push(B({
+		t.push(z({
 			baseUrl: window.location.origin,
 			appName: r
 		}));
@@ -553,14 +545,14 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 				originLabel: t.name
 			}));
 		}
-		let i = re((e) => H(e.traceId));
+		let i = g((e) => H(e.traceId));
 		return () => {
 			for (let e of t) e.dispose();
 			for (let e of n) e.dispose();
 			i();
 		};
 	}, [e]);
-	let m = new Map(e.map((e) => [e.name, i.clients.get(e.name)?.client ?? te])), h = new Map(e.map((e) => {
+	let x = new Map(e.map((e) => [e.name, i.clients.get(e.name)?.client ?? m])), S = new Map(e.map((e) => {
 		let t = i.clients.get(e.name);
 		return t ? [e.name, {
 			runtime: t.runtime,
@@ -570,28 +562,28 @@ var w = e("reconnect", null), ie = () => s(w) ?? (() => {}), ae = 150, T = 220,
 			inspectBaseUrl: Y(e.wsUrl, e.name),
 			errorBus: t.errorBus
 		}] : [e.name, {
-			...ne,
+			...h,
 			descriptors: e.descriptors
 		}];
 	}));
-	return /* @__PURE__ */ S(w.Provider, {
+	return /* @__PURE__ */ _(y.Provider, {
 		value: d,
-		children: /* @__PURE__ */ S(y, {
-			apis: h,
-			children: /* @__PURE__ */ C(t.Provider, {
-				value: m,
-				children: [n, f ? /* @__PURE__ */ C(x, { children: [
-					/* @__PURE__ */ S(E, {}),
+		children: /* @__PURE__ */ _(f, {
+			apis: S,
+			children: /* @__PURE__ */ v(t.Provider, {
+				value: x,
+				children: [n, p ? /* @__PURE__ */ v(ee, { children: [
+					/* @__PURE__ */ _(C, {}),
 					r,
-					X() ? /* @__PURE__ */ S(xe, {}) : null
+					X() ? /* @__PURE__ */ _(pe, {}) : null
 				] }) : null]
 			})
 		})
 	});
-}, Oe = ({ App: e, apis: t, Devtools: n }) => /* @__PURE__ */ S($, {
+}, be = ({ App: e, apis: t, Devtools: n }) => /* @__PURE__ */ _($, {
 	apis: t,
-	chrome: n ? /* @__PURE__ */ S(n, {}) : null,
-	children: /* @__PURE__ */ S(e, {})
+	chrome: n ? /* @__PURE__ */ _(n, {}) : null,
+	children: /* @__PURE__ */ _(e, {})
 });
 //#endregion
-export { K as a, E as c, B as i, w as l, $ as n, H as o, z as r, W as s, Oe as t, ie as u };
+export { K as a, C as c, z as i, y as l, $ as n, H as o, R as r, W as s, be as t, b as u };

package/dist/frameworkBoot.d.ts

@@ -1,5 +1,6 @@
 import { ComponentType } from 'react';
 import { ReactNode } from 'react';
+import { ResolvableHeaders } from '@voltro/client';
 import { Rpc } from '@effect/rpc';
 import { RpcGroup } from '@effect/rpc';
 
@@ -27,14 +28,6 @@ export declare interface FrameworkBootProps {
     readonly Devtools?: ComponentType;
 }
 
-export declare interface MountedApi {
-    readonly name: string;
-    readonly group: RpcGroup.RpcGroup<Rpc.Any>;
-    readonly descriptors: ClientDescriptorMap;
-    readonly wsUrl: string;
-    readonly headers?: ResolvableHeaders | undefined;
-}
-
 /**
  * Auth headers for an api's WS rpc client. @effect/rpc sends these in the
  * per-request MESSAGE frame (NOT the WS upgrade — a browser can't set upgrade
@@ -42,8 +35,17 @@ export declare interface MountedApi {
  * what lets a cross-origin api authenticate WS subscriptions. A thunk is
  * resolved fresh on every (re)connect, so a rotating token (e.g. a Supabase
  * access token) is pulled anew per connect instead of freezing at first mount.
+ *
+ * `ResolvableHeaders` is re-exported from `@voltro/client` (the lower layer that
+ * owns `buildApiRuntime`) so there is ONE definition, not a web-local copy.
  */
-export declare type ResolvableHeaders = Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+export declare interface MountedApi {
+    readonly name: string;
+    readonly group: RpcGroup.RpcGroup<Rpc.Any>;
+    readonly descriptors: ClientDescriptorMap;
+    readonly wsUrl: string;
+    readonly headers?: ResolvableHeaders | undefined;
+}
 
 export declare const VoltroRuntimeProvider: ({ apis, children, chrome }: VoltroRuntimeProviderProps) => ReactNode;
 

package/dist/frameworkBoot.js

@@ -1,2 +1,2 @@
-import { n as e, t } from "./frameworkBoot-DHdoAwd9.js";
+import { n as e, t } from "./frameworkBoot-BkBY6M2s.js";
 export { t as FrameworkBoot, e as VoltroRuntimeProvider };