@voltro/plugin-storage 0.83.1 → 0.85.0

package/dist/index.js

@@ -1,88 +1,88 @@
 import { StorageAccessDenied as e, StorageError as t, StorageRejected as n, StorageScanRejected as r, StorageService as i } from "./types.js";
-import { abortMultipartUploadDescriptor as a, beginMultipartUploadDescriptor as o, beginResumableUploadDescriptor as s, completeMultipartUploadDescriptor as c, finalizeUploadDescriptor as l, ingestUrlDescriptor as u, listGrantsDescriptor as d, listRefsDescriptor as f, mintPresignedUploadDescriptor as p, mintUploadTicketDescriptor as m, mintUploadUrlDescriptor as ee, mintUrlDescriptor as te, revokeDescriptor as h, shareDescriptor as ne, signMultipartPartDescriptor as g, storageRpcClientImports as re, uploadDescriptor as ie } from "./rpc.js";
-import { processIdentity as _ } from "@voltro/protocol/identity";
-import { Chunk as v, Effect as y, Exit as b, Layer as x, Schedule as S, Schema as C, Stream as w } from "effect";
-import { definePlugin as T, pluginInstanceName as ae } from "@voltro/protocol";
-import { readCookie as oe, resolveSessionSecret as se, verifySession as ce } from "@voltro/protocol/session";
-import { and as E, bytes as le, contains as D, eq as O, generateId as k, id as ue, integer as A, json as j, mixin as de, neq as M, or as N, reference as fe, table as P, text as F, timestamp as pe } from "@voltro/database";
-import { pluginEnv as me } from "@voltro/env";
-import { createHash as he, createHmac as I, randomBytes as ge, randomUUID as _e, scryptSync as L, timingSafeEqual as R } from "node:crypto";
-import { ssrfReason as ve } from "@voltro/runtime";
-import { spawn as ye } from "node:child_process";
-import { mkdtemp as be, readFile as xe, rm as Se, writeFile as Ce } from "node:fs/promises";
-import { tmpdir as we } from "node:os";
-import { join as z } from "node:path";
-import { statSync as B } from "node:fs";
+import { abortMultipartUploadDescriptor as a, beginMultipartUploadDescriptor as o, beginResumableUploadDescriptor as s, completeMultipartUploadDescriptor as c, finalizeUploadDescriptor as l, ingestUrlDescriptor as u, listGrantsDescriptor as d, listRefsDescriptor as f, mintPresignedUploadDescriptor as p, mintUploadTicketDescriptor as m, mintUploadUrlDescriptor as ee, mintUrlDescriptor as te, revokeDescriptor as ne, shareDescriptor as h, signMultipartPartDescriptor as g, storageRpcClientImports as _, uploadDescriptor as re } from "./rpc.js";
+import { processIdentity as ie } from "@voltro/protocol/identity";
+import { Effect as v, Exit as y, Layer as b, Schedule as x, Schema as S, Stream as C } from "effect";
+import { StorageAccessPolicySchema as ae, definePlugin as oe, pluginInstanceName as w } from "@voltro/protocol";
+import { readCookie as se, resolveSessionSecret as ce, verifySession as le } from "@voltro/protocol/session";
+import { and as ue, authoredError as T, bigint as E, bytes as D, causeBranches as O, column as de, contains as fe, eq as k, extractDbCause as pe, generateId as A, id as j, integer as M, isNull as me, isTransientContention as he, json as ge, mixin as _e, neq as ve, or as N, reference as ye, table as P, text as F, timestamp as be, wireSafeCause as xe } from "@voltro/database";
+import { pluginEnv as Se } from "@voltro/env";
+import { createHash as Ce, createHmac as I, randomBytes as we, randomUUID as Te, scryptSync as Ee, timingSafeEqual as L } from "node:crypto";
+import { ssrfReason as De } from "@voltro/runtime";
+import { spawn as Oe } from "node:child_process";
+import { mkdtemp as R, readFile as z, rm as ke, writeFile as Ae } from "node:fs/promises";
+import { tmpdir as je } from "node:os";
+import { join as Me } from "node:path";
+import { statSync as Ne } from "node:fs";
 //#region src/streamBridge.ts
-var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
+var Pe = 1 << 20, Fe = (e, n, r = !1) => new t({
 	provider: e,
 	message: n,
 	transient: r
-}), De = (e) => {
+}), Ie = (e) => {
 	let t = 0;
 	for (let n of e) t += n.byteLength;
 	let n = new Uint8Array(t), r = 0;
 	for (let t of e) n.set(t, r), r += t.byteLength;
 	return n;
-}, Oe = (e, t = Te) => {
+}, Le = (e, t = Pe) => {
 	let n = [];
 	for (let r = 0; r < e.byteLength; r += t) n.push(e.subarray(r, Math.min(r + t, e.byteLength)));
-	return w.fromIterable(n);
-}, ke = (e) => e.pipe(w.runCollect, y.map((e) => De(v.toReadonlyArray(e)))), Ae = (e, t) => w.suspend(() => w.fromAsyncIterable(t(), (t) => Ee(e, `read stream failed: ${String(t?.message ?? t)}`, !0))).pipe(w.map((e) => e instanceof Uint8Array ? e : new Uint8Array(e))), je = async (e) => {
+	return C.fromIterable(n);
+}, Re = (e) => e.pipe(C.runCollect, v.map((e) => Ie(e))), ze = (e, t) => C.suspend(() => C.fromAsyncIterable(t(), (t) => Fe(e, `read stream failed: ${String(t?.message ?? t)}`, !0))).pipe(C.map((e) => e instanceof Uint8Array ? e : new Uint8Array(e))), Be = async (e) => {
 	let { Readable: t } = await import("node:stream");
-	return t.fromWeb(w.toReadableStream(e));
-}, Me = (e, t) => e.getStream ? e.getStream(t) : e.get(t).pipe(y.map((e) => ({
-	stream: Oe(e.bytes),
+	return t.fromWeb(C.toReadableStream(e));
+}, Ve = (e, t) => e.getStream ? e.getStream(t) : e.get(t).pipe(v.map((e) => ({
+	stream: Le(e.bytes),
 	contentType: e.contentType,
 	size: e.bytes.byteLength
-}))), Ne = (e, t, n, r) => e.putStream ? e.putStream(t, n, r) : ke(n).pipe(y.flatMap((n) => e.put(t, n, {
+}))), He = (e, t, n, r) => e.putStream ? e.putStream(t, n, r) : Re(n).pipe(v.flatMap((n) => e.put(t, n, {
 	contentType: r.contentType,
 	...r.public === void 0 ? {} : { public: r.public }
-}))), V = "_voltro_storage_refs", H = "_voltro_storage_grants", U = "_voltro_storage_blobs", Pe = "_voltro_storage_usage", Fe = P(V, {
-	id: ue({ prefix: "file" }),
+}))), B = "_voltro_storage_refs", V = "_voltro_storage_grants", H = "_voltro_storage_blobs", Ue = "_voltro_storage_usage", We = P(B, {
+	id: j({ prefix: "file" }),
 	tenantId: F().nullable(),
 	ownerId: F().nullable(),
 	bucket: F(),
 	key: F(),
 	contentType: F(),
-	size: A(),
+	size: E(),
 	checksum: F(),
 	visibility: F(),
-	accessPolicy: j().nullable(),
+	accessPolicy: ge().nullable(),
 	passwordHash: F().nullable(),
-	width: A().nullable(),
-	height: A().nullable(),
-	duration: A().nullable(),
+	width: M().nullable(),
+	height: M().nullable(),
+	duration: M().nullable(),
 	placeholder: F().nullable(),
 	folder: F().nullable(),
-	tags: j().nullable(),
+	tags: ge().nullable(),
 	alt: F().nullable(),
 	caption: F().nullable(),
 	derivedFrom: F().nullable(),
 	kind: F().nullable(),
-	createdAt: pe()
-}).index(["key"]).index(["tenantId"]).index(["ownerId"]).index(["folder"]).index(["derivedFrom"]), Ie = P(H, {
-	id: ue({ prefix: "sgrant" }),
+	createdAt: be()
+}).index(["key"]).index(["tenantId"]).index(["ownerId"]).index(["folder"]).index(["derivedFrom"]), Ge = P(V, {
+	id: j({ prefix: "sgrant" }),
 	refId: F(),
 	principalType: F(),
 	principalId: F(),
 	permission: F(),
-	createdAt: pe(),
-	expiresAt: pe().nullable(),
+	createdAt: be(),
+	expiresAt: be().nullable(),
 	createdBy: F().nullable()
-}).index(["refId"]).index(["principalId"]), Le = P(Pe, {
-	id: ue({ prefix: "susage" }),
+}).index(["refId"]).index(["principalId"]), Ke = P(Ue, {
+	id: j({ prefix: "susage" }),
 	tenantId: F().maxLength(191),
-	bytes: A().default(0),
-	count: A().default(0),
-	updatedAt: pe()
-}).unique("byStorageUsageTenant", ["tenantId"]), Re = P(U, {
-	id: ue({ prefix: "blob" }),
+	bytes: E().default("0"),
+	count: E().default("0"),
+	updatedAt: be()
+}).unique("byStorageUsageTenant", ["tenantId"]), qe = P(H, {
+	id: j({ prefix: "blob" }),
 	key: F(),
-	data: le(),
+	data: D(),
 	contentType: F(),
-	size: A()
-}).index(["key"]), W = me([
+	size: E()
+}).index(["key"]), U = Se([
 	{
 		name: "STORAGE_PROVIDER",
 		required: !1,
@@ -233,47 +233,67 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		secret: !1,
 		description: "clamd port for the optional clamav virus scanner. Default 3310."
 	}
-]), G = (e, n, r, i) => new t({
+]), W = (e, n) => {
+	let r = typeof e == "number" ? e : typeof e == "bigint" || typeof e == "string" && /^\d+$/.test(e) ? Number(e) : NaN;
+	if (!Number.isSafeInteger(r) || r < 0) throw new t({
+		provider: "metadata",
+		message: `Storage ${n} must be a non-negative safe integer at most Number.MAX_SAFE_INTEGER`,
+		transient: !1
+	});
+	return r;
+}, Je = (e, t, n) => W(e + t, n), G = (e, n, r = !1) => {
+	let i = O(e).find(S.is(t));
+	if (i !== void 0) return i;
+	let a = pe(e), o = a.dbCode === "22003" || a.dbSqlState === "22003" || a.dbCode === "ER_WARN_DATA_OUT_OF_RANGE" || a.dbErrno === 1264 || a.dbNumber === 8115 || a.dbNumber === 248, s = new t({
+		provider: n,
+		message: `${o ? "Storage metadata numeric value out of range: " : ""}${xe(e)}`,
+		transient: o ? !1 : he(e) || r
+	});
+	return Object.defineProperty(s, "cause", {
+		value: e,
+		configurable: !0
+	}), s;
+}, Ye = (e) => O(e).find(S.is(n)), K = (e, n, r, i) => new t({
 	provider: e,
 	message: n,
 	transient: r,
 	...i === void 0 ? {} : { status: i }
-}), ze = (e) => e === void 0 || e === 408 || e === 429 || e >= 500, Be = /* @__PURE__ */ new Map(), Ve = (e, t) => Be.get(e)?.get(t)?.bytes, He = (e) => {
-	Be.get(e)?.clear();
-}, Ue = (e = "default") => {
-	let t = Be.get(e) ?? /* @__PURE__ */ new Map();
-	return Be.set(e, t), {
+}), Xe = (e) => e === void 0 || e === 408 || e === 429 || e >= 500, Ze = /* @__PURE__ */ new Map(), Qe = (e, t) => Ze.get(e)?.get(t)?.bytes, $e = (e) => {
+	Ze.get(e)?.clear();
+}, et = (e = "default") => {
+	let t = Ze.get(e) ?? /* @__PURE__ */ new Map();
+	return Ze.set(e, t), {
 		name: "memory",
 		presigns: !1,
-		put: (e, n, r) => y.sync(() => (t.set(e, {
+		put: (e, n, r) => v.sync(() => (t.set(e, {
 			bytes: n,
 			contentType: r.contentType
 		}), { size: n.byteLength })),
-		get: (e) => y.suspend(() => {
+		get: (e) => v.suspend(() => {
 			let n = t.get(e);
-			return n ? y.succeed({
+			return n ? v.succeed({
 				bytes: n.bytes,
 				contentType: n.contentType
-			}) : y.fail(G("memory", `no object at key '${e}'`, !1, 404));
+			}) : v.fail(K("memory", `no object at key '${e}'`, !1, 404));
 		}),
-		delete: (e) => y.sync(() => {
+		delete: (e) => v.sync(() => {
 			t.delete(e);
 		}),
 		publicUrl: () => null,
-		getUrl: () => y.succeed(""),
-		head: (e) => y.sync(() => {
+		getUrl: () => v.succeed(""),
+		head: (e) => v.sync(() => {
 			let n = t.get(e);
 			return n ? { size: n.bytes.byteLength } : null;
 		})
 	};
-}, We = (e) => {
+}, tt = (e) => {
 	let t = e.root, n = async (e) => {
 		let { join: n, resolve: r, sep: i } = await import("node:path"), a = r(t), o = r(a, e);
 		if (o !== a && !o.startsWith(a + i)) throw Error(`key '${e}' escapes the storage root`);
 		return n(o);
-	}, r = (e, t, n = !1) => y.tryPromise({
+	}, r = (e, t, n = !1) => v.tryPromise({
 		try: e,
-		catch: (e) => e?.code === "ENOENT" ? G("filesystem", `no object at key '${t}'`, !1, 404) : G("filesystem", String(e?.message ?? e), n)
+		catch: (e) => e?.code === "ENOENT" ? K("filesystem", `no object at key '${t}'`, !1, 404) : K("filesystem", String(e?.message ?? e), n)
 	});
 	return {
 		root: t,
@@ -301,8 +321,8 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			await (await import("node:fs/promises")).rm(await n(e), { force: !0 });
 		}, e),
 		publicUrl: () => null,
-		getUrl: () => y.succeed(""),
-		head: (e) => y.tryPromise({
+		getUrl: () => v.succeed(""),
+		head: (e) => v.tryPromise({
 			try: async () => {
 				let t = await import("node:fs/promises");
 				try {
@@ -312,12 +332,12 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					throw e;
 				}
 			},
-			catch: (e) => G("filesystem", String(e?.message ?? e), !1)
+			catch: (e) => K("filesystem", String(e?.message ?? e), !1)
 		}),
 		getStream: (e) => r(async () => {
 			let t = await import("node:fs/promises"), { createReadStream: r } = await import("node:fs"), i = await n(e), a = await t.stat(i);
 			return {
-				stream: Ae("filesystem", () => r(i)),
+				stream: ze("filesystem", () => r(i)),
 				contentType: "application/octet-stream",
 				size: a.size
 			};
@@ -327,7 +347,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			await r.mkdir(i(c), { recursive: !0 });
 			let l = `${c}.tmp-${a()}`;
 			try {
-				await s(await je(t), o(l));
+				await s(await Be(t), o(l));
 				let e = await r.stat(l);
 				return await r.rename(l, c), { size: e.size };
 			} catch (e) {
@@ -342,10 +362,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					end: i
 				});
 				s.on("data", (e) => o.push(e)), s.on("end", () => e()), s.on("error", n);
-			}), De(o);
+			}), Ie(o);
 		}, e)
 	};
-}, Ge = (e) => {
+}, nt = (e) => {
 	let t = e.name ?? "s3", n = e.publicAcl ?? !0, r = null, i = () => r || (r = (async () => {
 		let t, n;
 		try {
@@ -366,11 +386,11 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			cmds: t,
 			presign: n.getSignedUrl
 		};
-	})(), r), a = (e) => y.tryPromise({
+	})(), r), a = (e) => v.tryPromise({
 		try: e,
 		catch: (e) => {
 			let n = e?.$metadata?.httpStatusCode;
-			return G(t, String(e?.message ?? e), ze(n), n);
+			return K(t, String(e?.message ?? e), Xe(n), n);
 		}
 	}), o = async (e) => {
 		let t = e;
@@ -474,7 +494,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				UploadId: n
 			}));
 		}),
-		head: (n) => y.tryPromise({
+		head: (n) => v.tryPromise({
 			try: async () => {
 				let { client: t, cmds: r } = await i();
 				try {
@@ -493,7 +513,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			},
 			catch: (e) => {
 				let n = e?.$metadata?.httpStatusCode;
-				return G(t, String(e?.message ?? e), ze(n), n);
+				return K(t, String(e?.message ?? e), Xe(n), n);
 			}
 		}),
 		getStream: (n) => a(async () => {
@@ -502,7 +522,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				Key: n
 			})), s = o.Body;
 			return {
-				stream: Ae(t, () => s),
+				stream: ze(t, () => s),
 				contentType: o.ContentType ?? "application/octet-stream",
 				...o.ContentLength === void 0 ? {} : { size: o.ContentLength }
 			};
@@ -514,7 +534,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			} catch (e) {
 				throw Error("s3/minio `putStream` requires the '@aws-sdk/lib-storage' optional dependency (multipart upload). Install it to enable streamed uploads.", { cause: e });
 			}
-			let l = await je(r);
+			let l = await Be(r);
 			return await new c.Upload({
 				client: a,
 				params: {
@@ -538,15 +558,15 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			return o(c.Body);
 		})
 	};
-}, Ke = (e) => e instanceof Uint8Array ? e : typeof e == "string" ? new Uint8Array(Buffer.from(e, "base64")) : new Uint8Array(e), qe = () => {
+}, rt = (e) => e instanceof Uint8Array ? e : typeof e == "string" ? new Uint8Array(Buffer.from(e, "base64")) : new Uint8Array(e), it = () => {
 	let e = null, t = () => {
-		if (!e) throw Error("the 'database' storage provider isn't bound to a DataStore yet");
+		if (!e) throw T("the 'database' storage provider isn't bound to a DataStore yet");
 		return e;
-	}, n = (e) => y.tryPromise({
+	}, n = (e) => v.tryPromise({
 		try: e,
-		catch: (e) => G("database", String(e?.message ?? e), !0)
+		catch: (e) => G(e, "database", !0)
 	}), r = async (e, n) => (await t().query({
-		table: U,
+		table: H,
 		predicate: {
 			column: "key",
 			op: "eq",
@@ -565,37 +585,37 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		},
 		put: (e, i, a) => n(async () => {
 			let n = await r(e);
-			return n ? await t().update(U, String(n.id), {
+			return n ? await t().update(H, String(n.id), {
 				data: i,
 				contentType: a.contentType,
-				size: i.byteLength
-			}) : await t().insert(U, {
-				id: k({
+				size: String(i.byteLength)
+			}) : await t().insert(H, {
+				id: A({
 					kind: "typeid",
 					prefix: "blob"
-				}, U),
+				}, H),
 				key: e,
 				data: i,
 				contentType: a.contentType,
-				size: i.byteLength
+				size: String(i.byteLength)
 			}), { size: i.byteLength };
 		}),
-		get: (e) => y.suspend(() => n(() => r(e)).pipe(y.flatMap((t) => t ? y.succeed({
-			bytes: Ke(t.data),
+		get: (e) => v.suspend(() => n(() => r(e)).pipe(v.flatMap((t) => t ? v.succeed({
+			bytes: rt(t.data),
 			contentType: String(t.contentType)
-		}) : y.fail(G("database", `no object at key '${e}'`, !1, 404))))),
+		}) : v.fail(K("database", `no object at key '${e}'`, !1, 404))))),
 		delete: (e) => n(async () => {
 			let n = await r(e, ["id"]);
-			n && await t().delete(U, String(n.id));
+			n && await t().delete(H, String(n.id));
 		}),
 		publicUrl: () => null,
-		getUrl: () => y.succeed(""),
+		getUrl: () => v.succeed(""),
 		head: (e) => n(async () => {
 			let t = await r(e, ["size"]);
-			return t ? { size: Number(t.size) } : null;
+			return t ? { size: W(t.size, "blob size") } : null;
 		})
 	};
-}, Je = (e) => {
+}, at = (e) => {
 	let t = null, n = () => t || (t = (async () => {
 		let t;
 		try {
@@ -603,17 +623,17 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		} catch (e) {
 			throw Error("the 'azure' storage provider requires the '@azure/storage-blob' optional dependency. Install it to enable it.", { cause: e });
 		}
-		let n = W.read("AZURE_STORAGE_ACCOUNT", e.accountName), r = W.read("AZURE_STORAGE_KEY", e.accountKey), i = n && r ? new t.StorageSharedKeyCredential(n, r) : null, a = W.read("AZURE_STORAGE_CONNECTION_STRING", e.connectionString);
+		let n = U.read("AZURE_STORAGE_ACCOUNT", e.accountName), r = U.read("AZURE_STORAGE_KEY", e.accountKey), i = n && r ? new t.StorageSharedKeyCredential(n, r) : null, a = U.read("AZURE_STORAGE_CONNECTION_STRING", e.connectionString);
 		return {
 			container: (a ? t.BlobServiceClient.fromConnectionString(a) : new t.BlobServiceClient(e.endpoint ?? `https://${n}.blob.core.windows.net`, i ?? void 0)).getContainerClient(e.container),
 			sdk: t,
 			cred: i
 		};
-	})(), t), r = (e) => y.tryPromise({
+	})(), t), r = (e) => v.tryPromise({
 		try: e,
 		catch: (e) => {
 			let t = e?.statusCode;
-			return G("azure", String(e?.message ?? e), ze(t), t);
+			return K("azure", String(e?.message ?? e), Xe(t), t);
 		}
 	}), i = async (e) => {
 		if (!e) return /* @__PURE__ */ new Uint8Array();
@@ -655,7 +675,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		publicUrl: (t) => e.cdnBaseUrl ? `${e.cdnBaseUrl.replace(/\/$/, "")}/${t}` : null,
 		getUrl: (e, t) => r(() => a(e, "r", t)),
 		getUploadUrl: (e, t, n) => r(() => a(e, "cw", t)),
-		head: (e) => y.tryPromise({
+		head: (e) => v.tryPromise({
 			try: async () => {
 				let { container: t } = await n();
 				try {
@@ -671,19 +691,19 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			},
 			catch: (e) => {
 				let t = e?.statusCode;
-				return G("azure", String(e?.message ?? e), ze(t), t);
+				return K("azure", String(e?.message ?? e), Xe(t), t);
 			}
 		}),
 		getStream: (e) => r(async () => {
 			let { container: t } = await n(), r = await t.getBlockBlobClient(e).download();
 			return {
-				stream: Ae("azure", () => r.readableStreamBody),
+				stream: ze("azure", () => r.readableStreamBody),
 				contentType: r.contentType ?? "application/octet-stream",
 				...r.contentLength === void 0 ? {} : { size: r.contentLength }
 			};
 		}),
 		putStream: (e, t, i) => r(async () => {
-			let { container: r } = await n(), a = await je(t);
+			let { container: r } = await n(), a = await Be(t);
 			return await r.getBlockBlobClient(e).uploadStream(a, 4194304, 5, { blobHTTPHeaders: { blobContentType: i.contentType } }), { size: i.totalSize ?? (await r.getBlockBlobClient(e).getProperties()).contentLength ?? 0 };
 		}),
 		getRange: (e, t, a) => r(async () => {
@@ -691,7 +711,34 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			return i(o.readableStreamBody);
 		})
 	};
-}, Ye = (e, t, n, r, i, a) => {
+}, ot = (e = {
+	entries: 200,
+	bytes: 67108864,
+	pending: 32
+}) => {
+	let t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map(), r = 0;
+	return { getOrCreate: (i, a) => {
+		let o = t.get(i);
+		if (o) return Promise.resolve(o);
+		let s = n.get(i);
+		if (s) return s;
+		if (n.size >= e.pending) return Promise.resolve(null);
+		let c = Promise.resolve().then(a).then((n) => {
+			if (n && e.entries > 0 && n.bytes.byteLength <= e.bytes) {
+				for (; t.size >= e.entries || r + n.bytes.byteLength > e.bytes;) {
+					let e = t.keys().next().value;
+					if (e === void 0) break;
+					r -= t.get(e).bytes.byteLength, t.delete(e);
+				}
+				t.set(i, n), r += n.bytes.byteLength;
+			}
+			return n;
+		}).finally(() => {
+			n.delete(i);
+		});
+		return n.set(i, c), c;
+	} };
+}, st = (e, t, n, r, i, a) => {
 	let o = n / r, s = Math.min(e, Math.round(t * o)), c = Math.min(t, Math.round(s / o)), l = (e, t) => Math.max(0, Math.min(t, e));
 	return {
 		left: l(Math.round(i * e - s / 2), e - s),
@@ -699,13 +746,13 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		width: s,
 		height: c
 	};
-}, Xe = {
+}, ct = {
 	webp: "image/webp",
 	avif: "image/avif",
 	jpeg: "image/jpeg",
 	jpg: "image/jpeg",
 	png: "image/png"
-}, Ze = (e) => {
+}, lt = (e) => {
 	if (!e) return null;
 	let t = new URLSearchParams(e), n = (e) => {
 		let n = t.get(e);
@@ -724,24 +771,15 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		...s ? { fit: s } : {},
 		...l ? { fp: l } : {}
 	};
-}, Qe = (e) => e.startsWith("image/") && !e.includes("svg"), $e, et = async () => {
-	if ($e !== void 0) return $e;
-	try {
-		let e = await import("sharp");
-		$e = e.default ?? e;
-	} catch {
-		$e = null;
-	}
-	return $e;
-}, tt = async (e, t) => t ? null : Qe(e) ? await et() === null ? "no-sharp" : "failed" : "not-an-image", nt = async (e, t, n) => {
-	if (!Qe(t)) return null;
-	let r = await et();
+}, ut = (e) => e.startsWith("image/") && !e.includes("svg"), dt, ft = async () => (dt ??= import("sharp").then((e) => e.default ?? e, () => null), dt), pt = async (e, t) => t ? null : ut(e) ? await ft() === null ? "no-sharp" : "failed" : "not-an-image", mt = async (e, t, n) => {
+	if (!ut(t)) return null;
+	let r = await ft();
 	if (!r) return null;
 	try {
 		let i = r(Buffer.from(e), { failOn: "none" }), a = n.fit ?? "cover";
 		if (n.fp !== void 0 && n.w !== void 0 && n.h !== void 0 && a === "cover") {
 			let e = await i.metadata();
-			e.width !== void 0 && e.height !== void 0 && (i = i.extract(Ye(e.width, e.height, n.w, n.h, n.fp.x, n.fp.y)));
+			e.width !== void 0 && e.height !== void 0 && (i = i.extract(st(e.width, e.height, n.w, n.h, n.fp.x, n.fp.y)));
 		}
 		(n.w !== void 0 || n.h !== void 0) && (i = i.resize({
 			...n.w === void 0 ? {} : { width: n.w },
@@ -749,10 +787,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			fit: n.fit ?? "cover",
 			withoutEnlargement: !0
 		}));
-		let o = n.format && Xe[n.format] ? n.format : void 0, s = t;
+		let o = n.format && ct[n.format] ? n.format : void 0, s = t;
 		if (o) {
 			let e = o === "jpg" ? "jpeg" : o;
-			i = i.toFormat(e, n.q === void 0 ? {} : { quality: n.q }), s = Xe[o];
+			i = i.toFormat(e, n.q === void 0 ? {} : { quality: n.q }), s = ct[o];
 		} else n.q !== void 0 && (t === "image/jpeg" || t === "image/webp") && (i = i.toFormat(t === "image/webp" ? "webp" : "jpeg", { quality: n.q }));
 		let c = await i.toBuffer();
 		return {
@@ -762,43 +800,57 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	} catch {
 		return null;
 	}
-}, rt = 200, it = /* @__PURE__ */ new Map(), at = async (e, t, n, r) => {
-	let i = `${e}::${JSON.stringify(r)}`, a = it.get(i);
-	if (a) return a;
-	let o = await nt(t, n, r);
-	if (o && (it.set(i, o), it.size > rt)) {
-		let e = it.keys().next().value;
-		e !== void 0 && it.delete(e);
+}, ht = async (e, t, n) => {
+	if (!ut(t) || n.rotate === void 0 && n.flip !== !0 && n.flop !== !0 && n.grayscale !== !0 && n.crop === void 0) return null;
+	let r = await ft();
+	if (!r) return null;
+	try {
+		let i = r(Buffer.from(e), { failOn: "none" });
+		return n.crop !== void 0 && (i = i.extract(n.crop)), n.rotate !== void 0 && (i = i.rotate(n.rotate)), n.flip === !0 && (i = i.flip()), n.flop === !0 && (i = i.flop()), n.grayscale === !0 && (i = i.grayscale()), {
+			bytes: new Uint8Array(await i.toBuffer()),
+			contentType: t
+		};
+	} catch {
+		return null;
 	}
-	return o;
-}, ot = (e) => {
-	let t = ge(16).toString("hex");
-	return `${t}:${L(e, t, 32).toString("hex")}`;
-}, st = (e, t) => {
+}, gt = ot(), _t = (e, t, n) => JSON.stringify([
+	e,
+	t,
+	n.w,
+	n.h,
+	n.format,
+	n.q,
+	n.fit,
+	n.fp?.x,
+	n.fp?.y
+]), vt = async (e, t, n, r) => gt.getOrCreate(_t(e, n, r), () => mt(t, n, r)), yt = (e) => {
+	let t = we(16).toString("hex");
+	return `${t}:${Ee(e, t, 32).toString("hex")}`;
+}, bt = (e, t) => {
 	if (!e || !t) return !1;
 	let [n, r] = t.split(":");
 	if (!n || !r) return !1;
-	let i = Buffer.from(r, "hex"), a = L(e, n, i.length);
-	return a.length === i.length && R(a, i);
-}, ct = (e) => Array.isArray(e) ? e.filter((e) => typeof e == "string") : [], lt = (e) => ct(e.metadata?.roles), ut = (e) => ct(e.scopes), dt = (e, t) => e.some((e) => t.includes(e)), ft = (e) => ct(e.metadata?.groups), pt = (e) => typeof e == "boolean" ? y.succeed(e) : y.isEffect(e) ? e : y.promise(() => e), mt = (e, t, n = {}) => y.gen(function* () {
+	let i = Buffer.from(r, "hex"), a = Ee(e, n, i.length);
+	return a.length === i.length && L(a, i);
+}, xt = (e) => Array.isArray(e) ? e.filter((e) => typeof e == "string") : [], St = (e) => xt(e.metadata?.roles), Ct = (e) => xt(e.scopes), wt = (e, t) => e.some((e) => t.includes(e)), Tt = (e) => xt(e.metadata?.groups), Et = (e) => typeof e == "boolean" ? v.succeed(e) : v.isEffect(e) ? e : v.promise(() => e), Dt = (e, t, n = {}) => v.gen(function* () {
 	if (t.id && e.ownerId && t.id === e.ownerId) return !0;
 	let r = e.accessPolicy ?? [];
 	if (r.length === 0) return !1;
-	let i = n.resolveGroups ? yield* y.promise(async () => await n.resolveGroups(t)) : ft(t);
-	for (let a of r) if (yield* ht(a, e, t, i, n)) return !0;
+	let i = n.resolveGroups ? yield* v.promise(async () => await n.resolveGroups(t)) : Tt(t);
+	for (let a of r) if (yield* Ot(a, e, t, i, n)) return !0;
 	return !1;
-}), ht = (e, t, n, r, i) => y.gen(function* () {
+}), Ot = (e, t, n, r, i) => v.gen(function* () {
 	let a = !1, o = (e) => (a = !0, e);
-	if (e.owner !== void 0 && e.owner && !o(!!n.id && !!t.ownerId && n.id === t.ownerId) || e.tenant !== void 0 && e.tenant && !o(!!n.tenantId && n.tenantId === t.tenantId) || e.apiKey !== void 0 && e.apiKey && !o(n.type === "apiKey") || e.roles && e.roles.length > 0 && !o(dt(lt(n), e.roles)) || e.groups && e.groups.length > 0 && !o(dt(r, e.groups)) || e.scopes && e.scopes.length > 0 && !o(dt(ut(n), e.scopes)) || e.password !== void 0 && e.password && !o(st(i.password, t.passwordHash))) return !1;
+	if (e.owner !== void 0 && e.owner && !o(!!n.id && !!t.ownerId && n.id === t.ownerId) || e.tenant !== void 0 && e.tenant && !o(!!n.tenantId && n.tenantId === t.tenantId) || e.apiKey !== void 0 && e.apiKey && !o(n.type === "apiKey") || e.roles && e.roles.length > 0 && !o(wt(St(n), e.roles)) || e.groups && e.groups.length > 0 && !o(wt(r, e.groups)) || e.scopes && e.scopes.length > 0 && !o(wt(Ct(n), e.scopes)) || e.password !== void 0 && e.password && !o(bt(i.password, t.passwordHash))) return !1;
 	if (e.guard) {
 		let r = i.guards?.[e.guard];
-		if (!o(r ? yield* pt(r({
+		if (!o(r ? yield* Et(r({
 			subject: n,
 			ref: t
 		})) : !1)) return !1;
 	}
 	return a;
-}), gt = (e, t) => {
+}), kt = (e, t) => {
 	let n = [];
 	e.id && n.push({
 		type: e.type === "apiKey" ? "apiKey" : "user",
@@ -809,116 +861,120 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		id: e
 	});
 	return n;
-}, _t = (e, t, n, r, i) => {
-	let a = gt(t, n);
+}, At = (e, t, n, r, i) => {
+	let a = kt(t, n);
 	return e.some((e) => e.expiresAt && e.expiresAt.getTime() < i || r === "write" && e.permission !== "write" ? !1 : a.some((t) => t.type === e.principalType && t.id === e.principalId));
-}, vt = (e, t) => t.resolveGroups ? y.promise(async () => await t.resolveGroups(e)) : y.succeed(ft(e)), K = () => W.read("VOLTRO_STORAGE_SECRET") ?? se(), q = (e) => (typeof e == "string" ? Buffer.from(e, "utf8") : e).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, ""), J = (e) => {
+}, jt = (e, t) => t.resolveGroups ? v.promise(async () => await t.resolveGroups(e)) : v.succeed(Tt(e)), q = () => U.read("VOLTRO_STORAGE_SECRET") ?? ce(), J = (e) => (typeof e == "string" ? Buffer.from(e, "utf8") : e).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, ""), Y = (e) => {
 	let t = e.replace(/-/g, "+").replace(/_/g, "/") + "=".repeat((4 - e.length % 4) % 4);
 	return Buffer.from(t, "base64");
-}, yt = (e, t, n = K(), r = "/_voltro/storage") => {
+}, Mt = (e, t, n = q(), r = "/_voltro/storage") => {
 	if (!n) throw Error("signGrant: secret must be a non-empty string");
 	let i = {
 		refId: e,
 		audience: r,
 		exp: Math.floor(Date.now() / 1e3) + Math.floor(t)
-	}, a = q(JSON.stringify(i));
-	return `${a}.${q(I("sha256", n).update(a).digest())}`;
-}, bt = (e, t = K()) => {
+	}, a = J(JSON.stringify(i));
+	return `${a}.${J(I("sha256", n).update(a).digest())}`;
+}, Nt = (e, t = q()) => {
 	if (!e || !t) return null;
 	let n = e.indexOf(".");
 	if (n <= 0 || n === e.length - 1) return null;
-	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(r).digest(), o = J(i);
-	if (o.length !== a.length || !R(o, a)) return null;
+	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(r).digest(), o = Y(i);
+	if (o.length !== a.length || !L(o, a)) return null;
 	try {
-		let e = JSON.parse(J(r).toString("utf8"));
+		let e = JSON.parse(Y(r).toString("utf8"));
 		return typeof e.audience != "string" || !e.audience || typeof e.refId != "string" || typeof e.exp != "number" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
 	} catch {
 		return null;
 	}
-}, xt = (e, t, n = K()) => {
+}, Pt = (e) => e.version === 1 ? e.access === void 0 || e.vis === "private" && y.isSuccess(S.decodeUnknownExit(ae, { onExcessProperty: "error" })(e.access)) : !1, Ft = (e, t, n = q()) => {
 	if (!n) throw Error("signUploadTicket: secret must be a non-empty string");
 	let r = {
 		...e,
+		version: 1,
 		exp: Math.floor(Date.now() / 1e3) + Math.floor(t)
-	}, i = q(JSON.stringify(r));
-	return `${i}.${q(I("sha256", n).update(`u:${i}`).digest())}`;
-}, St = (e, t = K()) => {
+	}, i = J(JSON.stringify(r));
+	return `${i}.${J(I("sha256", n).update(`u:${i}`).digest())}`;
+}, It = (e, t = q()) => {
 	if (!e || !t) return null;
 	let n = e.indexOf(".");
 	if (n <= 0 || n === e.length - 1) return null;
-	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`u:${r}`).digest(), o = J(i);
-	if (o.length !== a.length || !R(o, a)) return null;
+	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`u:${r}`).digest(), o = Y(i);
+	if (o.length !== a.length || !L(o, a)) return null;
 	try {
-		let e = JSON.parse(J(r).toString("utf8"));
-		return e.operationId !== void 0 && (typeof e.operationId != "string" || !e.operationId.trim() || e.operationId.length > 200) || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.replicaId !== void 0 && (typeof e.replicaId != "string" || !e.replicaId.trim()) || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
+		let e = JSON.parse(Y(r).toString("utf8"));
+		return !Pt(e) || e.operationId !== void 0 && (typeof e.operationId != "string" || !e.operationId.trim() || e.operationId.length > 200) || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.replicaId !== void 0 && (typeof e.replicaId != "string" || !e.replicaId.trim()) || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
 	} catch {
 		return null;
 	}
-}, Ct = (e, t, n = K()) => {
+}, Lt = (e, t, n = q()) => {
 	if (!n) throw Error("signFinalizeTicket: secret must be a non-empty string");
 	let r = {
 		...e,
+		version: 1,
 		exp: Math.floor(Date.now() / 1e3) + Math.floor(t)
-	}, i = q(JSON.stringify(r));
-	return `${i}.${q(I("sha256", n).update(`f:${i}`).digest())}`;
-}, wt = (e, t = K()) => {
+	}, i = J(JSON.stringify(r));
+	return `${i}.${J(I("sha256", n).update(`f:${i}`).digest())}`;
+}, Rt = (e, t = q()) => {
 	if (!e || !t) return null;
 	let n = e.indexOf(".");
 	if (n <= 0 || n === e.length - 1) return null;
-	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`f:${r}`).digest(), o = J(i);
-	if (o.length !== a.length || !R(o, a)) return null;
+	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`f:${r}`).digest(), o = Y(i);
+	if (o.length !== a.length || !L(o, a)) return null;
 	try {
-		let e = JSON.parse(J(r).toString("utf8"));
-		return typeof e.key != "string" || e.key.length === 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
+		let e = JSON.parse(Y(r).toString("utf8"));
+		return !Pt(e) || typeof e.key != "string" || e.key.length === 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
 	} catch {
 		return null;
 	}
-}, Tt = (e, t, n = K()) => {
+}, zt = (e, t, n = q()) => {
 	if (!n) throw Error("signResumableTicket: secret must be a non-empty string");
 	let r = {
 		...e,
+		version: 1,
 		exp: Math.floor(Date.now() / 1e3) + Math.floor(t)
-	}, i = q(JSON.stringify(r));
-	return `${i}.${q(I("sha256", n).update(`r:${i}`).digest())}`;
-}, Et = (e, t = K()) => {
+	}, i = J(JSON.stringify(r));
+	return `${i}.${J(I("sha256", n).update(`r:${i}`).digest())}`;
+}, Bt = (e, t = q()) => {
 	if (!e || !t) return null;
 	let n = e.indexOf(".");
 	if (n <= 0 || n === e.length - 1) return null;
-	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`r:${r}`).digest(), o = J(i);
-	if (o.length !== a.length || !R(o, a)) return null;
+	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`r:${r}`).digest(), o = Y(i);
+	if (o.length !== a.length || !L(o, a)) return null;
 	try {
-		let e = JSON.parse(J(r).toString("utf8"));
-		return typeof e.id != "string" || e.id.length === 0 || typeof e.size != "number" || e.size < 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
+		let e = JSON.parse(Y(r).toString("utf8"));
+		return !Pt(e) || typeof e.id != "string" || e.id.length === 0 || typeof e.size != "number" || e.size < 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
 	} catch {
 		return null;
 	}
-}, Dt = (e, t, n = K()) => {
+}, Vt = (e, t, n = q()) => {
 	if (!n) throw Error("signMultipartTicket: secret must be a non-empty string");
 	let r = {
 		...e,
+		version: 1,
 		exp: Math.floor(Date.now() / 1e3) + Math.floor(t)
-	}, i = q(JSON.stringify(r));
-	return `${i}.${q(I("sha256", n).update(`m:${i}`).digest())}`;
-}, Ot = (e, t = K()) => {
+	}, i = J(JSON.stringify(r));
+	return `${i}.${J(I("sha256", n).update(`m:${i}`).digest())}`;
+}, Ht = (e, t = q()) => {
 	if (!e || !t) return null;
 	let n = e.indexOf(".");
 	if (n <= 0 || n === e.length - 1) return null;
-	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`m:${r}`).digest(), o = J(i);
-	if (o.length !== a.length || !R(o, a)) return null;
+	let r = e.slice(0, n), i = e.slice(n + 1), a = I("sha256", t).update(`m:${r}`).digest(), o = Y(i);
+	if (o.length !== a.length || !L(o, a)) return null;
 	try {
-		let e = JSON.parse(J(r).toString("utf8"));
-		return typeof e.key != "string" || e.key.length === 0 || typeof e.uploadId != "string" || e.uploadId.length === 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
+		let e = JSON.parse(Y(r).toString("utf8"));
+		return !Pt(e) || typeof e.key != "string" || e.key.length === 0 || typeof e.uploadId != "string" || e.uploadId.length === 0 || typeof e.instance != "string" || !e.instance || typeof e.ct != "string" || typeof e.exp != "number" || e.vis !== "public" && e.vis !== "private" || e.exp < Math.floor(Date.now() / 1e3) ? null : e;
 	} catch {
 		return null;
 	}
-}, kt = (e, t) => {
+}, Ut = (e, t) => {
 	if (!t || t.length === 0) return !0;
 	let n = e.toLowerCase();
 	return t.some((e) => {
 		let t = e.toLowerCase();
 		return t.endsWith("/*") ? n.startsWith(t.slice(0, -1)) : n === t;
 	});
-}, At = [
+}, Wt = [
 	{
 		ct: /^image\/png$/,
 		offset: 0,
@@ -988,21 +1044,21 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		offset: 0,
 		magic: [31, 139]
 	}
-], jt = (e, t) => {
-	let n = t.toLowerCase(), r = At.find((e) => e.ct.test(n));
+], Gt = (e, t) => {
+	let n = t.toLowerCase(), r = Wt.find((e) => e.ct.test(n));
 	return r ? e.length < r.offset + r.magic.length ? !1 : r.magic.every((t, n) => e[r.offset + n] === t) : !0;
-}, Mt = (e, t, n) => n ? n.maxBytes !== void 0 && e.byteLength > n.maxBytes ? {
+}, Kt = (e, t, n) => n ? n.maxBytes !== void 0 && e.byteLength > n.maxBytes ? {
 	reason: "too-large",
 	detail: `${e.byteLength} bytes exceeds the ${n.maxBytes}-byte limit`
-} : kt(t, n.allowedContentTypes) ? n.sniff && !jt(e, t) ? {
+} : Ut(t, n.allowedContentTypes) ? n.sniff && !Gt(e, t) ? {
 	reason: "content-mismatch",
 	detail: `bytes do not match the declared content type '${t}'`
 } : null : {
 	reason: "content-type-not-allowed",
 	detail: `content type '${t}' is not in the allow-list`
-} : null, Nt = async (e, t, n) => {
-	if (!Qe(t)) return { bytes: e };
-	let r = await et();
+} : null, qt = async (e, t, n) => {
+	if (!ut(t)) return { bytes: e };
+	let r = await ft();
 	if (!r) return { bytes: e };
 	try {
 		let t = e;
@@ -1025,31 +1081,31 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	} catch {
 		return { bytes: e };
 	}
-}, Pt = 67108864, Ft = (e) => new n({
+}, Jt = 67108864, Yt = (e) => new n({
 	reason: "too-large",
 	detail: `remote body exceeds the ${e}-byte ingest limit`
-}), It = (e, t) => new n({
+}), Xt = (e, t) => new n({
 	reason: "blocked-source",
 	detail: `will not fetch ${e}: ${t}`
-}), Lt = (e, r, i = {}) => y.suspend(() => {
-	let a = r ?? Pt;
-	return !Number.isSafeInteger(a) || a < 0 ? y.fail(new t({
+}), Zt = (e, r, i = {}) => v.suspend(() => {
+	let a = r ?? Jt;
+	return !Number.isSafeInteger(a) || a < 0 ? v.fail(new t({
 		provider: "ingest",
 		message: "limits.maxBytes must be a non-negative safe integer",
 		transient: !1
-	})) : y.tryPromise({
+	})) : v.tryPromise({
 		try: async (n) => {
 			let r = e, o;
 			for (let e = 0;; e++) {
-				let t = ve(r, { ...i.allowHosts === void 0 ? {} : { allowHosts: i.allowHosts } });
-				if (t !== null) throw It(r, t);
+				let t = De(r, { ...i.allowHosts === void 0 ? {} : { allowHosts: i.allowHosts } });
+				if (t !== null) throw Xt(r, t);
 				o = await fetch(r, {
 					signal: n,
 					redirect: "manual"
 				});
 				let a = o.headers.get("location");
 				if (o.status < 300 || o.status >= 400 || a === null) break;
-				if (await o.body?.cancel().catch(() => {}), e >= (i.maxRedirects ?? 5)) throw It(r, "too many redirects");
+				if (await o.body?.cancel().catch(() => {}), e >= (i.maxRedirects ?? 5)) throw Xt(r, "too many redirects");
 				r = new URL(a, r).toString();
 			}
 			let s;
@@ -1061,12 +1117,12 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					status: o.status
 				});
 				let e = o.headers.get("content-length"), n = o.headers.get("content-encoding")?.trim().toLowerCase();
-				if ((!n || n === "identity") && e !== null && /^\d+$/.test(e) && BigInt(e) > BigInt(a)) throw Ft(a);
+				if ((!n || n === "identity") && e !== null && /^\d+$/.test(e) && BigInt(e) > BigInt(a)) throw Yt(a);
 				let r = /* @__PURE__ */ new Uint8Array(), i = 0;
 				if (o.body !== null) for (s = o.body.getReader();;) {
 					let e = await s.read();
 					if (e.done) break;
-					if (e.value.byteLength > a - i) throw Ft(a);
+					if (e.value.byteLength > a - i) throw Yt(a);
 					if (e.value.byteLength !== 0) {
 						let t = i + e.value.byteLength;
 						if (t > r.byteLength) {
@@ -1090,26 +1146,35 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			transient: !0
 		})
 	});
-}), Rt = (e, t) => y.suspend(() => {
+}), Qt = (e, t) => v.suspend(() => {
 	if (t === void 0) return e;
-	if (t.aborted) return y.interrupt;
-	let n = y.async((e) => {
-		let n = () => e(y.interrupt);
-		return t.addEventListener("abort", n, { once: !0 }), t.aborted && n(), y.sync(() => t.removeEventListener("abort", n));
+	if (t.aborted) return v.interrupt;
+	let n = v.callback((e) => {
+		let n = () => e(v.interrupt);
+		return t.addEventListener("abort", n, { once: !0 }), t.aborted && n(), v.sync(() => t.removeEventListener("abort", n));
 	});
-	return y.raceFirst(e, n);
-}), zt = (e) => {
-	let r = (e, r) => y.tryPromise({
-		try: r,
-		catch: (r) => C.is(n)(r) ? r : new t({
-			provider: "metadata",
-			message: `Storage ${e} was not confirmed; retain the operation identity for recovery`,
-			transient: !1
-		})
+	return v.raceFirst(e, n);
+}), $t = (e) => {
+	let r = (e, n) => v.tryPromise({
+		try: n,
+		catch: (n) => {
+			let r = Ye(n);
+			if (r !== void 0) return r;
+			let i = G(n, "metadata"), a = new t({
+				provider: "metadata",
+				message: `Storage ${e} was not confirmed: ${i.message}; retain the operation identity for recovery`,
+				transient: i.transient,
+				...i.status === void 0 ? {} : { status: i.status }
+			});
+			return Object.defineProperty(a, "cause", {
+				value: n,
+				configurable: !0
+			}), a;
+		}
 	});
 	return {
-		put: (t) => y.gen(function* () {
-			if (t.bytes.byteLength !== t.ref.size || he("sha256").update(t.bytes).digest("hex") !== t.identity.checksum) return yield* y.fail(new n({
+		put: (t) => v.gen(function* () {
+			if (t.bytes.byteLength !== t.ref.size || Ce("sha256").update(t.bytes).digest("hex") !== t.identity.checksum) return yield* v.fail(new n({
 				reason: "operation-content-mismatch",
 				detail: "Storage operation bytes do not match their reserved identity"
 			}));
@@ -1125,15 +1190,15 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				outcome: a
 			});
 		}),
-		delete: (t, n, i) => y.gen(function* () {
+		delete: (t, n, i) => v.gen(function* () {
 			let a = yield* r("delete acceptance", () => e.metadata.beginDelete(t, n, i));
 			"operation" in a && (a.operation.deleteKey !== null && (yield* e.provider.delete(a.operation.deleteKey)), yield* r("delete confirmation", () => e.metadata.confirmDelete(a.identity)));
 		})
 	};
-}, Bt = async (e) => {
+}, en = async (e) => {
 	let { createHash: t } = await import("node:crypto");
 	return t("sha256").update(e).digest("hex");
-}, Vt = (e, t, n) => `${e?.replace(/\/+$/, "") ?? ""}${n}/${t}`, Ht = (e) => {
+}, tn = (e, t, n) => `${e?.replace(/\/+$/, "") ?? ""}${n}/${t}`, nn = (e) => {
 	let t = /* @__PURE__ */ new Map(), n = {
 		public: 0,
 		private: 0
@@ -1143,13 +1208,13 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			count: 0,
 			bytes: 0
 		};
-		i.count += r.count, i.bytes += r.bytes, t.set(e, i), r.visibility === "public" ? n.public += r.count : n.private += r.count;
+		i.count = Je(i.count, r.count, "ref count"), i.bytes = Je(i.bytes, r.bytes, "usage bytes"), t.set(e, i), r.visibility === "public" ? n.public = Je(n.public, r.count, "public ref count") : n.private = Je(n.private, r.count, "private ref count");
 	}
 	return {
 		byTenant: Object.fromEntries(t),
 		visibility: n
 	};
-}, Ut = (e, t) => {
+}, rn = (e, t) => {
 	if (t.search && ![
 		e.id,
 		e.key,
@@ -1166,26 +1231,32 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		if (!t.tags.every((e) => n.includes(e))) return !1;
 	}
 	return !0;
-}, Wt = (e) => e ?? "global", Gt = () => {
+}, an = (e) => e ?? "global", on = () => {
 	let e = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Map();
 	return {
-		statistics: () => y.sync(() => Ht((function* () {
-			for (let t of e.values()) yield {
-				tenantId: t.tenantId,
-				visibility: t.visibility,
-				count: 1,
-				bytes: t.size
-			};
-		})())),
-		insert: (t) => y.sync(() => {
-			e.set(t.id, t);
+		statistics: () => v.try({
+			try: () => nn((function* () {
+				for (let t of e.values()) yield {
+					tenantId: t.tenantId,
+					visibility: t.visibility,
+					count: 1,
+					bytes: t.size
+				};
+			})()),
+			catch: (e) => G(e, "refstore")
+		}),
+		insert: (t) => v.try({
+			try: () => {
+				W(t.size, "ref size"), e.set(t.id, t);
+			},
+			catch: (e) => G(e, "refstore")
 		}),
-		getById: (t) => y.sync(() => e.get(t) ?? null),
-		delete: (t) => y.sync(() => e.delete(t)),
-		listRecent: (t) => y.sync(() => [...e.values()].sort((e, t) => t.createdAt.getTime() - e.createdAt.getTime() || t.id.localeCompare(e.id)).slice(0, t)),
-		countByKey: (t, n) => y.sync(() => [...e.values()].filter((e) => e.bucket === t && e.key === n).length),
-		countPublicByKey: (t, n) => y.sync(() => [...e.values()].filter((e) => e.bucket === t && e.key === n && e.visibility === "public").length),
-		setVisibility: (t, n) => y.sync(() => {
+		getById: (t) => v.sync(() => e.get(t) ?? null),
+		delete: (t) => v.sync(() => e.delete(t)),
+		listRecent: (t) => v.sync(() => [...e.values()].sort((e, t) => t.createdAt.getTime() - e.createdAt.getTime() || t.id.localeCompare(e.id)).slice(0, t)),
+		countByKey: (t, n) => v.sync(() => [...e.values()].filter((e) => e.bucket === t && e.key === n).length),
+		countPublicByKey: (t, n) => v.sync(() => [...e.values()].filter((e) => e.bucket === t && e.key === n && e.visibility === "public").length),
+		setVisibility: (t, n) => v.sync(() => {
 			let r = e.get(t);
 			if (r === void 0) return null;
 			let i = {
@@ -1194,46 +1265,57 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			};
 			return e.set(t, i), i;
 		}),
-		usageByTenant: (t) => y.sync(() => {
-			let n = 0, r = 0;
-			for (let i of e.values()) (i.tenantId ?? null) === (t ?? null) && (n += i.size, r++);
-			return {
-				bytes: n,
-				count: r
-			};
+		usageByTenant: (t) => v.try({
+			try: () => {
+				let n = 0, r = 0;
+				for (let i of e.values()) (i.tenantId ?? null) === (t ?? null) && (n = Je(n, i.size, "usage bytes"), r++);
+				return {
+					bytes: n,
+					count: r
+				};
+			},
+			catch: (e) => G(e, "refstore")
 		}),
-		consumeUsage: (e, n, r) => y.sync(() => {
-			let i = Wt(e), a = t.get(i) ?? {
-				bytes: 0,
-				count: 0
-			}, o = (r?.maxBytes === void 0 || a.bytes + n.bytes <= r.maxBytes) && (r?.maxCount === void 0 || a.count + n.count <= r.maxCount);
-			return o && t.set(i, {
-				bytes: a.bytes + n.bytes,
-				count: a.count + n.count
-			}), {
-				allowed: o,
-				bytes: a.bytes,
-				count: a.count
-			};
+		consumeUsage: (e, n, r) => v.try({
+			try: () => {
+				let i = an(e), a = t.get(i) ?? {
+					bytes: 0,
+					count: 0
+				};
+				W(n.bytes, "usage byte delta"), W(n.count, "usage count delta");
+				let o = Number.isSafeInteger(a.bytes + n.bytes) && Number.isSafeInteger(a.count + n.count) && (r?.maxBytes === void 0 || a.bytes + n.bytes <= r.maxBytes) && (r?.maxCount === void 0 || a.count + n.count <= r.maxCount);
+				return o && t.set(i, {
+					bytes: a.bytes + n.bytes,
+					count: a.count + n.count
+				}), {
+					allowed: o,
+					bytes: a.bytes,
+					count: a.count
+				};
+			},
+			catch: (e) => G(e, "refstore")
 		}),
-		releaseUsage: (e, n) => y.sync(() => {
-			let r = Wt(e), i = t.get(r);
-			i && t.set(r, {
-				bytes: Math.max(0, i.bytes - n.bytes),
-				count: Math.max(0, i.count - n.count)
-			});
+		releaseUsage: (e, n) => v.try({
+			try: () => {
+				let r = an(e), i = t.get(r);
+				W(n.bytes, "usage byte delta"), W(n.count, "usage count delta"), i && t.set(r, {
+					bytes: Math.max(0, i.bytes - n.bytes),
+					count: Math.max(0, i.count - n.count)
+				});
+			},
+			catch: (e) => G(e, "refstore")
 		}),
-		listByDerivedFrom: (t) => y.sync(() => [...e.values()].filter((e) => (e.derivedFrom ?? null) === t)),
-		listRefs: (t) => y.sync(() => [...e.values()].filter((e) => Ut(e, t)).sort((e, t) => t.createdAt.getTime() - e.createdAt.getTime() || t.id.localeCompare(e.id)).slice(t.offset, t.offset + t.limit))
+		listByDerivedFrom: (t) => v.sync(() => [...e.values()].filter((e) => (e.derivedFrom ?? null) === t)),
+		listRefs: (t) => v.sync(() => [...e.values()].filter((e) => rn(e, t)).sort((e, t) => t.createdAt.getTime() - e.createdAt.getTime() || t.id.localeCompare(e.id)).slice(t.offset, t.offset + t.limit))
 	};
-}, Kt = (e) => Array.isArray(e) && e.every((e) => typeof e == "string") ? e : null, Y = (e) => ({
+}, sn = (e) => Array.isArray(e) && e.every((e) => typeof e == "string") ? e : null, X = (e) => ({
 	id: String(e.id),
 	tenantId: e.tenantId ?? null,
 	ownerId: e.ownerId ?? null,
 	bucket: String(e.bucket),
 	key: String(e.key),
 	contentType: String(e.contentType),
-	size: Number(e.size),
+	size: W(e.size, "ref size"),
 	checksum: String(e.checksum),
 	visibility: e.visibility === "public" ? "public" : "private",
 	accessPolicy: e.accessPolicy ?? null,
@@ -1244,19 +1326,15 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	duration: e.duration ?? null,
 	placeholder: e.placeholder ?? null,
 	folder: e.folder ?? null,
-	tags: Kt(e.tags),
+	tags: sn(e.tags),
 	alt: e.alt ?? null,
 	caption: e.caption ?? null,
 	derivedFrom: e.derivedFrom ?? null,
 	kind: e.kind ?? null
-}), X = (e) => y.tryPromise({
+}), Z = (e) => v.tryPromise({
 	try: e,
-	catch: (e) => new t({
-		provider: "refstore",
-		message: String(e?.message ?? e),
-		transient: !0
-	})
-}), qt = async (e, t) => (await e.query({
+	catch: (e) => G(e, "refstore", !0)
+}), cn = async (e, t) => (await e.query({
 	table: "_voltro_storage_usage",
 	predicate: {
 		column: "tenantId",
@@ -1267,33 +1345,41 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	take: 1,
 	skip: void 0,
 	projection: void 0
-}))[0] ?? null, Jt = (e) => ({
-	statistics: () => X(async () => Ht((await e.query({
-		table: V,
+}))[0] ?? null, ln = (e) => ({
+	statistics: () => Z(async () => nn((await e.query({
+		table: B,
 		predicate: void 0,
 		order: [],
 		take: void 0,
 		skip: void 0,
 		projection: void 0,
 		groupBy: ["tenantId", "visibility"],
-		aggregations: [{
-			op: "count",
-			alias: "count"
-		}, {
-			op: "sum",
-			column: "size",
-			alias: "bytes"
-		}]
+		aggregations: [
+			de("tenantId"),
+			de("visibility"),
+			{
+				op: "count",
+				alias: "count"
+			},
+			{
+				op: "sum",
+				column: "size",
+				alias: "bytes"
+			}
+		]
 	})).map((e) => ({
 		tenantId: e.tenantId == null ? null : String(e.tenantId),
 		visibility: String(e.visibility),
-		count: Number(e.count),
-		bytes: Number(e.bytes ?? 0)
+		count: W(e.count, "ref count"),
+		bytes: W(e.bytes ?? 0, "usage bytes")
 	})))),
-	insert: (t) => X(() => e.insert(V, { ...t })),
-	getById: (t) => X(async () => {
+	insert: (t) => Z(() => e.insert(B, {
+		...t,
+		size: String(W(t.size, "ref size"))
+	})),
+	getById: (t) => Z(async () => {
 		let n = await e.query({
-			table: V,
+			table: B,
 			predicate: {
 				column: "id",
 				op: "eq",
@@ -1304,11 +1390,11 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			skip: void 0,
 			projection: void 0
 		});
-		return n[0] ? Y(n[0]) : null;
+		return n[0] ? X(n[0]) : null;
 	}),
-	delete: (t) => X(() => e.delete(V, t)),
-	listRecent: (t) => X(async () => (await e.query({
-		table: V,
+	delete: (t) => Z(() => e.delete(B, t)),
+	listRecent: (t) => Z(async () => (await e.query({
+		table: B,
 		predicate: void 0,
 		order: [{
 			column: "createdAt",
@@ -1317,9 +1403,9 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		take: t,
 		skip: void 0,
 		projection: void 0
-	})).map(Y)),
-	countByKey: (t, n) => X(async () => (await e.query({
-		table: V,
+	})).map(X)),
+	countByKey: (t, n) => Z(async () => W((await e.query({
+		table: B,
 		predicate: { and: [{
 			column: "bucket",
 			op: "eq",
@@ -1332,10 +1418,14 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		order: [],
 		take: void 0,
 		skip: void 0,
-		projection: void 0
-	})).length),
-	countPublicByKey: (t, n) => X(async () => (await e.query({
-		table: V,
+		projection: void 0,
+		aggregations: [{
+			op: "count",
+			alias: "count"
+		}]
+	}))[0]?.count ?? 0, "ref count")),
+	countPublicByKey: (t, n) => Z(async () => W((await e.query({
+		table: B,
 		predicate: { and: [
 			{
 				column: "bucket",
@@ -1356,15 +1446,19 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		order: [],
 		take: void 0,
 		skip: void 0,
-		projection: ["id"]
-	})).length),
-	setVisibility: (t, n) => X(async () => {
-		let r = await e.update(V, t, { visibility: n });
-		return r ? Y(r) : null;
+		projection: void 0,
+		aggregations: [{
+			op: "count",
+			alias: "count"
+		}]
+	}))[0]?.count ?? 0, "ref count")),
+	setVisibility: (t, n) => Z(async () => {
+		let r = await e.update(B, t, { visibility: n });
+		return r ? X(r) : null;
 	}),
-	usageByTenant: (t) => X(async () => {
+	usageByTenant: (t) => Z(async () => {
 		let n = await e.query({
-			table: V,
+			table: B,
 			predicate: {
 				column: "tenantId",
 				op: "eq",
@@ -1373,43 +1467,64 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			order: [],
 			take: void 0,
 			skip: void 0,
-			projection: void 0
-		}), r = 0;
-		for (let e of n) r += Number(e.size ?? 0);
-		return {
-			bytes: r,
-			count: n.length
+			projection: void 0,
+			aggregations: [
+				{
+					op: "count",
+					alias: "count"
+				},
+				{
+					op: "sum",
+					column: "size",
+					alias: "bytes"
+				},
+				{
+					op: "min",
+					column: "size",
+					alias: "minSize"
+				},
+				{
+					op: "max",
+					column: "size",
+					alias: "maxSize"
+				}
+			]
+		});
+		return W(n[0]?.count ?? 0, "ref count") > 0 && (W(n[0]?.minSize, "ref size"), W(n[0]?.maxSize, "ref size")), {
+			bytes: W(n[0]?.bytes ?? 0, "usage bytes"),
+			count: W(n[0]?.count ?? 0, "ref count")
 		};
 	}),
-	consumeUsage: (t, n, r) => X(async () => {
-		let i = Wt(t);
+	consumeUsage: (t, n, r) => Z(async () => {
+		let i = an(t);
+		W(n.bytes, "usage byte delta"), W(n.count, "usage count delta");
 		for (let t = 0; t < 32; t++) {
 			t > 0 && await new Promise((e) => setTimeout(e, t));
-			let a = await qt(e, i), o = a ? Number(a.bytes ?? 0) : 0, s = a ? Number(a.count ?? 0) : 0;
-			if (!((r?.maxBytes === void 0 || o + n.bytes <= r.maxBytes) && (r?.maxCount === void 0 || s + n.count <= r.maxCount))) return {
+			let a = await cn(e, i), o = a ? W(a.bytes, "usage bytes") : 0, s = a ? W(a.count, "ref count") : 0;
+			if (!(Number.isSafeInteger(o + n.bytes) && Number.isSafeInteger(s + n.count) && (r?.maxBytes === void 0 || o + n.bytes <= r.maxBytes) && (r?.maxCount === void 0 || s + n.count <= r.maxCount))) return {
 				allowed: !1,
 				bytes: o,
 				count: s
 			};
 			if (a) {
 				if (await e.updateMany("_voltro_storage_usage", {
-					bytes: o + n.bytes,
-					count: s + n.count,
+					bytes: String(o + n.bytes),
+					count: String(s + n.count),
 					updatedAt: /* @__PURE__ */ new Date()
-				}, { where: E(O("id", String(a.id)), O("bytes", o), O("count", s)) }) === 1) return {
+				}, { where: ue(k("id", String(a.id)), k("bytes", a.bytes), k("count", a.count)) }) === 1) return {
 					allowed: !0,
 					bytes: o,
 					count: s
 				};
 			} else {
-				let t = k({
+				let t = A({
 					kind: "typeid",
 					prefix: "susage"
-				}, Pe), r = await e.insertIgnore(Pe, {
+				}, Ue), r = await e.insertIgnore(Ue, {
 					id: t,
 					tenantId: i,
-					bytes: n.bytes,
-					count: n.count,
+					bytes: String(n.bytes),
+					count: String(n.count),
 					updatedAt: /* @__PURE__ */ new Date()
 				}, { conflictColumns: ["tenantId"] });
 				if (String(r.id) === t) return {
@@ -1419,25 +1534,26 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				};
 			}
 		}
-		throw Error(`storage usage consume: contention on tenant '${i}' exceeded 32 attempts`);
+		throw T("Storage quota reservation contended after 32 attempts; retry");
 	}),
-	releaseUsage: (t, n) => X(async () => {
-		let r = Wt(t);
+	releaseUsage: (t, n) => Z(async () => {
+		let r = an(t);
+		W(n.bytes, "usage byte delta"), W(n.count, "usage count delta");
 		for (let t = 0; t < 32; t++) {
 			t > 0 && await new Promise((e) => setTimeout(e, t));
-			let i = await qt(e, r);
+			let i = await cn(e, r);
 			if (!i) return;
-			let a = Number(i.bytes ?? 0), o = Number(i.count ?? 0);
+			let a = W(i.bytes, "usage bytes"), o = W(i.count, "ref count");
 			if (await e.updateMany("_voltro_storage_usage", {
-				bytes: Math.max(0, a - n.bytes),
-				count: Math.max(0, o - n.count),
+				bytes: String(Math.max(0, a - n.bytes)),
+				count: String(Math.max(0, o - n.count)),
 				updatedAt: /* @__PURE__ */ new Date()
-			}, { where: E(O("id", String(i.id)), O("bytes", a), O("count", o)) }) === 1) return;
+			}, { where: ue(k("id", String(i.id)), k("bytes", i.bytes), k("count", i.count)) }) === 1) return;
 		}
-		throw Error(`storage usage release: contention on tenant '${r}' exceeded 32 attempts`);
+		throw T("Storage quota release contended after 32 attempts; retry");
 	}),
-	listByDerivedFrom: (t) => X(async () => (await e.query({
-		table: V,
+	listByDerivedFrom: (t) => Z(async () => (await e.query({
+		table: B,
 		predicate: {
 			column: "derivedFrom",
 			op: "eq",
@@ -1450,18 +1566,18 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		take: void 0,
 		skip: void 0,
 		projection: void 0
-	})).map(Y)),
-	listRefs: (t) => X(async () => {
+	})).map(X)),
+	listRefs: (t) => Z(async () => {
 		let n = [];
-		t.tenantId !== void 0 && n.push(O("tenantId", t.tenantId)), t.ownerId !== void 0 && n.push(O("ownerId", t.ownerId)), t.search && n.push(N(...[
+		t.tenantId !== void 0 && n.push(k("tenantId", t.tenantId)), t.ownerId !== void 0 && n.push(k("ownerId", t.ownerId)), t.search && n.push(N(...[
 			"id",
 			"key",
 			"contentType",
 			"ownerId",
 			"tenantId"
-		].map((e) => D(e, t.search))));
-		let r = t.folder === void 0 && t.tags.length === 0 && t.includeDerived, i = n.length ? E(...n) : void 0, a = await e.query({
-			table: V,
+		].map((e) => fe(e, t.search)))), t.includeDerived || n.push(me("derivedFrom"));
+		let r = t.folder === void 0 && t.tags.length === 0, i = n.length ? ue(...n) : void 0, a = await e.query({
+			table: B,
 			predicate: i,
 			order: [{
 				column: "createdAt",
@@ -1474,24 +1590,24 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			skip: r ? t.offset : void 0,
 			projection: void 0
 		});
-		return r ? a.map(Y) : a.map(Y).filter((e) => Ut(e, t)).slice(t.offset, t.offset + t.limit);
+		return r ? a.map(X) : a.map(X).filter((e) => rn(e, t)).slice(t.offset, t.offset + t.limit);
 	})
-}), Yt = () => {
+}), un = () => {
 	let e = /* @__PURE__ */ new Map();
 	return {
-		insert: (t) => y.sync(() => {
+		insert: (t) => v.sync(() => {
 			e.set(t.id, t);
 		}),
-		delete: (t) => y.sync(() => {
+		delete: (t) => v.sync(() => {
 			e.delete(t);
 		}),
-		getById: (t) => y.sync(() => e.get(t) ?? null),
-		listByRef: (t) => y.sync(() => [...e.values()].filter((e) => e.refId === t)),
-		deleteByRef: (t) => y.sync(() => {
+		getById: (t) => v.sync(() => e.get(t) ?? null),
+		listByRef: (t) => v.sync(() => [...e.values()].filter((e) => e.refId === t)),
+		deleteByRef: (t) => v.sync(() => {
 			for (let [n, r] of e) r.refId === t && e.delete(n);
 		})
 	};
-}, Xt = (e) => ({
+}, dn = (e) => ({
 	id: String(e.id),
 	refId: String(e.refId),
 	principalType: e.principalType,
@@ -1500,12 +1616,12 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	createdAt: e.createdAt instanceof Date ? e.createdAt : new Date(String(e.createdAt)),
 	expiresAt: e.expiresAt ? e.expiresAt instanceof Date ? e.expiresAt : new Date(String(e.expiresAt)) : null,
 	createdBy: e.createdBy ?? null
-}), Zt = (e) => ({
-	insert: (t) => X(() => e.insert(H, { ...t })),
-	delete: (t) => X(() => e.delete(H, t)),
-	getById: (t) => X(async () => {
+}), fn = (e) => ({
+	insert: (t) => Z(() => e.insert(V, { ...t })),
+	delete: (t) => Z(() => e.delete(V, t)),
+	getById: (t) => Z(async () => {
 		let n = (await e.query({
-			table: H,
+			table: V,
 			predicate: {
 				column: "id",
 				op: "eq",
@@ -1516,10 +1632,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			skip: void 0,
 			projection: void 0
 		}))[0];
-		return n ? Xt(n) : null;
+		return n ? dn(n) : null;
 	}),
-	listByRef: (t) => X(async () => (await e.query({
-		table: H,
+	listByRef: (t) => Z(async () => (await e.query({
+		table: V,
 		predicate: {
 			column: "refId",
 			op: "eq",
@@ -1532,10 +1648,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		take: void 0,
 		skip: void 0,
 		projection: void 0
-	})).map(Xt)),
-	deleteByRef: (t) => X(async () => {
+	})).map(dn)),
+	deleteByRef: (t) => Z(async () => {
 		let n = await e.query({
-			table: H,
+			table: V,
 			predicate: {
 				column: "refId",
 				op: "eq",
@@ -1546,23 +1662,23 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			skip: void 0,
 			projection: void 0
 		});
-		for (let t of n) await e.delete(H, String(t.id));
+		for (let t of n) await e.delete(V, String(t.id));
 	})
-}), Qt = () => k({
+}), pn = () => A({
 	kind: "typeid",
 	prefix: "file"
-}, V), $t = () => k({
+}, B), mn = () => A({
 	kind: "typeid",
 	prefix: "grant"
-}, H), en = (i) => {
-	let { provider: a, refStore: o, grantStore: s, bucket: c } = i, l = i.access ?? {}, u = i.attempts ?? 3, d = i.urlExpiresInSec ?? 3600, f = (e) => Vt(i.publicBaseUrl, e, i.httpPath ?? "/_voltro/storage"), p = S.recurs(Math.max(0, u - 1)).pipe(S.intersect(S.exponential("100 millis")), S.whileInput((e) => e.transient)), m = (e, t, n) => [
+}, V), hn = (i) => {
+	let { provider: a, refStore: o, grantStore: s, bucket: c } = i, l = i.access ?? {}, u = i.attempts ?? 3, d = i.urlExpiresInSec ?? 3600, f = (e) => tn(i.publicBaseUrl, e, i.httpPath ?? "/_voltro/storage"), p = x.max([x.recurs(Math.max(0, u - 1)), x.exponential("100 millis")]).pipe(x.while(({ input: e }) => e.transient)), m = (e, t, n) => [
 		i.tenantPrefix,
 		e ?? "global",
 		n ?? t
 	].filter(Boolean).join("/"), ee = (e) => {
-		if (e === void 0) return y.succeed(void 0);
+		if (e === void 0) return v.succeed(void 0);
 		let n = e.length === 0 ? "empty" : e.includes("\0") ? "contains NUL" : e.startsWith("/") || e.startsWith("\\") ? "starts with a path separator" : e.includes("\\") ? "contains a backslash" : e.split("/").some((e) => e === "" || e === "." || e === "..") ? "contains an empty, \".\" or \"..\" segment" : void 0;
-		return n === void 0 ? y.succeed(e) : y.fail(new t({
+		return n === void 0 ? v.succeed(e) : v.fail(new t({
 			provider: a.name,
 			message: `storage key rejected: ${n}`,
 			transient: !1,
@@ -1574,20 +1690,20 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		"_incoming",
 		t,
 		String(n).padStart(6, "0")
-	].filter(Boolean).join("/"), h = (e, n) => n !== void 0 && e.tenantId !== n ? y.fail(new t({
+	].filter(Boolean).join("/"), ne = (e, t) => t === void 0 || e.tenantId === t, h = (e, n) => ne(e, n) ? v.succeed(e) : v.fail(new t({
 		provider: a.name,
 		message: "cross-tenant access denied",
 		transient: !1,
 		status: 403
-	})) : y.succeed(e), ne = (e, n, r) => y.gen(function* () {
+	})), g = (e, n, r) => v.gen(function* () {
 		let o = i.objects?.(), s = (e) => new t({
 			provider: "metadata",
 			message: e,
 			transient: !1,
 			status: 409
 		});
-		if (o === void 0) return r === void 0 ? !1 : yield* y.fail(s(`claim '${r}' cannot be released: no data store is bound, so ref '${e}' holds no claims`));
-		let c = yield* y.tryPromise({
+		if (o === void 0) return r === void 0 ? !1 : yield* v.fail(s(`claim '${r}' cannot be released: no data store is bound, so ref '${e}' holds no claims`));
+		let c = yield* v.tryPromise({
 			try: () => o.intent(e),
 			catch: (e) => new t({
 				provider: "metadata",
@@ -1595,25 +1711,25 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				transient: !1
 			})
 		});
-		return c === void 0 ? r === void 0 ? !1 : yield* y.fail(s(`claim '${r}' cannot be released: ref '${e}' was not written through an operation and holds no claims`)) : (yield* h(c.ref, n), yield* zt({
+		return c === void 0 ? r === void 0 ? !1 : yield* v.fail(s(`claim '${r}' cannot be released: ref '${e}' was not written through an operation and holds no claims`)) : (yield* h(c.ref, n), yield* $t({
 			metadata: o,
 			provider: {
 				...a,
-				delete: (e) => a.delete(e).pipe(y.retry(p))
+				delete: (e) => a.delete(e).pipe(v.retry(p))
 			}
-		}).delete(e, n, r).pipe(y.catchTag("StorageRejected", (e) => y.fail(e.reason === "claim-not-held" ? s(e.detail) : new t({
+		}).delete(e, n, r).pipe(v.catchTag("StorageRejected", (e) => v.fail(e.reason === "claim-not-held" ? s(e.detail) : new t({
 			provider: "metadata",
 			message: e.detail,
 			transient: !1
 		})))), !0);
-	}), g = (e, n) => o.getById(e).pipe(y.flatMap((r) => r ? h(r, n) : y.fail(new t({
+	}), _ = (e, n) => o.getById(e).pipe(v.flatMap((r) => r ? h(r, n) : v.fail(new t({
 		provider: a.name,
 		message: `no ref '${e}'`,
 		transient: !1,
 		status: 404
-	})))), re = (e) => y.suspend(() => {
+	})))), re = (e) => v.suspend(() => {
 		let n = i.scan(e);
-		return y.isEffect(n) ? n : y.tryPromise({
+		return v.isEffect(n) ? n : v.tryPromise({
 			try: () => Promise.resolve(n),
 			catch: (e) => new t({
 				provider: "scan",
@@ -1621,23 +1737,23 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				transient: !0
 			})
 		});
-	}), ie = (e) => y.suspend(() => {
+	}), ie = (e) => v.suspend(() => {
 		let t = e.contentType;
-		if (!i.videoProbe || !(t.startsWith("video/") || t.startsWith("audio/"))) return y.succeed(null);
+		if (!i.videoProbe || !(t.startsWith("video/") || t.startsWith("audio/"))) return v.succeed(null);
 		let n;
 		try {
 			n = i.videoProbe(e);
 		} catch {
-			return y.succeed(null);
+			return v.succeed(null);
 		}
-		return y.isEffect(n) ? n.pipe(y.catchAll(() => y.succeed(null))) : y.tryPromise({
+		return v.isEffect(n) ? n.pipe(v.catch(() => v.succeed(null))) : v.tryPromise({
 			try: () => Promise.resolve(n),
 			catch: () => null
-		}).pipe(y.catchAll(() => y.succeed(null)));
-	}), _ = (e) => y.gen(function* () {
-		let t = Mt(e.bytes, e.contentType, i.limits);
-		if (t) return yield* y.fail(new n(t));
-		if (e.claim !== void 0 && e.operationId === void 0) return yield* y.fail(new n({
+		}).pipe(v.catch(() => v.succeed(null)));
+	}), b = (e) => v.gen(function* () {
+		let t = Kt(e.bytes, e.contentType, i.limits);
+		if (t) return yield* v.fail(new n(t));
+		if (e.claim !== void 0 && e.operationId === void 0) return yield* v.fail(new n({
 			reason: "claim-without-operation",
 			detail: "a put with a claim needs an operationId; the claim names this caller's hold on that operation's object"
 		}));
@@ -1647,38 +1763,38 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				contentType: e.contentType,
 				...e.key ? { key: e.key } : {}
 			});
-			if (!t.clean) return yield* y.fail(new r({ threat: t.threat ?? "unknown" }));
+			if (!t.clean) return yield* v.fail(new r({ threat: t.threat ?? "unknown" }));
 		}
-		let s = yield* y.promise(() => Nt(e.bytes, e.contentType, { normalize: i.normalizeImages ?? !1 })), l = s.bytes, u = yield* ie({
+		let s = yield* v.promise(() => qt(e.bytes, e.contentType, { normalize: i.normalizeImages ?? !1 })), l = s.bytes, u = yield* ie({
 			bytes: l,
 			contentType: e.contentType
-		}), d = s.width ?? u?.width, f = s.height ?? u?.height, te = s.placeholder ?? u?.poster, h = e.duration ?? u?.duration, ne = yield* y.promise(() => Bt(l)), g = e.tenantId ?? null, _ = e.visibility ?? "private", v = m(g, ne, yield* ee(e.key)), S = e.password ? yield* y.sync(() => ot(e.password)) : null, C = {
-			id: Qt(),
+		}), d = s.width ?? u?.width, f = s.height ?? u?.height, te = s.placeholder ?? u?.poster, ne = e.duration ?? u?.duration, h = yield* v.promise(() => en(l)), g = e.tenantId ?? null, _ = e.visibility ?? "private", b = m(g, h, yield* ee(e.key)), x = e.password ? yield* v.sync(() => yt(e.password)) : null, S = {
+			id: pn(),
 			tenantId: g,
 			ownerId: e.ownerId ?? null,
 			bucket: c,
-			key: v,
+			key: b,
 			contentType: e.contentType,
 			size: l.byteLength,
-			checksum: ne,
+			checksum: h,
 			visibility: _,
 			accessPolicy: e.access ?? null,
-			passwordHash: S,
+			passwordHash: x,
 			createdAt: /* @__PURE__ */ new Date(),
 			...d === void 0 ? {} : { width: d },
 			...f === void 0 ? {} : { height: f },
 			...te === void 0 ? {} : { placeholder: te },
-			...h === void 0 ? {} : { duration: h },
+			...ne === void 0 ? {} : { duration: ne },
 			...e.folder === void 0 ? {} : { folder: e.folder },
 			...e.tags === void 0 ? {} : { tags: e.tags },
 			...e.alt === void 0 ? {} : { alt: e.alt },
 			...e.caption === void 0 ? {} : { caption: e.caption },
 			...e.derivedFrom === void 0 ? {} : { derivedFrom: e.derivedFrom },
 			...e.kind === void 0 ? {} : { kind: e.kind }
-		}, w = i.transcode !== void 0 && i.autoTranscode !== !1, T = (t) => w && t.derivedFrom == null && (e.contentType.startsWith("video/") || e.contentType.startsWith("audio/")) ? y.forkDaemon(x(t).pipe(y.ignore)) : y.void;
+		}, C = i.transcode !== void 0 && i.autoTranscode !== !1, oe = (t) => C && t.derivedFrom == null && (e.contentType.startsWith("video/") || e.contentType.startsWith("audio/")) ? v.forkDetach(ae(t).pipe(v.ignore)) : v.void;
 		if (e.operationId !== void 0) {
 			let t = i.objects?.();
-			if (t === void 0) return yield* y.fail(new n({
+			if (t === void 0) return yield* v.fail(new n({
 				reason: "operation-store-unbound",
 				detail: "a put with an operationId needs a bound data store; the in-memory ref store cannot hold operation intents"
 			}));
@@ -1686,10 +1802,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				tenantId: g,
 				bucket: c,
 				operationId: e.operationId,
-				checksum: ne,
-				logicalKey: v,
-				fingerprint: yield* y.promise(() => Bt(new TextEncoder().encode(JSON.stringify([
-					ne,
+				checksum: h,
+				logicalKey: b,
+				fingerprint: yield* v.promise(() => en(new TextEncoder().encode(JSON.stringify([
+					h,
 					e.contentType,
 					_,
 					e.access ?? null,
@@ -1701,66 +1817,66 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					e.caption ?? null,
 					e.derivedFrom ?? null,
 					e.kind ?? null,
-					h ?? null,
+					ne ?? null,
 					e.password !== void 0
 				]))))
-			}, o = yield* zt({
+			}, o = yield* $t({
 				metadata: t,
 				provider: {
 					...a,
-					put: (e, t, n) => a.put(e, t, n).pipe(y.retry(p))
+					put: (e, t, n) => a.put(e, t, n).pipe(v.retry(p))
 				}
 			}).put({
 				identity: r,
-				ref: C,
+				ref: S,
 				bytes: l,
 				...i.quota === void 0 ? {} : { quota: i.quota },
 				...e.claim === void 0 ? {} : { claim: e.claim }
 			});
-			return yield* T(o.ref), {
+			return yield* oe(o.ref), {
 				...o.ref,
 				outcome: o.outcome
 			};
 		}
-		let ae = {
+		let w = {
 			bytes: l.byteLength,
 			count: 1
-		}, oe = yield* o.consumeUsage(g, ae, i.quota);
-		if (!oe.allowed) {
-			let e = i.quota ?? {}, t = e.maxCount !== void 0 && oe.count + 1 > e.maxCount ? `tenant object count ${oe.count} + 1 exceeds max ${e.maxCount}` : `tenant usage ${oe.bytes} + ${l.byteLength} bytes exceeds max ${e.maxBytes}`;
-			return yield* y.fail(new n({
+		}, se = yield* o.consumeUsage(g, w, i.quota);
+		if (!se.allowed) {
+			let e = i.quota ?? {}, t = e.maxCount !== void 0 && se.count + 1 > e.maxCount ? `tenant object count ${se.count} + 1 exceeds max ${e.maxCount}` : `tenant usage ${se.bytes} + ${l.byteLength} bytes exceeds max ${e.maxBytes}`;
+			return yield* v.fail(new n({
 				reason: "quota-exceeded",
 				detail: t
 			}));
 		}
-		return yield* ((e) => e.pipe(y.onExit((e) => b.isSuccess(e) ? y.void : o.delete(C.id).pipe(y.zipRight(o.releaseUsage(g, ae)), y.ignore))))(o.insert(C).pipe(y.zipRight(a.put(v, l, {
+		return yield* ((e) => e.pipe(v.onExit((e) => y.isSuccess(e) ? v.void : o.delete(S.id).pipe(v.andThen(o.releaseUsage(g, w)), v.ignore))))(o.insert(S).pipe(v.andThen(a.put(b, l, {
 			contentType: e.contentType,
 			public: _ === "public"
-		}).pipe(y.retry(p))))), yield* T(C), {
-			...C,
+		}).pipe(v.retry(p))))), yield* oe(S), {
+			...S,
 			outcome: "created"
 		};
-	}), v = (e) => y.suspend(() => {
-		if (!i.transcode) return y.succeed([]);
+	}), S = (e) => v.suspend(() => {
+		if (!i.transcode) return v.succeed([]);
 		let t;
 		try {
 			t = i.transcode(e);
 		} catch {
-			return y.succeed([]);
+			return v.succeed([]);
 		}
-		return y.isEffect(t) ? t.pipe(y.catchAll(() => y.succeed([]))) : y.tryPromise({
+		return v.isEffect(t) ? t.pipe(v.catch(() => v.succeed([]))) : v.tryPromise({
 			try: () => Promise.resolve(t),
 			catch: () => []
-		}).pipe(y.catchAll(() => y.succeed([])));
-	}), x = (e) => y.gen(function* () {
+		}).pipe(v.catch(() => v.succeed([])));
+	}), ae = (e) => v.gen(function* () {
 		if (!i.transcode || e.derivedFrom != null) return [];
-		let t = yield* a.get(e.key).pipe(y.retry(p)), n = yield* v({
+		let t = yield* a.get(e.key).pipe(v.retry(p)), n = yield* S({
 			bytes: t.bytes,
 			contentType: e.contentType,
 			ref: e
 		}), r = [];
 		for (let t of n) {
-			let n = yield* _({
+			let n = yield* b({
 				bytes: t.bytes,
 				contentType: t.contentType,
 				tenantId: e.tenantId,
@@ -1773,14 +1889,20 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			r.push(n);
 		}
 		return r;
-	}), C = (e, t, n) => y.gen(function* () {
-		if (e.visibility === "public" || (yield* mt(e, t, {
+	}), oe = (e, t, n) => v.gen(function* () {
+		if (e.derivedFrom != null) {
+			let r = yield* o.getById(e.derivedFrom);
+			return r === null ? !1 : yield* oe(r, t, n);
+		}
+		if (e.visibility === "public") return !0;
+		if (e.tenantId !== null && !ne(e, t.tenantId ?? null)) return !1;
+		if (yield* Dt(e, t, {
 			...l,
 			...n?.password === void 0 ? {} : { password: n.password }
-		}))) return !0;
-		let r = yield* vt(t, l);
-		return _t(yield* s.listByRef(e.id), t, r, n?.permission ?? "read", Date.now());
-	}), T = (e) => {
+		})) return !0;
+		let r = yield* jt(t, l);
+		return At(yield* s.listByRef(e.id), t, r, n?.permission ?? "read", Date.now());
+	}), w = (e) => {
 		if (e.visibility === "public") {
 			let t = a.publicUrl?.(e.key);
 			if (t != null) return t;
@@ -1788,94 +1910,99 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		return f(e.id);
 	};
 	return {
-		put: _,
-		get: (e, t) => g(e, t?.tenantId).pipe(y.flatMap((e) => a.get(e.key).pipe(y.retry(p), y.map((t) => ({
+		put: b,
+		get: (e, t) => _(e, t?.tenantId).pipe(v.flatMap((e) => a.get(e.key).pipe(v.retry(p), v.map((t) => ({
 			bytes: t.bytes,
 			ref: e
 		}))))),
-		getStream: (e, t) => g(e, t?.tenantId).pipe(y.map((e) => ({
+		getStream: (e, t) => _(e, t?.tenantId).pipe(v.map((e) => ({
 			ref: e,
-			stream: w.unwrap(y.suspend(() => a.getStream ? a.getStream(e.key).pipe(y.retry(p), y.map((e) => e.stream)) : a.get(e.key).pipe(y.retry(p), y.map((e) => w.make(e.bytes)))))
+			stream: C.unwrap(v.suspend(() => a.getStream ? a.getStream(e.key).pipe(v.retry(p), v.map((e) => e.stream)) : a.get(e.key).pipe(v.retry(p), v.map((e) => C.make(e.bytes)))))
 		}))),
-		getRange: (e, n, r) => g(e, r?.tenantId).pipe(y.flatMap((e) => {
+		getRange: (e, n, r) => _(e, r?.tenantId).pipe(v.flatMap((e) => {
 			let r = e.size, i = Math.max(0, Math.trunc(n.start));
-			if (r > 0 && i >= r) return y.fail(new t({
+			if (r > 0 && i >= r) return v.fail(new t({
 				provider: a.name,
 				message: `range start ${i} past end ${r}`,
 				transient: !1,
 				status: 416
 			}));
 			let o = Math.min(Math.trunc(n.endInclusive), Math.max(0, r - 1));
-			return o < i ? y.fail(new t({
+			return o < i ? v.fail(new t({
 				provider: a.name,
 				message: `empty range ${i}-${o}`,
 				transient: !1,
 				status: 416
-			})) : (a.getRange ? a.getRange(e.key, i, o).pipe(y.retry(p)) : a.get(e.key).pipe(y.retry(p), y.map((e) => e.bytes.subarray(i, o + 1)))).pipe(y.map((t) => ({
+			})) : (a.getRange ? a.getRange(e.key, i, o).pipe(v.retry(p)) : a.get(e.key).pipe(v.retry(p), v.map((e) => e.bytes.subarray(i, o + 1)))).pipe(v.map((t) => ({
 				bytes: t,
 				ref: e,
 				totalSize: r
 			})));
 		})),
-		getUrl: (e, t) => g(e, t?.tenantId).pipe(y.flatMap((e) => e.visibility === "public" ? y.succeed(T(e)) : a.presigns ? a.getUrl(e.key, t?.expiresInSec ?? d) : y.succeed(f(e.id)))),
-		head: (e, t) => o.getById(e).pipe(y.flatMap((e) => e ? h(e, t?.tenantId).pipe(y.map((e) => e)) : y.succeed(null))),
-		delete: (e, t) => ne(e, t?.tenantId, t?.claim).pipe(y.flatMap((n) => n ? y.void : g(e, t?.tenantId).pipe(y.flatMap((t) => s.deleteByRef(e).pipe(y.flatMap(() => o.delete(e)), y.flatMap((e) => e ? o.countByKey(t.bucket, t.key).pipe(y.flatMap((e) => e === 0 ? a.delete(t.key).pipe(y.retry(p)) : y.void), y.flatMap(() => o.releaseUsage(t.tenantId, {
+		getUrl: (e, t) => _(e, t?.tenantId).pipe(v.flatMap((e) => e.visibility === "public" ? v.succeed(w(e)) : a.presigns ? a.getUrl(e.key, t?.expiresInSec ?? d) : v.succeed(f(e.id)))),
+		head: (e, t) => o.getById(e).pipe(v.flatMap((e) => e ? h(e, t?.tenantId).pipe(v.map((e) => e)) : v.succeed(null))),
+		delete: (e, t) => g(e, t?.tenantId, t?.claim).pipe(v.flatMap((n) => n ? v.void : _(e, t?.tenantId).pipe(v.flatMap((t) => s.deleteByRef(e).pipe(v.flatMap(() => o.delete(e)), v.flatMap((e) => e ? o.countByKey(t.bucket, t.key).pipe(v.flatMap((e) => e === 0 ? a.delete(t.key).pipe(v.retry(p)) : v.void), v.flatMap(() => o.releaseUsage(t.tenantId, {
 			bytes: t.size,
 			count: 1
-		}))) : y.void), y.asVoid))))),
-		signedUrl: (e, t) => g(e, t?.tenantId).pipe(y.flatMap((e) => {
-			if (e.visibility === "public") return y.succeed(T(e));
+		}))) : v.void), v.asVoid))))),
+		signedUrl: (e, t) => _(e, t?.tenantId).pipe(v.flatMap((e) => {
+			if (e.visibility === "public") return v.succeed(w(e));
 			let n = t?.expiresInSec ?? d;
-			return a.presigns ? a.getUrl(e.key, n) : y.sync(() => `${f(e.id)}?t=${yt(e.id, n, void 0, i.httpPath ?? "/_voltro/storage")}`);
+			return a.presigns ? a.getUrl(e.key, n) : v.sync(() => `${f(e.id)}?t=${Mt(e.id, n, void 0, i.httpPath ?? "/_voltro/storage")}`);
 		})),
-		setVisibility: (e, r, i) => y.gen(function* () {
-			let s = yield* g(e, i?.tenantId);
+		setVisibility: (e, r, i) => v.gen(function* () {
+			let s = yield* _(e, i?.tenantId);
 			if (s.visibility === r) return s;
 			let c = o.setVisibility;
-			if (c === void 0) return yield* y.fail(new n({
+			if (c === void 0) return yield* v.fail(new n({
 				reason: "visibility-unsupported",
 				detail: "the ref store cannot change a stored object's visibility"
 			}));
-			if (r === "private" && a.publicUrl?.(s.key) != null) return yield* y.fail(new n({
+			if (r === "private" && a.publicUrl?.(s.key) != null) return yield* v.fail(new n({
 				reason: "visibility-unsupported",
 				detail: `objects are served from a public base (${a.name} cdnBaseUrl); a public object cannot be made private there`
 			}));
-			if (r === "private" && a.setObjectPublic !== void 0 && o.countPublicByKey === void 0) return yield* y.fail(new n({
+			if (r === "private" && a.setObjectPublic !== void 0 && o.countPublicByKey === void 0) return yield* v.fail(new n({
 				reason: "visibility-unsupported",
 				detail: "the ref store cannot tell whether other refs keep these bytes public"
 			}));
 			let l = yield* c(s.id, r);
-			if (l === null) return yield* y.fail(new t({
+			if (l === null) return yield* v.fail(new t({
 				provider: a.name,
 				message: `no ref '${e}'`,
 				transient: !1,
 				status: 404
 			}));
+			let u = s.derivedFrom == null ? yield* o.listByDerivedFrom(s.id) : [];
+			for (let e of u) e.visibility !== r && (yield* c(e.id, r));
 			if (a.setObjectPublic !== void 0) {
-				let e = o.countPublicByKey, t = r === "public" || e !== void 0 && (yield* e(s.bucket, s.key)) > 0;
-				yield* a.setObjectPublic(s.key, t);
+				let e = o.countPublicByKey;
+				for (let t of [s, ...u]) {
+					let n = r === "public" || e !== void 0 && (yield* e(t.bucket, t.key)) > 0;
+					yield* a.setObjectPublic(t.key, n);
+				}
 			}
 			return l;
 		}),
-		mintUrl: (n, r, s) => y.gen(function* () {
-			let c = yield* o.getById(n).pipe(y.flatMap((e) => e ? y.succeed(e) : y.fail(new t({
+		mintUrl: (n, r, s) => v.gen(function* () {
+			let c = yield* o.getById(n).pipe(v.flatMap((e) => e ? v.succeed(e) : v.fail(new t({
 				provider: a.name,
 				message: `no ref '${n}'`,
 				transient: !1,
 				status: 404
 			}))));
-			if (c.visibility === "public") return T(c);
-			if (!(yield* C(c, r, s?.password === void 0 ? {} : { password: s.password }))) return yield* y.fail(new e({
+			if (c.visibility === "public" && c.derivedFrom == null) return w(c);
+			if (!(yield* oe(c, r, s?.password === void 0 ? {} : { password: s.password }))) return yield* v.fail(new e({
 				refId: n,
 				reason: "access denied"
 			}));
 			let l = s?.expiresInSec ?? d;
 			if (a.presigns) return yield* a.getUrl(c.key, l);
-			let u = yield* y.sync(() => yt(c.id, l, void 0, i.httpPath ?? "/_voltro/storage"));
+			let u = yield* v.sync(() => Mt(c.id, l, void 0, i.httpPath ?? "/_voltro/storage"));
 			return `${f(c.id)}?t=${u}`;
 		}),
-		mintUploadUrl: (e) => y.gen(function* () {
-			if (!a.getUploadUrl) return yield* y.fail(new t({
+		mintUploadUrl: (e) => v.gen(function* () {
+			if (!a.getUploadUrl) return yield* v.fail(new t({
 				provider: a.name,
 				message: `provider '${a.name}' does not support presigned uploads`,
 				transient: !1,
@@ -1884,10 +2011,10 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			let n = m(e.tenantId ?? null, "", yield* ee(e.key));
 			return yield* a.getUploadUrl(n, e.expiresInSec ?? d, e.contentType);
 		}),
-		checkAccess: C,
-		grant: (e) => y.gen(function* () {
+		checkAccess: oe,
+		grant: (e) => v.gen(function* () {
 			let t = {
-				id: $t(),
+				id: mn(),
 				refId: e.refId,
 				principalType: e.principalType,
 				principalId: e.principalId,
@@ -1898,7 +2025,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			};
 			return yield* s.insert(t), t;
 		}),
-		listRefs: (e) => y.suspend(() => {
+		listRefs: (e) => v.suspend(() => {
 			let t = Math.min(500, Math.max(1, Math.trunc(e?.limit ?? 50))), n = Math.max(0, Math.trunc(e?.offset ?? 0)), r = {
 				tenantId: e && "tenantId" in e ? e.tenantId : void 0,
 				folder: e?.folder,
@@ -1908,7 +2035,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				limit: t + 1,
 				offset: n
 			};
-			return o.listRefs(r).pipe(y.map((e) => {
+			return o.listRefs(r).pipe(v.map((e) => {
 				let r = e.length > t;
 				return {
 					refs: r ? e.slice(0, t) : e,
@@ -1920,7 +2047,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		getGrant: (e) => s.getById(e),
 		listGrants: (e) => s.listByRef(e),
 		usage: (e) => o.usageByTenant(e),
-		sweepOrphans: (e) => y.gen(function* () {
+		sweepOrphans: (e) => v.gen(function* () {
 			let t = e?.limit ?? 1e3, n = e?.dryRun ?? !1, r = yield* o.listRecent(t), i = [];
 			for (let e of r) if ((yield* a.head(e.key)) === null) {
 				if (!n) {
@@ -1937,9 +2064,9 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				removed: i
 			};
 		}),
-		ingestUrl: (e, t) => Rt(y.gen(function* () {
-			let n = yield* Lt(e, i.limits?.maxBytes, i.ingest);
-			return yield* _({
+		ingestUrl: (e, t) => Qt(v.gen(function* () {
+			let n = yield* Zt(e, i.limits?.maxBytes, i.ingest);
+			return yield* b({
 				bytes: n.bytes,
 				contentType: t?.contentType ?? n.contentType,
 				...t?.tenantId === void 0 ? {} : { tenantId: t.tenantId },
@@ -1954,39 +2081,40 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				...t?.caption === void 0 ? {} : { caption: t.caption }
 			});
 		}), t?.abortSignal),
-		mintPresignedUpload: (e) => y.gen(function* () {
-			if (!a.getUploadUrl) return yield* y.fail(new t({
+		mintPresignedUpload: (e) => v.gen(function* () {
+			if (!a.getUploadUrl) return yield* v.fail(new t({
 				provider: a.name,
 				message: `provider '${a.name}' does not support presigned uploads`,
 				transient: !1,
 				status: 400
 			}));
-			let n = e.expiresInSec ?? d, r = `_incoming/${k({
+			let n = e.expiresInSec ?? d, r = `_incoming/${A({
 				kind: "typeid",
 				prefix: "up"
-			}, V)}`, i = m(e.tenantId ?? null, "", r);
+			}, B)}`, i = m(e.tenantId ?? null, "", r);
 			return {
 				uploadUrl: yield* a.getUploadUrl(i, n, e.contentType),
 				key: i,
 				expiresInSec: n
 			};
 		}),
-		finalizeUpload: (e) => a.get(e.key).pipe(y.retry(p), y.flatMap((t) => _({
+		finalizeUpload: (e) => a.get(e.key).pipe(v.retry(p), v.flatMap((t) => b({
 			bytes: t.bytes,
 			contentType: e.contentType,
 			...e.tenantId === void 0 ? {} : { tenantId: e.tenantId },
 			...e.ownerId === void 0 ? {} : { ownerId: e.ownerId },
 			...e.visibility === void 0 ? {} : { visibility: e.visibility },
+			...e.access === void 0 ? {} : { access: e.access },
 			...e.folder === void 0 ? {} : { folder: e.folder },
 			...e.tags === void 0 ? {} : { tags: e.tags },
 			...e.alt === void 0 ? {} : { alt: e.alt },
 			...e.caption === void 0 ? {} : { caption: e.caption }
-		})), y.ensuring(a.delete(e.key).pipe(y.retry(p), y.ignore))),
-		putResumableChunk: (e) => a.put(te(e.tenantId ?? null, e.uploadId, e.index), e.bytes, { contentType: "application/octet-stream" }).pipe(y.retry(p), y.asVoid),
-		resumableStatus: (e) => y.gen(function* () {
+		})), v.ensuring(a.delete(e.key).pipe(v.retry(p), v.ignore))),
+		putResumableChunk: (e) => a.put(te(e.tenantId ?? null, e.uploadId, e.index), e.bytes, { contentType: "application/octet-stream" }).pipe(v.retry(p), v.asVoid),
+		resumableStatus: (e) => v.gen(function* () {
 			let t = 0, n = 0;
 			for (; t < 1e6;) {
-				let r = yield* a.head(te(e.tenantId ?? null, e.uploadId, t)).pipe(y.retry(p), y.catchAll(() => y.succeed(null)));
+				let r = yield* a.head(te(e.tenantId ?? null, e.uploadId, t)).pipe(v.retry(p), v.catch(() => v.succeed(null)));
 				if (r === null) break;
 				n += r.size, t += 1;
 			}
@@ -1995,42 +2123,42 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				nextIndex: t
 			};
 		}),
-		finalizeResumable: (e) => y.gen(function* () {
+		finalizeResumable: (e) => v.gen(function* () {
 			let r = i.limits?.maxBytes ?? 2 ** 53 - 1;
-			if (!Number.isSafeInteger(r) || r < 0 || !Number.isSafeInteger(e.count) || e.count < 0) return yield* y.fail(new t({
+			if (!Number.isSafeInteger(r) || r < 0 || !Number.isSafeInteger(e.count) || e.count < 0) return yield* v.fail(new t({
 				provider: a.name,
 				message: "resumable count and limits.maxBytes must be non-negative safe integers",
 				transient: !1,
 				status: 400
 			}));
-			let o = (t) => te(e.tenantId ?? null, e.uploadId, t), s = y.gen(function* () {
-				for (let t = 0; t < e.count; t++) yield* a.delete(o(t)).pipe(y.retry(p), y.ignore);
+			let o = (t) => te(e.tenantId ?? null, e.uploadId, t), s = v.gen(function* () {
+				for (let t = 0; t < e.count; t++) yield* a.delete(o(t)).pipe(v.retry(p), v.ignore);
 			}), c = () => new n({
 				reason: "too-large",
 				detail: `resumable upload exceeds ${r}-byte limit`
-			}), l = yield* y.gen(function* () {
+			}), l = yield* v.gen(function* () {
 				let n = 0;
 				for (let i = 0; i < e.count; i++) {
-					let e = yield* a.head(o(i)).pipe(y.retry(p));
-					if (e === null) return yield* y.fail(new t({
+					let e = yield* a.head(o(i)).pipe(v.retry(p));
+					if (e === null) return yield* v.fail(new t({
 						provider: a.name,
 						message: `no resumable chunk at '${o(i)}'`,
 						transient: !1,
 						status: 404
 					}));
-					if (!Number.isSafeInteger(e.size) || e.size < 0) return yield* y.fail(new t({
+					if (!Number.isSafeInteger(e.size) || e.size < 0) return yield* v.fail(new t({
 						provider: a.name,
 						message: "resumable chunk metadata has an invalid size",
 						transient: !1
 					}));
-					if (e.size > r - n) return yield* y.fail(c());
+					if (e.size > r - n) return yield* v.fail(c());
 					n += e.size;
 				}
 				let i = /* @__PURE__ */ new Uint8Array(), s = 0;
 				for (let t = 0; t < e.count; t++) {
-					let e = yield* Me(a, o(t)).pipe(y.retry(p));
-					yield* w.runForEach(e.stream, (e) => y.gen(function* () {
-						if (e.byteLength > r - s) return yield* y.fail(c());
+					let e = yield* Ve(a, o(t)).pipe(v.retry(p));
+					yield* C.runForEach(e.stream, (e) => v.gen(function* () {
+						if (e.byteLength > r - s) return yield* v.fail(c());
 						let t = s + e.byteLength;
 						if (t > i.byteLength) {
 							let e = new Uint8Array(Math.min(r, Math.max(65536, i.byteLength * 2, t)));
@@ -2040,60 +2168,61 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					}));
 				}
 				return i.subarray(0, s);
-			}).pipe(y.tapError((e) => e._tag === "StorageRejected" ? s : y.void));
-			return yield* _({
+			}).pipe(v.tapError((e) => e._tag === "StorageRejected" ? s : v.void));
+			return yield* b({
 				bytes: l,
 				contentType: e.contentType,
 				...e.tenantId === void 0 ? {} : { tenantId: e.tenantId },
 				...e.ownerId === void 0 ? {} : { ownerId: e.ownerId },
 				...e.visibility === void 0 ? {} : { visibility: e.visibility },
+				...e.access === void 0 ? {} : { access: e.access },
 				...e.folder === void 0 ? {} : { folder: e.folder },
 				...e.tags === void 0 ? {} : { tags: e.tags },
 				...e.alt === void 0 ? {} : { alt: e.alt },
 				...e.caption === void 0 ? {} : { caption: e.caption }
-			}).pipe(y.ensuring(s));
+			}).pipe(v.ensuring(s));
 		}),
-		transcode: (e, t) => g(e, t?.tenantId).pipe(y.flatMap((e) => x(e))),
-		renditions: (e, t) => g(e, t?.tenantId).pipe(y.flatMap(() => o.listByDerivedFrom(e))),
-		beginMultipartUpload: (e) => y.gen(function* () {
-			if (!a.createMultipartUpload || !a.presignUploadPart || !a.completeMultipartUpload) return yield* y.fail(new t({
+		transcode: (e, t) => _(e, t?.tenantId).pipe(v.flatMap((e) => ae(e))),
+		renditions: (e, t) => _(e, t?.tenantId).pipe(v.flatMap(() => o.listByDerivedFrom(e))),
+		beginMultipartUpload: (e) => v.gen(function* () {
+			if (!a.createMultipartUpload || !a.presignUploadPart || !a.completeMultipartUpload) return yield* v.fail(new t({
 				provider: a.name,
 				message: `provider '${a.name}' does not support multipart uploads`,
 				transient: !1,
 				status: 400
 			}));
-			let n = m(e.tenantId ?? null, "", `multipart/${k({
+			let n = m(e.tenantId ?? null, "", `multipart/${A({
 				kind: "typeid",
 				prefix: "mp"
-			}, V)}`);
+			}, B)}`);
 			return {
 				uploadId: (yield* a.createMultipartUpload(n, e.contentType, { public: (e.visibility ?? "private") === "public" })).uploadId,
 				key: n
 			};
 		}),
-		signMultipartPart: (e) => y.suspend(() => a.presignUploadPart ? a.presignUploadPart(e.key, e.uploadId, e.partNumber, e.expiresInSec ?? d) : y.fail(new t({
+		signMultipartPart: (e) => v.suspend(() => a.presignUploadPart ? a.presignUploadPart(e.key, e.uploadId, e.partNumber, e.expiresInSec ?? d) : v.fail(new t({
 			provider: a.name,
 			message: "provider does not support multipart uploads",
 			transient: !1,
 			status: 400
 		}))),
-		completeMultipart: (e) => y.gen(function* () {
-			if (!a.completeMultipartUpload) return yield* y.fail(new t({
+		completeMultipart: (e) => v.gen(function* () {
+			if (!a.completeMultipartUpload) return yield* v.fail(new t({
 				provider: a.name,
 				message: "provider does not support multipart uploads",
 				transient: !1,
 				status: 400
 			}));
-			let r = yield* a.completeMultipartUpload(e.key, e.uploadId, e.parts), s = yield* a.head(e.key).pipe(y.retry(p)), l = s?.size ?? 0, u = (r.etag ?? s?.etag ?? "").replace(/"/g, ""), d = e.tenantId ?? null, f = {
+			let r = yield* a.completeMultipartUpload(e.key, e.uploadId, e.parts), s = yield* a.head(e.key).pipe(v.retry(p)), l = s?.size ?? 0, u = (r.etag ?? s?.etag ?? "").replace(/"/g, ""), d = e.tenantId ?? null, f = {
 				bytes: l,
 				count: 1
 			};
-			if (!(yield* o.consumeUsage(d, f, i.quota)).allowed) return yield* a.delete(e.key).pipe(y.retry(p), y.ignore), yield* y.fail(new n({
+			if (!(yield* o.consumeUsage(d, f, i.quota)).allowed) return yield* a.delete(e.key).pipe(v.retry(p), v.ignore), yield* v.fail(new n({
 				reason: "quota-exceeded",
 				detail: `multipart upload of ${l} bytes exceeds tenant quota`
 			}));
 			let m = {
-				id: Qt(),
+				id: pn(),
 				tenantId: e.tenantId ?? null,
 				ownerId: e.ownerId ?? null,
 				bucket: c,
@@ -2102,7 +2231,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				size: l,
 				checksum: u,
 				visibility: e.visibility ?? "private",
-				accessPolicy: null,
+				accessPolicy: e.access ?? null,
 				passwordHash: null,
 				createdAt: /* @__PURE__ */ new Date(),
 				...e.folder === void 0 ? {} : { folder: e.folder },
@@ -2110,22 +2239,22 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 				...e.alt === void 0 ? {} : { alt: e.alt },
 				...e.caption === void 0 ? {} : { caption: e.caption }
 			};
-			return yield* o.insert(m).pipe(y.onExit((e) => b.isSuccess(e) ? y.void : o.releaseUsage(d, f).pipe(y.ignore))), m;
+			return yield* o.insert(m).pipe(v.onExit((e) => y.isSuccess(e) ? v.void : o.releaseUsage(d, f).pipe(v.ignore))), m;
 		}),
-		abortMultipart: (e) => y.suspend(() => a.abortMultipartUpload ? a.abortMultipartUpload(e.key, e.uploadId).pipe(y.retry(p)) : y.void)
+		abortMultipart: (e) => v.suspend(() => a.abortMultipartUpload ? a.abortMultipartUpload(e.key, e.uploadId).pipe(v.retry(p)) : v.void)
 	};
-}, tn = (e) => x.succeed(i, en(e)), nn = "_voltro_storage_operation_locks", Z = "_voltro_storage_object_heads", rn = "_voltro_storage_operations", an = "_voltro_storage_object_claims", on = [
-	P(nn, {
+}, gn = (e) => b.succeed(i, hn(e)), _n = "_voltro_storage_operation_locks", Q = "_voltro_storage_object_heads", vn = "_voltro_storage_operations", yn = "_voltro_storage_object_claims", bn = [
+	P(_n, {
 		id: F().maxLength(64),
 		nonce: F()
 	}).primaryKey(["id"]).nonReactive(),
-	P(Z, {
+	P(Q, {
 		id: F().maxLength(64),
 		generation: F(),
 		key: F(),
-		reservations: A()
+		reservations: E()
 	}).primaryKey(["id"]).nonReactive(),
-	P(rn, {
+	P(vn, {
 		id: F().maxLength(64),
 		objectId: F().maxLength(64),
 		fingerprint: F().maxLength(64),
@@ -2135,90 +2264,98 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		state: F(),
 		deleteKey: F().nullable()
 	}).primaryKey(["id"]).nonReactive(),
-	P(an, {
+	P(yn, {
 		id: F().maxLength(64),
 		operationId: F().maxLength(64),
 		claim: F()
 	}).primaryKey(["id"]).nonReactive()
-], sn = C.Struct({
-	id: C.String,
-	objectId: C.String,
-	fingerprint: C.String,
-	generation: C.String,
-	key: C.String,
-	refId: C.String,
-	state: C.Literal("reserved", "ready", "deleting", "deleted"),
-	deleteKey: C.NullOr(C.String)
-}), cn = C.Struct({
-	id: C.String,
-	generation: C.String,
-	key: C.String,
-	reservations: C.Int.pipe(C.nonNegative())
-}), ln = (e) => he("sha256").update(JSON.stringify(e)).digest("hex"), un = (e, t) => ln([e, t]), dn = (e) => {
+], xn = S.Struct({
+	id: S.String,
+	objectId: S.String,
+	fingerprint: S.String,
+	generation: S.String,
+	key: S.String,
+	refId: S.String,
+	state: S.Literals([
+		"reserved",
+		"ready",
+		"deleting",
+		"deleted"
+	]),
+	deleteKey: S.NullOr(S.String)
+}), Sn = S.Struct({
+	id: S.String,
+	generation: S.String,
+	key: S.String,
+	reservations: S.Int.pipe(S.check(S.isGreaterThanOrEqualTo(0)))
+}), Cn = (e) => S.decodeUnknownSync(Sn)({
+	...e,
+	reservations: W(e.reservations, "shared-object reservation count")
+}), wn = (e) => Ce("sha256").update(JSON.stringify(e)).digest("hex"), Tn = (e, t) => wn([e, t]), En = (e) => {
 	if (!e.bucket || !e.operationId || !e.logicalKey || !/^[a-f0-9]{64}$/.test(e.fingerprint) || !/^[a-f0-9]{64}$/.test(e.checksum)) throw Error("Storage operation requires a bucket, operation identity, key and SHA-256 fingerprint");
 	return {
-		id: ln([
+		id: wn([
 			e.bucket,
 			e.tenantId,
 			e.operationId
 		]),
-		objectId: ln([
+		objectId: wn([
 			e.bucket,
 			e.tenantId,
 			e.logicalKey,
 			e.checksum
 		]),
-		lockId: ln([e.tenantId])
+		lockId: wn([e.tenantId])
 	};
-}, fn = async (e, t, n) => {
-	let { lockId: r } = dn(t);
-	return await e.insertIgnoreWithOutcome(nn, {
+}, Dn = async (e, t, n) => {
+	let { lockId: r } = En(t);
+	return await e.insertIgnoreWithOutcome(_n, {
 		id: r,
-		nonce: _e()
+		nonce: Te()
 	}, { conflictColumns: ["id"] }), e.transactional(async (e) => {
 		if ((await e.query({
-			table: nn,
-			predicate: O("id", r),
+			table: _n,
+			predicate: k("id", r),
 			lock: "update",
 			order: [],
 			take: 1,
 			skip: void 0,
 			projection: void 0
-		})).length !== 1 || await e.update(nn, r, { nonce: _e() }) === null) throw Error("Storage operation lock is unavailable");
+		})).length !== 1 || await e.update(_n, r, { nonce: Te() }) === null) throw Error("Storage operation lock is unavailable");
 		return n(e);
 	});
-}, Q = async (e, t) => {
-	let r = dn(t), i = await e.query({
-		table: rn,
-		predicate: O("id", r.id),
+}, $ = async (e, t) => {
+	let r = En(t), i = await e.query({
+		table: vn,
+		predicate: k("id", r.id),
 		order: [],
 		take: 1,
 		skip: void 0,
 		projection: void 0
 	});
 	if (!i[0]) return;
-	let a = C.decodeUnknownSync(sn)(i[0]);
+	let a = S.decodeUnknownSync(xn)(i[0]);
 	if (a.fingerprint !== t.fingerprint || a.objectId !== r.objectId) throw new n({
 		reason: "operation-identity-reused",
 		detail: `storage operation '${t.operationId}' was already used with different inputs`
 	});
 	return a;
-}, pn = async (e, t) => {
-	let n = await Q(e, t);
+}, On = async (e, t) => {
+	let n = await $(e, t);
 	if (n) return n;
-	let { id: r, objectId: i } = dn(t), a = await e.query({
-		table: Z,
-		predicate: O("id", i),
+	let { id: r, objectId: i } = En(t), a = await e.query({
+		table: Q,
+		predicate: k("id", i),
 		order: [],
 		take: 1,
 		skip: void 0,
 		projection: void 0
-	}), o = a[0] ? C.decodeUnknownSync(cn)(a[0]) : void 0, s = o?.generation ?? _e(), c = o?.key ?? `${t.logicalKey}/g-${s}`;
-	o ? await e.update(Z, i, { reservations: o.reservations + 1 }) : await e.insert(Z, {
+	}), o = a[0] ? Cn(a[0]) : void 0, s = o?.generation ?? Te(), c = o?.key ?? `${t.logicalKey}/g-${s}`;
+	o ? await e.update(Q, i, { reservations: String(Je(o.reservations, 1, "shared-object reservation count")) }) : await e.insert(Q, {
 		id: i,
 		generation: s,
 		key: c,
-		reservations: 1
+		reservations: "1"
 	});
 	let l = {
 		id: r,
@@ -2226,35 +2363,35 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		fingerprint: t.fingerprint,
 		generation: s,
 		key: c,
-		refId: `file_${_e()}`,
+		refId: `file_${Te()}`,
 		state: "reserved",
 		deleteKey: null
 	};
-	return await e.insert(rn, l), l;
-}, mn = async (e, t) => {
-	let n = await Q(e, t);
+	return await e.insert(vn, l), l;
+}, kn = async (e, t) => {
+	let n = await $(e, t);
 	if (!n) throw Error("Storage operation is missing");
 	if (n.state === "deleting" || n.state === "deleted") throw Error("Deleted storage operation cannot be confirmed by a late put");
-	return await e.update(rn, n.id, { state: "ready" }), {
+	return await e.update(vn, n.id, { state: "ready" }), {
 		...n,
 		state: "ready"
 	};
-}, hn = async (e, t) => {
-	let n = await Q(e, t);
+}, An = async (e, t) => {
+	let n = await $(e, t);
 	if (!n) throw Error("Storage operation is missing");
 	if (n.state === "deleting" || n.state === "deleted") return n;
 	if (n.state !== "ready") throw Error("An unconfirmed put cannot be deleted");
 	let r = await e.query({
-		table: Z,
-		predicate: O("id", n.objectId),
+		table: Q,
+		predicate: k("id", n.objectId),
 		order: [],
 		take: 1,
 		skip: void 0,
 		projection: void 0
-	}), i = r[0] ? C.decodeUnknownSync(cn)(r[0]) : void 0;
+	}), i = r[0] ? Cn(r[0]) : void 0;
 	if (!i || i.generation !== n.generation || i.reservations < 1) throw Error("Storage object generation does not own its reservation");
 	let a = i.reservations === 1 ? i.key : null;
-	return a === null ? await e.update(Z, i.id, { reservations: i.reservations - 1 }) : await e.delete(Z, i.id), await e.update(rn, n.id, {
+	return a === null ? await e.update(Q, i.id, { reservations: String(i.reservations - 1) }) : await e.delete(Q, i.id), await e.update(vn, n.id, {
 		state: "deleting",
 		deleteKey: a
 	}), {
@@ -2262,46 +2399,46 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		state: "deleting",
 		deleteKey: a
 	};
-}, gn = async (e, t) => {
-	let n = await Q(e, t);
+}, jn = async (e, t) => {
+	let n = await $(e, t);
 	if (!n || n.state !== "deleting" && n.state !== "deleted") throw Error("Storage deletion has not been accepted");
-	return n.state !== "deleted" && (await e.update(rn, n.id, { state: "deleted" }), !0);
-}, _n = async (e, t, n) => {
+	return n.state !== "deleted" && (await e.update(vn, n.id, { state: "deleted" }), !0);
+}, Mn = async (e, t, n) => {
 	if (!n) throw Error("Storage object claim must be a non-empty string");
-	await e.insertIgnoreWithOutcome(an, {
-		id: un(t, n),
+	await e.insertIgnoreWithOutcome(yn, {
+		id: Tn(t, n),
 		operationId: t,
 		claim: n
 	}, { conflictColumns: ["id"] });
-}, vn = async (e, t, n) => {
-	let r = un(t, n);
+}, Nn = async (e, t, n) => {
+	let r = Tn(t, n);
 	return {
-		held: await e.delete(an, r),
+		held: await e.delete(yn, r),
 		others: (await e.query({
-			table: an,
-			predicate: E(O("operationId", t), M("claim", n)),
+			table: yn,
+			predicate: ue(k("operationId", t), ve("claim", n)),
 			order: [],
 			take: 1,
 			skip: void 0,
 			projection: void 0
 		})).length > 0
 	};
-}, yn = (e, t) => e.deleteMany(an, { where: O("operationId", t) }), bn = "_voltro_storage_put_intents", xn = P(bn, {
+}, Pn = (e, t) => e.deleteMany(yn, { where: k("operationId", t) }), Fn = "_voltro_storage_put_intents", In = P(Fn, {
 	id: F().maxLength(64),
 	refId: F().maxLength(64),
-	identity: j(),
-	ref: j()
-}).primaryKey(["id"]).unique("storagePutRef", ["refId"]).nonReactive(), Sn = C.Struct({
-	tenantId: C.NullOr(C.String),
-	bucket: C.String,
-	operationId: C.String,
-	fingerprint: C.String,
-	checksum: C.String,
-	logicalKey: C.String
-}), Cn = async (e, t) => {
+	identity: ge(),
+	ref: ge()
+}).primaryKey(["id"]).unique("storagePutRef", ["refId"]).nonReactive(), Ln = S.Struct({
+	tenantId: S.NullOr(S.String),
+	bucket: S.String,
+	operationId: S.String,
+	fingerprint: S.String,
+	checksum: S.String,
+	logicalKey: S.String
+}), Rn = async (e, t) => {
 	let n = await e.query({
-		table: bn,
-		predicate: O("refId", t),
+		table: Fn,
+		predicate: k("refId", t),
 		order: [],
 		take: 2,
 		skip: void 0,
@@ -2309,44 +2446,44 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	});
 	if (n.length === 0) return;
 	if (n.length !== 1) throw Error("Storage reference has ambiguous operation ownership");
-	let r = n[0], i = C.decodeUnknownSync(Sn)(r.identity);
+	let r = n[0], i = S.decodeUnknownSync(Ln)(r.identity);
 	if (typeof r.ref != "object" || r.ref === null || Array.isArray(r.ref)) throw Error("Storage operation reference is unreadable");
-	let a = Y(r.ref);
+	let a = X(r.ref);
 	if (a.id !== t || a.bucket !== i.bucket || a.tenantId !== i.tenantId || a.checksum !== i.checksum || !Number.isSafeInteger(a.size) || a.size < 0 || !Number.isFinite(a.createdAt.getTime())) throw Error("Storage operation reference does not match its identity");
 	return {
 		identity: i,
 		ref: a
 	};
-}, wn = (e) => ({
-	intent: (t) => Cn(e, t),
-	reserve: (t, r, i, a) => fn(e, t, async (e) => {
+}, zn = (e) => ({
+	intent: (t) => Rn(e, t),
+	reserve: (t, r, i, a) => Dn(e, t, async (e) => {
 		if (r.tenantId !== t.tenantId || r.bucket !== t.bucket || r.checksum !== t.checksum || !Number.isSafeInteger(r.size) || r.size < 0) throw Error("Storage put metadata does not match its identity");
-		let o = await Q(e, t);
+		let o = await $(e, t);
 		if (o) {
 			if (o.state === "deleting" || o.state === "deleted") throw Error("Storage put identity has already been deleted");
-			let t = await Cn(e, o.refId);
+			let t = await Rn(e, o.refId);
 			if (!t) throw Error("Storage operation lost its put intent");
 			let n = o.state === "ready";
-			return n && a !== void 0 && await _n(e, o.id, a), {
+			return n && a !== void 0 && await Mn(e, o.id, a), {
 				ref: t.ref,
 				ready: n,
 				outcome: n ? "joined" : "resumed"
 			};
 		}
-		let s = await pn(e, t), c = Jt(e);
-		if (!(await y.runPromise(c.consumeUsage(t.tenantId, {
+		let s = await On(e, t), c = ln(e);
+		if (!(await v.runPromise(c.consumeUsage(t.tenantId, {
 			bytes: r.size,
 			count: 1
 		}, i))).allowed) throw new n({
 			reason: "quota-exceeded",
 			detail: "Storage operation exceeds tenant quota"
 		});
-		let l = Y({
+		let l = X({
 			...r,
 			id: s.refId,
 			key: s.key
 		});
-		return await e.insert(bn, {
+		return await e.insert(Fn, {
 			id: s.id,
 			refId: l.id,
 			identity: t,
@@ -2357,31 +2494,31 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			outcome: "created"
 		};
 	}),
-	confirm: (t, n) => fn(e, t, async (e) => {
-		let r = await Q(e, t);
+	confirm: (t, n) => Dn(e, t, async (e) => {
+		let r = await $(e, t);
 		if (!r) throw Error("Storage put operation is missing");
-		let i = await Cn(e, r.refId);
+		let i = await Rn(e, r.refId);
 		if (!i) throw Error("Storage put intent is missing");
-		if (n !== void 0 && await _n(e, r.id, n), r.state === "ready") {
-			let n = await y.runPromise(Jt(e).getById(r.refId));
+		if (n !== void 0 && await Mn(e, r.id, n), r.state === "ready") {
+			let n = await v.runPromise(ln(e).getById(r.refId));
 			if (!n || n.key !== r.key || n.checksum !== t.checksum) throw Error("Confirmed storage operation lost its reference");
 			return n;
 		}
-		return await mn(e, t), await y.runPromise(Jt(e).insert(i.ref)), i.ref;
+		return await kn(e, t), await v.runPromise(ln(e).insert(i.ref)), i.ref;
 	}),
 	beginDelete: async (t, r, i) => {
-		let a = await Cn(e, t);
+		let a = await Rn(e, t);
 		if (!a) throw Error("Storage delete operation is missing");
 		if (r !== void 0 && a.identity.tenantId !== r) throw Error("Storage delete tenant mismatch");
-		return fn(e, a.identity, async (e) => {
-			let r = await Cn(e, t);
+		return Dn(e, a.identity, async (e) => {
+			let r = await Rn(e, t);
 			if (!r) throw Error("Storage delete intent disappeared");
-			let a = await Q(e, r.identity);
+			let a = await $(e, r.identity);
 			if (!a) throw Error("Storage delete lost its operation");
 			let o = a.state !== "deleting" && a.state !== "deleted";
-			if (i === void 0) o && await yn(e, a.id);
+			if (i === void 0) o && await Pn(e, a.id);
 			else if (o) {
-				let o = await vn(e, a.id, i);
+				let o = await Nn(e, a.id, i);
 				if (o.others) return {
 					released: !0,
 					identity: r.identity
@@ -2391,11 +2528,11 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 					detail: `claim '${i}' is not held on storage reference '${t}'; a reference put without a claim is deleted as a whole by a delete that names none`
 				});
 			}
-			let s = await hn(e, r.identity);
+			let s = await An(e, r.identity);
 			if (a.state === "ready") {
-				let n = Jt(e);
-				if (await y.runPromise(Zt(e).deleteByRef(t)), !await y.runPromise(n.delete(t))) throw Error("Storage deletion lost its confirmed reference");
-				await y.runPromise(n.releaseUsage(r.identity.tenantId, {
+				let n = ln(e);
+				if (await v.runPromise(fn(e).deleteByRef(t)), !await v.runPromise(n.delete(t))) throw Error("Storage deletion lost its confirmed reference");
+				await v.runPromise(n.releaseUsage(r.identity.tenantId, {
 					bytes: r.ref.size,
 					count: 1
 				}));
@@ -2407,8 +2544,8 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 			};
 		});
 	},
-	confirmDelete: (t) => fn(e, t, (e) => gn(e, t))
-}), Tn = (e, t = 65536) => {
+	confirmDelete: (t) => Dn(e, t, (e) => jn(e, t))
+}), Bn = (e, t = 65536) => {
 	let n = [Buffer.from("zINSTREAM\0", "utf8")];
 	for (let r = 0; r < e.length; r += t) {
 		let i = e.subarray(r, Math.min(r + t, e.length)), a = Buffer.alloc(4);
@@ -2416,7 +2553,7 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	}
 	let r = Buffer.alloc(4);
 	return r.writeUInt32BE(0, 0), n.push(r), Buffer.concat(n);
-}, En = (e) => {
+}, Vn = (e) => {
 	let t = e.replace(/\0+$/, "").trim();
 	if (/\bOK$/.test(t)) return { clean: !0 };
 	let n = /:\s*(.+?)\s+FOUND$/.exec(t);
@@ -2425,8 +2562,8 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		threat: n[1] ?? "unknown"
 	};
 	throw Error(`clamav: unexpected response: ${t}`);
-}, Dn = async (e, t) => {
-	let n = await import("node:net"), r = W.read("CLAMAV_HOST", t.host) ?? "127.0.0.1", i = W.read("CLAMAV_PORT"), a = t.port ?? (i ? Number(i) : 3310), o = t.timeoutMs ?? 3e4;
+}, Hn = async (e, t) => {
+	let n = await import("node:net"), r = U.read("CLAMAV_HOST", t.host) ?? "127.0.0.1", i = U.read("CLAMAV_PORT"), a = t.port ?? (i ? Number(i) : 3310), o = t.timeoutMs ?? 3e4;
 	return new Promise((i, s) => {
 		let c = n.createConnection({
 			host: r,
@@ -2437,20 +2574,20 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 		c.on("error", (e) => {
 			clearTimeout(u), s(e);
 		}), c.on("connect", () => {
-			c.end(Tn(e, t.chunkSize));
+			c.end(Bn(e, t.chunkSize));
 		}), c.on("data", (e) => {
 			l += e.toString("utf8");
 		}), c.on("close", () => {
 			clearTimeout(u);
 			try {
-				i(En(l));
+				i(Vn(l));
 			} catch (e) {
 				s(e);
 			}
 		});
 	});
-}, On = (e = {}) => (t) => Dn(t.bytes, e), kn = (e, t, n) => new Promise((r, i) => {
-	let a = ye(e, [...t], { stdio: [
+}, Un = (e = {}) => (t) => Hn(t.bytes, e), Wn = (e, t, n) => new Promise((r, i) => {
+	let a = Oe(e, [...t], { stdio: [
 		"ignore",
 		"ignore",
 		"pipe"
@@ -2464,31 +2601,31 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 	}), a.on("close", (e) => {
 		clearTimeout(s), e === 0 ? r() : i(/* @__PURE__ */ Error(`ffmpeg exited ${String(e)}: ${o.slice(-400)}`));
 	});
-}), An = (e) => async ({ bytes: t }) => {
-	let n = e.ffmpegPath ?? "ffmpeg", r = e.timeoutMs ?? 3e5, i = await be(z(we(), "voltro-tc-")), a = z(i, "in"), o = [];
+}), Gn = (e) => async ({ bytes: t }) => {
+	let n = e.ffmpegPath ?? "ffmpeg", r = e.timeoutMs ?? 3e5, i = await R(Me(je(), "voltro-tc-")), a = Me(i, "in"), o = [];
 	try {
-		await Ce(a, t);
+		await Ae(a, t);
 		for (let t of e.renditions) {
-			let e = z(i, `out.${t.ext}`);
+			let e = Me(i, `out.${t.ext}`);
 			try {
-				await kn(n, [
+				await Wn(n, [
 					"-y",
 					"-i",
 					a,
 					...t.args,
 					e
 				], r);
-				let i = await xe(e);
+				let i = await z(e);
 				o.push({
 					bytes: new Uint8Array(i),
 					contentType: t.contentType,
 					kind: t.kind,
 					...t.label === void 0 ? {} : { label: t.label }
-				}), await Se(e, { force: !0 });
+				}), await ke(e, { force: !0 });
 			} catch {}
 		}
 	} finally {
-		await Se(i, {
+		await ke(i, {
 			recursive: !0,
 			force: !0
 		}).catch(() => void 0);
@@ -2497,21 +2634,21 @@ var Te = 1 << 20, Ee = (e, n, r = !1) => new t({
 };
 //#endregion
 //#region src/assetRef.ts
-function jn(e = {}) {
-	let t = e.nullable ?? !0, n = e.fk === !1 ? F().externalId() : fe(() => Fe, { onDelete: e.onDelete ?? "setNull" });
+function Kn(e = {}) {
+	let t = e.nullable ?? !0, n = e.fk === !1 ? F().externalId() : ye(() => We, { onDelete: e.onDelete ?? "setNull" });
 	return t ? n.nullable() : n;
 }
-var Mn = () => de({
+var qn = () => _e({
 	id: "@voltro/plugin-storage/withStorage",
-	fields: { asset: jn() }
-}), Nn = {
+	fields: { asset: Kn() }
+}), Jn = {
 	"image/png": "png",
 	"image/jpeg": "jpg",
 	"image/jpg": "jpg",
 	"image/gif": "gif",
 	"image/webp": "webp",
 	"image/svg+xml": "svg"
-}, Pn = (e) => {
+}, Yn = (e) => {
 	let t = /^data:([^;,]+)(;base64)?,(.*)$/s.exec(e);
 	if (!t) throw Error("not a data URI");
 	let n = t[1] || "application/octet-stream", r = !!t[2], i = t[3] ?? "";
@@ -2519,16 +2656,16 @@ var Mn = () => de({
 		bytes: r ? new Uint8Array(Buffer.from(i, "base64")) : new Uint8Array(Buffer.from(decodeURIComponent(i), "utf8")),
 		contentType: n
 	};
-}, Fn = (e, n) => y.gen(function* () {
-	let r = yield* y.try({
-		try: () => Pn(n.dataUri),
+}, Xn = (e, n) => v.gen(function* () {
+	let r = yield* v.try({
+		try: () => Yn(n.dataUri),
 		catch: (e) => new t({
 			provider: "avatar",
 			message: String(e?.message ?? e),
 			transient: !1,
 			status: 400
 		})
-	}), i = Nn[r.contentType] ?? "bin";
+	}), i = Jn[r.contentType] ?? "bin";
 	return yield* e.put({
 		bytes: r.bytes,
 		contentType: r.contentType,
@@ -2537,27 +2674,27 @@ var Mn = () => de({
 		visibility: "public",
 		key: `avatars/${n.userId}/avatar.${i}`
 	});
-}), In = (e) => {
+}), Zn = (e) => {
 	try {
-		let t = B(e), n = B("/");
+		let t = Ne(e), n = Ne("/");
 		return typeof t.dev != "number" || typeof n.dev != "number" ? "unknown" : t.dev === n.dev ? "same-device-as-root" : "separate-mount";
 	} catch {
 		return "unknown";
 	}
-}, Ln = (e) => {
-	if (In(e) === "same-device-as-root") return `the capture is going to ${e}, which is on the SAME filesystem as \`/\`.\n  A mounted volume would be a separate one. If this process is a container, that means the capture
+}, Qn = (e) => {
+	if (Zn(e) === "same-device-as-root") return `the capture is going to ${e}, which is on the SAME filesystem as \`/\`.\n  A mounted volume would be a separate one. If this process is a container, that means the capture
   dies with it — which is the exact failure it exists for. On a development machine this is normal
   and can be ignored.`;
-}, Rn = W.read("VOLTRO_SESSION_COOKIE") ?? "voltro:session", zn, Bn = (e) => {
-	zn = e;
-}, Vn = () => zn ?? Un({}), Hn = () => zn === void 0 ? W.read("STORAGE_PROVIDER") === void 0 ? void 0 : Un({}) : zn, Un = (e) => {
+}, $n = U.read("VOLTRO_SESSION_COOKIE") ?? "voltro:session", er, tr = (e) => {
+	er = e;
+}, nr = () => er ?? ir({}), rr = () => er === void 0 ? U.read("STORAGE_PROVIDER") === void 0 ? void 0 : ir({}) : er, ir = (e) => {
 	if (e.provider && typeof e.provider == "object") return e.provider;
-	let t = (e.provider ?? W.read("STORAGE_PROVIDER") ?? "memory").toLowerCase(), n = W.read("S3_BUCKET", e.bucket) ?? W.read("STORAGE_BUCKET") ?? "voltro";
+	let t = (e.provider ?? U.read("STORAGE_PROVIDER") ?? "memory").toLowerCase(), n = U.read("S3_BUCKET", e.bucket) ?? U.read("STORAGE_BUCKET") ?? "voltro";
 	switch (t) {
 		case "s3":
 		case "minio": {
-			let r = W.read("S3_REGION", e.region) ?? W.read("AWS_REGION"), i = W.read("S3_ENDPOINT", e.endpoint) ?? W.read("MINIO_ENDPOINT"), a = W.read("S3_ACCESS_KEY_ID", e.accessKeyId) ?? W.read("AWS_ACCESS_KEY_ID"), o = W.read("S3_SECRET_ACCESS_KEY", e.secretAccessKey) ?? W.read("AWS_SECRET_ACCESS_KEY"), s = W.read("STORAGE_CDN_URL", e.cdnBaseUrl);
-			return Ge({
+			let r = U.read("S3_REGION", e.region) ?? U.read("AWS_REGION"), i = U.read("S3_ENDPOINT", e.endpoint) ?? U.read("MINIO_ENDPOINT"), a = U.read("S3_ACCESS_KEY_ID", e.accessKeyId) ?? U.read("AWS_ACCESS_KEY_ID"), o = U.read("S3_SECRET_ACCESS_KEY", e.secretAccessKey) ?? U.read("AWS_SECRET_ACCESS_KEY"), s = U.read("STORAGE_CDN_URL", e.cdnBaseUrl);
+			return nt({
 				bucket: n,
 				name: t,
 				...r ? { region: r } : {},
@@ -2566,13 +2703,13 @@ var Mn = () => de({
 				...o ? { secretAccessKey: o } : {},
 				...s ? { cdnBaseUrl: s } : {},
 				...e.publicAcl === void 0 ? {} : { publicAcl: e.publicAcl },
-				...t === "minio" || W.read("S3_FORCE_PATH_STYLE") === "1" ? { forcePathStyle: !0 } : {}
+				...t === "minio" || U.read("S3_FORCE_PATH_STYLE") === "1" ? { forcePathStyle: !0 } : {}
 			});
 		}
 		case "azure": {
-			let t = W.read("AZURE_STORAGE_ACCOUNT", e.accountName), r = W.read("AZURE_STORAGE_KEY", e.accountKey), i = W.read("AZURE_STORAGE_CONNECTION_STRING", e.connectionString), a = W.read("AZURE_STORAGE_ENDPOINT", e.endpoint), o = W.read("STORAGE_CDN_URL", e.cdnBaseUrl);
-			return Je({
-				container: W.read("AZURE_STORAGE_CONTAINER", e.bucket) ?? n,
+			let t = U.read("AZURE_STORAGE_ACCOUNT", e.accountName), r = U.read("AZURE_STORAGE_KEY", e.accountKey), i = U.read("AZURE_STORAGE_CONNECTION_STRING", e.connectionString), a = U.read("AZURE_STORAGE_ENDPOINT", e.endpoint), o = U.read("STORAGE_CDN_URL", e.cdnBaseUrl);
+			return at({
+				container: U.read("AZURE_STORAGE_CONTAINER", e.bucket) ?? n,
 				...t ? { accountName: t } : {},
 				...r ? { accountKey: r } : {},
 				...i ? { connectionString: i } : {},
@@ -2580,11 +2717,11 @@ var Mn = () => de({
 				...o ? { cdnBaseUrl: o } : {}
 			});
 		}
-		case "database": return qe();
-		case "filesystem": return We({ root: W.read("STORAGE_ROOT", e.root) ?? ".voltro-storage" });
-		default: return Ue(e.name ?? "default");
+		case "database": return it();
+		case "filesystem": return tt({ root: U.read("STORAGE_ROOT", e.root) ?? ".voltro-storage" });
+		default: return et(e.name ?? "default");
 	}
-}, Wn = (e) => {
+}, ar = (e) => {
 	let t = "stored files (uploads, renditions) and their reads", n = "provider 'database' or 'filesystem' keeps the bytes inside the installation";
 	if (e.provider && typeof e.provider == "object") return [{
 		destination: `runtime:the '${e.provider.name}' storage provider`,
@@ -2592,9 +2729,9 @@ var Mn = () => de({
 		data: ["files"],
 		disable: n
 	}];
-	let r = (e.provider ?? W.read("STORAGE_PROVIDER") ?? "memory").toLowerCase();
+	let r = (e.provider ?? U.read("STORAGE_PROVIDER") ?? "memory").toLowerCase();
 	if (r === "s3" || r === "minio") {
-		let r = W.read("S3_ENDPOINT", e.endpoint) ?? W.read("MINIO_ENDPOINT"), i = W.read("S3_REGION", e.region) ?? W.read("AWS_REGION") ?? "us-east-1";
+		let r = U.read("S3_ENDPOINT", e.endpoint) ?? U.read("MINIO_ENDPOINT"), i = U.read("S3_REGION", e.region) ?? U.read("AWS_REGION") ?? "us-east-1";
 		return [{
 			destination: r ?? `s3.${i}.amazonaws.com`,
 			purpose: t,
@@ -2603,7 +2740,7 @@ var Mn = () => de({
 		}];
 	}
 	if (r === "azure") {
-		let r = W.read("AZURE_STORAGE_ENDPOINT", e.endpoint), i = W.read("AZURE_STORAGE_ACCOUNT", e.accountName);
+		let r = U.read("AZURE_STORAGE_ENDPOINT", e.endpoint), i = U.read("AZURE_STORAGE_ACCOUNT", e.accountName);
 		return [{
 			destination: r ?? (i === void 0 ? "runtime:the Azure storage connection string" : `${i}.blob.core.windows.net`),
 			purpose: t,
@@ -2612,11 +2749,11 @@ var Mn = () => de({
 		}];
 	}
 	return [];
-}, Gn = (e) => {
+}, or = (e) => {
 	if (e !== void 0) return e;
-	let t = W.read("STORAGE_ALLOWED_ORIGINS");
+	let t = U.read("STORAGE_ALLOWED_ORIGINS");
 	return t ? t.trim() === "*" ? "*" : t.split(",").map((e) => e.trim()).filter(Boolean) : [];
-}, Kn = (e, t) => {
+}, sr = (e, t) => {
 	if (!e || t !== "*" && !t.includes(e)) return {};
 	let n = {
 		"access-control-allow-origin": t === "*" ? "*" : e,
@@ -2626,7 +2763,7 @@ var Mn = () => de({
 		vary: "Origin"
 	};
 	return t !== "*" && (n["access-control-allow-credentials"] = "true"), n;
-}, qn = (e) => ({
+}, cr = (e) => ({
 	id: e.id,
 	tenantId: e.tenantId,
 	ownerId: e.ownerId,
@@ -2649,29 +2786,29 @@ var Mn = () => de({
 	caption: e.caption ?? null,
 	derivedFrom: e.derivedFrom ?? null,
 	kind: e.kind ?? null
-}), Jn = () => new t({
+}), lr = () => new t({
 	provider: "storage",
 	message: "not permitted to administer sharing for this object",
 	transient: !1,
 	status: 403
-}), Yn = (e, t, n) => {
+}), ur = (e, t, n) => {
 	let r = n.request.subject;
-	return (r.scopes ?? []).includes("admin:full") ? y.void : e.head(t, { tenantId: r.tenantId ?? null }).pipe(y.catchAll(() => y.fail(Jn())), y.flatMap((e) => {
+	return (r.scopes ?? []).includes("admin:full") ? v.void : e.head(t, { tenantId: r.tenantId ?? null }).pipe(v.catch(() => v.fail(lr())), v.flatMap((e) => {
 		let t = e?.ownerId;
-		return t != null && t === r.id ? y.void : y.fail(Jn());
+		return t != null && t === r.id ? v.void : v.fail(lr());
 	}));
-}, Xn = () => new t({
+}, dr = () => new t({
 	provider: "storage",
 	message: "an upload needs an identified caller: this request carries no subject, and the app has not set `anonymousUploads: true` on storagePlugin. The ticket attributes the object to whoever minted it — with no subject there is nobody to attribute it to, so the finalized object would carry no owner and no tenant and no later owner check, tenant filter or quota could reach it.",
 	transient: !1,
 	status: 401
-}), $ = (e, t) => {
+}), fr = (e, t) => {
 	let n = e.request.subject.id ?? null, r = e.request.subject.tenantId ?? null;
-	return n === null && !t ? y.fail(Xn()) : y.succeed({
+	return n === null && !t ? v.fail(dr()) : v.succeed({
 		id: n,
 		tenantId: r
 	});
-}, Zn = (e, t) => e !== null && e !== (t ?? null), Qn = (e) => ({
+}, pr = (e, t) => e !== null && e !== (t ?? null), mr = (e) => ({
 	id: e.id,
 	refId: e.refId,
 	principalType: e.principalType,
@@ -2680,47 +2817,79 @@ var Mn = () => de({
 	createdAt: e.createdAt.toISOString(),
 	expiresAt: e.expiresAt ? e.expiresAt.toISOString() : null,
 	createdBy: e.createdBy
-}), $n = "@voltro/plugin-storage", er = (e = {}) => ae({
-	base: $n,
+}), hr = "@voltro/plugin-storage", gr = (e = {}) => w({
+	base: hr,
 	alias: e.alias,
 	instance: e.name
-}), tr = (i = {}) => {
-	let v = ae({
-		base: $n,
+}), _r = (i = {}) => {
+	let y = w({
+		base: hr,
 		alias: i.alias,
 		instance: i.name
-	}), b = v === $n ? "/_voltro/storage" : `/_voltro/storage/i/${Buffer.from(v).toString("hex")}`, x = Un(i);
-	Bn(x);
-	let S = W.read("S3_BUCKET", i.bucket) ?? W.read("STORAGE_BUCKET") ?? "voltro", E = W.read("VOLTRO_PUBLIC_URL", i.publicBaseUrl), le = Gn(i.allowedOrigins), D = i.limits?.maxBytes, O = i.anonymousUploads === !0, k = 5242880, ue = 21600, A = i.refStore === void 0 || i.refStore === "memory", j = i.grantStore === void 0 || i.grantStore === "memory", de = (e) => e !== "public" && i.uploadAccess !== void 0 ? { access: i.uploadAccess } : {}, M = { current: A ? Gt() : i.refStore }, N = { current: j ? Yt() : i.grantStore }, fe = { current: void 0 }, P = {
-		insert: (e) => M.current.insert(e),
-		getById: (e) => M.current.getById(e),
-		delete: (e) => M.current.delete(e),
-		statistics: () => M.current.statistics(),
-		listRecent: (e) => M.current.listRecent(e),
-		countByKey: (e, t) => M.current.countByKey(e, t),
-		usageByTenant: (e) => M.current.usageByTenant(e),
-		consumeUsage: (e, t, n) => M.current.consumeUsage(e, t, n),
-		releaseUsage: (e, t) => M.current.releaseUsage(e, t),
-		listByDerivedFrom: (e) => M.current.listByDerivedFrom(e),
-		listRefs: (e) => M.current.listRefs(e),
+	}), b = y === hr ? "/_voltro/storage" : `/_voltro/storage/i/${Buffer.from(y).toString("hex")}`, x = ir(i);
+	tr(x);
+	let ue = U.read("S3_BUCKET", i.bucket) ?? U.read("STORAGE_BUCKET") ?? "voltro", T = U.read("VOLTRO_PUBLIC_URL", i.publicBaseUrl), E = or(i.allowedOrigins), D = i.limits?.maxBytes, O = i.anonymousUploads === !0, de = 5242880, fe = 21600, k = i.refStore === void 0 || i.refStore === "memory", pe = i.grantStore === void 0 || i.grantStore === "memory", A = (e, n) => v.gen(function* () {
+		let r = (e) => S.decodeUnknownEffect(ae)(e, { onExcessProperty: "error" }).pipe(v.mapError(() => new t({
+			provider: "storage",
+			message: "Invalid upload access policy",
+			transient: !1,
+			status: 400
+		}))), a = e.access === void 0 ? void 0 : yield* r(e.access), o = e.visibility ?? "private";
+		if (a !== void 0 && o === "public") return yield* v.fail(new t({
+			provider: "storage",
+			message: "An access policy requires a private upload",
+			transient: !1,
+			status: 400
+		}));
+		let s = i.uploadAccess;
+		if (a !== void 0 && typeof s != "function") return yield* v.fail(new t({
+			provider: "storage",
+			message: "Requested upload access requires an uploadAccess authorization function on storagePlugin",
+			transient: !1,
+			status: 403
+		}));
+		let c = typeof s == "function" ? yield* s({
+			subject: n,
+			requested: a,
+			visibility: o,
+			contentType: e.contentType
+		}) : o === "private" ? s : void 0, l = c === void 0 ? void 0 : yield* r(c);
+		return o === "public" ? l !== void 0 && l.length > 0 ? yield* v.fail(new t({
+			provider: "storage",
+			message: "A public upload cannot carry an access policy",
+			transient: !1,
+			status: 400
+		})) : {} : l === void 0 ? {} : { access: l };
+	}), j = { current: k ? on() : i.refStore }, M = { current: pe ? un() : i.grantStore }, me = { current: void 0 }, he = {
+		insert: (e) => j.current.insert(e),
+		getById: (e) => j.current.getById(e),
+		delete: (e) => j.current.delete(e),
+		statistics: () => j.current.statistics(),
+		listRecent: (e) => j.current.listRecent(e),
+		countByKey: (e, t) => j.current.countByKey(e, t),
+		usageByTenant: (e) => j.current.usageByTenant(e),
+		consumeUsage: (e, t, n) => j.current.consumeUsage(e, t, n),
+		releaseUsage: (e, t) => j.current.releaseUsage(e, t),
+		listByDerivedFrom: (e) => j.current.listByDerivedFrom(e),
+		listRefs: (e) => j.current.listRefs(e),
 		get setVisibility() {
-			return M.current.setVisibility;
+			return j.current.setVisibility;
 		},
 		get countPublicByKey() {
-			return M.current.countPublicByKey;
+			return j.current.countPublicByKey;
 		}
-	}, F = {
-		insert: (e) => N.current.insert(e),
-		delete: (e) => N.current.delete(e),
-		getById: (e) => N.current.getById(e),
-		listByRef: (e) => N.current.listByRef(e),
-		deleteByRef: (e) => N.current.deleteByRef(e)
-	}, pe = {
+	}, ge = {
+		insert: (e) => M.current.insert(e),
+		delete: (e) => M.current.delete(e),
+		getById: (e) => M.current.getById(e),
+		listByRef: (e) => M.current.listByRef(e),
+		deleteByRef: (e) => M.current.deleteByRef(e)
+	}, _e = {
 		httpPath: b,
 		provider: x,
-		refStore: P,
-		grantStore: F,
-		bucket: S,
+		refStore: he,
+		grantStore: ge,
+		bucket: ue,
 		...i.tenantPrefix === void 0 ? {} : { tenantPrefix: i.tenantPrefix },
 		...i.attempts === void 0 ? {} : { attempts: i.attempts },
 		...i.urlExpiresInSec === void 0 ? {} : { urlExpiresInSec: i.urlExpiresInSec },
@@ -2731,11 +2900,11 @@ var Mn = () => de({
 		...i.videoProbe === void 0 ? {} : { videoProbe: i.videoProbe },
 		...i.transcode === void 0 ? {} : { transcode: i.transcode },
 		...i.autoTranscode === void 0 ? {} : { autoTranscode: i.autoTranscode },
-		...E ? { publicBaseUrl: E } : {},
+		...T ? { publicBaseUrl: T } : {},
 		...i.normalizeImages === void 0 ? {} : { normalizeImages: i.normalizeImages },
 		...i.quota === void 0 ? {} : { quota: i.quota },
-		objects: () => fe.current
-	}, me = tn(pe), I = en(pe), ge = `${b}/`, L = (e) => y.runPromise(e.pipe(y.catchAll(() => y.succeed(null)))), R = (e, t) => {
+		objects: () => me.current
+	}, ve = gn(_e), N = hn(_e), ye = `${b}/`, P = (e) => v.runPromise(e.pipe(v.catch(() => v.succeed(null)))), F = (e, t) => {
 		if (!e) return "invalid";
 		let n = /^bytes=(\d*)-(\d*)$/.exec(e.trim());
 		if (!n) return "invalid";
@@ -2756,31 +2925,34 @@ var Mn = () => de({
 			start: a,
 			endInclusive: o
 		};
-	}, ve = /^(?:image\/(?!svg)|video\/|audio\/|application\/pdf(?:;|$)|text\/plain(?:;|$))/i, ye = (e) => ({
+	}, be = i.publicCacheSeconds === void 0 ? "public, max-age=31536000, immutable" : `public, max-age=${Math.max(0, Math.floor(i.publicCacheSeconds))}`, xe = /^(?:image\/(?!svg)|video\/|audio\/|application\/pdf(?:;|$)|text\/plain(?:;|$))/i, Se = (e) => ({
 		"x-content-type-options": "nosniff",
-		"content-disposition": ve.test(e) ? "inline" : "attachment"
-	}), be = async (e, t, n, r) => {
+		"content-disposition": xe.test(e) ? "inline" : "attachment"
+	}), I = ot(), we = async (e, t, n, r) => {
 		if (n) {
-			let r = await L(I.get(e.id));
-			if (!r) return {
+			let r, i = await I.getOrCreate(_t(JSON.stringify([e.id, e.checksum]), e.contentType, n), async () => {
+				let t = await P(N.get(e.id));
+				return t ? (r = t.bytes, mt(t.bytes, e.contentType, n)) : null;
+			}).catch(() => null);
+			if (!i && r === void 0 && (r = (await P(N.get(e.id)))?.bytes), !i && r === void 0) return {
 				status: 404,
 				body: "not found",
 				contentType: "text/plain"
 			};
-			let i = await at(e.id, r.bytes, e.contentType, n).catch(() => null), a = i ? i.bytes : r.bytes, o = i ? i.contentType : e.contentType, s = await tt(e.contentType, i !== null);
+			let a = i ? i.bytes : r, o = i ? i.contentType : e.contentType, s = await pt(e.contentType, i !== null);
 			return {
 				status: 200,
 				body: a,
 				contentType: o,
 				headers: {
-					...ye(o),
+					...Se(o),
 					"cache-control": t,
 					"accept-ranges": "none",
 					...s === null ? {} : { "x-voltro-transform": `original; reason=${s}` }
 				}
 			};
 		}
-		let i = r === void 0 ? "invalid" : R(r, e.size);
+		let i = r === void 0 ? "invalid" : F(r, e.size);
 		if (i === "unsatisfiable") return {
 			status: 416,
 			body: "range not satisfiable",
@@ -2791,13 +2963,13 @@ var Mn = () => de({
 			}
 		};
 		if (i !== "invalid") {
-			let n = await L(I.getRange(e.id, i));
+			let n = await P(N.getRange(e.id, i));
 			return n ? {
 				status: 206,
 				body: n.bytes,
 				contentType: e.contentType,
 				headers: {
-					...ye(e.contentType),
+					...Se(e.contentType),
 					"cache-control": t,
 					"accept-ranges": "bytes",
 					"content-range": `bytes ${i.start}-${i.endInclusive}/${n.totalSize}`
@@ -2808,39 +2980,44 @@ var Mn = () => de({
 				contentType: "text/plain"
 			};
 		}
-		let a = await L(I.getStream(e.id));
+		let a = await P(N.getStream(e.id));
 		return a ? {
 			status: 200,
 			contentType: e.contentType,
 			headers: {
-				...ye(e.contentType),
+				...Se(e.contentType),
 				"cache-control": t,
 				"accept-ranges": "bytes"
 			},
 			byteStream: {
 				contentLength: e.size,
-				stream: () => w.toReadableStream(a.stream)
+				stream: () => C.toReadableStream(a.stream)
 			}
 		} : {
 			status: 404,
 			body: "not found",
 			contentType: "text/plain"
 		};
-	}, xe = async (e) => {
-		let t = e.path.startsWith(ge) ? e.path.slice(ge.length).split("/")[0] ?? "" : "";
+	}, Ee = async (e) => {
+		let t = e.path.startsWith(ye) ? e.path.slice(ye.length).split("/")[0] ?? "" : "";
 		if (!t) return {
 			status: 404,
 			body: "not found",
 			contentType: "text/plain"
 		};
-		let n = await L(I.head(t));
+		let n = await P(N.head(t));
 		if (!n) return {
 			status: 404,
 			body: "not found",
 			contentType: "text/plain"
 		};
-		let r = Ze(e.query), i = e.headers.range;
-		if (n.visibility === "public") {
+		let r = lt(e.query), i = e.headers.range, a = n.derivedFrom == null ? null : await P(N.head(n.derivedFrom));
+		if (n.derivedFrom != null && a === null) return {
+			status: 404,
+			body: "not found",
+			contentType: "text/plain"
+		};
+		if (n.visibility === "public" && (a === null || a.visibility === "public")) {
 			let e = x.publicUrl?.(n.key) ?? null;
 			return e && !r ? {
 				status: 302,
@@ -2848,24 +3025,24 @@ var Mn = () => de({
 					location: e,
 					"cache-control": "public, max-age=300"
 				}
-			} : be(n, "public, max-age=31536000, immutable", r, i);
+			} : we(n, be, r, i);
 		}
-		let a = !1, o = e.query ? new URLSearchParams(e.query).get("t") : null;
-		if (o) {
-			let e = bt(o);
-			a = !!e && e.refId === t && e.audience === b;
+		let o = !1, s = e.query ? new URLSearchParams(e.query).get("t") : null;
+		if (s) {
+			let e = Nt(s);
+			o = !!e && (e.refId === t || a !== null && e.refId === a.id) && e.audience === b;
 		}
-		if (!a) {
-			let t = oe(e.headers.cookie, Rn), r = t ? ce(t, se()) : null;
-			r && (a = await L(I.checkAccess(n, r)) === !0);
+		if (!o) {
+			let t = se(e.headers.cookie, $n), r = t ? le(t, ce()) : null;
+			r && (o = await P(N.checkAccess(n, r)) === !0);
 		}
-		if (!a) return {
+		if (!o) return {
 			status: 403,
 			body: "forbidden",
 			contentType: "text/plain"
 		};
 		if (x.presigns && !r) {
-			let e = await L(x.getUrl(n.key, 300));
+			let e = await P(x.getUrl(n.key, 300));
 			if (e && /^https?:/.test(e)) return {
 				status: 302,
 				headers: {
@@ -2874,12 +3051,12 @@ var Mn = () => de({
 				}
 			};
 		}
-		return be(n, "private, no-store", r, i);
-	}, Se = {
+		return we(n, "private, no-store", r, i);
+	}, L = {
 		method: "GET",
 		path: b,
 		handle: async (e) => {
-			let t = await xe(e), n = Kn(e.headers.origin, le);
+			let t = await Ee(e), n = sr(e.headers.origin, E);
 			return Object.keys(n).length === 0 ? t : {
 				...t,
 				headers: {
@@ -2888,12 +3065,12 @@ var Mn = () => de({
 				}
 			};
 		}
-	}, Ce = {
+	}, De = {
 		method: "*",
 		path: `${b}/upload`,
 		originGuard: "exempt",
 		handle: async (e) => {
-			let t = Kn(e.headers.origin, le);
+			let t = sr(e.headers.origin, E);
 			if (e.method === "OPTIONS") return {
 				status: 204,
 				headers: t
@@ -2904,14 +3081,14 @@ var Mn = () => de({
 				contentType: "text/plain",
 				headers: t
 			};
-			let n = e.query ? new URLSearchParams(e.query).get("ticket") : null, r = n ? St(n) : null;
-			if (!r || r.instance !== v) return {
+			let n = e.query ? new URLSearchParams(e.query).get("ticket") : null, r = n ? It(n) : null;
+			if (!r || r.instance !== y) return {
 				status: 401,
 				body: "invalid or expired upload ticket",
 				contentType: "text/plain",
 				headers: t
 			};
-			if (r.replicaId !== void 0 && r.replicaId !== _().replicaId) return {
+			if (r.replicaId !== void 0 && r.replicaId !== ie().replicaId) return {
 				status: 409,
 				body: "upload ticket belongs to another replica",
 				contentType: "text/plain",
@@ -2929,34 +3106,34 @@ var Mn = () => de({
 				contentType: "text/plain",
 				headers: t
 			};
-			let i = await y.runPromise(I.put({
+			let i = await v.runPromise(N.put({
 				bytes: e.rawBody,
 				contentType: r.ct,
 				tenantId: r.tenant,
 				ownerId: r.sub,
 				visibility: r.vis,
-				...de(r.vis),
+				...r.access === void 0 ? {} : { access: r.access },
 				...r.operationId === void 0 ? {} : { operationId: r.operationId },
 				...r.key === void 0 ? {} : { key: r.key },
 				...r.folder === void 0 ? {} : { folder: r.folder },
 				...r.tags === void 0 ? {} : { tags: r.tags },
 				...r.alt === void 0 ? {} : { alt: r.alt },
 				...r.caption === void 0 ? {} : { caption: r.caption }
-			}).pipe(y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+			}).pipe(v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 				kind: "ok",
 				ref: e,
 				url: t
-			})))), y.catchTags({
-				StorageRejected: (e) => y.succeed({
+			})))), v.catchTags({
+				StorageRejected: (e) => v.succeed({
 					kind: "rejected",
 					status: e.reason === "too-large" ? 413 : 415,
 					detail: e.detail
 				}),
-				StorageScanRejected: (e) => y.succeed({
+				StorageScanRejected: (e) => v.succeed({
 					kind: "scan",
 					threat: e.threat
 				}),
-				StorageError: (e) => y.succeed({
+				StorageError: (e) => v.succeed({
 					kind: "error",
 					message: e.message
 				})
@@ -2988,28 +3165,28 @@ var Mn = () => de({
 				headers: t
 			};
 		}
-	}, we = {
+	}, Oe = {
 		method: "*",
 		path: `${b}/upload/resumable`,
 		originGuard: "exempt",
 		handle: async (e) => {
-			let t = Kn(e.headers.origin, le);
+			let t = sr(e.headers.origin, E);
 			if (e.method === "OPTIONS") return {
 				status: 204,
 				headers: t
 			};
-			let n = new URLSearchParams(e.query || ""), r = Et(n.get("token") ?? "");
-			if (!r || r.instance !== v) return {
+			let n = new URLSearchParams(e.query || ""), r = Bt(n.get("token") ?? "");
+			if (!r || r.instance !== y) return {
 				status: 401,
 				body: "invalid or expired resumable token",
 				contentType: "text/plain",
 				headers: t
 			};
 			if (e.method === "GET" || e.method === "HEAD") {
-				let e = await y.runPromise(I.resumableStatus({
+				let e = await v.runPromise(N.resumableStatus({
 					uploadId: r.id,
 					tenantId: r.tenant
-				}).pipe(y.match({
+				}).pipe(v.match({
 					onFailure: (e) => ({ error: e.message }),
 					onSuccess: (e) => e
 				})));
@@ -3047,38 +3224,38 @@ var Mn = () => de({
 				contentType: "text/plain",
 				headers: t
 			};
-			let a = n.get("final") === "1", o = await y.runPromise(I.putResumableChunk({
+			let a = n.get("final") === "1", o = await v.runPromise(N.putResumableChunk({
 				uploadId: r.id,
 				tenantId: r.tenant,
 				index: i,
 				bytes: e.rawBody
-			}).pipe(y.flatMap(() => a ? I.finalizeResumable({
+			}).pipe(v.flatMap(() => a ? N.finalizeResumable({
 				uploadId: r.id,
 				count: i + 1,
 				contentType: r.ct,
 				tenantId: r.tenant,
 				ownerId: r.sub,
 				visibility: r.vis,
-				...de(r.vis),
+				...r.access === void 0 ? {} : { access: r.access },
 				...r.folder === void 0 ? {} : { folder: r.folder },
 				...r.tags === void 0 ? {} : { tags: r.tags },
 				...r.alt === void 0 ? {} : { alt: r.alt },
 				...r.caption === void 0 ? {} : { caption: r.caption }
-			}).pipe(y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+			}).pipe(v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 				kind: "done",
 				ref: e,
 				url: t
-			}))))) : y.succeed({ kind: "chunk" })), y.catchTags({
-				StorageRejected: (e) => y.succeed({
+			}))))) : v.succeed({ kind: "chunk" })), v.catchTags({
+				StorageRejected: (e) => v.succeed({
 					kind: "rejected",
 					status: e.reason === "too-large" ? 413 : 415,
 					detail: e.detail
 				}),
-				StorageScanRejected: (e) => y.succeed({
+				StorageScanRejected: (e) => v.succeed({
 					kind: "scan",
 					threat: e.threat
 				}),
-				StorageError: (e) => y.succeed({
+				StorageError: (e) => v.succeed({
 					kind: "error",
 					message: e.message
 				})
@@ -3116,45 +3293,51 @@ var Mn = () => de({
 				headers: t
 			};
 		}
-	}, z = (e) => ({
+	}, R = (e) => ({
 		kind: "json",
 		data: e
-	}), B = (e, t) => ({
+	}), z = (e, t) => ({
 		kind: "json",
 		status: e,
 		data: { error: t }
-	}), Te = (e, t) => {
+	}), ke = (e, t) => {
 		try {
 			return new URL(e, "http://localhost").searchParams.get(t);
 		} catch {
 			return null;
 		}
-	}, Ee = [
+	}, Ae = [
 		{
 			method: "POST",
 			path: "/upload-ticket",
 			description: "Authorize a binary upload with explicit tenant and owner attribution",
-			handler: (e) => y.gen(function* () {
-				let n = C.String.pipe(C.filter((e) => e.trim().length > 0)), r = yield* C.decodeUnknown(C.parseJson(C.Struct({
-					operationId: C.optional(n.pipe(C.maxLength(200))),
-					tenantId: C.NullOr(n),
-					ownerId: C.NullOr(n),
-					key: n.pipe(C.maxLength(1024)),
-					contentType: n.pipe(C.maxLength(255), C.filter((e) => !/[\r\n]/.test(e))),
-					size: C.Number.pipe(C.int(), C.positive(), C.filter(Number.isSafeInteger)),
-					visibility: C.optional(C.Literal("public", "private"))
-				})))(e.body).pipe(y.mapError(() => new t({
+			handler: (e) => v.gen(function* () {
+				let n = S.String.pipe(S.check(S.makeFilter((e) => e.trim().length > 0))), r = yield* S.decodeUnknownEffect(S.fromJsonString(S.Struct({
+					operationId: S.optional(n.pipe(S.check(S.isMaxLength(200)))),
+					tenantId: S.NullOr(n),
+					ownerId: S.NullOr(n),
+					key: n.pipe(S.check(S.isMaxLength(1024))),
+					contentType: n.pipe(S.check(S.isMaxLength(255)), S.check(S.makeFilter((e) => !/[\r\n]/.test(e)))),
+					size: S.Number.pipe(S.check(S.isInt()), S.check(S.isGreaterThan(0)), S.check(S.makeFilter(Number.isSafeInteger))),
+					visibility: S.optional(S.Literals(["public", "private"]))
+				})))(e.body).pipe(v.mapError(() => new t({
 					provider: "inspect",
 					message: "Provide explicit tenantId and ownerId (or null), key, contentType and a positive file size",
 					transient: !1,
 					status: 400
 				})));
-				if (r.operationId !== void 0 && fe.current === void 0) return B(409, "Durable uploads require a bound operation store with default reference and grant stores");
-				if (D !== void 0 && r.size > D) return B(413, "File exceeds the configured upload limit");
-				let i = xt({
-					instance: v,
-					...r.operationId === void 0 ? {} : { operationId: `inspect-upload:${he("sha256").update(JSON.stringify([v, r.operationId])).digest("hex")}` },
-					replicaId: _().replicaId,
+				if (r.operationId !== void 0 && me.current === void 0) return z(409, "Durable uploads require a bound operation store with default reference and grant stores");
+				if (D !== void 0 && r.size > D) return z(413, "File exceeds the configured upload limit");
+				let a = r.visibility !== "public" && Array.isArray(i.uploadAccess) ? yield* S.decodeUnknownEffect(ae)(i.uploadAccess, { onExcessProperty: "error" }).pipe(v.mapError(() => new t({
+					provider: "storage",
+					message: "Invalid upload access policy",
+					transient: !1,
+					status: 400
+				}))) : void 0, o = Ft({
+					instance: y,
+					...a === void 0 ? {} : { access: a },
+					...r.operationId === void 0 ? {} : { operationId: `inspect-upload:${Ce("sha256").update(JSON.stringify([y, r.operationId])).digest("hex")}` },
+					replicaId: ie().replicaId,
 					sub: r.ownerId,
 					tenant: r.tenantId,
 					ct: r.contentType,
@@ -3162,32 +3345,32 @@ var Mn = () => de({
 					vis: r.visibility ?? "private",
 					max: r.size
 				}, 300);
-				return z({
-					uploadPath: `${b}/upload?ticket=${encodeURIComponent(i)}`,
+				return R({
+					uploadPath: `${b}/upload?ticket=${encodeURIComponent(o)}`,
 					expiresInSec: 300,
 					maxBytes: r.size
 				});
-			}).pipe(y.catchAll((e) => y.succeed(B(e.status ?? 500, e.message))))
+			}).pipe(v.catch((e) => v.succeed(z(e.status ?? 500, e.message))))
 		},
 		{
 			method: "GET",
 			path: "/download",
 			description: "Stream a stored file as an attachment for authorized inspect readers",
-			handler: (e) => y.gen(function* () {
-				let t = Te(e.url, "refId");
-				if (!t?.trim()) return B(400, "A non-empty refId is required");
-				let { ref: n, stream: r } = yield* I.getStream(t), i = n.key.split("/").pop() || n.id, a = encodeURIComponent(i).replace(/[!'()*]/g, (e) => `%${e.charCodeAt(0).toString(16).toUpperCase()}`);
+			handler: (e) => v.gen(function* () {
+				let t = ke(e.url, "refId");
+				if (!t?.trim()) return z(400, "A non-empty refId is required");
+				let { ref: n, stream: r } = yield* N.getStream(t), i = n.key.split("/").pop() || n.id, a = encodeURIComponent(i).replace(/[!'()*]/g, (e) => `%${e.charCodeAt(0).toString(16).toUpperCase()}`);
 				return {
 					kind: "bytes",
 					contentType: n.contentType,
 					byteStream: {
-						stream: () => w.toReadableStream(r),
+						stream: () => C.toReadableStream(r),
 						contentLength: n.size,
 						contentDisposition: `attachment; filename="download"; filename*=UTF-8''${a}`
 					},
 					headers: { "cache-control": "no-store" }
 				};
-			}).pipe(y.catchAll((e) => y.succeed(B(e.status ?? 500, e.message))))
+			}).pipe(v.catch((e) => v.succeed(z(e.status ?? 500, e.message))))
 		},
 		{
 			method: "GET",
@@ -3195,8 +3378,8 @@ var Mn = () => de({
 			scope: "process",
 			description: "Searchable storage refs, newest first, paginated",
 			handler: (e) => {
-				let t = Number(Te(e.url, "offset") ?? 0), n = Number.isSafeInteger(t) && t >= 0 ? t : 0, r = (Te(e.url, "search") ?? "").trim().slice(0, 200);
-				return P.listRefs({
+				let t = Number(ke(e.url, "offset") ?? 0), n = Number.isSafeInteger(t) && t >= 0 ? t : 0, r = (ke(e.url, "search") ?? "").trim().slice(0, 200);
+				return he.listRefs({
 					tenantId: void 0,
 					ownerId: void 0,
 					folder: void 0,
@@ -3205,14 +3388,14 @@ var Mn = () => de({
 					search: r,
 					limit: 51,
 					offset: n
-				}).pipe(y.map((e) => z({
-					refs: e.slice(0, 50).map(qn),
+				}).pipe(v.map((e) => R({
+					refs: e.slice(0, 50).map(cr),
 					page: {
 						search: r,
 						offset: n,
 						nextOffset: e.length > 50 ? n + 50 : null
 					}
-				})), y.catchAll((e) => y.succeed(B(500, e.message))));
+				})), v.catch((e) => v.succeed(z(500, e.message))));
 			}
 		},
 		{
@@ -3220,11 +3403,11 @@ var Mn = () => de({
 			path: "/stats",
 			scope: "process",
 			description: "Object count + total bytes per tenant + visibility split",
-			handler: () => P.statistics().pipe(y.map((e) => z({
+			handler: () => he.statistics().pipe(v.map((e) => R({
 				provider: x.name,
-				bucket: S,
+				bucket: ue,
 				...e
-			})), y.catchAll((e) => y.succeed(B(500, e.message))))
+			})), v.catch((e) => v.succeed(z(500, e.message))))
 		},
 		{
 			method: "GET",
@@ -3232,110 +3415,118 @@ var Mn = () => de({
 			scope: "process",
 			description: "Grants for a ref (?refId=…)",
 			handler: (e) => {
-				let t = Te(e.url, "refId");
-				return t ? F.listByRef(t).pipe(y.map((e) => z({ grants: e.map(Qn) })), y.catchAll((e) => y.succeed(B(500, e.message)))) : y.succeed(B(400, "refId query param required"));
+				let t = ke(e.url, "refId");
+				return t ? ge.listByRef(t).pipe(v.map((e) => R({ grants: e.map(mr) })), v.catch((e) => v.succeed(z(500, e.message)))) : v.succeed(z(400, "refId query param required"));
 			}
 		},
 		{
 			method: "POST",
 			path: "/share",
 			description: "Grant a principal access to a ref",
-			handler: (e) => y.gen(function* () {
-				let n = yield* C.decodeUnknown(C.parseJson(C.Struct({
-					refId: C.String.pipe(C.filter((e) => e.trim().length > 0)),
-					principalType: C.Literal("user", "group", "apiKey"),
-					principalId: C.String.pipe(C.filter((e) => e.trim().length > 0)),
-					permission: C.optional(C.Literal("read", "write")),
-					expiresInDays: C.optional(C.Number.pipe(C.finite(), C.positive()))
-				})))(e.body).pipe(y.mapError(() => new t({
+			handler: (e) => v.gen(function* () {
+				let n = yield* S.decodeUnknownEffect(S.fromJsonString(S.Struct({
+					refId: S.String.pipe(S.check(S.makeFilter((e) => e.trim().length > 0))),
+					principalType: S.Literals([
+						"user",
+						"group",
+						"apiKey"
+					]),
+					principalId: S.String.pipe(S.check(S.makeFilter((e) => e.trim().length > 0))),
+					permission: S.optional(S.Literals(["read", "write"])),
+					expiresInDays: S.optional(S.Number.pipe(S.check(S.isFinite()), S.check(S.isGreaterThan(0))))
+				})))(e.body).pipe(v.mapError(() => new t({
 					provider: "inspect",
 					message: "Invalid share input: provide refId, principalType, principalId, read/write permission and a positive finite expiry if set",
 					transient: !1,
 					status: 400
 				}))), r = n.expiresInDays === void 0 ? null : new Date(Date.now() + n.expiresInDays * 864e5);
-				if (r !== null && !Number.isFinite(r.getTime())) return B(400, "Expiry exceeds the supported date range");
-				let i = yield* I.grant({
+				if (r !== null && !Number.isFinite(r.getTime())) return z(400, "Expiry exceeds the supported date range");
+				let i = yield* N.grant({
 					refId: n.refId,
 					principalType: n.principalType,
 					principalId: n.principalId,
 					...n.permission ? { permission: n.permission } : {},
 					expiresAt: r
 				});
-				return z({ grant: Qn(i) });
-			}).pipe(y.catchAll((e) => y.succeed(B(e.status ?? 500, e.message ?? "share failed"))))
+				return R({ grant: mr(i) });
+			}).pipe(v.catch((e) => v.succeed(z(e.status ?? 500, e.message ?? "share failed"))))
 		},
 		{
 			method: "POST",
 			path: "/delete",
 			description: "Delete an object reference and its grants; release unreferenced bytes",
-			handler: (e) => y.gen(function* () {
-				let n = yield* C.decodeUnknown(C.parseJson(C.Struct({ refId: C.String.pipe(C.filter((e) => e.trim().length > 0)) })))(e.body).pipe(y.mapError(() => new t({
+			handler: (e) => v.gen(function* () {
+				let n = yield* S.decodeUnknownEffect(S.fromJsonString(S.Struct({ refId: S.String.pipe(S.check(S.makeFilter((e) => e.trim().length > 0))) })))(e.body).pipe(v.mapError(() => new t({
 					provider: "inspect",
 					message: "A non-empty refId is required",
 					transient: !1,
 					status: 400
 				})));
-				return yield* I.delete(n.refId), z({ ok: !0 });
-			}).pipe(y.catchAll((e) => y.succeed(B(e.status ?? 500, e.message))))
+				return yield* N.delete(n.refId), R({ ok: !0 });
+			}).pipe(v.catch((e) => v.succeed(z(e.status ?? 500, e.message))))
 		},
 		{
 			method: "POST",
 			path: "/revoke",
 			description: "Revoke a grant by id",
-			handler: (e) => y.gen(function* () {
-				let n = yield* C.decodeUnknown(C.parseJson(C.Struct({ grantId: C.String.pipe(C.filter((e) => e.trim().length > 0)) })))(e.body).pipe(y.mapError(() => new t({
+			handler: (e) => v.gen(function* () {
+				let n = yield* S.decodeUnknownEffect(S.fromJsonString(S.Struct({ grantId: S.String.pipe(S.check(S.makeFilter((e) => e.trim().length > 0))) })))(e.body).pipe(v.mapError(() => new t({
 					provider: "inspect",
 					message: "A non-empty grantId is required",
 					transient: !1,
 					status: 400
 				})));
-				return yield* I.revoke(n.grantId), z({ ok: !0 });
-			}).pipe(y.catchAll((e) => y.succeed(B(e.status ?? 500, e.message ?? "revoke failed"))))
+				return yield* N.revoke(n.grantId), R({ ok: !0 });
+			}).pipe(v.catch((e) => v.succeed(z(e.status ?? 500, e.message ?? "revoke failed"))))
 		}
-	], De = [
+	], je = [
 		{
 			...te,
 			execute: (e, t) => {
 				let n = e;
-				return I.mintUrl(n.id, t.request.subject, {
+				return N.mintUrl(n.id, t.request.subject, {
 					...n.password === void 0 ? {} : { password: n.password },
 					...n.expiresInSec === void 0 ? {} : { expiresInSec: n.expiresInSec }
-				}).pipe(y.map((e) => ({ url: e })));
+				}).pipe(v.map((e) => ({ url: e })));
 			}
 		},
 		{
 			...ee,
 			execute: (e, t) => {
 				let n = e;
-				return I.mintUploadUrl({
+				return N.mintUploadUrl({
 					key: n.key,
 					contentType: n.contentType,
 					tenantId: t.request.subject.tenantId,
 					...n.expiresInSec === void 0 ? {} : { expiresInSec: n.expiresInSec }
-				}).pipe(y.map((e) => ({ url: e })));
+				}).pipe(v.map((e) => ({ url: e })));
 			}
 		},
 		{
 			...m,
 			execute: (e, t) => {
 				let n = e;
-				return $(t, O).pipe(y.map((e) => {
-					let t = n.expiresInSec ?? 900, r = xt({
-						instance: v,
+				return fr(t, O).pipe(v.flatMap((e) => A(n, t.request.subject).pipe(v.map((t) => ({
+					writer: e,
+					policy: t
+				})))), v.map(({ writer: e, policy: t }) => {
+					let r = n.expiresInSec ?? 900, i = Ft({
+						instance: y,
 						sub: e.id,
 						tenant: e.tenantId,
 						ct: n.contentType,
 						vis: n.visibility ?? "private",
+						...t,
 						...n.key === void 0 ? {} : { key: n.key },
 						...n.folder === void 0 ? {} : { folder: n.folder },
 						...n.tags === void 0 ? {} : { tags: n.tags },
 						...n.alt === void 0 ? {} : { alt: n.alt },
 						...n.caption === void 0 ? {} : { caption: n.caption },
 						...D === void 0 ? {} : { max: D }
-					}, t);
+					}, r);
 					return {
-						uploadUrl: `${E ? E.replace(/\/+$/, "") : ""}${b}/upload?ticket=${encodeURIComponent(r)}`,
-						expiresInSec: t
+						uploadUrl: `${T ? T.replace(/\/+$/, "") : ""}${b}/upload?ticket=${encodeURIComponent(i)}`,
+						expiresInSec: r
 					};
 				}));
 			}
@@ -3344,28 +3535,32 @@ var Mn = () => de({
 			...p,
 			execute: (e, t) => {
 				let n = e;
-				return $(t, O).pipe(y.flatMap((e) => I.mintPresignedUpload({
+				return fr(t, O).pipe(v.flatMap((e) => A(n, t.request.subject).pipe(v.map((t) => ({
+					writer: e,
+					policy: t
+				})))), v.flatMap(({ writer: e, policy: t }) => N.mintPresignedUpload({
 					contentType: n.contentType,
 					tenantId: e.tenantId,
 					...n.expiresInSec === void 0 ? {} : { expiresInSec: n.expiresInSec }
-				}).pipe(y.map((t) => {
-					let r = Ct({
-						instance: v,
-						key: t.key,
+				}).pipe(v.map((r) => {
+					let i = Lt({
+						instance: y,
+						key: r.key,
 						sub: e.id,
 						tenant: e.tenantId,
 						ct: n.contentType,
 						vis: n.visibility ?? "private",
+						...t,
 						...n.folder === void 0 ? {} : { folder: n.folder },
 						...n.tags === void 0 ? {} : { tags: n.tags },
 						...n.alt === void 0 ? {} : { alt: n.alt },
 						...n.caption === void 0 ? {} : { caption: n.caption },
 						...D === void 0 ? {} : { max: D }
-					}, t.expiresInSec);
+					}, r.expiresInSec);
 					return {
-						uploadUrl: t.uploadUrl,
-						finalizeToken: r,
-						expiresInSec: t.expiresInSec
+						uploadUrl: r.uploadUrl,
+						finalizeToken: i,
+						expiresInSec: r.expiresInSec
 					};
 				}))));
 			}
@@ -3373,29 +3568,29 @@ var Mn = () => de({
 		{
 			...l,
 			execute: (e, n) => {
-				let r = wt(e.finalizeToken);
-				return !r || r.instance !== v ? y.fail(new t({
+				let r = Rt(e.finalizeToken);
+				return !r || r.instance !== y ? v.fail(new t({
 					provider: "storage",
 					message: "invalid or expired finalize token",
 					transient: !1,
 					status: 401
-				})) : Zn(r.sub, n.request.subject.id) ? y.fail(new t({
+				})) : pr(r.sub, n.request.subject.id) ? v.fail(new t({
 					provider: "storage",
 					message: "finalize token belongs to another subject",
 					transient: !1,
 					status: 403
-				})) : I.finalizeUpload({
+				})) : N.finalizeUpload({
 					key: r.key,
 					contentType: r.ct,
 					tenantId: r.tenant,
 					ownerId: r.sub,
 					visibility: r.vis,
-					...de(r.vis),
+					...r.access === void 0 ? {} : { access: r.access },
 					...r.folder === void 0 ? {} : { folder: r.folder },
 					...r.tags === void 0 ? {} : { tags: r.tags },
 					...r.alt === void 0 ? {} : { alt: r.alt },
 					...r.caption === void 0 ? {} : { caption: r.caption }
-				}).pipe(y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+				}).pipe(v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 					id: e.id,
 					url: t,
 					contentType: e.contentType,
@@ -3409,27 +3604,31 @@ var Mn = () => de({
 			...s,
 			execute: (e, t) => {
 				let n = e;
-				return $(t, O).pipe(y.map((e) => {
-					let t = n.expiresInSec ?? ue, r = _e(), i = n.chunkSize && n.chunkSize > 0 ? n.chunkSize : k;
+				return fr(t, O).pipe(v.flatMap((e) => A(n, t.request.subject).pipe(v.map((t) => ({
+					writer: e,
+					policy: t
+				})))), v.map(({ writer: e, policy: t }) => {
+					let r = n.expiresInSec ?? fe, i = Te(), a = n.chunkSize && n.chunkSize > 0 ? n.chunkSize : de;
 					return {
-						uploadId: r,
-						resumableToken: Tt({
-							instance: v,
-							id: r,
+						uploadId: i,
+						resumableToken: zt({
+							instance: y,
+							id: i,
 							sub: e.id,
 							tenant: e.tenantId,
 							ct: n.contentType,
 							vis: n.visibility ?? "private",
+							...t,
 							size: n.size,
 							...n.folder === void 0 ? {} : { folder: n.folder },
 							...n.tags === void 0 ? {} : { tags: n.tags },
 							...n.alt === void 0 ? {} : { alt: n.alt },
 							...n.caption === void 0 ? {} : { caption: n.caption },
 							...D === void 0 ? {} : { max: D }
-						}, t),
-						uploadUrl: `${E ? E.replace(/\/+$/, "") : ""}${b}/upload/resumable`,
-						chunkSize: i,
-						expiresInSec: t
+						}, r),
+						uploadUrl: `${T ? T.replace(/\/+$/, "") : ""}${b}/upload/resumable`,
+						chunkSize: a,
+						expiresInSec: r
 					};
 				}));
 			}
@@ -3437,28 +3636,32 @@ var Mn = () => de({
 		{
 			...o,
 			execute: (e, t) => {
-				let n = e, r = n.expiresInSec ?? ue;
-				return $(t, O).pipe(y.flatMap((e) => I.beginMultipartUpload({
+				let n = e, r = n.expiresInSec ?? fe;
+				return fr(t, O).pipe(v.flatMap((e) => A(n, t.request.subject).pipe(v.map((t) => ({
+					writer: e,
+					policy: t
+				})))), v.flatMap(({ writer: e, policy: t }) => N.beginMultipartUpload({
 					contentType: n.contentType,
 					tenantId: e.tenantId,
 					visibility: n.visibility ?? "private",
 					expiresInSec: r
-				}).pipe(y.map((t) => ({
-					multipartToken: Dt({
-						instance: v,
-						key: t.key,
-						uploadId: t.uploadId,
+				}).pipe(v.map((i) => ({
+					multipartToken: Vt({
+						instance: y,
+						key: i.key,
+						uploadId: i.uploadId,
 						sub: e.id,
 						tenant: e.tenantId,
 						ct: n.contentType,
 						vis: n.visibility ?? "private",
+						...t,
 						size: n.size,
 						...n.folder === void 0 ? {} : { folder: n.folder },
 						...n.tags === void 0 ? {} : { tags: n.tags },
 						...n.alt === void 0 ? {} : { alt: n.alt },
 						...n.caption === void 0 ? {} : { caption: n.caption }
 					}, r),
-					partSize: n.partSize && n.partSize >= k ? n.partSize : k,
+					partSize: n.partSize && n.partSize >= de ? n.partSize : de,
 					expiresInSec: r
 				})))));
 			}
@@ -3466,39 +3669,39 @@ var Mn = () => de({
 		{
 			...g,
 			execute: (e) => {
-				let n = e, r = Ot(n.multipartToken);
-				return !r || r.instance !== v ? y.fail(new t({
+				let n = e, r = Ht(n.multipartToken);
+				return !r || r.instance !== y ? v.fail(new t({
 					provider: "storage",
 					message: "invalid or expired multipart token",
 					transient: !1,
 					status: 401
-				})) : !Number.isInteger(n.partNumber) || n.partNumber < 1 ? y.fail(new t({
+				})) : !Number.isInteger(n.partNumber) || n.partNumber < 1 ? v.fail(new t({
 					provider: "storage",
 					message: "partNumber must be a positive integer",
 					transient: !1,
 					status: 400
-				})) : I.signMultipartPart({
+				})) : N.signMultipartPart({
 					key: r.key,
 					uploadId: r.uploadId,
 					partNumber: n.partNumber
-				}).pipe(y.map((e) => ({ url: e })));
+				}).pipe(v.map((e) => ({ url: e })));
 			}
 		},
 		{
 			...c,
 			execute: (e, n) => {
-				let r = e, i = Ot(r.multipartToken);
-				return !i || i.instance !== v ? y.fail(new t({
+				let r = e, i = Ht(r.multipartToken);
+				return !i || i.instance !== y ? v.fail(new t({
 					provider: "storage",
 					message: "invalid or expired multipart token",
 					transient: !1,
 					status: 401
-				})) : Zn(i.sub, n.request.subject.id) ? y.fail(new t({
+				})) : pr(i.sub, n.request.subject.id) ? v.fail(new t({
 					provider: "storage",
 					message: "multipart token belongs to another subject",
 					transient: !1,
 					status: 403
-				})) : I.completeMultipart({
+				})) : N.completeMultipart({
 					key: i.key,
 					uploadId: i.uploadId,
 					parts: r.parts,
@@ -3506,12 +3709,12 @@ var Mn = () => de({
 					tenantId: i.tenant,
 					ownerId: i.sub,
 					visibility: i.vis,
-					...de(i.vis),
+					...i.access === void 0 ? {} : { access: i.access },
 					...i.folder === void 0 ? {} : { folder: i.folder },
 					...i.tags === void 0 ? {} : { tags: i.tags },
 					...i.alt === void 0 ? {} : { alt: i.alt },
 					...i.caption === void 0 ? {} : { caption: i.caption }
-				}).pipe(y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+				}).pipe(v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 					id: e.id,
 					url: t,
 					size: e.size
@@ -3521,31 +3724,35 @@ var Mn = () => de({
 		{
 			...a,
 			execute: (e) => {
-				let n = Ot(e.multipartToken);
-				return !n || n.instance !== v ? y.fail(new t({
+				let n = Ht(e.multipartToken);
+				return !n || n.instance !== y ? v.fail(new t({
 					provider: "storage",
 					message: "invalid or expired multipart token",
 					transient: !1,
 					status: 401
-				})) : I.abortMultipart({
+				})) : N.abortMultipart({
 					key: n.key,
 					uploadId: n.uploadId
-				}).pipe(y.as({ ok: !0 }));
+				}).pipe(v.as({ ok: !0 }));
 			}
 		},
 		{
-			...ie,
+			...re,
 			execute: (e, t) => {
 				let n = e, r = new Uint8Array(Buffer.from(n.bytesBase64, "base64"));
-				return $(t, O).pipe(y.flatMap((e) => I.put({
+				return fr(t, O).pipe(v.flatMap((e) => A(n, t.request.subject).pipe(v.map((t) => ({
+					writer: e,
+					policy: t
+				})))), v.flatMap(({ writer: e, policy: t }) => N.put({
 					bytes: r,
+					...t,
 					contentType: n.contentType,
 					tenantId: e.tenantId,
 					ownerId: e.id,
 					...n.visibility ? { visibility: n.visibility } : {},
 					...n.key ? { key: n.key } : {},
 					...n.password ? { password: n.password } : {}
-				})), y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+				})), v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 					id: e.id,
 					url: t
 				})))));
@@ -3555,7 +3762,7 @@ var Mn = () => de({
 			...u,
 			execute: (e, t) => {
 				let n = e;
-				return $(t, O).pipe(y.flatMap((e) => I.ingestUrl(n.url, {
+				return fr(t, O).pipe(v.flatMap((e) => N.ingestUrl(n.url, {
 					tenantId: e.tenantId,
 					ownerId: e.id,
 					...n.visibility ? { visibility: n.visibility } : {},
@@ -3564,45 +3771,45 @@ var Mn = () => de({
 					...n.alt === void 0 ? {} : { alt: n.alt },
 					...n.caption === void 0 ? {} : { caption: n.caption },
 					...n.key === void 0 ? {} : { key: n.key }
-				})), y.flatMap((e) => I.getUrl(e.id).pipe(y.map((t) => ({
+				})), v.flatMap((e) => N.getUrl(e.id).pipe(v.map((t) => ({
 					id: e.id,
 					url: t
 				})))));
 			}
 		},
 		{
-			...ne,
+			...h,
 			execute: (e, t) => {
 				let n = e, r = n.expiresInDays ? new Date(Date.now() + n.expiresInDays * 864e5) : null;
-				return Yn(I, n.refId, t).pipe(y.flatMap(() => I.grant({
+				return ur(N, n.refId, t).pipe(v.flatMap(() => N.grant({
 					refId: n.refId,
 					principalType: n.principalType,
 					principalId: n.principalId,
 					...n.permission ? { permission: n.permission } : {},
 					expiresAt: r,
 					createdBy: t.request.subject.id
-				})), y.map((e) => ({ grantId: e.id })));
+				})), v.map((e) => ({ grantId: e.id })));
 			}
 		},
 		{
-			...h,
+			...ne,
 			execute: (e, t) => {
 				let n = e;
-				return I.getGrant(n.grantId).pipe(y.flatMap((e) => e === null ? y.fail(Jn()) : Yn(I, e.refId, t)), y.flatMap(() => I.revoke(n.grantId)), y.map(() => ({ ok: !0 })));
+				return N.getGrant(n.grantId).pipe(v.flatMap((e) => e === null ? v.fail(lr()) : ur(N, e.refId, t)), v.flatMap(() => N.revoke(n.grantId)), v.map(() => ({ ok: !0 })));
 			}
 		},
 		{
 			...d,
 			execute: (e, t) => {
 				let n = e;
-				return Yn(I, n.refId, t).pipe(y.flatMap(() => I.listGrants(n.refId)), y.map((e) => ({ grants: e.map(Qn) })));
+				return ur(N, n.refId, t).pipe(v.flatMap(() => N.listGrants(n.refId)), v.map((e) => ({ grants: e.map(mr) })));
 			}
 		},
 		{
 			...f,
 			execute: (e, t) => {
 				let n = e;
-				return I.listRefs({
+				return N.listRefs({
 					tenantId: t.request.subject.tenantId,
 					...n.folder === void 0 ? {} : { folder: n.folder },
 					...n.tags === void 0 ? {} : { tags: n.tags },
@@ -3610,37 +3817,37 @@ var Mn = () => de({
 					...n.includeDerived === void 0 ? {} : { includeDerived: n.includeDerived },
 					...n.limit === void 0 ? {} : { limit: n.limit },
 					...n.offset === void 0 ? {} : { offset: n.offset }
-				}).pipe(y.map((e) => ({
-					refs: e.refs.map(qn),
+				}).pipe(v.map((e) => ({
+					refs: e.refs.map(cr),
 					nextOffset: e.nextOffset
 				})));
 			}
 		}
 	];
-	return T({
-		name: ae({
-			base: $n,
+	return oe({
+		name: w({
+			base: hr,
 			alias: i.alias,
 			instance: i.name
 		}),
-		baseName: $n,
+		baseName: hr,
 		description: "File storage — StorageService over S3 / MinIO / filesystem / memory. Public objects served direct from bucket/CDN; private objects gated by an access policy + per-object grants. Checksums, tenant key-prefixing, _voltro_storage_refs + _voltro_storage_grants, retry.",
 		permissions: [
 			"network:outbound:*",
 			"inspect:read",
 			"inspect:write"
 		],
-		declaredEnv: W.declared,
-		egress: Wn(i),
-		services: me,
-		inspectEndpoints: Ee,
+		declaredEnv: U.declared,
+		egress: ar(i),
+		services: ve,
+		inspectEndpoints: Ae,
 		httpRoutes: [
-			Se,
-			Ce,
-			we
+			L,
+			De,
+			Oe
 		],
-		routes: De,
-		rpcClientDescriptors: re,
+		routes: je,
+		rpcClientDescriptors: _,
 		errorSchemas: [
 			{
 				schema: t,
@@ -3673,7 +3880,7 @@ var Mn = () => de({
 		],
 		capabilities: { mediaPersist: {
 			put: async ({ bytes: e, mediaType: t, tenantId: n, operationId: r, ownerId: i, visibility: a, tags: o }) => {
-				let s = await y.runPromise(I.put({
+				let s = await v.runPromise(N.put({
 					bytes: e,
 					contentType: t,
 					tenantId: n,
@@ -3681,40 +3888,40 @@ var Mn = () => de({
 					...i === void 0 ? {} : { ownerId: i },
 					...a === void 0 ? {} : { visibility: a },
 					...o === void 0 ? {} : { tags: o },
-					...fe.current === void 0 ? {} : { operationId: r }
+					...me.current === void 0 ? {} : { operationId: r }
 				}));
 				return {
-					url: await y.runPromise(I.getUrl(s.id, { tenantId: n })),
+					url: await v.runPromise(N.getUrl(s.id, { tenantId: n })),
 					refId: s.id
 				};
 			},
 			ingestUrl: async ({ url: e, tenantId: t, operationId: n, ownerId: r, visibility: i, tags: a }) => {
-				let o = await y.runPromise(I.ingestUrl(e, {
+				let o = await v.runPromise(N.ingestUrl(e, {
 					tenantId: t,
 					...r === void 0 ? {} : { ownerId: r },
 					...i === void 0 ? {} : { visibility: i },
 					...a === void 0 ? {} : { tags: a },
-					...fe.current === void 0 ? {} : { operationId: n }
+					...me.current === void 0 ? {} : { operationId: n }
 				}));
 				return {
-					url: await y.runPromise(I.getUrl(o.id, { tenantId: t })),
+					url: await v.runPromise(N.getUrl(o.id, { tenantId: t })),
 					refId: o.id
 				};
 			}
 		} },
 		bindDataStore: (e) => {
-			A && (M.current = Jt(e)), j && (N.current = Zt(e)), A && j && (fe.current = wn(e)), x.bindDataStore?.(e);
+			k && (j.current = ln(e)), pe && (M.current = fn(e)), k && pe && (me.current = zn(e)), x.bindDataStore?.(e);
 		},
-		onActivate: (e) => y.sync(() => {
-			let t = !!E || !!W.read("STORAGE_CDN_URL", i.cdnBaseUrl);
+		onActivate: (e) => v.sync(() => {
+			let t = !!T || !!U.read("STORAGE_CDN_URL", i.cdnBaseUrl);
 			e.logger.info(`storage: provider=${x.name} presign=${x.presigns ? "yes" : "no"} publicUrl=${t ? "yes" : "no"} transforms=yes`, {
 				provider: x.name,
-				bucket: S,
-				refStore: A ? "memory" : "custom"
+				bucket: ue,
+				refStore: k ? "memory" : "custom"
 			}), x.name === "memory" && process.env.NODE_ENV !== "test" && e.logger.warn("storage: provider=memory — uploads are IN-MEMORY and LOST on restart. Set STORAGE_PROVIDER (filesystem / s3 / r2 / azure / gcs) for anything but throwaway dev. (Empty/placeholder storage env silently falls back to memory.)"), !t && !x.presigns && e.logger.warn("storage: no VOLTRO_PUBLIC_URL / STORAGE_CDN_URL and this provider can't presign — serve URLs are RELATIVE and will not resolve cross-origin (browser <img> / server-to-server AI fetches). Set VOLTRO_PUBLIC_URL to this api's absolute base URL.");
 		}),
-		onDeactivate: () => y.void
+		onDeactivate: () => v.void
 	});
 };
 //#endregion
-export { U as STORAGE_BLOBS_TABLE, H as STORAGE_GRANTS_TABLE, V as STORAGE_REFS_TABLE, Pe as STORAGE_USAGE_TABLE, e as StorageAccessDenied, t as StorageError, n as StorageRejected, r as StorageScanRejected, i as StorageService, Re as _voltroStorageBlobsTable, Ie as _voltroStorageGrantsTable, Fe as _voltroStorageRefsTable, Le as _voltroStorageUsageTable, Vn as appStorageProvider, jn as assetRef, Je as azureProvider, en as buildStorageService, Oe as bytesToStream, Mt as checkLimits, On as clamavScanner, He as clearStorageBuffer, ke as collectStream, De as concatBytes, Hn as configuredStorageProvider, kt as contentTypeAllowed, Zt as dataStoreGrantStore, Jt as dataStoreRefStore, qe as databaseProvider, Pn as decodeDataUri, Ln as durabilityNotice, Tn as encodeInstream, An as ffmpegTranscoder, We as filesystemProvider, Ae as fromNodeReadable, Me as getObjectStream, ot as hashPassword, wn as makeStorageObjectMetadata, Yt as memoryGrantStore, Ue as memoryProvider, Gt as memoryRefStore, En as parseClamavResponse, Ze as parseTransformParams, In as pathDurability, Fn as putAvatar, Ne as putObjectStream, Ve as readStorageBuffer, Ut as refMatchesListQuery, Un as resolveStorageProvider, K as resolveStorageSecret, Ge as s3Provider, Bn as setActiveStorageProvider, Ct as signFinalizeTicket, yt as signGrant, Dt as signMultipartTicket, Tt as signResumableTicket, xt as signUploadTicket, jt as sniffMatches, Wn as storageEgressOf, er as storageInstanceName, on as storageObjectLifecycleTables, tr as storagePlugin, xn as storagePutIntentsTable, tn as storageServiceLayer, je as toNodeReadable, at as transformCached, tt as transformFallbackReason, nt as transformImage, wt as verifyFinalizeTicket, bt as verifyGrant, Ot as verifyMultipartTicket, st as verifyPassword, Et as verifyResumableTicket, St as verifyUploadTicket, Mn as withStorage };
+export { H as STORAGE_BLOBS_TABLE, V as STORAGE_GRANTS_TABLE, B as STORAGE_REFS_TABLE, Ue as STORAGE_USAGE_TABLE, e as StorageAccessDenied, t as StorageError, n as StorageRejected, r as StorageScanRejected, i as StorageService, qe as _voltroStorageBlobsTable, Ge as _voltroStorageGrantsTable, We as _voltroStorageRefsTable, Ke as _voltroStorageUsageTable, nr as appStorageProvider, Kn as assetRef, at as azureProvider, hn as buildStorageService, Le as bytesToStream, Kt as checkLimits, Un as clamavScanner, $e as clearStorageBuffer, Re as collectStream, Ie as concatBytes, rr as configuredStorageProvider, Ut as contentTypeAllowed, fn as dataStoreGrantStore, ln as dataStoreRefStore, it as databaseProvider, Yn as decodeDataUri, Qn as durabilityNotice, ht as editImage, Bn as encodeInstream, Gn as ffmpegTranscoder, tt as filesystemProvider, ze as fromNodeReadable, Ve as getObjectStream, yt as hashPassword, zn as makeStorageObjectMetadata, un as memoryGrantStore, et as memoryProvider, on as memoryRefStore, Vn as parseClamavResponse, lt as parseTransformParams, Zn as pathDurability, Xn as putAvatar, He as putObjectStream, Qe as readStorageBuffer, rn as refMatchesListQuery, ir as resolveStorageProvider, q as resolveStorageSecret, nt as s3Provider, tr as setActiveStorageProvider, Lt as signFinalizeTicket, Mt as signGrant, Vt as signMultipartTicket, zt as signResumableTicket, Ft as signUploadTicket, Gt as sniffMatches, ar as storageEgressOf, gr as storageInstanceName, bn as storageObjectLifecycleTables, _r as storagePlugin, In as storagePutIntentsTable, gn as storageServiceLayer, Be as toNodeReadable, vt as transformCached, pt as transformFallbackReason, mt as transformImage, Rt as verifyFinalizeTicket, Nt as verifyGrant, Ht as verifyMultipartTicket, bt as verifyPassword, Bt as verifyResumableTicket, It as verifyUploadTicket, qn as withStorage };