@voltro/cli 0.43.2 → 0.44.1

package/dist/{dataCommand-DD2bRHCu.js → dataCommand-WFn8CM11.js}

@@ -1,5 +1,5 @@
 import { t as e } from "./cliError-BmdYnghb.js";
-import { c as t, i as n, o as r } from "./dev-wumUfDm1.js";
+import { c as t, i as n, o as r } from "./dev-D-JZ6CGQ.js";
 import { n as i, t as a } from "./cliArgs-D4p8n7EE.js";
 import { r as o } from "./dialectDriver-czCHYpeH.js";
 import { t as s } from "./dataProfile-Cm0YVKSy.js";
@@ -12,18 +12,18 @@ import { declaredSnapshot as h, fingerprintSchema as g, introspectSchema as _ }
 import { connectionIdentity as v, normaliseTarget as y, sameDatabase as b, streamTable as x } from "@voltro/database";
 import { STORAGE_REFS_TABLE as ee, resolveStorageProvider as S } from "@voltro/plugin-storage";
 import { createHash as te } from "node:crypto";
-import { assessLiveImport as ne, backupArtifactName as C, backupCommand as re, classificationFromSnapshot as ie, decryptStream as w, encryptStream as ae, packBundle as T, peekBundle as E, previewMasking as oe, restoreCommand as D, runExport as O, runImport as se, runNativeStep as k, storageAssetSink as ce, storageAssetSource as le, storageBlobSink as ue, storageBlobSource as de, unpackBundle as fe, unpackBundleToDir as A } from "@voltro/data-transfer";
-import { request as pe } from "node:http";
-import { request as me } from "node:https";
+import { assessLiveImport as ne, backupArtifactName as C, backupCommand as re, classificationFromSnapshot as ie, decryptStream as w, encryptStream as ae, packBundle as T, peekBundle as E, previewMasking as oe, restoreCommand as D, runExport as se, runImport as ce, runNativeStep as O, storageAssetSink as le, storageAssetSource as ue, storageBlobSink as de, storageBlobSource as fe, unpackBundle as pe, unpackBundleToDir as k } from "@voltro/data-transfer";
+import { request as me } from "node:http";
+import { request as he } from "node:https";
 //#region src/longRequest.ts
-var j = class extends Error {
+var A = class extends Error {
 	elapsedMs;
 	url;
 	constructor(e, t) {
 		super(`no response after ${Math.round(e / 1e3)}s`), this.elapsedMs = e, this.url = t, this.name = "LongRequestTimeout";
 	}
-}, M = async (e, t, n, r) => {
-	let i = new URL(e), a = i.protocol === "https:" ? me : pe, o = Date.now();
+}, j = async (e, t, n, r) => {
+	let i = new URL(e), a = i.protocol === "https:" ? he : me, o = Date.now();
 	return await new Promise((s, c) => {
 		let l = a({
 			protocol: i.protocol,
@@ -41,7 +41,7 @@ var j = class extends Error {
 			})), e.on("error", c);
 		});
 		if (r?.timeoutMs !== void 0 && r.timeoutMs > 0 && l.setTimeout(r.timeoutMs, () => {
-			l.destroy(new j(Date.now() - o, e));
+			l.destroy(new A(Date.now() - o, e));
 		}), l.on("error", c), typeof t == "string" || Buffer.isBuffer(t)) {
 			l.end(t);
 			return;
@@ -55,7 +55,7 @@ var j = class extends Error {
 			}
 		})();
 	});
-}, he = (e, t) => `the instance did not answer within ${Math.round(e.elapsedMs / 1e3)}s. This is a client-side deadline, not a failure on the server: the upload itself finished long before, and the response arrives only when the import does. The instance is very probably STILL IMPORTING and will finish.\n` + (t === "replace" ? "  Do NOT simply re-run: --mode replace empties the target first, so a second run started while the first is mid-flight would empty it under the first one. Check the instance's log for the import's completion, and check the target's row counts, before deciding." : `  Re-running the same bundle is safe once the first run has finished (--mode ${t} is idempotent), but check the instance's log first — the work may already be done.`) + "\n  To keep a deadline anyway, pass --timeout <seconds>; the default is to wait.", ge = 16777216, _e = async function* (e, t) {
+}, ge = (e, t) => `the instance did not answer within ${Math.round(e.elapsedMs / 1e3)}s. This is a client-side deadline, not a failure on the server: the upload itself finished long before, and the response arrives only when the import does. The instance is very probably STILL IMPORTING and will finish.\n` + (t === "replace" ? "  Do NOT simply re-run: --mode replace empties the target first, so a second run started while the first is mid-flight would empty it under the first one. Check the instance's log for the import's completion, and check the target's row counts, before deciding." : `  Re-running the same bundle is safe once the first run has finished (--mode ${t} is idempotent), but check the instance's log first — the work may already be done.`) + "\n  To keep a deadline anyway, pass --timeout <seconds>; the default is to wait.", _e = 16777216, ve = async function* (e, t) {
 	let n = [], r = 0, i = 0, a = function* (e) {
 		let t = Buffer.concat(n);
 		n = [], r = 0;
@@ -77,12 +77,12 @@ var j = class extends Error {
 		i += a.byteLength, yield s;
 	}
 	yield* a(!0);
-}, ve = (e) => te("sha256").update(Buffer.from(e)).digest("hex"), ye = async (e) => {
+}, ye = (e) => te("sha256").update(Buffer.from(e)).digest("hex"), be = async (e) => {
 	let t = 0, n = 0, r = {
 		status: 0,
 		body: {}
 	};
-	for await (let i of _e(e.stream, e.chunkBytes)) {
+	for await (let i of ve(e.stream, e.chunkBytes)) {
 		if (i.offset + i.bytes.byteLength <= e.alreadyHeld && !i.final) {
 			n++;
 			continue;
@@ -92,7 +92,7 @@ var j = class extends Error {
 			n++;
 			continue;
 		}
-		if (r = await e.target.send(Buffer.from(o), {
+		if (i.final && e.onFinalChunk?.(), r = await e.target.send(Buffer.from(o), {
 			...e.baseHeaders,
 			"content-type": "application/octet-stream",
 			"x-import-upload-id": e.uploadId,
@@ -108,13 +108,13 @@ var j = class extends Error {
 		bytes: t,
 		resumedFrom: e.alreadyHeld
 	};
-}, N = "voltro-backup-stamp.json", be = (e) => ({
+}, M = "voltro-backup-stamp.json", xe = (e) => ({
 	stampVersion: 1,
 	dialect: e.dialect,
 	schemaFingerprint: e.schemaFingerprint,
 	voltroVersion: e.voltroVersion,
 	createdAt: e.createdAt
-}), P = (e) => {
+}), N = (e) => {
 	let t;
 	try {
 		t = JSON.parse(e);
@@ -132,10 +132,10 @@ var j = class extends Error {
 		voltroVersion: n.voltroVersion,
 		createdAt: n.createdAt
 	};
-}, xe = (e) => {
+}, Se = (e) => {
 	let { stamp: t, currentDialect: n, currentFingerprint: r } = e;
 	if (t === null) return {
-		warn: `no ${N} beside the dump — an older/handmade backup. Cannot verify dialect or schema version; make sure this dump is a ${n} dump.`,
+		warn: `no ${M} beside the dump — an older/handmade backup. Cannot verify dialect or schema version; make sure this dump is a ${n} dump.`,
 		info: []
 	};
 	let i = [`backup produced by @voltro/cli ${t.voltroVersion} at ${t.createdAt}`, `schema fingerprint: ${t.schemaFingerprint ?? "<none recorded>"}`];
@@ -146,20 +146,20 @@ var j = class extends Error {
 		refuse: `dialect mismatch — backup is a ${t.dialect} dump, but DB_DIALECT is ${n}. A cross-dialect restore is never valid.`,
 		info: i
 	};
-}, F = (e) => {
+}, P = (e) => {
 	try {
 		let t = new URL(e), n = t.pathname.replace(/^\//, "");
 		return `${t.hostname.toLowerCase()}:${t.port || "(default)"}/${n}`;
 	} catch {
 		return e.trim();
 	}
-}, Se = (e) => {
+}, Ce = (e) => {
 	let t = e.flagUrl ?? e.envUrl;
 	if (t === void 0 || t.trim() === "") return {
 		ok: !1,
 		error: "no drill target — pass `--drill-url <url>` or set `DRILL_DB_URL`. The drill restores into a THROWAWAY database (never the live one), so it needs its own connection."
 	};
-	let n = F(t);
+	let n = P(t);
 	return e.liveKeys.some((e) => e === n) ? {
 		ok: !1,
 		error: `drill target (${n}) is the LIVE database — a restore drill must target a throwaway DB, never production. It would --clean and overwrite it.`
@@ -167,7 +167,7 @@ var j = class extends Error {
 		ok: !0,
 		url: t
 	};
-}, Ce = (e) => {
+}, we = (e) => {
 	let { stampFingerprint: t, restoredFingerprint: n, restoredTableCount: r } = e;
 	return r === 0 ? {
 		pass: !1,
@@ -182,24 +182,24 @@ var j = class extends Error {
 		pass: !0,
 		lines: [`PASS — restored ${r} table(s); schema fingerprint matches the backup stamp (${n.slice(0, 12)}).`]
 	};
-}, I = d({ scope: "voltro:data" }), we = async () => {
+}, F = d({ scope: "voltro:data" }), Te = async () => {
 	try {
 		let { createRequire: e } = await import("node:module"), { join: t } = await import("node:path"), { readFileSync: n } = await import("node:fs"), r = e(t(process.cwd(), "package.json")).resolve("@voltro/cli/package.json");
 		return JSON.parse(n(r, "utf8")).version ?? "unknown";
 	} catch {
 		return "unknown";
 	}
-}, L = async (e) => {
+}, I = async (e) => {
 	try {
-		return g(await W(e));
+		return g(await U(e));
 	} catch {
 		return null;
 	}
-}, R = (e) => {
+}, L = (e) => {
 	if (e.event !== "done") return;
 	let t = e.total === void 0 ? "" : ` / ${e.total}`;
-	I.info(`${e.phase} [${e.index + 1}/${e.tableCount}] ${e.table}`, { rows: `${e.rowsDone}${t}` });
-}, Te = async (e) => {
+	F.info(`${e.phase} [${e.index + 1}/${e.tableCount}] ${e.table}`, { rows: `${e.rowsDone}${t}` });
+}, Ee = async (e) => {
 	let t = (e) => e?.meta?.databaseId;
 	if (e) {
 		let n = await l({
@@ -219,12 +219,12 @@ var j = class extends Error {
 		};
 	}
 	return null;
-}, z = async (e) => {
-	let t = e.includes("--allow-live"), n = t ? null : await Te(B(e, "--api-url")), i = v({
-		dialect: H(),
+}, R = async (e) => {
+	let t = e.includes("--allow-live"), n = t ? null : await Ee(z(e, "--api-url")), i = v({
+		dialect: V(),
 		...r()
 	}), a = y({
-		dialect: H(),
+		dialect: V(),
 		...r()
 	}), { refuse: o, message: s } = ne({
 		liveInstance: n?.label ?? null,
@@ -232,8 +232,8 @@ var j = class extends Error {
 		sameTarget: b(i, n?.databaseId),
 		...a === void 0 ? {} : { targetLabel: `${a.host}:${a.port}/${a.database}` }
 	});
-	return !o || (I.error(s ?? "refusing: live instance detected"), !1);
-}, B = i, Ee = [
+	return !o || (F.error(s ?? "refusing: live instance detected"), !1);
+}, z = i, De = [
 	"--api-url",
 	"--bundle-key",
 	"--compression",
@@ -242,6 +242,7 @@ var j = class extends Error {
 	"--chunk-size",
 	"--exclude",
 	"--mode",
+	"--no-atomic",
 	"--on-conflict",
 	"--passphrase",
 	"--profile",
@@ -250,44 +251,44 @@ var j = class extends Error {
 	"--timeout",
 	"--tenant",
 	"--token"
-], V = (e) => a(e, Ee), H = () => {
+], B = (e) => a(e, De), V = () => {
 	let t = (process.env.DB_DIALECT ?? "postgres").toLowerCase();
 	if (t === "memory") throw new e("voltro data: requires a real dialect, not DB_DIALECT=memory.");
 	return t;
-}, U = async (e, t) => {
+}, H = async (e, t) => {
 	let n = (await o(e)).makeSqlLayer(t);
 	return f.runPromise(m.SqlClient.pipe(f.flatMap(_), f.provide(n)));
-}, W = (e) => U(e, r()), De = () => {
+}, U = (e) => H(e, r()), Oe = () => {
 	let e = r(), t = [];
-	return e.url && t.push(F(e.url)), (e.host || e.database) && t.push(`${(e.host ?? "localhost").toLowerCase()}:${e.port ?? "(default)"}/${e.database ?? ""}`), t;
-}, G = async () => {
+	return e.url && t.push(P(e.url)), (e.host || e.database) && t.push(`${(e.host ?? "localhost").toLowerCase()}:${e.port ?? "(default)"}/${e.database ?? ""}`), t;
+}, W = async () => {
 	let r = process.cwd(), i = await t(r);
 	if (!i) throw new e("voltro data: no app.config.ts found in the current directory.");
-	let a = await n(i, void 0), o = H();
+	let a = await n(i, void 0), o = V();
 	return {
 		store: a,
-		snapshot: await W(o),
+		snapshot: await U(o),
 		dialect: o
 	};
-}, K = (e) => x(e, {
+}, G = (e) => x(e, {
 	table: ee,
 	chunkSize: 500
 }).pipe(p.map((e) => ({
 	key: String(e.key),
 	contentType: String(e.contentType ?? "application/octet-stream"),
 	size: Number(e.size ?? 0)
-}))), q = (e) => !!e && e.endsWith(".vbundle"), J = (e) => B(e, "--passphrase") ?? process.env.VOLTRO_BUNDLE_KEY, Oe = (e) => e.includes("--encrypt") || B(e, "--passphrase") !== void 0 || process.env.VOLTRO_BUNDLE_KEY !== void 0, ke = async (e, t) => {
+}))), K = (e) => !!e && e.endsWith(".vbundle"), q = (e) => z(e, "--passphrase") ?? process.env.VOLTRO_BUNDLE_KEY, ke = (e) => e.includes("--encrypt") || z(e, "--passphrase") !== void 0 || process.env.VOLTRO_BUNDLE_KEY !== void 0, Ae = async (e, t) => {
 	let { createWriteStream: n } = await import("node:fs"), { pipeline: r } = await import("node:stream/promises"), { Readable: i } = await import("node:stream");
 	await r(i.from(e), n(t));
-}, Y = (e) => ({ async *[Symbol.asyncIterator]() {
+}, J = (e) => ({ async *[Symbol.asyncIterator]() {
 	let { createReadStream: t } = await import("node:fs");
 	for await (let n of t(e)) yield n instanceof Uint8Array ? n : new Uint8Array(n);
-} }), X = (e) => (e ?? "").split(",").map((e) => e.trim()).filter(Boolean), Ae = (t, n) => {
-	let r = B(t, "--tenant"), i = B(t, "--tables"), a = B(t, "--exclude");
+} }), Y = (e) => (e ?? "").split(",").map((e) => e.trim()).filter(Boolean), je = (t, n) => {
+	let r = z(t, "--tenant"), i = z(t, "--tables"), a = z(t, "--exclude");
 	if (a !== void 0) {
 		if (i !== void 0) throw new e("voltro data export: --exclude and --tables are two ways to say the same thing; use one.");
 		if (r !== void 0) throw new e("voltro data export: --exclude does not apply to --tenant, whose table set is derived from the tenant closure.");
-		let t = X(a), o = new Set(n), s = t.filter((e) => !o.has(e));
+		let t = Y(a), o = new Set(n), s = t.filter((e) => !o.has(e));
 		if (s.length > 0) throw new e(`voltro data export: --exclude names ${s.length} table(s) that do not exist: ${s.join(", ")}. An exclusion that excludes nothing would leave the run looking like it worked.`);
 		let c = new Set(t);
 		return {
@@ -300,15 +301,15 @@ var j = class extends Error {
 		tenantId: r
 	} : i ? {
 		kind: "tables",
-		tables: X(i)
+		tables: Y(i)
 	} : { kind: "all" };
-}, je = async () => {
+}, Me = async () => {
 	let e = await u(process.cwd());
 	return ie(h(e));
-}, Me = "voltro/tenant", Ne = async () => {
-	let e = (await u(process.cwd())).filter((e) => (e.appliedMixins ?? []).some((e) => e.id === Me)).map((e) => e.tableName);
+}, Ne = "voltro/tenant", Pe = async () => {
+	let e = (await u(process.cwd())).filter((e) => (e.appliedMixins ?? []).some((e) => e.id === Ne)).map((e) => e.tableName);
 	return e.length > 0 ? e : void 0;
-}, Pe = (e) => {
+}, Fe = (e) => {
 	for (let t of e.tables) if (t.samples.length !== 0) {
 		console.log(`\n  ${t.table}`);
 		for (let e of t.samples) console.log(`    ${e.column}  [${e.action}]  ${JSON.stringify(e.before)} → ${JSON.stringify(e.after)}`);
@@ -321,8 +322,8 @@ var j = class extends Error {
 		console.log("\n  ✗ unclassified (would BLOCK a real export — add .sensitive()/.safe() or a policy override):");
 		for (let t of e.unclassified) console.log(`    ${t}`);
 	} else console.log("\n  ✓ every exported column is classified — safe to run.");
-}, Fe = async (t) => {
-	let { resolve: n, join: r } = await import("node:path"), i = await import("node:fs/promises"), a = B(t.args, "--chunk-size"), o = a === void 0 ? ge : Math.round(Number(a) * 1024 * 1024);
+}, Ie = async (t) => {
+	let { resolve: n, join: r } = await import("node:path"), i = await import("node:fs/promises"), a = z(t.args, "--chunk-size"), o = a === void 0 ? _e : Math.round(Number(a) * 1024 * 1024);
 	if (!Number.isFinite(o) || o <= 0) throw new e(`--chunk-size expects a positive number of megabytes, got '${String(a)}'`);
 	let s = t.stream[Symbol.asyncIterator](), c = [], l = 0, u = !1;
 	for (; l <= o;) {
@@ -337,28 +338,34 @@ var j = class extends Error {
 		kind: "small",
 		body: Buffer.concat(c)
 	};
-	let d = n(process.cwd(), t.bundleDir), f = ve(q(t.bundleDir) ? await i.readFile(d) : await i.readFile(r(d, "manifest.json"))), p = `up-${f.slice(0, 32)}`, m = await M(t.url, Buffer.alloc(0), {
+	let d = n(process.cwd(), t.bundleDir), f = ye(K(t.bundleDir) ? await i.readFile(d) : await i.readFile(r(d, "manifest.json"))), p = `up-${f.slice(0, 32)}`, m = await j(t.url, Buffer.alloc(0), {
 		...t.headers,
 		"x-import-upload-id": p,
 		"x-import-probe": "1"
-	}, Z(t.args)), h = m.status === 200 ? Number(JSON.parse(m.body.toString("utf8")).bytes ?? 0) : 0;
+	}, Q(t.args)), h = m.status === 200 ? Number(JSON.parse(m.body.toString("utf8")).bytes ?? 0) : 0;
 	h > 0 && t.log.info("api import: resuming a chunked upload the instance already holds", { bytes: h });
-	let g = await ye({
-		stream: (async function* () {
-			for (let e of c) yield e;
-			for (;;) {
-				let e = await s.next();
-				if (e.done === !0) return;
-				yield e.value;
-			}
-		})(),
+	let g = (async function* () {
+		for (let e of c) yield e;
+		for (;;) {
+			let e = await s.next();
+			if (e.done === !0) return;
+			yield e.value;
+		}
+	})(), _ = 0, v = await be({
+		stream: g,
 		chunkBytes: o,
 		uploadId: p,
 		key: f,
 		alreadyHeld: h,
 		baseHeaders: t.headers,
+		onProgress: (e) => {
+			_++, t.log.info(`api import: uploading — chunk ${_}, ${Math.round(e / 1024)} KiB sent`);
+		},
+		onFinalChunk: () => {
+			t.log.info("api import: upload done — the instance is importing now. This request stays open until it finishes, which on a full bundle is minutes, and nothing more is printed until then. It is not a hang; the instance logs the import itself.");
+		},
 		target: { send: async (e, n) => {
-			let r = await M(t.url, e, n, Z(t.args)), i = {};
+			let r = await j(t.url, e, n, Q(t.args)), i = {};
 			try {
 				i = JSON.parse(r.body.toString("utf8") || "{}");
 			} catch {}
@@ -369,70 +376,70 @@ var j = class extends Error {
 		} }
 	});
 	return t.log.info("api import: uploaded in chunks", {
-		chunks: g.chunks,
-		bytes: g.bytes,
-		...g.resumedFrom > 0 ? { resumedFrom: g.resumedFrom } : {}
+		chunks: v.chunks,
+		bytes: v.bytes,
+		...v.resumedFrom > 0 ? { resumedFrom: v.resumedFrom } : {}
 	}), {
 		kind: "sent",
 		res: {
-			status: g.status,
+			status: v.status,
 			headers: {},
-			body: Buffer.from(JSON.stringify(g.body))
+			body: Buffer.from(JSON.stringify(v.body))
 		}
 	};
-}, Z = (t) => {
-	let n = B(t, "--timeout");
+}, X = (e) => `--mode replace with --no-atomic against a ${e ? "RUNNING instance" : "live database"}: the target is empty between the delete and the load, and anything the application writes in that window can collide with a row from the bundle — or survive the import as a row the bundle never carried. Drop --no-atomic to run the whole load in one transaction (concurrent writers then wait instead of racing), or stop the traffic for the duration.`, Z = (e, t) => e.includes("--no-atomic") ? !1 : e.includes("--atomic") || t === "replace", Q = (t) => {
+	let n = z(t, "--timeout");
 	if (n === void 0) return {};
 	let r = Number(n);
 	if (!Number.isFinite(r) || r <= 0) throw new e(`--timeout expects a positive number of seconds, got '${n}'`);
 	return { timeoutMs: Math.round(r * 1e3) };
-}, Ie = async (e) => {
-	let t = B(e, "--target") === "api", n = B(e, "--bundle-key"), r = V(e);
-	if (!r && !(t && n)) return I.error("usage: voltro data export <outDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--timeout <seconds>] [--profile <name>] [--tenant <id>] [--tables a,b] [--exclude a,b] [--bundle-key <storage-key>] [--assets] [--compression zstd|gzip|none] [--consistency live|snapshot] [--dry-run]"), 1;
+}, Le = async (e) => {
+	let t = z(e, "--target") === "api", n = z(e, "--bundle-key"), r = B(e);
+	if (!r && !(t && n)) return F.error("usage: voltro data export <outDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--timeout <seconds>] [--profile <name>] [--tenant <id>] [--tables a,b] [--exclude a,b] [--bundle-key <storage-key>] [--assets] [--compression zstd|gzip|none] [--consistency live|snapshot] [--dry-run]"), 1;
 	if (t) {
-		let t = B(e, "--api-url");
-		if (!t) return I.error("--target api requires --api-url <url> (the running instance)"), 1;
-		let i = B(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
-		if (!i) return I.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
-		if (B(e, "--exclude") !== void 0) return I.error("--exclude is a direct-target flag: it expands against the live table list, which --target api does not expose. Use --tables with the explicit set."), 1;
-		let a = B(e, "--tables"), o = {
-			...B(e, "--profile") ? { profile: B(e, "--profile") } : {},
-			...B(e, "--tenant") ? { tenant: B(e, "--tenant") } : {},
+		let t = z(e, "--api-url");
+		if (!t) return F.error("--target api requires --api-url <url> (the running instance)"), 1;
+		let i = z(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
+		if (!i) return F.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
+		if (z(e, "--exclude") !== void 0) return F.error("--exclude is a direct-target flag: it expands against the live table list, which --target api does not expose. Use --tables with the explicit set."), 1;
+		let a = z(e, "--tables"), o = {
+			...z(e, "--profile") ? { profile: z(e, "--profile") } : {},
+			...z(e, "--tenant") ? { tenant: z(e, "--tenant") } : {},
 			...a ? { tables: a.split(",").map((e) => e.trim()).filter(Boolean) } : {},
-			...B(e, "--consistency") === "snapshot" ? { consistency: "snapshot" } : {},
-			...B(e, "--compression") ? { compression: B(e, "--compression") } : {},
+			...z(e, "--consistency") === "snapshot" ? { consistency: "snapshot" } : {},
+			...z(e, "--compression") ? { compression: z(e, "--compression") } : {},
 			...e.includes("--assets") ? { assets: !0 } : {},
 			...n ? { bundleKey: n } : {}
 		}, s;
 		try {
-			s = await M(`${t.replace(/\/+$/, "")}/_voltro/admin/export`, JSON.stringify(o), {
+			s = await j(`${t.replace(/\/+$/, "")}/_voltro/admin/export`, JSON.stringify(o), {
 				"content-type": "application/json",
 				authorization: `Bearer ${i}`
-			}, Z(e));
+			}, Q(e));
 		} catch (e) {
-			if (e instanceof j) return I.error(`api export: the instance did not answer within ${Math.round(e.elapsedMs / 1e3)}s. That is a client-side deadline, not a server failure — the response arrives only when the export does. Nothing was written locally; re-run, or pass --timeout <seconds> (the default is to wait).`), 1;
+			if (e instanceof A) return F.error(`api export: the instance did not answer within ${Math.round(e.elapsedMs / 1e3)}s. That is a client-side deadline, not a server failure — the response arrives only when the export does. Nothing was written locally; re-run, or pass --timeout <seconds> (the default is to wait).`), 1;
 			throw e;
 		}
-		if (s.status < 200 || s.status >= 300) return I.error(`api export failed: HTTP ${s.status} — ${s.body.toString("utf8")}`), 1;
-		if (n) return I.info("api export complete (pushed to storage)", {
+		if (s.status < 200 || s.status >= 300) return F.error(`api export failed: HTTP ${s.status} — ${s.body.toString("utf8")}`), 1;
+		if (n) return F.info("api export complete (pushed to storage)", {
 			via: t,
 			...JSON.parse(s.body.toString("utf8"))
 		}), 0;
 		let { resolve: c } = await import("node:path"), l = new Uint8Array(s.body);
-		return await A((async function* () {
+		return await k((async function* () {
 			yield l;
-		})(), c(process.cwd(), r)), I.info("api export complete (downloaded from the running instance)", {
+		})(), c(process.cwd(), r)), F.info("api export complete (downloaded from the running instance)", {
 			outDir: r,
 			tables: s.headers["x-export-tables"],
 			rows: s.headers["x-export-rows"],
 			masked: s.headers["x-export-masked"]
 		}), 0;
 	}
-	if (!r) return I.error("a <outDir> is required for a direct export"), 1;
-	let i = B(e, "--profile"), a = i ? await s(i, { allowPath: !0 }) : {}, { store: o, snapshot: c, dialect: l } = await G(), u = e.includes("--assets") || a.assets === !0, d = u ? S({}) : void 0, p = B(e, "--compression") ?? a.compression, m = B(e, "--consistency") === "snapshot" ? "snapshot" : a.consistency ?? "live", h = a.masking, g = a.subset, _ = a.scope ?? Ae(e, c.tables.map((e) => e.name)), v = h ? await je() : void 0, y = _.kind === "tenant" ? await Ne() : void 0, b = y ? { tenantTables: y } : {};
+	if (!r) return F.error("a <outDir> is required for a direct export"), 1;
+	let i = z(e, "--profile"), a = i ? await s(i, { allowPath: !0 }) : {}, { store: o, snapshot: c, dialect: l } = await W(), u = e.includes("--assets") || a.assets === !0, d = u ? S({}) : void 0, p = z(e, "--compression") ?? a.compression, m = z(e, "--consistency") === "snapshot" ? "snapshot" : a.consistency ?? "live", h = a.masking, g = a.subset, _ = a.scope ?? je(e, c.tables.map((e) => e.name)), v = h ? await Me() : void 0, y = _.kind === "tenant" ? await Pe() : void 0, b = y ? { tenantTables: y } : {};
 	if (e.includes("--dry-run")) {
 		let e = _.kind === "tables" && _.tables ? [..._.tables] : c.tables.map((e) => e.name);
-		if (I.info("export DRY RUN — nothing was written", {
+		if (F.info("export DRY RUN — nothing was written", {
 			outDir: r,
 			tables: e.length,
 			scope: _.kind,
@@ -440,7 +447,7 @@ var j = class extends Error {
 			compression: p ?? "zstd",
 			assets: u,
 			masking: h ? "profile policy applies" : "none"
-		}), I.info(`would export: ${e.join(", ")}`), !h) return 0;
+		}), F.info(`would export: ${e.join(", ")}`), !h) return 0;
 		let t = await f.runPromise(oe({
 			store: o,
 			snapshot: c,
@@ -451,12 +458,12 @@ var j = class extends Error {
 				...b
 			}
 		}));
-		return Pe(t), +(t.unclassified.length > 0);
+		return Fe(t), +(t.unclassified.length > 0);
 	}
-	if (q(r)) {
+	if (K(r)) {
 		let t = await import("node:os"), n = await import("node:fs/promises"), { resolve: i, join: a } = await import("node:path"), s = await n.mkdtemp(a(t.tmpdir(), "voltro-export-"));
 		try {
-			let t = await f.runPromise(O({
+			let t = await f.runPromise(se({
 				store: o,
 				snapshot: c,
 				dialect: l,
@@ -469,17 +476,17 @@ var j = class extends Error {
 				...p ? { compression: p } : {},
 				...h ? { masking: h } : {},
 				...v ? { classification: v } : {},
-				onProgress: R
+				onProgress: L
 			})), n = T({
 				dir: s,
-				...d ? { blobs: de(d, () => K(o)) } : {}
-			}), a = Oe(e);
+				...d ? { blobs: fe(d, () => G(o)) } : {}
+			}), a = ke(e);
 			if (a) {
-				let t = J(e);
-				if (!t) return I.error("--encrypt requires --passphrase <p> or VOLTRO_BUNDLE_KEY (a dedicated key, NOT the transfer secret)"), 1;
+				let t = q(e);
+				if (!t) return F.error("--encrypt requires --passphrase <p> or VOLTRO_BUNDLE_KEY (a dedicated key, NOT the transfer secret)"), 1;
 				n = ae(n, t);
 			}
-			return await ke(n, i(process.cwd(), r)), I.info("export complete (single file)", {
+			return await Ae(n, i(process.cwd(), r)), F.info("export complete (single file)", {
 				file: r,
 				encrypted: a,
 				assets: u,
@@ -493,7 +500,7 @@ var j = class extends Error {
 			});
 		}
 	}
-	let x = await f.runPromise(O({
+	let x = await f.runPromise(se({
 		store: o,
 		snapshot: c,
 		dialect: l,
@@ -506,10 +513,10 @@ var j = class extends Error {
 		...p ? { compression: p } : {},
 		...h ? { masking: h } : {},
 		...v ? { classification: v } : {},
-		...d ? { assets: le(d, () => K(o)) } : {},
-		onProgress: R
+		...d ? { assets: ue(d, () => G(o)) } : {},
+		onProgress: L
 	}));
-	return I.info("export complete", {
+	return F.info("export complete", {
 		outDir: r,
 		tables: x.tables.length,
 		rows: x.tables.reduce((e, t) => e + t.rowCount, 0),
@@ -517,106 +524,121 @@ var j = class extends Error {
 		compression: x.compression,
 		...x.masking ? { maskedColumns: x.masking.transformed.length } : {}
 	}), 0;
-}, Q = () => "dry run checked: schema fit, cross-dialect portability, mode legality, the table selection. It did NOT read per-table checksums (those stream during the load) and cannot see conflicts that depend on the target's current rows.", Le = (e) => {
-	let t = B(e, "--tables");
+}, Re = () => "dry run checked: schema fit, cross-dialect portability, mode legality, the table selection. It did NOT read per-table checksums (those stream during the load) and cannot see conflicts that depend on the target's current rows.", ze = (e) => {
+	let t = z(e, "--tables");
 	return {
 		...t ? { tables: t.split(",").map((e) => e.trim()).filter(Boolean) } : {},
 		...e.includes("--dry-run") ? { dryRun: !0 } : {}
 	};
-}, Re = (e, t) => {
+}, Be = (e) => ({
+	tables: e.tablesWritten,
+	rows: e.rowsWritten,
+	carried: e.manifest.tables.reduce((e, t) => e + t.rowCount, 0),
+	...e.tablesSkipped > 0 ? {
+		skippedTables: e.tablesSkipped,
+		skippedRows: e.rowsSkipped
+	} : {}
+}), Ve = (e, t) => {
 	if (e.includes("--dry-run")) {
-		I.info("import DRY RUN — nothing was written", t), I.info(Q());
+		F.info("import DRY RUN — nothing was written", t), F.info(Re());
 		return;
 	}
-	I.info("import complete", t);
-}, ze = (e) => {
+	if (t.rows === 0 && typeof t.skippedRows == "number" && t.skippedRows !== 0) {
+		F.info("import complete — 0 rows written, every table was already applied by an earlier run of this bundle directory", t);
+		return;
+	}
+	F.info("import complete", t);
+}, He = (e) => {
 	let t = e;
 	if (t?._tag !== "RowsRefusedError" || !Array.isArray(t.rows)) return;
 	let n = t.rows, r = n.filter((e) => !e.derived), i = Number(t.totalCount ?? n.length), a = Number(t.primaryCount ?? r.length);
-	I.error(`import refused ${i} row(s), of which ${a} are the actual failures — the rest could not land because a row they reference did not.`);
-	for (let e of r) I.error(`  ${e.table} ${e.id}  ${e.reason}`);
-	let o = i - a;
-	o > 0 && I.error(`  … and ${o} row(s) behind them. Fix the ${a} above and re-run; they resolve with their parents.`);
-}, Be = async (e) => {
-	let t = B(e, "--target") === "api", n = B(e, "--bundle-key"), i = V(e);
-	if (!i && !(t && n)) return I.error("usage: voltro data import <bundleDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--timeout <seconds>] [--bundle-key <storage-key>] [--tables a,b] [--mode upsert|append|replace] [--on-conflict skip|fail] [--atomic] [--assets] [--no-verify] [--force] [--allow-live] [--dry-run]  (--force: import despite schema drift AND cross-dialect warnings; --dry-run: report what would move, write nothing)"), 1;
-	let a = B(e, "--mode") ?? "upsert", o = B(e, "--on-conflict") ?? "skip";
+	F.error(`import refused ${i} row(s), of which ${a} are the actual failures — the rest could not land because a row they reference did not.`);
+	let o = Array.isArray(t.byTable) ? t.byTable : [];
+	o.length > 1 && F.error(`  by table: ${o.map((e) => `${e.table} ${e.refused}`).join(", ")}`);
+	for (let e of r) F.error(`  ${e.table} ${e.id}  ${e.reason}`);
+	n.length < i && F.error(`  (the list above is capped at ${n.length} of ${i} — the counts by table are complete)`);
+	let s = i - a;
+	s > 0 && F.error(`  … and ${s} row(s) behind them. Fix the ${a} above and re-run; they resolve with their parents.`);
+}, Ue = async (e) => {
+	let t = z(e, "--target") === "api", n = z(e, "--bundle-key"), i = B(e);
+	if (!i && !(t && n)) return F.error("usage: voltro data import <bundleDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--timeout <seconds>] [--bundle-key <storage-key>] [--tables a,b] [--mode upsert|append|replace] [--on-conflict skip|fail] [--atomic] [--assets] [--no-verify] [--force] [--allow-live] [--dry-run]  (--force: import despite schema drift AND cross-dialect warnings; --dry-run: report what would move, write nothing)"), 1;
+	let a = z(e, "--mode") ?? "upsert", o = z(e, "--on-conflict") ?? "skip";
 	if (t) {
-		let t = B(e, "--api-url");
-		if (!t) return I.error("--target api requires --api-url <url> (the running instance)"), 1;
-		let r = B(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
-		if (!r) return I.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
-		let s = B(e, "--tables"), c = {
+		let t = z(e, "--api-url");
+		if (!t) return F.error("--target api requires --api-url <url> (the running instance)"), 1;
+		let r = z(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
+		if (!r) return F.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
+		let s = z(e, "--tables"), c = {
 			authorization: `Bearer ${r}`,
 			"x-import-mode": a,
 			"x-import-on-conflict": o,
-			...e.includes("--atomic") ? { "x-import-atomic": "1" } : {},
+			...Z(e, a) ? { "x-import-atomic": "1" } : {},
+			...e.includes("--no-atomic") ? { "x-import-atomic": "0" } : {},
 			...e.includes("--force") ? { "x-import-force": "1" } : {},
 			...e.includes("--dry-run") ? { "x-import-dry-run": "1" } : {},
 			...s ? { "x-import-tables": s } : {}
 		}, { resolve: l } = await import("node:path"), u;
 		if (n) c["content-type"] = "application/json", u = JSON.stringify({ bundleKey: n });
-		else if (q(i)) {
-			let t = Y(l(process.cwd(), i)), n = J(e);
+		else if (K(i)) {
+			let t = J(l(process.cwd(), i)), n = q(e);
 			n && (t = w(t, n)), c["content-type"] = "application/octet-stream", u = t;
-		} else await (await import("node:fs/promises")).access(l(process.cwd(), i, "assets", "index.ndjson")).then(() => !0, () => !1) && I.warn("this directory bundle has assets; --target api uploads DATA ONLY. Pack a single-file `.vbundle` (voltro data export <name>.vbundle --assets) to transfer assets over the API."), c["content-type"] = "application/octet-stream", u = T({ dir: l(process.cwd(), i) });
+		} else await (await import("node:fs/promises")).access(l(process.cwd(), i, "assets", "index.ndjson")).then(() => !0, () => !1) && F.warn("this directory bundle has assets; --target api uploads DATA ONLY. Pack a single-file `.vbundle` (voltro data export <name>.vbundle --assets) to transfer assets over the API."), c["content-type"] = "application/octet-stream", u = T({ dir: l(process.cwd(), i) });
+		a === "replace" && !Z(e, a) && F.warn(X(!0));
 		let d = `${t.replace(/\/+$/, "")}/_voltro/admin/import`, f;
 		try {
-			let t = typeof u == "string" ? null : await Fe({
+			let t = typeof u == "string" ? null : await Ie({
 				stream: u,
 				url: d,
 				headers: c,
 				bundleDir: i,
 				args: e,
-				log: I
+				log: F
 			});
-			f = t === null ? await M(d, u, c, Z(e)) : t.kind === "sent" ? t.res : await M(d, t.body, c, Z(e));
+			(t === null || t.kind === "small") && F.info("api import: uploading the bundle — this request stays open until the instance has imported it"), f = t === null ? await j(d, u, c, Q(e)) : t.kind === "sent" ? t.res : await j(d, t.body, c, Q(e));
 		} catch (e) {
-			if (e instanceof j) return I.error(`api import: ${he(e, a)}`), 1;
+			if (e instanceof A) return F.error(`api import: ${ge(e, a)}`), 1;
 			throw e;
 		}
-		if (f.status < 200 || f.status >= 300) return I.error(`api import failed: HTTP ${f.status} — ${f.body.toString("utf8")}`), 1;
+		if (f.status < 200 || f.status >= 300) return F.error(`api import failed: HTTP ${f.status} — ${f.body.toString("utf8")}`), 1;
 		let p = JSON.parse(f.body.toString("utf8"));
-		return e.includes("--dry-run") ? (I.info("api import DRY RUN — nothing was written", {
+		return e.includes("--dry-run") ? (F.info("api import DRY RUN — nothing was written", {
 			via: t,
 			...p
-		}), I.info(Q()), 0) : (I.info("api import complete (imported by the running instance)", {
+		}), F.info(Re()), 0) : (F.info("api import complete (imported by the running instance)", {
 			via: t,
 			...p
 		}), 0);
 	}
-	if (!i) return I.error("a <bundleDir> is required for a direct import"), 1;
-	if (!await z(e)) return 1;
-	let { store: s, snapshot: c } = await G(), l = e.includes("--force"), u = (e) => I.warn(e), d = e.includes("--assets") ? S({}) : void 0, p = H() === "postgres" ? (await import("@voltro/sql-postgres")).makePgCopySession(r()) : void 0;
-	if (q(i)) {
+	if (!i) return F.error("a <bundleDir> is required for a direct import"), 1;
+	if (!await R(e)) return 1;
+	a === "replace" && e.includes("--allow-live") && !Z(e, a) && F.warn(X(!1));
+	let { store: s, snapshot: c } = await W(), l = e.includes("--force"), u = (e) => F.warn(e), d = e.includes("--assets") ? S({}) : void 0, p = V() === "postgres" ? (await import("@voltro/sql-postgres")).makePgCopySession(r()) : void 0;
+	if (K(i)) {
 		let t = await import("node:os"), n = await import("node:fs/promises"), { resolve: r, join: m } = await import("node:path"), h = await n.mkdtemp(m(t.tmpdir(), "voltro-import-"));
 		try {
-			let t = Y(r(process.cwd(), i)), n = J(e);
-			n && (t = w(t, n)), await fe(t, {
+			let t = J(r(process.cwd(), i)), n = q(e);
+			return n && (t = w(t, n)), await pe(t, {
 				dir: h,
-				blobs: ue(d ?? S({}))
-			});
-			let m = await f.runPromise(se({
-				store: s,
-				bundleDir: h,
-				mode: a,
-				onConflict: o,
-				atomic: e.includes("--atomic"),
-				verify: !e.includes("--no-verify"),
-				targetDialect: H(),
-				allowIncompatible: l,
-				targetSnapshot: c,
-				force: l,
-				onWarn: u,
-				onProgress: R,
-				assetsAlreadyRestored: !0,
-				...Le(e),
-				...p ? { copyLoader: p } : {}
-			}));
-			return Re(e, {
+				blobs: de(d ?? S({}))
+			}), Ve(e, {
 				file: i,
-				tables: m.tables.length,
-				rows: m.tables.reduce((e, t) => e + t.rowCount, 0)
+				...Be(await f.runPromise(ce({
+					store: s,
+					bundleDir: h,
+					mode: a,
+					onConflict: o,
+					atomic: Z(e, a),
+					verify: !e.includes("--no-verify"),
+					targetDialect: V(),
+					allowIncompatible: l,
+					targetSnapshot: c,
+					force: l,
+					onWarn: u,
+					onProgress: L,
+					assetsAlreadyRestored: !0,
+					...ze(e),
+					...p ? { copyLoader: p } : {}
+				})))
 			}), 0;
 		} finally {
 			await p?.close(), await n.rm(h, {
@@ -625,32 +647,31 @@ var j = class extends Error {
 			});
 		}
 	}
-	let m = await f.runPromise(se({
+	let m = await f.runPromise(ce({
 		store: s,
 		bundleDir: i,
 		mode: a,
 		onConflict: o,
-		atomic: e.includes("--atomic"),
+		atomic: Z(e, a),
 		verify: !e.includes("--no-verify"),
-		targetDialect: H(),
+		targetDialect: V(),
 		allowIncompatible: l,
 		targetSnapshot: c,
 		force: l,
 		onWarn: u,
-		onProgress: R,
-		...Le(e),
-		...d ? { assets: ce(d) } : {},
+		onProgress: L,
+		...ze(e),
+		...d ? { assets: le(d) } : {},
 		...p ? { copyLoader: p } : {}
 	})).catch((e) => {
-		throw ze(e), e;
+		throw He(e), e;
 	}).finally(() => p?.close());
-	return Re(e, {
+	return Ve(e, {
 		bundleDir: i,
-		tables: m.tables.length,
-		rows: m.tables.reduce((e, t) => e + t.rowCount, 0),
-		assets: m.assets.count
+		...Be(m),
+		assets: m.manifest.assets.count
 	}), 0;
-}, Ve = () => {
+}, We = () => {
 	let e = r();
 	return {
 		...e.url ? { url: e.url } : {},
@@ -660,75 +681,75 @@ var j = class extends Error {
 		...e.password ? { password: e.password } : {},
 		...e.database ? { database: e.database } : {}
 	};
-}, He = async (e) => {
-	let t = V(e);
-	if (!t) return I.error("usage: voltro data backup <outDir>  (native pg_dump/mysqldump/… + consistent artifact)"), 1;
-	let n = H(), { mkdir: r, writeFile: i } = await import("node:fs/promises"), { join: a } = await import("node:path");
+}, Ge = async (e) => {
+	let t = B(e);
+	if (!t) return F.error("usage: voltro data backup <outDir>  (native pg_dump/mysqldump/… + consistent artifact)"), 1;
+	let n = V(), { mkdir: r, writeFile: i } = await import("node:fs/promises"), { join: a } = await import("node:path");
 	await r(t, { recursive: !0 });
 	let o = a(t, C(n));
-	await f.runPromise(k(re(n, Ve(), o)));
-	let s = be({
+	await f.runPromise(O(re(n, We(), o)));
+	let s = xe({
 		dialect: n,
-		schemaFingerprint: await L(n),
-		voltroVersion: await we(),
+		schemaFingerprint: await I(n),
+		voltroVersion: await Te(),
 		createdAt: (/* @__PURE__ */ new Date()).toISOString()
 	});
-	return await i(a(t, N), `${JSON.stringify(s, null, 2)}\n`, "utf8"), I.info("native backup complete", {
+	return await i(a(t, M), `${JSON.stringify(s, null, 2)}\n`, "utf8"), F.info("native backup complete", {
 		dialect: n,
 		artifact: o,
-		stamp: N,
+		stamp: M,
 		schemaFingerprint: s.schemaFingerprint ?? "<none>",
 		assets: "NOT included — use `voltro data export --assets` for rows + blobs"
 	}), 0;
-}, Ue = async (e, t) => {
-	let n = H(), { join: r } = await import("node:path"), { readFile: i } = await import("node:fs/promises"), a = r(e, C(n)), o = Se({
-		flagUrl: B(t, "--drill-url"),
+}, Ke = async (e, t) => {
+	let n = V(), { join: r } = await import("node:path"), { readFile: i } = await import("node:fs/promises"), a = r(e, C(n)), o = Ce({
+		flagUrl: z(t, "--drill-url"),
 		envUrl: process.env.DRILL_DB_URL,
-		liveKeys: De()
+		liveKeys: Oe()
 	});
-	if (!o.ok) return I.error(`restore --drill: ${o.error}`), 1;
-	let s = await i(r(e, N), "utf8").then(P, () => null);
-	if (s && s.dialect !== n) return I.error(`restore --drill: backup is a ${s.dialect} dump but DB_DIALECT is ${n} — cross-dialect restore is never valid.`), 1;
-	I.info("restore drill: restoring into throwaway DB", {
+	if (!o.ok) return F.error(`restore --drill: ${o.error}`), 1;
+	let s = await i(r(e, M), "utf8").then(N, () => null);
+	if (s && s.dialect !== n) return F.error(`restore --drill: backup is a ${s.dialect} dump but DB_DIALECT is ${n} — cross-dialect restore is never valid.`), 1;
+	F.info("restore drill: restoring into throwaway DB", {
 		dialect: n,
-		target: F(o.url)
-	}), await f.runPromise(k(D(n, { url: o.url }, a)));
+		target: P(o.url)
+	}), await f.runPromise(O(D(n, { url: o.url }, a)));
 	let c = null, l = 0;
 	try {
-		let e = await U(n, { url: o.url });
+		let e = await H(n, { url: o.url });
 		c = g(e), l = e.tables.length;
 	} catch (e) {
-		return I.error(`restore --drill: could not introspect the restored DB — ${String(e)}`), 1;
+		return F.error(`restore --drill: could not introspect the restored DB — ${String(e)}`), 1;
 	}
-	let u = Ce({
+	let u = we({
 		stampFingerprint: s?.schemaFingerprint ?? null,
 		restoredFingerprint: c,
 		restoredTableCount: l
 	});
-	for (let e of u.lines) u.pass ? I.info(`restore drill: ${e}`) : I.error(`restore drill: ${e}`);
+	for (let e of u.lines) u.pass ? F.info(`restore drill: ${e}`) : F.error(`restore drill: ${e}`);
 	return +!u.pass;
-}, We = async (e) => {
-	let t = V(e);
-	if (!t) return I.error("usage: voltro data restore <backupDir> [--allow-live] [--api-url <url>] [--force] [--drill [--drill-url <url>]]  (native pg_restore/mysql/…)"), 1;
-	if (e.includes("--drill")) return Ue(t, e);
-	if (!await z(e)) return 1;
-	let n = H(), { join: r } = await import("node:path"), { readFile: i } = await import("node:fs/promises"), a = r(t, C(n)), o = xe({
-		stamp: await i(r(t, N), "utf8").then(P, () => null),
+}, qe = async (e) => {
+	let t = B(e);
+	if (!t) return F.error("usage: voltro data restore <backupDir> [--allow-live] [--api-url <url>] [--force] [--drill [--drill-url <url>]]  (native pg_restore/mysql/…)"), 1;
+	if (e.includes("--drill")) return Ke(t, e);
+	if (!await R(e)) return 1;
+	let n = V(), { join: r } = await import("node:path"), { readFile: i } = await import("node:fs/promises"), a = r(t, C(n)), o = Se({
+		stamp: await i(r(t, M), "utf8").then(N, () => null),
 		currentDialect: n,
-		currentFingerprint: await L(n)
+		currentFingerprint: await I(n)
 	});
-	for (let e of o.info) I.info(`backup stamp: ${e}`);
-	if (o.warn && I.warn(o.warn), o.refuse) {
-		if (!e.includes("--force")) return I.error(`restore refused: ${o.refuse} (pass --force to override)`), 1;
-		I.warn(`restore proceeding despite: ${o.refuse} (--force)`);
+	for (let e of o.info) F.info(`backup stamp: ${e}`);
+	if (o.warn && F.warn(o.warn), o.refuse) {
+		if (!e.includes("--force")) return F.error(`restore refused: ${o.refuse} (pass --force to override)`), 1;
+		F.warn(`restore proceeding despite: ${o.refuse} (--force)`);
 	}
-	return await f.runPromise(k(D(n, Ve(), a))), I.info("native restore complete", {
+	return await f.runPromise(O(D(n, We(), a))), F.info("native restore complete", {
 		dialect: n,
 		artifact: a
 	}), 0;
-}, Ge = async (e) => {
-	let t = V(e);
-	if (!t) return I.error("usage: voltro data inspect <file.vbundle|dir> [--json] [--passphrase <p>]"), 1;
+}, Je = async (e) => {
+	let t = B(e);
+	if (!t) return F.error("usage: voltro data inspect <file.vbundle|dir> [--json] [--passphrase <p>]"), 1;
 	let { resolve: n, join: r } = await import("node:path"), i = await import("node:fs/promises"), a = n(process.cwd(), t);
 	if ((await i.stat(a).catch(() => void 0))?.isDirectory()) {
 		let n = r(a, "manifest.json"), o = r(a, "README.md");
@@ -737,25 +758,25 @@ var j = class extends Error {
 			if (e !== void 0) return console.log(e), 0;
 		}
 		let s = await i.readFile(n, "utf8").catch(() => void 0);
-		return s === void 0 ? (I.error(`'${t}' is a directory but holds no manifest.json — is it an unpacked bundle? (a bundle exported with --target api is always unpacked into a directory, even when the path ends in .vbundle)`), 1) : (console.log(s), 0);
+		return s === void 0 ? (F.error(`'${t}' is a directory but holds no manifest.json — is it an unpacked bundle? (a bundle exported with --target api is always unpacked into a directory, even when the path ends in .vbundle)`), 1) : (console.log(s), 0);
 	}
-	let o = J(e), s = () => {
-		let e = Y(a);
+	let o = q(e), s = () => {
+		let e = J(a);
 		return o ? w(e, o) : e;
 	};
 	if (e.includes("--json")) {
 		let e = (await E(s(), ["manifest.json"])).get("manifest.json");
-		return e ? (console.log(e.toString("utf8")), 0) : (I.error("no manifest.json found in the bundle"), 1);
+		return e ? (console.log(e.toString("utf8")), 0) : (F.error("no manifest.json found in the bundle"), 1);
 	}
 	let c = (await E(s(), ["README.md"])).get("README.md");
 	if (c) return console.log(c.toString("utf8")), 0;
 	let l = (await E(s(), ["manifest.json"])).get("manifest.json");
-	return l ? (console.log(l.toString("utf8")), 0) : (I.error("bundle has no README.md or manifest.json"), 1);
-}, Ke = async (e) => {
-	let t = V(e), n = V(e.filter((e) => e !== t));
-	if (!t || !n) return I.error("usage: voltro data unpack <file.vbundle> <dir> [--passphrase <p>]"), 1;
-	let { resolve: r } = await import("node:path"), i = Y(r(process.cwd(), t)), a = J(e);
-	return a && (i = w(i, a)), await A(i, r(process.cwd(), n)), I.info("unpack complete", {
+	return l ? (console.log(l.toString("utf8")), 0) : (F.error("bundle has no README.md or manifest.json"), 1);
+}, Ye = async (e) => {
+	let t = B(e), n = B(e.filter((e) => e !== t));
+	if (!t || !n) return F.error("usage: voltro data unpack <file.vbundle> <dir> [--passphrase <p>]"), 1;
+	let { resolve: r } = await import("node:path"), i = J(r(process.cwd(), t)), a = q(e);
+	return a && (i = w(i, a)), await k(i, r(process.cwd(), n)), F.info("unpack complete", {
 		file: t,
 		dir: n
 	}), 0;
@@ -791,6 +812,7 @@ var j = class extends Error {
 			"--mode",
 			"--on-conflict",
 			"--atomic",
+			"--no-atomic",
 			"--assets",
 			"--force",
 			"--dry-run",
@@ -820,13 +842,13 @@ var j = class extends Error {
 		"--drill-url",
 		"--api-url"
 	] }
-}, qe = (e) => e.split("=")[0], Je = (e, t) => {
+}, Xe = (e) => e.split("=")[0], Ze = (e, t) => {
 	let n = $[e];
 	if (!n) return;
-	let r = B(t, "--target") === "api" ? "api" : "direct", i = /* @__PURE__ */ new Set([...n.common, ...r === "api" ? n.apiOnly ?? [] : n.directOnly ?? []]), a = new Set(r === "api" ? n.directOnly ?? [] : n.apiOnly ?? []);
+	let r = z(t, "--target") === "api" ? "api" : "direct", i = /* @__PURE__ */ new Set([...n.common, ...r === "api" ? n.apiOnly ?? [] : n.directOnly ?? []]), a = new Set(r === "api" ? n.directOnly ?? [] : n.apiOnly ?? []);
 	for (let n of t) {
 		if (!n.startsWith("--")) continue;
-		let t = qe(n);
+		let t = Xe(n);
 		if (i.has(t)) continue;
 		if (a.has(t)) return `voltro data ${e}: ${t} is not read with --target ${r} (it is a --target ${r === "api" ? "direct" : "api"} flag). Remove it, or change --target.`;
 		let o = Object.entries($).filter(([n, r]) => n !== e && [
@@ -836,13 +858,13 @@ var j = class extends Error {
 		].includes(t)).map(([e]) => e);
 		return o.length > 0 ? `voltro data ${e}: ${t} is not a \`${e}\` flag (it belongs to \`voltro data ${o.join("` / `")}\`). Remove it.` : `voltro data ${e}: unknown flag ${t}. Run \`voltro data --help\` for the flags this command reads.`;
 	}
-}, Ye = async (e) => {
+}, Qe = async (e) => {
 	let [t, ...n] = e;
 	if (t !== void 0 && $[t] !== void 0) {
-		let e = Je(t, n);
-		if (e) return I.error(e), 2;
+		let e = Ze(t, n);
+		if (e) return F.error(e), 2;
 	}
-	return t === "export" ? Ie(n) : t === "import" ? Be(n) : t === "unpack" ? Ke(n) : t === "inspect" ? Ge(n) : t === "backup" ? He(n) : t === "restore" ? We(n) : (I.error("usage: voltro data <export|import|unpack|inspect|backup|restore> … (logical: export/import; native: backup/restore)"), t ? 2 : 1);
+	return t === "export" ? Le(n) : t === "import" ? Ue(n) : t === "unpack" ? Ye(n) : t === "inspect" ? Je(n) : t === "backup" ? Ge(n) : t === "restore" ? qe(n) : (F.error("usage: voltro data <export|import|unpack|inspect|backup|restore> … (logical: export/import; native: backup/restore)"), t ? 2 : 1);
 };
 //#endregion
-export { Ye as runDataCommand };
+export { Qe as runDataCommand };