@burdenoff/fe-libs 2026.1028.9 → 2026.1028.11

package/dist/shared/assistant/attachmentCommit.js

@@ -1,7 +1,8 @@
-import { classifyFilesError as e, extractErrorMessage as t, isDefinitiveFilesRefusal as n } from "../../storage/retryPolicy.js";
-import { FilesPortAbortError as r, FilesPortError as i } from "../../storage/filesPort.js";
+import { ATTACHMENT_EDITOR_ACCESS_COPY as e } from "./attachmentAccessCopy.js";
+import { classifyFilesError as t, extractErrorMessage as n, isDefinitiveFilesRefusal as r } from "../../storage/retryPolicy.js";
+import { FilesPortAbortError as i, FilesPortError as a } from "../../storage/filesPort.js";
 //#region src/shared/assistant/attachmentCommit.ts
-var a = 5 * 1024 * 1024, o = {
+var o = 5 * 1024 * 1024, s = {
 	concurrency: 2,
 	gatewayAttempts: 2,
 	gatewayRetryDelayMs: 1500,
@@ -14,7 +15,8 @@ var a = 5 * 1024 * 1024, o = {
 	discardAttempts: 2,
 	finalDrainRounds: 3,
 	finalDrainDelayMs: 5e3
-}, s = {
+}, c = {
+	editorAccessRequired: "ATTACHMENT_EDITOR_ACCESS_REQUIRED",
 	quotaNotProvisioned: "QUOTA_NOT_PROVISIONED",
 	quotaExceeded: "QUOTA_EXCEEDED",
 	tooLarge: "ATTACHMENT_TOO_LARGE_FOR_DIRECT_UPLOAD",
@@ -22,16 +24,19 @@ var a = 5 * 1024 * 1024, o = {
 	noDownloadUrl: "ATTACHMENT_NO_DOWNLOAD_URL",
 	timeout: "ATTACHMENT_SAVE_TIMEOUT",
 	uploadFailed: "ATTACHMENT_UPLOAD_FAILED",
-	folderFailed: "ATTACHMENT_FOLDER_FAILED"
-}, c = {
-	[s.quotaNotProvisioned]: "This workspace has no file storage, so the attachment could not be saved.",
-	[s.quotaExceeded]: "There is not enough file storage left for these attachments.",
-	[s.tooLarge]: "This file is over 5 MB and cannot be saved to Files.",
-	[s.noBytes]: "The file is empty or no longer available.",
-	[s.noDownloadUrl]: "The file was saved but could not be linked.",
-	[s.timeout]: "Saving took too long."
-}, l = () => {};
-function u(e, t) {
+	folderFailed: "ATTACHMENT_FOLDER_FAILED",
+	pendingUpload: "ATTACHMENT_UPLOAD_UNRESOLVED"
+}, l = {
+	[c.editorAccessRequired]: e.fallback,
+	[c.quotaNotProvisioned]: "This workspace has no file storage, so the attachment could not be saved.",
+	[c.quotaExceeded]: "There is not enough file storage left for these attachments.",
+	[c.tooLarge]: "This file is over 5 MB and cannot be saved to Files.",
+	[c.noBytes]: "The file is empty or no longer available.",
+	[c.noDownloadUrl]: "The file was saved but could not be linked.",
+	[c.timeout]: "Saving took too long.",
+	[c.pendingUpload]: "The previous upload is still being checked. Try Send again shortly."
+}, u = () => {};
+function d(e, t) {
 	return new Promise((n) => {
 		if (t?.aborted) {
 			n();
@@ -45,86 +50,86 @@ function u(e, t) {
 		t?.addEventListener("abort", r, { once: !0 });
 	});
 }
-function d(e) {
-	return e instanceof r || e instanceof Error && e.name === "AbortError";
-}
 function f(e) {
-	return e instanceof i ? e.source : e;
+	return e instanceof i || e instanceof Error && e.name === "AbortError";
 }
-function p(t) {
-	return e(f(t));
+function p(e) {
+	return e instanceof a ? e.source : e;
 }
 function m(e) {
-	let t = f(e);
+	return t(p(e));
+}
+function h(e) {
+	let t = p(e);
 	if (!t || typeof t != "object") return [];
 	let n = t;
 	return (n.errors ?? n.graphQLErrors ?? []).map((e) => e.extensions?.code).filter((e) => typeof e == "string");
 }
-function h(e) {
-	return m(e)[0];
-}
 function g(e) {
-	return n(f(e));
+	return h(e)[0];
 }
 function _(e) {
-	return d(e) || p(e) !== null ? !0 : !g(e);
+	return r(p(e));
 }
-function v(e, n) {
-	return e instanceof i && e.message ? e.message : t(e) ?? n;
+function v(e) {
+	return f(e) || m(e) !== null ? !0 : !_(e);
 }
-function y(e, t, n) {
-	return t.aborted ? (e.then((e) => n?.(e), l), Promise.reject(new r())) : new Promise((i, a) => {
+function y(e, t) {
+	return e instanceof a && e.message ? e.message : n(e) ?? t;
+}
+function b(e, t, n) {
+	return t.aborted ? (e.then((e) => n?.(e), u), Promise.reject(new i())) : new Promise((r, a) => {
 		let o = !1, s = () => {
-			o || (o = !0, a(new r()));
+			o || (o = !0, a(new i()));
 		};
 		t.addEventListener("abort", s, { once: !0 }), e.then((e) => {
 			if (t.removeEventListener("abort", s), o) {
 				n?.(e);
 				return;
 			}
-			o = !0, i(e);
+			o = !0, r(e);
 		}, (e) => {
 			t.removeEventListener("abort", s), !o && (o = !0, a(e));
 		});
 	});
 }
-function b(e) {
+function x(e) {
 	return e.includes(".") ? e.substring(e.lastIndexOf(".") + 1) : "";
 }
-function x(e, t) {
+function S(e, t) {
 	e.reason === "none" && (e.reason = t), e.abort();
 }
-function S(e) {
-	if (e.signal.aborted) throw new r();
+function C(e) {
+	if (e.signal.aborted) throw new i();
 }
-async function C(e, t, n) {
+async function w(e, t, n) {
 	for (let r = 1;; r += 1) {
-		S(e);
+		C(e);
 		try {
-			return await y(t(), e.signal, n);
+			return await b(t(), e.signal, n);
 		} catch (t) {
-			if (d(t) || e.signal.aborted || r >= e.policy.gatewayAttempts || p(t) === null) throw t;
+			if (f(t) || e.signal.aborted || r >= e.policy.gatewayAttempts || m(t) === null) throw t;
 			await e.sleep(e.policy.gatewayRetryDelayMs, e.signal);
 		}
 	}
 }
-function w(e, t) {
-	return new Promise((n, i) => {
+function T(e, t) {
+	return new Promise((n, r) => {
 		let a = !1, o = new AbortController();
 		t.then((e) => {
 			a = !0, o.abort(), n(e);
 		}, (e) => {
-			a = !0, o.abort(), i(e);
+			a = !0, o.abort(), r(e);
 		});
 		let s = () => {
 			e.sleep(e.policy.settleGraceMs, o.signal).then(() => {
-				a || o.signal.aborted || (a = !0, i(new r()));
+				a || o.signal.aborted || (a = !0, r(new i()));
 			});
 		};
 		e.signal.aborted ? s() : e.signal.addEventListener("abort", s, { once: !0 });
 	});
 }
-function T(e) {
+function E(e) {
 	if (!e) return {
 		state: "other",
 		status: "MISSING"
@@ -138,61 +143,61 @@ function T(e) {
 		status: t
 	};
 }
-async function E(e, t) {
+async function D(e, t) {
 	for (let n = 1; n <= e.policy.lookupAttempts; n += 1) try {
-		return T(await e.port.getSession(t));
+		return E(await e.port.getSession(t));
 	} catch (t) {
-		if (p(t) === null) break;
+		if (m(t) === null) break;
 		n < e.policy.lookupAttempts && await e.sleep(e.policy.lookupRetryDelayMs);
 	}
 	try {
 		let n = (await e.port.listSessions()).find((e) => e.id === t);
-		return n ? T(n) : { state: "unknown" };
+		return n ? E(n) : { state: "unknown" };
 	} catch {
 		return { state: "unknown" };
 	}
 }
-function D(e, t, n) {
+function O(e, t, n) {
 	let r = Math.max(0, Math.min(100, Math.round(n)));
 	r !== t.lastProgress && (t.lastProgress = r, e.patch(t, { progress: r }));
 }
-async function O(e, t) {
+async function k(e, t) {
 	let { attachment: n, blob: r } = t.draft;
 	if (!r) throw Error("no bytes");
-	let a = await C(e, () => e.port.initiate({
+	let i = await w(e, () => e.port.initiate({
 		fileName: n.filename,
 		fileSize: r.size,
 		mimeType: n.mimeType,
-		extension: b(n.filename)
+		extension: x(n.filename)
 	}), (t) => {
-		e.port.abort(t.sessionId).catch(l);
+		e.port.abort(t.sessionId).catch(u);
 	});
-	if (t.sessionId = a.sessionId, !a.uploadUrl) throw new k(s.tooLarge);
-	D(e, t, 5);
+	if (t.sessionId = i.sessionId, !i.uploadUrl) throw new A(c.tooLarge);
+	O(e, t, 5);
 	for (let o = 0;; o += 1) {
-		S(e);
+		C(e);
 		try {
 			await e.port.put({
-				url: a.uploadUrl,
+				url: i.uploadUrl,
 				blob: r,
 				mimeType: n.mimeType,
 				signal: e.signal,
-				onProgress: (n) => D(e, t, 5 + n * 85)
+				onProgress: (n) => O(e, t, 5 + n * 85)
 			});
 			return;
 		} catch (t) {
-			if (d(t) || e.signal.aborted || !(t instanceof i && (t.httpStatus === void 0 || t.httpStatus >= 500)) || o >= e.policy.putRetries) throw t;
+			if (f(t) || e.signal.aborted || !(t instanceof a && (t.httpStatus === void 0 || t.httpStatus >= 500)) || o >= e.policy.putRetries) throw t;
 			await e.sleep(e.policy.putRetryDelayMs, e.signal);
 		}
 	}
 }
-var k = class extends Error {
+var A = class extends Error {
 	code;
 	constructor(e, t) {
-		super(t ?? c[e] ?? e), this.code = e, this.name = "AttachmentCommitError";
+		super(t ?? l[e] ?? e), this.code = e, this.name = "AttachmentCommitError";
 	}
 };
-async function A(e, t, n) {
+async function j(e, t, n) {
 	let r = t.draft.blob, i = t.sessionId;
 	if (!r || !i) throw Error("not staged");
 	let a = {
@@ -201,17 +206,17 @@ async function A(e, t, n) {
 		folderId: n
 	};
 	t.completeIssued = !0;
-	let o, c;
+	let o, s;
 	try {
-		o = await w(e, e.port.complete(a));
+		o = await T(e, e.port.complete(a));
 	} catch (e) {
-		c = e;
+		s = e;
 	}
 	let l = 0;
 	for (; !o;) {
-		if (!_(c)) throw t.completeRefused = l === 0, l > 0 && (t.unresolved = !0), c;
-		if (e.signal.aborted) throw t.unresolved = !0, c;
-		let r = await E(e, i);
+		if (!v(s)) throw t.completeRefused = l === 0, l > 0 && (t.unresolved = !0), s;
+		if (e.signal.aborted) throw t.unresolved = !0, s;
+		let r = await D(e, i);
 		if (r.state === "finalized") {
 			t.fileId = r.fileId, o = {
 				fileId: r.fileId,
@@ -221,51 +226,44 @@ async function A(e, t, n) {
 			};
 			break;
 		}
-		if (r.state === "in-progress" && !e.signal.aborted && p(c) !== null && l < e.policy.completeReissues) {
+		if (r.state === "in-progress" && !e.signal.aborted && m(s) !== null && l < e.policy.completeReissues) {
 			l += 1;
 			try {
-				o = await w(e, e.port.complete(a));
+				o = await T(e, e.port.complete(a));
 			} catch (e) {
-				c = e;
+				s = e;
 			}
 			continue;
 		}
-		throw (r.state === "unknown" || r.state === "in-progress" || d(c)) && (t.unresolved = !0), c;
+		throw (r.state === "unknown" || r.state === "in-progress" || f(s)) && (t.unresolved = !0), s;
 	}
-	t.fileId = o.fileId;
-	let u = o.downloadUrl ?? await C(e, () => e.port.getDownloadUrl(o.fileId)).catch((e) => {
-		if (d(e)) throw e;
+	t.fileId = o.fileId, M(e, t.draft.attachment.id, { fileId: t.fileId });
+	let u = o.downloadUrl ?? await w(e, () => e.port.getDownloadUrl(o.fileId)).catch((e) => {
+		if (f(e)) throw e;
 		return null;
 	});
-	if (!u) throw new k(s.noDownloadUrl);
-	t.downloadUrl = u, t.urlResolvedAt = e.now(), t.done = !0;
-}
-async function j(e, t) {
-	for (let n = 1;; n += 1) try {
-		return await t();
-	} catch (t) {
-		if (n >= e.policy.discardAttempts || p(t) === null) throw t;
-		await e.sleep(e.policy.gatewayRetryDelayMs);
-	}
+	if (!u) throw new A(c.noDownloadUrl);
+	t.downloadUrl = u, t.urlResolvedAt = e.now(), t.done = !0, M(e, t.draft.attachment.id, {
+		fileId: t.fileId,
+		downloadUrl: t.downloadUrl,
+		urlResolvedAt: t.urlResolvedAt
+	});
 }
-async function M(e, t) {
-	try {
-		await j(e, () => e.port.deleteFile(t)) || e.store.entries.push({
-			kind: "file",
-			fileId: t
-		});
-	} catch {
-		e.store.entries.push({
-			kind: "file",
-			fileId: t
-		});
-	}
+function M(e, t, n) {
+	let r = e.store.retained ??= /* @__PURE__ */ new Map(), i = {
+		...r.get(t),
+		...n
+	};
+	r.set(t, i);
 }
 async function N(e, t) {
 	if (!t.handedOver) {
 		if (t.fileId) {
-			let n = t.fileId;
-			t.fileId = void 0, t.done = !1, await M(e, n);
+			M(e, t.draft.attachment.id, {
+				fileId: t.fileId,
+				downloadUrl: t.downloadUrl,
+				urlResolvedAt: t.urlResolvedAt
+			});
 			return;
 		}
 		if (t.sessionId) {
@@ -277,7 +275,8 @@ async function N(e, t) {
 			}
 			t.unresolved && (t.unresolved = !1, e.store.entries.push({
 				kind: "session",
-				sessionId: t.sessionId
+				sessionId: t.sessionId,
+				attachmentId: t.draft.attachment.id
 			}));
 		}
 	}
@@ -298,35 +297,32 @@ async function F(e, t, n) {
 	let i = {
 		port: e,
 		policy: {
-			...o,
+			...s,
 			...n.policy
 		},
-		sleep: n.sleep ?? u,
+		sleep: n.sleep ?? d,
 		store: t
 	};
 	for (let e of r) {
-		if (e.kind === "file") {
-			await M(i, e.fileId);
-			continue;
-		}
-		let n = await E(i, e.sessionId);
-		n.state === "finalized" ? await M(i, n.fileId) : (n.state === "unknown" || n.state === "in-progress") && t.entries.push(e);
+		if (e.kind === "file") continue;
+		let n = await D(i, e.sessionId);
+		n.state === "finalized" ? e.attachmentId && M(i, e.attachmentId, { fileId: n.fileId }) : (n.state === "unknown" || n.state === "in-progress") && t.entries.push(e);
 	}
 }
 function I(e, t) {
-	let n = t instanceof k ? t : null;
+	let n = t instanceof A ? t : null;
 	return {
 		id: e.draft.attachment.id,
-		message: n ? n.message : v(t, "The attachment could not be saved."),
-		code: n ? n.code : h(t) ?? s.uploadFailed
+		message: n ? n.message : y(t, "The attachment could not be saved."),
+		code: n ? n.code : g(t) ?? c.uploadFailed
 	};
 }
 function L(e) {
-	return !e.attachment.fileId && !e.attachment.inlineOnly;
+	return !(e.attachment.fileId && e.attachment.downloadUrl) && !e.attachment.inlineOnly;
 }
 async function R(e) {
 	let t = e.mode ?? "all-or-nothing", n = {
-		...o,
+		...s,
 		...e.policy
 	}, r = e.pendingDiscard ?? { entries: [] }, i = new AbortController(), a = {
 		port: e.port,
@@ -335,13 +331,19 @@ async function R(e) {
 		reason: "none",
 		policy: n,
 		now: e.now ?? (() => Date.now()),
-		sleep: e.sleep ?? u,
+		sleep: e.sleep ?? d,
 		patch: (t, n) => e.onChange?.(t.draft.attachment.id, n),
 		store: r
-	}, s = [];
-	for (let t of e.drafts) L(t) && s.push({
-		index: s.length,
+	}, o = [];
+	for (let t of e.drafts) L(t) && o.push({
+		index: o.length,
 		draft: t,
+		...r.retained?.get(t.attachment.id),
+		...t.attachment.fileId ? {
+			fileId: t.attachment.fileId,
+			downloadUrl: t.attachment.downloadUrl,
+			urlResolvedAt: t.attachment.urlResolvedAt
+		} : {},
 		completeIssued: !1,
 		completeRefused: !1,
 		unresolved: !1,
@@ -351,84 +353,115 @@ async function R(e) {
 		stopped: !1,
 		lastProgress: -1
 	});
-	let c = new AbortController(), l = () => x(a, "cancelled");
+	let c = new AbortController(), l = () => S(a, "cancelled");
 	e.signal?.aborted ? l() : e.signal?.addEventListener("abort", l, { once: !0 });
 	try {
-		s.length > 0 && await z(a, s, e, t, c);
+		o.length > 0 && await z(a, o, e, t, c);
 	} catch (e) {
-		for (let t of s) t.failure ??= I(t, e);
-		x(a, "failed");
+		for (let t of o) t.failure ??= I(t, e);
+		S(a, "failed");
 	} finally {
 		c.abort(), e.signal?.removeEventListener("abort", l);
 	}
-	return H(a, s, e, t);
+	return H(a, o, e, t);
 }
-async function z(e, t, n, r, a) {
+async function z(e, t, n, r, i) {
 	let o = r === "all-or-nothing";
 	for (let e of t) {
+		if (e.fileId) continue;
 		let t = e.draft.blob;
-		!t || t.size === 0 ? e.failure = I(e, new k(s.noBytes)) : t.size > 5242880 && (e.failure = I(e, new k(s.tooLarge)));
+		!t || t.size === 0 ? e.failure = I(e, new A(c.noBytes)) : t.size > 5242880 && (e.failure = I(e, new A(c.tooLarge)));
 	}
 	if (o && t.some((e) => e.failure)) {
-		x(e, "failed");
+		S(e, "failed");
 		return;
 	}
-	let c = t.filter((e) => !e.failure);
-	if (c.length === 0) return;
-	for (let t of c) e.patch(t, {
+	let s = t.filter((e) => !e.failure);
+	if (s.length === 0) return;
+	for (let t of s) e.patch(t, {
 		status: "uploading",
 		progress: 0,
 		saveError: void 0,
+		saveErrorCode: void 0,
 		progressNote: void 0
 	}), t.lastProgress = 0;
-	n.budgetMs !== void 0 && e.sleep(n.budgetMs, a.signal).then(() => {
-		a.signal.aborted || x(e, "budget");
+	n.budgetMs !== void 0 && e.sleep(n.budgetMs, i.signal).then(() => {
+		i.signal.aborted || S(e, "budget");
 	});
 	try {
-		await y(P(e.port, e.store, {
+		await b(P(e.port, e.store, {
 			sleep: e.sleep,
 			policy: e.policy
 		}), e.signal);
-		let t = await V(e, c, o);
-		if (t) {
-			for (let e of c) e.failure = I(e, t);
-			x(e, "failed");
+		let t = "unknown";
+		try {
+			n.preflightAccess && (t = await b(n.preflightAccess(), e.signal));
+		} catch (e) {
+			if (f(e)) throw e;
+		}
+		if (t === "denied") {
+			let t = new A(c.editorAccessRequired);
+			for (let e of s) e.failure = I(e, t);
+			S(e, "failed");
+			return;
+		}
+		for (let t of s) if (Object.assign(t, e.store.retained?.get(t.draft.attachment.id)), t.fileId) try {
+			if (t.downloadUrl ??= await w(e, () => e.port.getDownloadUrl(t.fileId)) ?? void 0, !t.downloadUrl) throw new A(c.noDownloadUrl);
+			t.urlResolvedAt ??= e.now(), t.done = !0, M(e, t.draft.attachment.id, {
+				fileId: t.fileId,
+				downloadUrl: t.downloadUrl,
+				urlResolvedAt: t.urlResolvedAt
+			});
+		} catch (e) {
+			if (f(e)) throw e;
+			t.failure = I(t, e);
+		}
+		else e.store.entries.some((e) => e.kind === "session" && e.attachmentId === t.draft.attachment.id) && (t.failure = I(t, new A(c.pendingUpload)));
+		if (o && s.some((e) => e.failure)) {
+			S(e, "failed");
+			return;
+		}
+		if (s = s.filter((e) => !e.done && !e.failure), s.length === 0) return;
+		let r = await V(e, s, o);
+		if (r) {
+			for (let e of s) e.failure = I(e, r);
+			S(e, "failed");
 			return;
 		}
-		if (c = c.filter((e) => !e.failure), c.length === 0) {
-			x(e, "failed");
+		if (s = s.filter((e) => !e.failure), s.length === 0) {
+			S(e, "failed");
 			return;
 		}
 	} catch (e) {
-		if (!d(e)) throw e;
+		if (!f(e)) throw e;
 		return;
 	}
 	let l = 0;
-	if (await Promise.all(Array.from({ length: Math.min(B(e), c.length) }, async () => {
+	if (await Promise.all(Array.from({ length: Math.min(B(e), s.length) }, async () => {
 		for (;;) {
 			if (e.signal.aborted) return;
-			let t = c[l];
+			let t = s[l];
 			if (l += 1, !t) return;
 			try {
-				await O(e, t), t.staged = !0;
+				await k(e, t), t.staged = !0;
 			} catch (n) {
-				d(n) ? t.stopped = !0 : (t.failure = I(t, n), o && x(e, "failed"));
+				f(n) ? t.stopped = !0 : (t.failure = I(t, n), o && S(e, "failed"));
 			}
 		}
 	})), e.signal.aborted) return;
-	let u = c.filter((e) => e.staged && !e.failure);
+	let u = s.filter((e) => e.staged && !e.failure);
 	if (u.length === 0) {
-		x(e, "failed");
+		S(e, "failed");
 		return;
 	}
-	let f;
+	let d;
 	try {
-		f = (await C(e, () => e.port.ensureFolder(n.folderPath))).id;
+		d = (await w(e, () => e.port.ensureFolder(n.folderPath))).id;
 	} catch (t) {
-		if (!d(t)) {
-			let n = t instanceof i ? t : new k(s.folderFailed);
+		if (!f(t)) {
+			let n = t instanceof a ? t : new A(c.folderFailed);
 			for (let e of u) e.failure = I(e, n);
-			x(e, "failed");
+			S(e, "failed");
 		}
 		return;
 	}
@@ -438,9 +471,9 @@ async function z(e, t, n, r, a) {
 			break;
 		}
 		try {
-			await A(e, t, f), D(e, t, 100);
+			await j(e, t, d), O(e, t, 100);
 		} catch (n) {
-			if (d(n) ? t.stopped = !0 : (t.failure = I(t, n), o && x(e, "failed")), o) break;
+			if (f(n) ? t.stopped = !0 : (t.failure = I(t, n), o && S(e, "failed")), o) break;
 		}
 	}
 }
@@ -451,16 +484,16 @@ async function V(e, t, n) {
 	if (!e.port.getStorageQuota) return null;
 	let r;
 	try {
-		r = await y(e.port.getStorageQuota(), e.signal);
+		r = await b(e.port.getStorageQuota(), e.signal);
 	} catch (e) {
-		if (d(e)) throw e;
+		if (f(e)) throw e;
 		return null;
 	}
-	if (r.state === "not-provisioned") return new k(s.quotaNotProvisioned);
+	if (r.state === "not-provisioned") return new A(c.quotaNotProvisioned);
 	if (r.state === "ok" && r.remainingBytes !== null) {
 		let e = (e) => e.draft.blob?.size ?? 0;
 		if (t.reduce((t, n) => t + e(n), 0) > r.remainingBytes) {
-			let i = new k(s.quotaExceeded);
+			let i = new A(c.quotaExceeded);
 			if (n) return i;
 			let a = r.remainingBytes;
 			for (let n of t) e(n) <= a ? a -= e(n) : n.failure = I(n, i);
@@ -470,22 +503,27 @@ async function V(e, t, n) {
 }
 async function H(e, t, n, r) {
 	let i = r === "all-or-nothing";
-	if (e.reason === "budget") for (let e of t) !e.done && !e.failure && (e.failure = I(e, new k(s.timeout)));
-	let a = e.reason === "cancelled", o = t.some((e) => e.failure), c = t.every((e) => e.done), l = !a && (i ? c && !o : !0), u = l ? t.filter((e) => !e.done) : t;
+	if (e.reason === "budget") for (let e of t) !e.done && !e.failure && (e.failure = I(e, new A(c.timeout)));
+	let a = e.reason === "cancelled", o = t.some((e) => e.failure), s = t.every((e) => e.done), l = !a && (i ? s && !o : !0), u = l ? t.filter((e) => !e.done) : t;
 	for (let t of u) await N(e, t);
-	for (let n of t) l && n.done ? e.patch(n, {
+	for (let n of t) n.done && l ? e.patch(n, {
 		status: "ready",
 		fileId: n.fileId,
 		downloadUrl: n.downloadUrl,
 		urlResolvedAt: n.urlResolvedAt,
 		progress: void 0,
 		saveError: void 0,
+		saveErrorCode: void 0,
 		progressNote: void 0
 	}) : e.patch(n, {
 		status: "ready",
+		fileId: void 0,
+		downloadUrl: void 0,
+		urlResolvedAt: void 0,
 		progress: void 0,
 		progressNote: void 0,
-		saveError: a ? void 0 : n.failure?.message
+		saveError: a ? void 0 : n.failure?.message,
+		saveErrorCode: a ? void 0 : n.failure?.code
 	});
 	let d = t.flatMap((e) => e.failure ? [e.failure] : []);
 	if (!l) return {
@@ -505,6 +543,7 @@ async function H(e, t, n, r) {
 			urlResolvedAt: t.urlResolvedAt,
 			progress: void 0,
 			saveError: void 0,
+			saveErrorCode: void 0,
 			progressNote: void 0
 		}) : p.push(e.attachment);
 	}
@@ -514,7 +553,7 @@ async function H(e, t, n, r) {
 		attachments: p,
 		dropped: d,
 		handedOver: () => {
-			for (let e of m) e.handedOver = !0;
+			for (let t of m) t.handedOver = !0, e.store.retained?.delete(t.draft.attachment.id);
 		},
 		rollback: async () => {
 			for (let t of m) t.handedOver || (await N(e, t), e.patch(t, {
@@ -526,56 +565,73 @@ async function H(e, t, n, r) {
 	};
 }
 function U(e) {
-	let t = { entries: [] }, n = null, r = null, i = /* @__PURE__ */ new Set(), a = (e) => {
+	let t = { entries: [] }, n = e.getScopeKey?.(), r = () => {
+		let r = e.getScopeKey?.();
+		return r !== n && (n = r, t = { entries: [] }), t;
+	}, i = null, a = null, o = /* @__PURE__ */ new Set(), c = (e) => {
 		let t = e.catch(() => void 0).then(() => {
-			i.delete(t);
+			o.delete(t);
 		});
-		return i.add(t), e;
+		return o.add(t), e;
 	};
 	return {
-		commit: (i, o = {}) => {
-			if (n) return n;
+		commit: (t, o = {}) => {
+			if (i) return i;
 			let s = new AbortController();
-			r = s;
-			let c = o.signal;
-			c?.aborted ? s.abort() : c?.addEventListener("abort", () => s.abort(), { once: !0 });
-			let l = R({
+			a = s;
+			let l = o.signal;
+			l?.aborted ? s.abort() : l?.addEventListener("abort", () => s.abort(), { once: !0 });
+			let u = r(), d = n, f = new Set(t.map((e) => e.attachment.id));
+			for (let e of u.retained?.keys() ?? []) f.has(e) || u.retained?.delete(e);
+			let p = R({
 				port: e.port,
+				preflightAccess: e.preflightAccess,
 				folderPath: e.folderPath,
-				drafts: i,
+				drafts: t,
 				signal: s.signal,
 				mode: o.mode,
 				budgetMs: o.budgetMs,
-				onChange: e.onChange,
-				pendingDiscard: t,
+				onChange: (t, n) => {
+					e.getScopeKey?.() === d && e.onChange?.(t, n);
+				},
+				pendingDiscard: u,
 				policy: e.policy,
 				now: e.now,
 				sleep: e.sleep
-			}).then((e) => e.ok ? {
-				...e,
-				rollback: () => a(e.rollback())
-			} : e).finally(() => {
-				n = null, r = null;
+			}).then(async (t) => t.ok ? e.getScopeKey?.() === d ? {
+				...t,
+				rollback: () => c(t.rollback())
+			} : (await t.rollback(), {
+				ok: !1,
+				cancelled: !0,
+				failures: [],
+				message: void 0
+			}) : t).finally(() => {
+				i = null, a = null;
 			});
-			return n = l, l;
+			return i = p, p;
 		},
-		cancel: () => r?.abort(),
+		cancel: () => a?.abort(),
 		get isCommitting() {
-			return n !== null;
+			return i !== null;
 		},
 		discardPending: async () => {
-			let r = n;
-			for (r && await r.catch(() => void 0); i.size > 0;) await Promise.all([...i]);
-			let a = () => P(e.port, t, {
+			if (e.getScopeKey?.() !== n) {
+				r();
+				return;
+			}
+			let a = t, c = n, l = i;
+			for (l && await l.catch(() => void 0); o.size > 0;) await Promise.all([...o]);
+			let u = () => e.getScopeKey?.() === c ? P(e.port, a, {
 				sleep: e.sleep,
 				policy: e.policy
-			});
-			await a();
-			let s = {
-				...o,
+			}) : Promise.resolve();
+			await u();
+			let f = {
+				...s,
 				...e.policy
-			}, c = e.sleep ?? u;
-			for (let e = 1; e <= s.finalDrainRounds && t.entries.length > 0; e += 1) await c(s.finalDrainDelayMs * e), await a();
+			}, p = e.sleep ?? d;
+			for (let t = 1; t <= f.finalDrainRounds && a.entries.length > 0 && e.getScopeKey?.() === c; t += 1) await p(f.finalDrainDelayMs * t), await u();
 		},
 		get pendingDiscard() {
 			return t.entries;
@@ -602,4 +658,4 @@ async function K(e, t, n = Date.now()) {
 	}));
 }
 //#endregion
-export { s as ATTACHMENT_COMMIT_CODES, o as ATTACHMENT_COMMIT_POLICY, a as ATTACHMENT_DIRECT_UPLOAD_MAX_BYTES, W as ATTACHMENT_URL_MAX_AGE_MS, G as attachmentUrlIsStale, R as commitAttachments, U as createAttachmentCommitter, P as drainPendingDiscards, K as refreshStaleAttachmentUrls };
+export { c as ATTACHMENT_COMMIT_CODES, s as ATTACHMENT_COMMIT_POLICY, o as ATTACHMENT_DIRECT_UPLOAD_MAX_BYTES, W as ATTACHMENT_URL_MAX_AGE_MS, G as attachmentUrlIsStale, R as commitAttachments, U as createAttachmentCommitter, P as drainPendingDiscards, K as refreshStaleAttachmentUrls };