@aiao/rxdb-plugin-sync 0.0.26 → 0.0.28

package/dist/index.js

@@ -1,164 +1,153 @@
-import { ConflictDetectedEvent as e, ConflictPendingEvent as t, ENTITY_REMOTE_CREATE_EVENT as n, ENTITY_REMOTE_REMOVE_EVENT as r, ENTITY_REMOTE_UPDATE_EVENT as i, LWWConflictResolver as a, RelationKind as o, RepositorySyncBeginEvent as s, RepositorySyncCompleteEvent as c, RepositorySyncErrorEvent as l, RxDBBranch as u, RxDBChange as d, RxDBDependencyFailedError as f, RxDBError as p, RxDBPartialSyncError as m, RxDBPluginBase as h, RxDBSync as g, SYNC_DISABLED_REASON as _, SyncBeginEvent as v, SyncCompleteEvent as y, SyncErrorEvent as b, buildOfflineWriteRepositoryRules as x, compactChanges as S, findCurrentSyncRecord as C, getCurrentBranch as w, getEntityMetadata as T, getLocalSystemRepositories as E, getOrCreateSyncRecord as D, getRemoteSystemRepositories as O, getRxDBChangeEntityIdQueryValues as k, getRxDBChangeKey as A, getRxDBEntityIdentityKey as j, getSyncCapability as M, getSyncType as N, isRepositorySyncEnabled as P, isSystemEntity as ee, needsPull as te, needsPush as ne, repositoryKey as F, resolvePullIneligibility as re, resolvePushIneligibility as ie } from "@aiao/rxdb";
-import { combineLatest as ae, firstValueFrom as I, merge as oe } from "rxjs";
-import { isIgnorableDetachedVersionEventError as se } from "@aiao/rxdb-plugin-history";
-//#region src/query-cache-outbox.ts
-var ce = {
-	INSERT: {
-		kind: "replay",
-		verb: "create"
-	},
-	UPDATE: {
-		kind: "discard",
-		repair: "drop"
-	},
-	DELETE: { kind: "noop" }
-}, le = {
-	INSERT: "update",
-	UPDATE: "update",
-	DELETE: "delete"
-}, ue = [/* @__PURE__ */ new Set(["DELETE"]), /* @__PURE__ */ new Set(["INSERT", "UPDATE"])], de = /* @__PURE__ */ new WeakMap();
-function fe(e, t, n, r) {
-	let i = de.get(e) ?? /* @__PURE__ */ new Map();
-	de.set(e, i);
-	let o = `${t}:${n}`, s = i.get(o);
-	if (s) return s;
-	let c = me(e, t, n, r?.conflictResolver ?? new a()).finally(() => {
-		i.delete(o);
-	});
-	return i.set(o, c), c;
+import { ConflictDetectedEvent as e, ConflictPendingEvent as t, ENTITY_REMOTE_CREATE_EVENT as n, ENTITY_REMOTE_REMOVE_EVENT as r, ENTITY_REMOTE_UPDATE_EVENT as i, InvalidBranchIdError as a, LWWConflictResolver as o, MAIN_BRANCH_ID as s, RelationKind as c, RepositorySyncBeginEvent as l, RepositorySyncCompleteEvent as u, RepositorySyncErrorEvent as d, RxDBBranch as f, RxDBChange as p, RxDBDependencyFailedError as m, RxDBError as h, RxDBPartialSyncError as g, RxDBPluginBase as _, RxDBSync as v, SWITCH_BRANCH_BEGIN as y, SWITCH_BRANCH_COMMIT as b, SYNC_DISABLED_REASON as x, SyncBeginEvent as S, SyncCompleteEvent as C, SyncErrorEvent as w, TrustedWriteIntent as T, assertSingleActiveBranch as E, assertUsableBranchId as D, branchMaterializationPageFingerprint as ee, buildOfflineWriteRepositoryRules as te, canonicalMaterializationJson as O, compactChanges as k, declareTrustedWrite as ne, findCurrentSyncRecord as re, getCurrentBranch as ie, getEntityMetadata as A, getLocalSystemRepositories as j, getOrCreateSyncRecord as M, getRemoteSystemRepositories as ae, getRxDBChangeEntityIdQueryValues as oe, getRxDBChangeKey as N, getRxDBEntityIdentityKey as se, getSyncCapability as P, getSyncConfig as ce, getSyncType as F, isRepositorySyncEnabled as I, isSystemEntity as le, needsPull as ue, repositoryKey as L, resolvePullIneligibility as de, resolvePushIneligibility as fe } from "@aiao/rxdb";
+import { combineLatest as pe, firstValueFrom as R, merge as me } from "rxjs";
+import { isIgnorableDetachedVersionEventError as he } from "@aiao/rxdb-plugin-history";
+//#region src/branch-utils.ts
+async function ge(e, t) {
+	if (t === s) return [t];
+	let { adapter: n } = await e.getLocalRepositories();
+	return _e(n.getRepository(f), t);
 }
-var pe = (e, t) => ({
-	repository: {
-		namespace: e,
-		entity: t
-	},
-	originalCount: 0,
-	compacted: 0,
-	replayed: 0,
-	discarded: 0,
-	noop: 0,
-	watermark: null,
-	conflicts: [],
-	failures: []
-});
-async function me(e, t, n, r) {
-	let i = ve(e, t, n), a = await w(e), { adapter: o } = await E(e), s = o, c = s.getRepository(g), l = await D(c, {
-		namespace: t,
-		entity: n,
-		branchId: a.id,
-		syncType: i
-	}, () => e.entityManager.instantiate(g));
-	if (!P(l)) return {
-		...pe(t, n),
-		skipped: _
-	};
-	let u = await ye(s.getRepository(d), t, n, a.id, l.lastPushedChangeId);
-	if (u.length === 0) return pe(t, n);
-	let f = u.reduce((e, t) => t.id > e ? t.id : e, u[0].id), p = be(u), m = {
-		...pe(t, n),
-		originalCount: u.length
-	};
-	if (p.length === 0) return await c.update(l, {
-		lastPushedChangeId: f,
-		updatedAt: /* @__PURE__ */ new Date()
-	}), {
-		...m,
-		compacted: u.length,
-		watermark: f
-	};
-	let h = await I(e.remoteAdapter$), v = {
-		...m,
-		compacted: u.length - p.length,
-		restoreIds: [],
-		dropIds: [],
-		settled: /* @__PURE__ */ new Set()
-	}, y = await Ce(h, n, p, e, v);
-	if (y && await we(p, y, {
-		rxdb: e,
-		entity: n,
-		remoteAdapter: h,
-		conflictResolver: r,
-		run: v
-	}), await je(s, h, n, v), v.failures.length > 0) {
-		let e = Te(p, v.settled, f);
-		return e <= (l.lastPushedChangeId ?? 0) ? he(v) : (await c.update(l, {
-			lastPushedChangeId: e,
-			updatedAt: /* @__PURE__ */ new Date()
-		}), {
-			...he(v),
-			watermark: e
-		});
+async function _e(e, t) {
+	let n = [t];
+	if (t === s) return n;
+	let r = t, i = /* @__PURE__ */ new Set([r]);
+	for (; r;) {
+		let t = (await e.find({
+			where: {
+				combinator: "and",
+				rules: [{
+					field: "id",
+					operator: "=",
+					value: r
+				}]
+			},
+			limit: 1
+		}))[0];
+		if (!t?.parentId || i.has(t.parentId)) break;
+		n.push(t.parentId), i.add(t.parentId), r = t.parentId;
 	}
-	return await c.update(l, {
-		lastPushedChangeId: f,
-		lastPushedAt: /* @__PURE__ */ new Date(),
-		updatedAt: /* @__PURE__ */ new Date()
-	}), {
-		...he(v),
-		watermark: f
-	};
+	return n;
 }
-var he = (e) => ({
-	repository: e.repository,
-	originalCount: e.originalCount,
-	compacted: e.compacted,
-	replayed: e.replayed,
-	discarded: e.discarded,
-	noop: e.noop,
-	watermark: e.watermark,
-	conflicts: e.restoreIds,
-	failures: e.failures
-});
-async function ge(e) {
-	let t = await w(e), { adapter: n } = await E(e), r = await n.getRepository(g).find({ where: {
-		combinator: "and",
-		rules: [{
-			field: "branchId",
-			operator: "=",
-			value: t.id
-		}]
-	} }), i = x(e.config.entities, e.config.sync, r);
-	return i.length === 0 ? 0 : I(e.entityManager.getRepository(d).count({ where: {
-		combinator: "and",
-		rules: [
-			{
-				field: "branchId",
-				operator: "=",
-				value: t.id
-			},
-			{
-				field: "revertChangeId",
-				operator: "=",
-				value: null
-			},
-			{
-				field: "remoteId",
-				operator: "=",
-				value: null
+//#endregion
+//#region src/dependency-graph.ts
+function z(e) {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e) {
+		let e = `${n.namespace}:${n.name}`, r = {
+			repository: {
+				namespace: n.namespace,
+				entity: n.name
 			},
-			{
-				combinator: "or",
-				rules: i
+			dependsOn: [],
+			requiredBy: []
+		};
+		if (n.relations) {
+			for (let e of n.relations) if (e.kind === c.MANY_TO_ONE || e.kind === c.ONE_TO_ONE) {
+				let t = e.mappedEntity, i = e.mappedNamespace || n.namespace;
+				r.dependsOn.push({
+					namespace: i,
+					entity: t
+				});
 			}
-		]
-	} }));
+		}
+		t.set(e, r);
+	}
+	for (let e of t.values()) for (let n of e.dependsOn) {
+		let r = t.get(`${n.namespace}:${n.entity}`);
+		r && r.requiredBy.push(e.repository);
+	}
+	return ve(t), t;
 }
-async function _e(e, t, n) {
-	let r = await w(e), { adapter: i } = await E(e), a = i, o = await C(e, t, n), s = await ye(a.getRepository(d), t, n, r.id, o?.lastPushedChangeId ?? null);
-	return new Set(s.map((e) => String(e.entityId)));
+function ve(e) {
+	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set(), r = [];
+	function i(a) {
+		t.add(a), n.add(a), r.push(a);
+		let o = e.get(a);
+		if (!o) return n.delete(a), r.pop(), !1;
+		for (let e of o.dependsOn) {
+			let o = `${e.namespace}:${e.entity}`;
+			if (o !== a) {
+				if (!t.has(o)) {
+					if (i(o)) return !0;
+				} else if (n.has(o)) {
+					let e = r.indexOf(o), t = [...r.slice(e), o];
+					throw new h(`Circular dependency detected: ${t.join(" -> ")}`);
+				}
+			}
+		}
+		return n.delete(a), r.pop(), !1;
+	}
+	for (let n of e.keys()) t.has(n) || i(n);
 }
-function ve(e, t, n) {
-	let r = e.config.entities.find((e) => {
-		let r = T(e);
-		return r.namespace === t && r.name === n;
-	});
-	if (!r) throw new p(`Entity not found for QueryCache outbox flush: ${t}/${n}`);
-	let i = N(T(r), e.config.sync);
-	if (i !== "querycache") throw new p(`flushQueryCacheOutbox only handles syncType 'querycache'; ${t}/${n} is '${i}'. Repositories with a changelog endpoint push through syncManager.push().`);
-	return i;
+//#endregion
+//#region src/pull-ancestor-changes.ts
+async function ye(e, t, n) {
+	let { namespace: r, entity: i, sinceId: a, limit: o, filter: s } = t, c = [`${r}:${i}`];
+	return (await Promise.all(n.map((t) => e.pullChanges(a, o, c, s, t)))).flat().sort((e, t) => e.id - t.id).slice(0, o);
 }
-async function ye(e, t, n, r, i) {
-	let a = [
+//#endregion
+//#region src/cascade-blocking.ts
+function be(e, t, n, r) {
+	let i = e.get(t);
+	if (i) for (let e of i[r]) {
+		let t = n.get(L(e));
+		if (t) return {
+			dependency: e,
+			cause: t
+		};
+	}
+}
+//#endregion
+//#region src/pull-conflict-utils.ts
+function B() {
+	return {
+		deletes: /* @__PURE__ */ new Map(),
+		updates: /* @__PURE__ */ new Map(),
+		inserts: /* @__PURE__ */ new Map()
+	};
+}
+function V(e) {
+	return e.inserts.size + e.updates.size + e.deletes.size;
+}
+function xe(e, t) {
+	if (t.type === "INSERT") {
+		e.inserts.set(t.key, t.change);
+		return;
+	}
+	if (t.type === "UPDATE") {
+		e.updates.set(t.key, t.change);
+		return;
+	}
+	e.deletes.set(t.key, t.change);
+}
+function Se(e, t) {
+	let n = /* @__PURE__ */ new Map();
+	for (let t of e) {
+		let e = N(t), r = n.get(e);
+		(!r || t.id > r.id) && n.set(e, t);
+	}
+	let r = [], i = (e, t) => {
+		for (let [i, a] of e) {
+			let e = n.get(i);
+			e && r.push({
+				key: i,
+				entityId: e.entityId,
+				type: t,
+				change: a,
+				remote: {
+					...e,
+					type: t,
+					patch: a.patch ?? null,
+					inversePatch: a.inversePatch ?? null
+				}
+			});
+		}
+	};
+	return i(t.inserts, "INSERT"), i(t.updates, "UPDATE"), i(t.deletes, "DELETE"), r;
+}
+async function Ce(e, t, n, r, i, a) {
+	if (a.length === 0) return /* @__PURE__ */ new Map();
+	let o = [
 		{
 			field: "namespace",
 			operator: "=",
@@ -179,835 +168,1080 @@ async function ye(e, t, n, r, i) {
 			operator: "=",
 			value: null
 		},
+		{
+			field: "rejectedAt",
+			operator: "=",
+			value: null
+		},
 		{
 			field: "revertChangeId",
 			operator: "=",
 			value: null
+		},
+		{
+			field: "entityId",
+			operator: "in",
+			value: oe(a)
 		}
 	];
-	return i !== null && a.push({
+	i !== null && o.push({
 		field: "id",
 		operator: ">",
 		value: i
-	}), e.find({
+	});
+	let s = await e.find({
 		where: {
 			combinator: "and",
-			rules: a
+			rules: o
 		},
 		orderBy: [{
 			field: "id",
 			sort: "asc"
 		}]
+	}), c = /* @__PURE__ */ new Map();
+	for (let e of s) {
+		let t = N(e);
+		c.has(t) || c.set(t, []), c.get(t).push(e);
+	}
+	return c;
+}
+async function we(e, t, n) {
+	for (let r of t) await e.update(r, {
+		remoteId: n,
+		updatedAt: /* @__PURE__ */ new Date()
 	});
 }
-function be(e) {
-	let t = /* @__PURE__ */ new Map();
-	for (let n of e) {
-		let e = A(n), r = t.get(e) ?? [];
-		r.push(n), t.set(e, r);
+var Te = (e, t) => t ? Object.assign(Object.create(Object.getPrototypeOf(e)), e, { clientId: t }) : e;
+async function Ee(n, r, i) {
+	let a = B(), o = [], s = new Map(n.map((e) => [e.key, e])), c = [];
+	for (let e of n) {
+		let t = r.get(e.key);
+		if (!t || t.length === 0) {
+			xe(a, e);
+			continue;
+		}
+		o.push({
+			entityKey: e.key,
+			local: Te(t[t.length - 1], i.localClientId),
+			remote: e.remote
+		});
 	}
-	let n = S(e), r = [], i = (e, n) => {
-		for (let [i, a] of e) {
-			let e = t.get(i);
-			if (!e?.length) throw new p(`Missing source changes for compacted QueryCache action: ${i}`);
-			let o = e[e.length - 1], s = e.reduce((e, t) => t.id < e ? t.id : e, e[0].id);
-			r.push({
-				key: i,
-				entityId: String(o.entityId),
-				kind: n,
-				action: a,
-				lastChange: o,
-				minChangeId: s
-			});
+	let l = 0;
+	if (o.length > 0) {
+		let { conflictResolver: n, changeRepo: u, dispatchEvent: d, repoLabel: f } = i, p = n.resolveAll ? await n.resolveAll(o) : await Promise.all(o.map((e) => n.resolve(e))), m = [];
+		for (let e = 0; e < o.length; e += 1) {
+			let t = o[e], n = p[e], i = s.get(t.entityKey), u = r.get(t.entityKey) ?? [];
+			if (i) {
+				if (n.type === "KEEP_LOCAL") {
+					l += 1;
+					continue;
+				}
+				if (n.type === "KEEP_REMOTE") {
+					l += 1, c.push({
+						localChanges: u,
+						remoteId: i.remote.id
+					}), xe(a, i);
+					continue;
+				}
+				m.push(t);
+			}
 		}
+		if (m.length > 0) throw d(new e(o, 0, m.length)), d(new t(m)), new h(`Unsupported conflict resolution returned during pull for ${f}. Only KEEP_LOCAL and KEEP_REMOTE can be applied automatically at runtime.`);
+		if (d(new e(o, o.length, 0)), !i.deferLocalChangeSupersession) for (let e of c) await we(u, e.localChanges, e.remoteId);
+	}
+	return {
+		applyActions: a,
+		conflictsResolved: l,
+		localChangeSupersessions: c
 	};
-	return i(n.deletes, "DELETE"), i(n.updates, "UPDATE"), i(n.inserts, "INSERT"), r;
-}
-var xe = 100;
-function Se(e, t) {
-	let n = [];
-	for (let r = 0; r < e.length; r += t) n.push(e.slice(r, r + t));
-	return n;
 }
-async function Ce(e, t, n, r, i) {
-	let a = n.map((e) => e.entityId), o = /* @__PURE__ */ new Map();
-	for (let n of Se(a, xe)) try {
-		let r = await I(e.fetchMetadata(t, {
-			combinator: "and",
-			rules: [{
+//#endregion
+//#region src/pull-round.ts
+var De = (e, t) => {
+	let n = [], r = [];
+	for (let i of e) i.clientId != null && i.clientId === t ? n.push(i) : r.push(i);
+	return {
+		ownChanges: n,
+		otherChanges: r
+	};
+}, Oe = async (e, t) => {
+	let n = t.filter((e) => e.localId != null);
+	if (n.length === 0) return;
+	let r = await e.find({ where: {
+		combinator: "and",
+		rules: [
+			{
 				field: "id",
 				operator: "in",
-				value: n
-			}]
-		}));
-		for (let e of r) o.set(e.id, e.updatedAt);
-	} catch (e) {
-		return r.reachability.report(e), i.failures.push({
-			entityId: null,
-			error: e instanceof Error ? e : Error(String(e))
-		}), null;
+				value: n.map((e) => e.localId)
+			},
+			{
+				field: "remoteId",
+				operator: "=",
+				value: null
+			},
+			{
+				field: "rejectedAt",
+				operator: "=",
+				value: null
+			}
+		]
+	} });
+	if (r.length === 0) return;
+	let i = new Map(n.map((e) => [e.localId, e.id]));
+	for (let t of r) {
+		let n = i.get(t.id);
+		n != null && await e.update(t, { remoteId: n });
 	}
-	return r.reachability.report(null), o;
+};
+//#endregion
+//#region src/topological-sort.ts
+function ke(e) {
+	return e === "pull" ? "dependsOn" : "requiredBy";
 }
-async function we(e, t, n) {
-	for (let r of ue) for (let i of e.filter((e) => r.has(e.kind))) {
-		if (n.run.failures.length > 0) return;
-		let e = n.run.failures.length;
-		await Ee(i, t.get(i.entityId), n), n.run.failures.length === e && n.run.settled.add(i);
-	}
+function Ae(e) {
+	return e === "DELETE" ? "push" : "pull";
 }
-function Te(e, t, n) {
-	let r;
-	for (let n of e) t.has(n) || (r === void 0 || n.minChangeId < r) && (r = n.minChangeId);
-	return r === void 0 ? n : r - 1;
+function je(e) {
+	return ke(Ae(e));
 }
-async function Ee(e, t, n) {
-	let r = await De(e, t, n.conflictResolver), { run: i } = n;
-	if (r.kind === "noop") {
-		i.noop += 1;
-		return;
-	}
-	if (r.kind === "discard") {
-		i.discarded += 1, (r.repair === "restore" ? i.restoreIds : i.dropIds).push(e.entityId);
-		return;
-	}
-	if (r.kind === "unresolved") {
-		i.failures.push({
-			entityId: e.entityId,
-			error: new p(`Unsupported conflict resolution '${r.resolution}' during QueryCache outbox replay for ${e.key}. Only KEEP_LOCAL and KEEP_REMOTE can be applied over REST verbs.`)
-		});
-		return;
+function Me(e, t) {
+	let n = [], r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
+	function a(o) {
+		if (r.has(o)) return;
+		if (i.has(o)) throw new h(`Circular dependency detected at ${o}`);
+		i.add(o);
+		let s = e.get(o);
+		if (!s) throw new h(`Repository ${o} not found in dependency graph`);
+		let c = s[ke(t)];
+		for (let t of c) {
+			let n = `${t.namespace}:${t.entity}`;
+			n !== o && e.has(n) && a(n);
+		}
+		i.delete(o), r.add(o), n.push(s.repository);
 	}
-	await ke(e, r.verb, n);
+	for (let t of e.keys()) a(t);
+	return n;
 }
-async function De(e, t, n) {
-	if (t === void 0) return ce[e.kind];
-	let r = await n.resolve({
-		entityKey: e.key,
-		local: e.lastChange,
-		remote: Oe(e, t)
-	});
-	return r.type === "KEEP_LOCAL" ? {
-		kind: "replay",
-		verb: le[e.kind]
-	} : r.type === "KEEP_REMOTE" ? {
-		kind: "discard",
-		repair: "restore"
-	} : {
-		kind: "unresolved",
-		resolution: r.type
-	};
+function Ne(e) {
+	return Me(e, "pull");
 }
-function Oe(e, t) {
-	let n = new Date(t);
+function Pe(e, t) {
+	return Me(e, Ae(t));
+}
+//#endregion
+//#region src/pull-repository.ts
+function Fe(e) {
+	if (!e || typeof e != "object") return !1;
+	let t = e;
+	return (t.combinator === "and" || t.combinator === "or") && Array.isArray(t.rules);
+}
+function Ie() {
 	return {
-		id: 0,
-		namespace: e.lastChange.namespace,
-		entity: e.lastChange.entity,
-		entityId: e.lastChange.entityId,
-		branchId: e.lastChange.branchId,
-		type: e.kind,
-		patch: null,
-		inversePatch: null,
-		createdAt: n,
-		updatedAt: n
+		pulled: 0,
+		compacted: 0,
+		applied: 0,
+		hasMore: !1,
+		conflictsResolved: 0,
+		conflictsDeferred: 0,
+		persistedProgress: !1,
+		historyInvalidated: !1,
+		failures: []
 	};
 }
-async function ke(e, t, n) {
-	let { entity: r, remoteAdapter: i, run: a, rxdb: o } = n, s = Ae(i, r, e, t);
-	if (!s) {
-		a.failures.push({
-			entityId: e.entityId,
-			error: new p(`Remote adapter does not support ${t} operation for ${r}`)
-		});
-		return;
-	}
+function Le(e) {
+	if (!(e instanceof g)) return;
+	let t = e.result;
+	if (!t || typeof t != "object") return;
+	let n = t;
+	return typeof n.applied == "number" && typeof n.persistedProgress == "boolean" ? n : void 0;
+}
+var Re = {
+	limit: 1e3,
+	fetchAll: !1,
+	includeRelated: !0,
+	filter: void 0,
+	conflictResolver: void 0
+};
+async function ze(e, t, n, r) {
+	let i = {
+		...Re,
+		...r
+	}, a = e.rxdb;
+	a.dispatchEvent(new l("pull", t, n, i.includeRelated));
 	try {
-		await I(s), o.reachability.report(null), a.replayed += 1;
-	} catch (t) {
-		o.reachability.report(t), a.failures.push({
-			entityId: e.entityId,
-			error: t instanceof Error ? t : Error(String(t))
-		});
+		let r = await Be(e, t, n, i);
+		return a.dispatchEvent(new u("pull", t, n, {
+			pulled: r.pulled,
+			compacted: r.compacted,
+			conflictsResolved: r.conflictsResolved,
+			conflictsDeferred: r.conflictsDeferred
+		})), r;
+	} catch (e) {
+		throw a.dispatchEvent(new d("pull", t, n, e)), e;
 	}
 }
-function Ae(e, t, n, r) {
-	if (r === "delete") return e.delete ? e.delete(t, [n.entityId]) : null;
-	let i = n.action.patch ?? {};
-	if (r === "create") {
-		let r = {
-			id: n.entityId,
-			...i
-		};
-		return e.create ? e.create(t, r) : null;
+async function Be(e, t, n, r) {
+	let i = e.rxdb.config.entities.find((e) => {
+		let r = A(e);
+		return r.namespace === t && r.name === n;
+	});
+	if (!i) throw new h(`Entity not found: ${t}:${n}`);
+	let a = A(i), o = F(a, e.rxdb.entitySync), s = await de(e.rxdb, t, n, o);
+	if (s) throw new h(`Cannot pull repository ${t}:${n}: ${s}.`);
+	let c = r.filter;
+	if (o === "filter" && !c) {
+		let r = ce(a, e.rxdb.entitySync);
+		if (r?.remote?.filter) {
+			try {
+				c = r.remote.filter();
+			} catch (e) {
+				throw new h(`Filter function failed for ${t}:${n}: ${e instanceof Error ? e.message : String(e)}`);
+			}
+			if (c && !Fe(c)) throw new h(`Invalid RuleGroup returned by filter function for ${t}:${n}: RuleGroup must have 'combinator' ('and' | 'or') and 'rules' array properties.`);
+		}
 	}
-	return e.update ? e.update(t, n.entityId, i) : null;
+	let l = {
+		...r,
+		filter: c
+	};
+	return r.includeRelated ? await Ve(e, t, n, l) : await We(e, t, n, l);
 }
-async function je(e, t, n, r) {
-	if (r.restoreIds.length > 0) {
-		let i = await I(t.findByIds(n, r.restoreIds));
-		await I(e.upsertMany(n, i));
+async function Ve(e, t, n, r) {
+	let i = z(e.rxdb.config.entities.map((e) => A(e))), a = new Map(e.rxdb.config.entities.map((e) => {
+		let t = A(e);
+		return [`${t.namespace}:${t.name}`, e];
+	})), o = Ne(i), s = `${t}:${n}`;
+	if (!i.get(s)) throw new h(`Repository ${t}:${n} not found in dependency graph`);
+	let c = /* @__PURE__ */ new Set([s]), l = (e) => {
+		let t = i.get(e);
+		if (t) for (let e of t.dependsOn) {
+			let t = `${e.namespace}:${e.entity}`;
+			c.has(t) || (c.add(t), l(t));
+		}
+	};
+	l(s);
+	let u = o.filter((e) => {
+		let t = `${e.namespace}:${e.entity}`;
+		return c.has(t);
+	}), d = [], f = [], p = /* @__PURE__ */ new Map();
+	for (let t of u) {
+		let n = await He(e, i, a, t, r, p);
+		d.push(n), n.error && (p.set(L(t), n.error), f.push({
+			repository: t,
+			error: n.error
+		}));
 	}
-	r.dropIds.length > 0 && await I(e.deleteByIds(n, r.dropIds));
+	let m = d.find((e) => e.repository.namespace === t && e.repository.entity === n);
+	if (!m) throw new h("Internal error: target repository result not found");
+	m.relatedResults = d.filter((e) => e !== m), m.failures = f;
+	for (let e of m.relatedResults) m.persistedProgress ||= e.persistedProgress, m.historyInvalidated ||= e.historyInvalidated;
+	let [_] = f;
+	if (!m.success && _) throw !m.persistedProgress && f.length === 1 ? _.error : new g(m, _.error);
+	return m;
 }
-//#endregion
-//#region src/branch-utils.ts
-async function L(e, t) {
-	let n = [t];
-	if (t === "main") return n;
-	let { adapter: r } = await e.getLocalRepositories(), i = r.getRepository(u), a = t, o = /* @__PURE__ */ new Set([a]);
-	for (; a;) {
-		let e = (await i.find({
-			where: {
-				combinator: "and",
-				rules: [{
-					field: "id",
-					operator: "=",
-					value: a
-				}]
-			},
-			limit: 1
-		}))[0];
-		if (!e?.parentId || o.has(e.parentId)) break;
-		n.push(e.parentId), o.add(e.parentId), a = e.parentId;
+async function He(e, t, n, r, i, a) {
+	let o = L(r), s = be(t, o, a, "dependsOn");
+	if (s) return {
+		...Ie(),
+		repository: r,
+		success: !1,
+		skipped: `dependency ${L(s.dependency)} failed`,
+		error: new m(r, s.dependency, s.cause)
+	};
+	let c = n.get(o);
+	if (!c) throw new h(`Internal error: entity not found for cascade node ${o}`);
+	let l = A(c), u = F(l, e.rxdb.entitySync), d = await de(e.rxdb, r.namespace, r.entity, u);
+	if (d) return {
+		...Ie(),
+		repository: r,
+		success: !0,
+		skipped: d
+	};
+	try {
+		let t = await We(e, r.namespace, r.entity, {
+			...i,
+			filter: Ue(o, ce(l, e.rxdb.entitySync), u, i.filter),
+			includeRelated: !1
+		});
+		return t.success = !0, t;
+	} catch (e) {
+		let t = e instanceof Error ? e : Error(String(e)), n = t instanceof g ? t.cause : t;
+		return {
+			...Le(t) ?? Ie(),
+			repository: r,
+			success: !1,
+			error: n,
+			failures: [{
+				repository: r,
+				error: n
+			}]
+		};
 	}
-	return n;
 }
-//#endregion
-//#region src/cascade-blocking.ts
-function Me(e, t, n, r) {
-	let i = e.get(t);
-	if (i) for (let e of i[r]) {
-		let t = n.get(F(e));
-		if (t) return {
-			dependency: e,
-			cause: t
-		};
+function Ue(e, t, n, r) {
+	if (n === "full") return;
+	if (n !== "filter") return r;
+	let i = t?.remote?.filter;
+	if (!i) return r;
+	let a;
+	try {
+		a = i();
+	} catch (t) {
+		throw new h(`Filter function failed for ${e}: ${t instanceof Error ? t.message : String(t)}`);
 	}
+	if (!Fe(a)) throw new h(`Invalid RuleGroup returned by filter function for ${e}: RuleGroup must have 'combinator' ('and' | 'or') and 'rules' array properties.`);
+	return a;
 }
-//#endregion
-//#region src/dependency-graph.ts
-function R(e) {
-	let t = /* @__PURE__ */ new Map();
-	for (let n of e) {
-		let e = `${n.namespace}:${n.name}`, r = {
-			repository: {
-				namespace: n.namespace,
-				entity: n.name
-			},
-			dependsOn: [],
-			requiredBy: []
-		};
-		if (n.relations) {
-			for (let e of n.relations) if (e.kind === o.MANY_TO_ONE || e.kind === o.ONE_TO_ONE) {
-				let t = e.mappedEntity, i = e.mappedNamespace || n.namespace;
-				r.dependsOn.push({
-					namespace: i,
-					entity: t
+async function We(e, t, n, r) {
+	let i = e.rxdb;
+	if (!i.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
+	let { adapter: a } = await e.getRemoteRepositories(), { adapter: s } = await e.getLocalRepositories(), c = await e.getCurrentBranch(), l = await ge(e, c.id), u = s.getRepository(v), d = e.rxdb.config.entities.find((e) => {
+		let r = A(e);
+		return r.namespace === t && r.name === n;
+	}), f = A(d), m = F(f, e.rxdb.entitySync), _ = await M(u, {
+		namespace: t,
+		entity: n,
+		branchId: c.id,
+		syncType: m
+	}, () => i.entityManager.instantiate(v)), y = _.lastPullRemoteChangeId, b = 0, x = 0, S = 0, C = 0, w = !1, E, D, ee = r.conflictResolver ?? new o(), te = y ?? 0, O = B();
+	try {
+		do {
+			let e = await ye(a, {
+				namespace: t,
+				entity: n,
+				sinceId: te,
+				limit: r.limit,
+				filter: r.filter
+			}, l);
+			if (b += e.length, E = e.length >= r.limit, e.length === 0) {
+				await u.update(_, {
+					lastPulledAt: /* @__PURE__ */ new Date(),
+					updatedAt: /* @__PURE__ */ new Date()
 				});
+				break;
 			}
-		}
-		t.set(e, r);
-	}
-	for (let e of t.values()) for (let n of e.dependsOn) {
-		let r = t.get(`${n.namespace}:${n.entity}`);
-		r && r.requiredBy.push(e.repository);
-	}
-	return Ne(t), t;
-}
-function Ne(e) {
-	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set(), r = [];
-	function i(a) {
-		t.add(a), n.add(a), r.push(a);
-		let o = e.get(a);
-		if (!o) return n.delete(a), r.pop(), !1;
-		for (let e of o.dependsOn) {
-			let o = `${e.namespace}:${e.entity}`;
-			if (o !== a) {
-				if (!t.has(o)) {
-					if (i(o)) return !0;
-				} else if (n.has(o)) {
-					let e = r.indexOf(o), t = [...r.slice(e), o];
-					throw new p(`Circular dependency detected: ${t.join(" -> ")}`);
+			D = e[e.length - 1], te = D.id;
+			let { ownChanges: o, otherChanges: d } = De(e, i.context.clientId), f = 0;
+			await s.transaction(async (e) => {
+				let r = e.getRepository(p), a = e.getRepository(v);
+				if (await Oe(r, o), d.length > 0) {
+					k(d, O);
+					let a = V(O);
+					x += d.length - a;
+					let o = Se(d, O), { applyActions: s, conflictsResolved: l, localChangeSupersessions: u } = await Ee(o, await Ce(r, t, n, c.id, _.lastPushedChangeId, [...new Set(o.map((e) => e.entityId))]), {
+						changeRepo: r,
+						conflictResolver: ee,
+						dispatchEvent: (e) => i.dispatchEvent(e),
+						repoLabel: `${t}:${n}`,
+						deferLocalChangeSupersession: !0,
+						localClientId: i.context.clientId
+					});
+					C += l;
+					let p = V(s);
+					if (p > 0) {
+						ne(e, {
+							file: "pull-repository.ts",
+							symbol: "pullSingleRepository",
+							intent: T.remote_sync
+						}), await e.mergeChanges(s, void 0, !0);
+						for (let e of u) await we(r, e.localChanges, e.remoteId);
+						f = p;
+					}
+					O = B();
 				}
-			}
-		}
-		return n.delete(a), r.pop(), !1;
+				let s = D.id;
+				_ = await a.update(_, {
+					lastPullRemoteChangeId: s,
+					lastPulledAt: /* @__PURE__ */ new Date(),
+					updatedAt: /* @__PURE__ */ new Date()
+				});
+			}), w = !0, S += f;
+		} while (E && r.fetchAll);
+	} catch (e) {
+		throw w ? new g({
+			repository: {
+				namespace: t,
+				entity: n
+			},
+			pulled: b,
+			compacted: x,
+			applied: S,
+			hasMore: !0,
+			conflictsResolved: C,
+			conflictsDeferred: 0,
+			persistedProgress: !0,
+			historyInvalidated: S > 0,
+			failures: [{
+				repository: {
+					namespace: t,
+					entity: n
+				},
+				error: e instanceof Error ? e : Error(String(e))
+			}]
+		}, e instanceof Error ? e : Error(String(e))) : e;
 	}
-	for (let n of e.keys()) t.has(n) || i(n);
-}
-//#endregion
-//#region src/pull-ancestor-changes.ts
-async function Pe(e, t, n) {
-	let { namespace: r, entity: i, sinceId: a, limit: o, filter: s } = t, c = [`${r}:${i}`];
-	return (await Promise.all(n.map((t) => e.pullChanges(a, o, c, s, t)))).flat().sort((e, t) => e.id - t.id).slice(0, o);
+	return {
+		repository: {
+			namespace: t,
+			entity: n
+		},
+		pulled: b,
+		compacted: x,
+		applied: S,
+		hasMore: E,
+		conflictsResolved: C,
+		conflictsDeferred: 0,
+		persistedProgress: w,
+		historyInvalidated: S > 0,
+		failures: []
+	};
 }
 //#endregion
-//#region src/pull-conflict-utils.ts
-function z() {
+//#region src/branch-materialization-source.ts
+var Ge = 1e3, Ke = (e) => typeof e == "object" && !!e && !Array.isArray(e), qe = (e) => Array.isArray(e) && e.every((e) => typeof e == "string"), Je = (e) => {
+	let t = e.frozenRemoteWatermark, { lineage: n, cutoffs: r, filters: i } = t;
+	if (!(qe(n) && Ke(r) && Ke(i) && e.syncScope.every((e) => typeof r[e] == "number" && e in i))) throw new h(`分支物化意图不是同步插件冻结的形状：${O(t)}`);
 	return {
-		deletes: /* @__PURE__ */ new Map(),
-		updates: /* @__PURE__ */ new Map(),
-		inserts: /* @__PURE__ */ new Map()
+		syncScope: e.syncScope,
+		lineage: n,
+		cutoffs: r,
+		filters: i
 	};
-}
-function B(e) {
-	return e.inserts.size + e.updates.size + e.deletes.size;
-}
-function Fe(e, t) {
-	if (t.type === "INSERT") {
-		e.inserts.set(t.key, t.change);
-		return;
-	}
-	if (t.type === "UPDATE") {
-		e.updates.set(t.key, t.change);
-		return;
-	}
-	e.deletes.set(t.key, t.change);
-}
-function Ie(e, t) {
-	let n = /* @__PURE__ */ new Map();
-	for (let t of e) {
-		let e = A(t), r = n.get(e);
-		(!r || t.id > r.id) && n.set(e, t);
-	}
-	let r = [], i = (e, t) => {
-		for (let [i, a] of e) {
-			let e = n.get(i);
-			e && r.push({
-				key: i,
-				entityId: e.entityId,
-				type: t,
-				change: a,
-				remote: {
-					...e,
-					type: t,
-					patch: a.patch ?? null,
-					inversePatch: a.inversePatch ?? null
-				}
-			});
-		}
+}, Ye = (e) => {
+	let { repository: t, sinceId: n, lastId: r, done: i, changes: a } = e;
+	if (!(typeof t == "string" && typeof n == "number" && typeof r == "number" && typeof i == "boolean" && Array.isArray(a))) throw new h(`分支物化分页不是同步插件交出的形状：${O(e)}`);
+	return {
+		repository: t,
+		sinceId: n,
+		lastId: r,
+		done: i,
+		changes: a
 	};
-	return i(t.inserts, "INSERT"), i(t.updates, "UPDATE"), i(t.deletes, "DELETE"), r;
-}
-async function Le(e, t, n, r, i, a) {
-	if (a.length === 0) return /* @__PURE__ */ new Map();
-	let o = [
-		{
-			field: "namespace",
+}, Xe = (e, t) => {
+	for (let n of e.config.entities) {
+		let e = A(n);
+		if (L({
+			namespace: e.namespace,
+			entity: e.name
+		}) === t) return e;
+	}
+	throw new h(`分支物化范围里的仓库 ${t} 不在当前实体配置里`);
+}, Ze = async (e, t) => (await e.find({
+	where: {
+		combinator: "and",
+		rules: [{
+			field: "id",
 			operator: "=",
 			value: t
+		}]
+	},
+	limit: 1
+}))[0], Qe = async (e, t, n) => {
+	let r = await _e(t.branchRepository, n), i = Ne(z(e.config.entities.map((e) => A(e)))), a = [], o = {};
+	for (let r of i) {
+		let i = L(r), s = Xe(e, i), c = F(s, e.entitySync);
+		if (!P(c).pull) continue;
+		let l = await Ze(t.syncRepository, `${i}:${n}`);
+		I(l) && (a.push(i), o[i] = Ue(i, ce(s, e.entitySync), c, void 0) ?? null);
+	}
+	return {
+		lineage: r,
+		syncScope: a,
+		filters: o
+	};
+}, $e = (e) => ({
+	branchRepository: e.getRepository(f),
+	syncRepository: e.getRepository(v)
+}), et = async (e) => {
+	if (!e.rxdb.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
+	let { adapter: t } = await e.getRemoteRepositories();
+	return t;
+}, tt = async (e, t, n) => {
+	let r = await Promise.all(n.map((n) => e.getChangeCount(0, [t], n)));
+	return Math.max(0, ...r.map((e) => e.latestChangeId));
+}, nt = (e, t) => {
+	if (!t) return {
+		index: 0,
+		sinceId: 0
+	};
+	let n = Ye(t.payload), r = e.syncScope.indexOf(n.repository);
+	if (r < 0) throw new h(`续拉游标指向的仓库 ${n.repository} 不在冻结范围里`);
+	return n.done ? {
+		index: r + 1,
+		sinceId: 0
+	} : {
+		index: r,
+		sinceId: n.lastId
+	};
+}, rt = async (e, t, n, r, i) => {
+	let a = Xe(e, r), o = n.cutoffs[r], s = await ye(t, {
+		namespace: a.namespace,
+		entity: a.name,
+		sinceId: i,
+		limit: Ge,
+		filter: n.filters[r] ?? void 0
+	}, n.lineage), c = s.filter((e) => e.id <= o), l = c.at(-1)?.id ?? i, u = {
+		repository: r,
+		sinceId: i,
+		lastId: l,
+		done: s.length < Ge || c.length < s.length || l >= o,
+		changes: c.map(it)
+	};
+	return {
+		payload: u,
+		fingerprint: ee(u)
+	};
+}, it = (e) => ({
+	id: e.id,
+	namespace: e.namespace,
+	entity: e.entity,
+	entityId: e.entityId,
+	branchId: e.branchId,
+	type: e.type,
+	patch: e.patch ?? null,
+	inversePatch: e.inversePatch ?? null,
+	createdAt: e.createdAt,
+	updatedAt: e.updatedAt
+}), at = (e, t) => {
+	if (O(e.syncScope) !== O(t.syncScope)) return `同步范围变了：冻结时 ${e.syncScope.join(", ")}，现在 ${t.syncScope.join(", ")}`;
+	if (O(e.lineage) !== O(t.lineage)) return `分支血缘变了：冻结时 ${e.lineage.join(" → ")}，现在 ${t.lineage.join(" → ")}`;
+	let n = e.syncScope.filter((n) => O(e.filters[n]) !== O(t.filters[n]));
+	if (n.length > 0) return `行级过滤条件变了：${n.join(", ")}`;
+}, ot = (e) => {
+	let t = e.rxdb;
+	return {
+		async freezeIntent(n) {
+			let { adapter: r } = await e.getLocalRepositories(), i = await Qe(t, {
+				branchRepository: r.getRepository(f),
+				syncRepository: r.getRepository(v)
+			}, n), a = await et(e), o = {};
+			for (let e of i.syncScope) o[e] = await tt(a, e, i.lineage);
+			let s = {
+				lineage: i.lineage,
+				cutoffs: o,
+				filters: i.filters
+			};
+			return {
+				syncScope: i.syncScope,
+				frozenRemoteWatermark: { ...s }
+			};
 		},
-		{
-			field: "entity",
-			operator: "=",
-			value: n
-		},
-		{
-			field: "branchId",
-			operator: "=",
-			value: r
+		async *pages(n) {
+			let r = Je(n.intent), i = nt(r, n.previousPage), a = await et(e), o = i.sinceId;
+			for (let e = i.index; e < r.syncScope.length; e++, o = 0) {
+				let n = r.syncScope[e], i = o >= r.cutoffs[n];
+				for (; !i;) {
+					let e = await rt(t, a, r, n, o);
+					yield e, i = e.payload.done === !0, o = e.payload.lastId;
+				}
+			}
 		},
-		{
-			field: "remoteId",
-			operator: "=",
-			value: null
+		async resolveIntentDrift(e) {
+			let n;
+			try {
+				n = Je(e.intent);
+			} catch (e) {
+				return e instanceof Error ? e.message : String(e);
+			}
+			let r = await Qe(t, $e(e.executor), e.targetBranchId);
+			return at(n, r);
 		},
-		{
-			field: "revertChangeId",
-			operator: "=",
-			value: null
+		async projectPage(e) {
+			return k(Ye(e.page.payload).changes);
 		},
-		{
-			field: "entityId",
-			operator: "in",
-			value: k(a)
+		async settle(e) {
+			let n = Je(e.intent), r = e.executor.getRepository(v), i = /* @__PURE__ */ new Date();
+			for (let a of n.syncScope) {
+				let o = Xe(t, a), s = await M(r, {
+					namespace: o.namespace,
+					entity: o.name,
+					branchId: e.targetBranchId,
+					syncType: F(o, t.entitySync)
+				}, () => t.entityManager.instantiate(v));
+				await r.update(s, {
+					lastPullRemoteChangeId: n.cutoffs[a],
+					lastPulledAt: i,
+					updatedAt: i
+				});
+			}
 		}
-	];
-	i !== null && o.push({
-		field: "id",
-		operator: ">",
-		value: i
-	});
-	let s = await e.find({
-		where: {
-			combinator: "and",
-			rules: o
-		},
-		orderBy: [{
-			field: "id",
-			sort: "asc"
-		}]
-	}), c = /* @__PURE__ */ new Map();
-	for (let e of s) {
-		let t = A(e);
-		c.has(t) || c.set(t, []), c.get(t).push(e);
-	}
-	return c;
-}
-async function Re(e, t, n) {
-	for (let r of t) await e.update(r, {
-		remoteId: n,
-		updatedAt: /* @__PURE__ */ new Date()
+	};
+}, st = {
+	INSERT: {
+		kind: "replay",
+		verb: "create"
+	},
+	UPDATE: {
+		kind: "discard",
+		repair: "drop"
+	},
+	DELETE: { kind: "noop" }
+}, ct = {
+	INSERT: "update",
+	UPDATE: "update",
+	DELETE: "delete"
+}, lt = [/* @__PURE__ */ new Set(["DELETE"]), /* @__PURE__ */ new Set(["INSERT", "UPDATE"])], ut = /* @__PURE__ */ new WeakMap();
+function dt(e, t, n, r) {
+	let i = ut.get(e) ?? /* @__PURE__ */ new Map();
+	ut.set(e, i);
+	let a = `${t}:${n}`, s = i.get(a);
+	if (s) return s;
+	let c = pt(e, t, n, r?.conflictResolver ?? new o()).finally(() => {
+		i.delete(a);
 	});
+	return i.set(a, c), c;
 }
-var ze = (e, t) => t ? Object.assign(Object.create(Object.getPrototypeOf(e)), e, { clientId: t }) : e;
-async function Be(n, r, i) {
-	let a = z(), o = [], s = new Map(n.map((e) => [e.key, e])), c = [];
-	for (let e of n) {
-		let t = r.get(e.key);
-		if (!t || t.length === 0) {
-			Fe(a, e);
-			continue;
-		}
-		o.push({
-			entityKey: e.key,
-			local: ze(t[t.length - 1], i.localClientId),
-			remote: e.remote
-		});
-	}
-	let l = 0;
-	if (o.length > 0) {
-		let { conflictResolver: n, changeRepo: u, dispatchEvent: d, repoLabel: f } = i, m = n.resolveAll ? await n.resolveAll(o) : await Promise.all(o.map((e) => n.resolve(e))), h = [];
-		for (let e = 0; e < o.length; e += 1) {
-			let t = o[e], n = m[e], i = s.get(t.entityKey), u = r.get(t.entityKey) ?? [];
-			if (i) {
-				if (n.type === "KEEP_LOCAL") {
-					l += 1;
-					continue;
-				}
-				if (n.type === "KEEP_REMOTE") {
-					l += 1, c.push({
-						localChanges: u,
-						remoteId: i.remote.id
-					}), Fe(a, i);
-					continue;
-				}
-				h.push(t);
-			}
-		}
-		if (h.length > 0) throw d(new e(o, 0, h.length)), d(new t(h)), new p(`Unsupported conflict resolution returned during pull for ${f}. Only KEEP_LOCAL and KEEP_REMOTE can be applied automatically at runtime.`);
-		if (d(new e(o, o.length, 0)), !i.deferLocalChangeSupersession) for (let e of c) await Re(u, e.localChanges, e.remoteId);
+var ft = (e, t) => ({
+	repository: {
+		namespace: e,
+		entity: t
+	},
+	originalCount: 0,
+	compacted: 0,
+	replayed: 0,
+	discarded: 0,
+	noop: 0,
+	watermark: null,
+	conflicts: [],
+	failures: []
+});
+async function pt(e, t, n, r) {
+	let i = _t(e, t, n), a = await ie(e), { adapter: o } = await j(e), s = o, c = s.getRepository(v), l = await M(c, {
+		namespace: t,
+		entity: n,
+		branchId: a.id,
+		syncType: i
+	}, () => e.entityManager.instantiate(v));
+	if (!I(l)) return {
+		...ft(t, n),
+		skipped: x
+	};
+	let u = s.getRepository(p), d = await vt(u, t, n, a.id, l.lastPushedChangeId);
+	if (d.length === 0) return ft(t, n);
+	let f = d.reduce((e, t) => t.id > e ? t.id : e, d[0].id), m = yt(d), h = {
+		...ft(t, n),
+		originalCount: d.length
+	};
+	if (m.length === 0) return await c.update(l, {
+		lastPushedChangeId: f,
+		updatedAt: /* @__PURE__ */ new Date()
+	}), {
+		...h,
+		compacted: d.length,
+		watermark: f
+	};
+	let g = await R(e.remoteAdapter$), _ = {
+		...h,
+		compacted: d.length - m.length,
+		restoreIds: [],
+		dropIds: [],
+		settled: /* @__PURE__ */ new Set()
+	}, y = await St(g, n, m, e, _);
+	if (y && await Ct(m, y, {
+		rxdb: e,
+		entity: n,
+		remoteAdapter: g,
+		conflictResolver: r,
+		run: _
+	}), await jt(s, g, n, _, {
+		changeRepo: u,
+		namespace: t,
+		branchId: a.id,
+		maxChangeId: f
+	}), _.failures.length > 0) {
+		let e = wt(m, _.settled, f);
+		return e <= (l.lastPushedChangeId ?? 0) ? mt(_) : (await c.update(l, {
+			lastPushedChangeId: e,
+			updatedAt: /* @__PURE__ */ new Date()
+		}), {
+			...mt(_),
+			watermark: e
+		});
 	}
-	return {
-		applyActions: a,
-		conflictsResolved: l,
-		localChangeSupersessions: c
+	return await c.update(l, {
+		lastPushedChangeId: f,
+		lastPushedAt: /* @__PURE__ */ new Date(),
+		updatedAt: /* @__PURE__ */ new Date()
+	}), {
+		...mt(_),
+		watermark: f
 	};
 }
-//#endregion
-//#region src/topological-sort.ts
-function Ve(e) {
-	return e === "pull" ? "dependsOn" : "requiredBy";
+var mt = (e) => ({
+	repository: e.repository,
+	originalCount: e.originalCount,
+	compacted: e.compacted,
+	replayed: e.replayed,
+	discarded: e.discarded,
+	noop: e.noop,
+	watermark: e.watermark,
+	conflicts: e.restoreIds,
+	failures: e.failures
+});
+async function ht(e) {
+	let t = await ie(e), { adapter: n } = await j(e), r = await n.getRepository(v).find({ where: {
+		combinator: "and",
+		rules: [{
+			field: "branchId",
+			operator: "=",
+			value: t.id
+		}]
+	} }), i = te(e.config.entities, e.entitySync, r);
+	return i.length === 0 ? 0 : R(e.entityManager.getRepository(p).count({ where: {
+		combinator: "and",
+		rules: [
+			{
+				field: "branchId",
+				operator: "=",
+				value: t.id
+			},
+			{
+				field: "revertChangeId",
+				operator: "=",
+				value: null
+			},
+			{
+				field: "remoteId",
+				operator: "=",
+				value: null
+			},
+			{
+				field: "rejectedAt",
+				operator: "=",
+				value: null
+			},
+			{
+				combinator: "or",
+				rules: i
+			}
+		]
+	} }));
 }
-function He(e) {
-	return e === "DELETE" ? "push" : "pull";
+async function gt(e, t, n) {
+	let r = await ie(e), { adapter: i } = await j(e), a = i, o = await re(e, t, n), s = await vt(a.getRepository(p), t, n, r.id, o?.lastPushedChangeId ?? null);
+	return new Set(s.map((e) => String(e.entityId)));
 }
-function Ue(e) {
-	return Ve(He(e));
+function _t(e, t, n) {
+	let r = e.config.entities.find((e) => {
+		let r = A(e);
+		return r.namespace === t && r.name === n;
+	});
+	if (!r) throw new h(`Entity not found for QueryCache outbox flush: ${t}/${n}`);
+	let i = F(A(r), e.entitySync);
+	if (i !== "querycache") throw new h(`flushQueryCacheOutbox only handles syncType 'querycache'; ${t}/${n} is '${i}'. Repositories with a changelog endpoint push through syncManager.push().`);
+	return i;
 }
-function We(e, t) {
-	let n = [], r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set();
-	function a(o) {
-		if (r.has(o)) return;
-		if (i.has(o)) throw new p(`Circular dependency detected at ${o}`);
-		i.add(o);
-		let s = e.get(o);
-		if (!s) throw new p(`Repository ${o} not found in dependency graph`);
-		let c = s[Ve(t)];
-		for (let t of c) {
-			let n = `${t.namespace}:${t.entity}`;
-			n !== o && e.has(n) && a(n);
+async function vt(e, t, n, r, i) {
+	let a = [
+		{
+			field: "namespace",
+			operator: "=",
+			value: t
+		},
+		{
+			field: "entity",
+			operator: "=",
+			value: n
+		},
+		{
+			field: "branchId",
+			operator: "=",
+			value: r
+		},
+		{
+			field: "remoteId",
+			operator: "=",
+			value: null
+		},
+		{
+			field: "rejectedAt",
+			operator: "=",
+			value: null
+		},
+		{
+			field: "revertChangeId",
+			operator: "=",
+			value: null
 		}
-		i.delete(o), r.add(o), n.push(s.repository);
-	}
-	for (let t of e.keys()) a(t);
-	return n;
-}
-function Ge(e) {
-	return We(e, "pull");
-}
-function Ke(e, t) {
-	return We(e, He(t));
-}
-//#endregion
-//#region src/pull-repository.ts
-function qe(e) {
-	if (!e || typeof e != "object") return !1;
-	let t = e;
-	return (t.combinator === "and" || t.combinator === "or") && Array.isArray(t.rules);
+	];
+	return i !== null && a.push({
+		field: "id",
+		operator: ">",
+		value: i
+	}), e.find({
+		where: {
+			combinator: "and",
+			rules: a
+		},
+		orderBy: [{
+			field: "id",
+			sort: "asc"
+		}]
+	});
 }
-function Je() {
-	return {
-		pulled: 0,
-		compacted: 0,
-		applied: 0,
-		hasMore: !1,
-		conflictsResolved: 0,
-		conflictsDeferred: 0,
-		persistedProgress: !1,
-		historyInvalidated: !1,
-		failures: []
+function yt(e) {
+	let t = /* @__PURE__ */ new Map();
+	for (let n of e) {
+		let e = N(n), r = t.get(e) ?? [];
+		r.push(n), t.set(e, r);
+	}
+	let n = k(e), r = [], i = (e, n) => {
+		for (let [i, a] of e) {
+			let e = t.get(i);
+			if (!e?.length) throw new h(`Missing source changes for compacted QueryCache action: ${i}`);
+			let o = e[e.length - 1], s = e.reduce((e, t) => t.id < e ? t.id : e, e[0].id);
+			r.push({
+				key: i,
+				entityId: String(o.entityId),
+				kind: n,
+				action: a,
+				lastChange: o,
+				minChangeId: s
+			});
+		}
 	};
+	return i(n.deletes, "DELETE"), i(n.updates, "UPDATE"), i(n.inserts, "INSERT"), r;
 }
-function Ye(e) {
-	if (!(e instanceof m)) return;
-	let t = e.result;
-	if (!t || typeof t != "object") return;
-	let n = t;
-	return typeof n.applied == "number" && typeof n.persistedProgress == "boolean" ? n : void 0;
+var bt = 100;
+function xt(e, t) {
+	let n = [];
+	for (let r = 0; r < e.length; r += t) n.push(e.slice(r, r + t));
+	return n;
 }
-var Xe = {
-	limit: 1e3,
-	fetchAll: !1,
-	includeRelated: !0,
-	filter: void 0,
-	conflictResolver: void 0
-};
-async function Ze(e, t, n, r) {
-	let i = {
-		...Xe,
-		...r
-	}, a = e.rxdb;
-	a.dispatchEvent(new s("pull", t, n, i.includeRelated));
-	try {
-		let r = await Qe(e, t, n, i);
-		return a.dispatchEvent(new c("pull", t, n, {
-			pulled: r.pulled,
-			compacted: r.compacted,
-			conflictsResolved: r.conflictsResolved,
-			conflictsDeferred: r.conflictsDeferred
-		})), r;
+async function St(e, t, n, r, i) {
+	let a = n.map((e) => e.entityId), o = /* @__PURE__ */ new Map();
+	for (let n of xt(a, bt)) try {
+		let r = await R(e.fetchMetadata(t, {
+			combinator: "and",
+			rules: [{
+				field: "id",
+				operator: "in",
+				value: n
+			}]
+		}));
+		for (let e of r) o.set(e.id, e.updatedAt);
 	} catch (e) {
-		throw a.dispatchEvent(new l("pull", t, n, e)), e;
+		return r.reachability.report(e), i.failures.push({
+			entityId: null,
+			error: e instanceof Error ? e : Error(String(e))
+		}), null;
 	}
+	return r.reachability.report(null), o;
 }
-async function Qe(e, t, n, r) {
-	let i = e.rxdb.config.entities.find((e) => {
-		let r = T(e);
-		return r.namespace === t && r.name === n;
-	});
-	if (!i) throw new p(`Entity not found: ${t}:${n}`);
-	let a = T(i), o = N(a, e.rxdb.config.sync), s = await re(e.rxdb, t, n, o);
-	if (s) throw new p(`Cannot pull repository ${t}:${n}: ${s}.`);
-	let c = r.filter;
-	if (o === "filter" && !c) {
-		let e = a.sync;
-		if (e?.remote?.filter) {
-			try {
-				c = e.remote.filter();
-			} catch (e) {
-				throw new p(`Filter function failed for ${t}:${n}: ${e instanceof Error ? e.message : String(e)}`);
-			}
-			if (c && !qe(c)) throw new p(`Invalid RuleGroup returned by filter function for ${t}:${n}: RuleGroup must have 'combinator' ('and' | 'or') and 'rules' array properties.`);
-		}
+async function Ct(e, t, n) {
+	for (let r of lt) for (let i of e.filter((e) => r.has(e.kind))) {
+		if (n.run.failures.length > 0) return;
+		let e = n.run.failures.length;
+		await Tt(i, t.get(i.entityId), n), n.run.failures.length === e && n.run.settled.add(i);
 	}
-	let l = {
-		...r,
-		filter: c
-	};
-	return r.includeRelated ? await $e(e, t, n, l) : await nt(e, t, n, l);
 }
-async function $e(e, t, n, r) {
-	let i = R(e.rxdb.config.entities.map((e) => T(e))), a = new Map(e.rxdb.config.entities.map((e) => {
-		let t = T(e);
-		return [`${t.namespace}:${t.name}`, e];
-	})), o = Ge(i), s = `${t}:${n}`;
-	if (!i.get(s)) throw new p(`Repository ${t}:${n} not found in dependency graph`);
-	let c = /* @__PURE__ */ new Set([s]), l = (e) => {
-		let t = i.get(e);
-		if (t) for (let e of t.dependsOn) {
-			let t = `${e.namespace}:${e.entity}`;
-			c.has(t) || (c.add(t), l(t));
-		}
-	};
-	l(s);
-	let u = o.filter((e) => {
-		let t = `${e.namespace}:${e.entity}`;
-		return c.has(t);
-	}), d = [], f = [], h = /* @__PURE__ */ new Map();
-	for (let t of u) {
-		let n = await et(e, i, a, t, r, h);
-		d.push(n), n.error && (h.set(F(t), n.error), f.push({
-			repository: t,
-			error: n.error
-		}));
-	}
-	let g = d.find((e) => e.repository.namespace === t && e.repository.entity === n);
-	if (!g) throw new p("Internal error: target repository result not found");
-	g.relatedResults = d.filter((e) => e !== g), g.failures = f;
-	for (let e of g.relatedResults) g.persistedProgress ||= e.persistedProgress, g.historyInvalidated ||= e.historyInvalidated;
-	let [_] = f;
-	if (!g.success && _) throw !g.persistedProgress && f.length === 1 ? _.error : new m(g, _.error);
-	return g;
+function wt(e, t, n) {
+	let r;
+	for (let n of e) t.has(n) || (r === void 0 || n.minChangeId < r) && (r = n.minChangeId);
+	return r === void 0 ? n : r - 1;
 }
-async function et(e, t, n, r, i, a) {
-	let o = F(r), s = Me(t, o, a, "dependsOn");
-	if (s) return {
-		...Je(),
-		repository: r,
-		success: !1,
-		skipped: `dependency ${F(s.dependency)} failed`,
-		error: new f(r, s.dependency, s.cause)
-	};
-	let c = n.get(o);
-	if (!c) throw new p(`Internal error: entity not found for cascade node ${o}`);
-	let l = T(c), u = N(l, e.rxdb.config.sync), d = await re(e.rxdb, r.namespace, r.entity, u);
-	if (d) return {
-		...Je(),
-		repository: r,
-		success: !0,
-		skipped: d
-	};
-	try {
-		let t = await nt(e, r.namespace, r.entity, {
-			...i,
-			filter: tt(o, l, u, i.filter),
-			includeRelated: !1
+async function Tt(e, t, n) {
+	let r = await Et(e, t, n.conflictResolver), { run: i } = n;
+	if (r.kind === "noop") {
+		i.noop += 1;
+		return;
+	}
+	if (r.kind === "discard") {
+		i.discarded += 1, (r.repair === "restore" ? i.restoreIds : i.dropIds).push(e.entityId);
+		return;
+	}
+	if (r.kind === "unresolved") {
+		i.failures.push({
+			entityId: e.entityId,
+			error: new h(`Unsupported conflict resolution '${r.resolution}' during QueryCache outbox replay for ${e.key}. Only KEEP_LOCAL and KEEP_REMOTE can be applied over REST verbs.`)
 		});
-		return t.success = !0, t;
-	} catch (e) {
-		let t = e instanceof Error ? e : Error(String(e)), n = t instanceof m ? t.cause : t;
-		return {
-			...Ye(t) ?? Je(),
-			repository: r,
-			success: !1,
-			error: n,
-			failures: [{
-				repository: r,
-				error: n
-			}]
-		};
+		return;
 	}
+	await Ot(e, r.verb, n);
 }
-function tt(e, t, n, r) {
-	if (n === "full") return;
-	if (n !== "filter") return r;
-	let i = t.sync?.remote?.filter;
-	if (!i) return r;
-	let a;
-	try {
-		a = i();
-	} catch (t) {
-		throw new p(`Filter function failed for ${e}: ${t instanceof Error ? t.message : String(t)}`);
-	}
-	if (!qe(a)) throw new p(`Invalid RuleGroup returned by filter function for ${e}: RuleGroup must have 'combinator' ('and' | 'or') and 'rules' array properties.`);
-	return a;
+async function Et(e, t, n) {
+	if (t === void 0) return st[e.kind];
+	let r = await n.resolve({
+		entityKey: e.key,
+		local: e.lastChange,
+		remote: Dt(e, t)
+	});
+	return r.type === "KEEP_LOCAL" ? {
+		kind: "replay",
+		verb: ct[e.kind]
+	} : r.type === "KEEP_REMOTE" ? {
+		kind: "discard",
+		repair: "restore"
+	} : {
+		kind: "unresolved",
+		resolution: r.type
+	};
 }
-async function nt(e, t, n, r) {
-	let i = e.rxdb;
-	if (!i.config.sync?.remote?.adapter) throw new p("Remote adapter not configured.");
-	let { adapter: o } = await e.getRemoteRepositories(), { adapter: s } = await e.getLocalRepositories(), c = await e.getCurrentBranch(), l = await L(e, c.id), u = s.getRepository(g), f = e.rxdb.config.entities.find((e) => {
-		let r = T(e);
-		return r.namespace === t && r.name === n;
-	}), h = T(f), _ = N(h, e.rxdb.config.sync), v = await D(u, {
-		namespace: t,
-		entity: n,
-		branchId: c.id,
-		syncType: _
-	}, () => i.entityManager.instantiate(g)), y = v.lastPullRemoteChangeId, b = 0, x = 0, C = 0, w = 0, E = !1, O, k, A = r.conflictResolver ?? new a(), j = y ?? 0, M = z();
-	try {
-		do {
-			let e = await Pe(o, {
-				namespace: t,
-				entity: n,
-				sinceId: j,
-				limit: r.limit,
-				filter: r.filter
-			}, l);
-			if (b += e.length, O = e.length >= r.limit, e.length === 0) {
-				await u.update(v, {
-					lastPulledAt: /* @__PURE__ */ new Date(),
-					updatedAt: /* @__PURE__ */ new Date()
-				});
-				break;
-			}
-			k = e[e.length - 1], j = k.id;
-			let a = i.context.clientId, f = [], p = [];
-			for (let t of e) t.clientId != null && t.clientId === a ? f.push(t) : p.push(t);
-			let m = 0;
-			await s.transaction(async (e) => {
-				let r = e.getRepository(d), a = e.getRepository(g), o = f.filter((e) => e.localId != null);
-				if (o.length > 0) {
-					let e = o.map((e) => e.localId), t = await r.find({ where: {
-						combinator: "and",
-						rules: [{
-							field: "id",
-							operator: "in",
-							value: e
-						}]
-					} }), n = new Map(t.map((e) => [e.id, e]));
-					for (let e of o) {
-						let t = n.get(e.localId);
-						t && t.remoteId == null && await r.update(t, { remoteId: e.id });
-					}
-				}
-				if (p.length > 0) {
-					S(p, M);
-					let a = B(M);
-					x += p.length - a;
-					let o = Ie(p, M), { applyActions: s, conflictsResolved: l, localChangeSupersessions: u } = await Be(o, await Le(r, t, n, c.id, v.lastPushedChangeId, [...new Set(o.map((e) => e.entityId))]), {
-						changeRepo: r,
-						conflictResolver: A,
-						dispatchEvent: (e) => i.dispatchEvent(e),
-						repoLabel: `${t}:${n}`,
-						deferLocalChangeSupersession: !0,
-						localClientId: i.context.clientId
-					});
-					w += l;
-					let d = B(s);
-					if (d > 0) {
-						await e.mergeChanges(s, void 0, !0);
-						for (let e of u) await Re(r, e.localChanges, e.remoteId);
-						m = d;
-					}
-					M = z();
-				}
-				let s = k.id;
-				v = await a.update(v, {
-					lastPullRemoteChangeId: s,
-					lastPulledAt: /* @__PURE__ */ new Date(),
-					updatedAt: /* @__PURE__ */ new Date()
-				});
-			}), E = !0, C += m;
-		} while (O && r.fetchAll);
-	} catch (e) {
-		throw E ? new m({
-			repository: {
-				namespace: t,
-				entity: n
-			},
-			pulled: b,
-			compacted: x,
-			applied: C,
-			hasMore: !0,
-			conflictsResolved: w,
-			conflictsDeferred: 0,
-			persistedProgress: !0,
-			historyInvalidated: C > 0,
-			failures: [{
-				repository: {
-					namespace: t,
-					entity: n
-				},
-				error: e instanceof Error ? e : Error(String(e))
-			}]
-		}, e instanceof Error ? e : Error(String(e))) : e;
-	}
-	return {
-		repository: {
-			namespace: t,
-			entity: n
-		},
-		pulled: b,
-		compacted: x,
-		applied: C,
-		hasMore: O,
-		conflictsResolved: w,
-		conflictsDeferred: 0,
-		persistedProgress: E,
-		historyInvalidated: C > 0,
-		failures: []
+function Dt(e, t) {
+	let n = new Date(t);
+	return {
+		id: 0,
+		namespace: e.lastChange.namespace,
+		entity: e.lastChange.entity,
+		entityId: e.lastChange.entityId,
+		branchId: e.lastChange.branchId,
+		type: e.kind,
+		patch: null,
+		inversePatch: null,
+		createdAt: n,
+		updatedAt: n
 	};
 }
+async function Ot(e, t, n) {
+	let { entity: r, remoteAdapter: i, run: a, rxdb: o } = n, s = kt(i, r, e, t);
+	if (!s) {
+		a.failures.push({
+			entityId: e.entityId,
+			error: new h(`Remote adapter does not support ${t} operation for ${r}`)
+		});
+		return;
+	}
+	try {
+		await R(s), o.reachability.report(null), a.replayed += 1;
+	} catch (t) {
+		o.reachability.report(t), a.failures.push({
+			entityId: e.entityId,
+			error: t instanceof Error ? t : Error(String(t))
+		});
+	}
+}
+function kt(e, t, n, r) {
+	if (r === "delete") return e.delete ? e.delete(t, [n.entityId]) : null;
+	let i = n.action.patch ?? {};
+	if (r === "create") {
+		let r = {
+			id: n.entityId,
+			...i
+		};
+		return e.create ? e.create(t, r) : null;
+	}
+	return e.update ? e.update(t, n.entityId, i) : null;
+}
+async function At(e, t) {
+	let n = await vt(e.changeRepo, e.namespace, t, e.branchId, e.maxChangeId);
+	return new Set(n.map((e) => String(e.entityId)));
+}
+async function jt(e, t, n, r, i) {
+	if (r.restoreIds.length === 0 && r.dropIds.length === 0) return;
+	let a = r.restoreIds.length > 0 ? await R(t.findByIds(n, r.restoreIds)) : [], o = await At(i, n), s = a.filter((e) => !o.has(e.id));
+	s.length > 0 && await R(e.upsertMany(n, s));
+	let c = r.dropIds.filter((e) => !o.has(e));
+	c.length > 0 && await R(e.deleteByIds(n, c));
+}
 //#endregion
 //#region src/push-repository.ts
-var rt = {
+var Mt = {
 	batchSize: 1e3,
 	includeRelated: !0
 };
-function it(e) {
+function Nt(e) {
 	if (!Number.isSafeInteger(e) || e <= 0) throw RangeError("batchSize must be a positive safe integer");
 }
-function at(e) {
-	if (!(e instanceof m)) return;
+function Pt(e) {
+	if (!(e instanceof g)) return;
 	let t = e.result;
 	if (!t || typeof t != "object") return;
 	let n = t;
 	return typeof n.pushed == "number" && typeof n.originalCount == "number" ? n : void 0;
 }
-function ot(e) {
+function Ft(e) {
 	let { error: t } = e;
-	throw t ? e.pushed === 0 ? t : new m(e, t) : new p(`Internal error: repository ${F(e.repository)} failed without an error`);
-}
-async function st(e, t, n, r) {
-	let i = {
-		batchSize: r?.batchSize === void 0 ? rt.batchSize : r.batchSize,
-		includeRelated: r?.includeRelated === void 0 ? rt.includeRelated : r.includeRelated
-	}, a = e.rxdb;
-	a.dispatchEvent(new s("push", t, n, i.includeRelated));
-	let o = e.pushInFlight.session();
+	throw t ? e.pushed === 0 ? t : new g(e, t) : new h(`Internal error: repository ${L(e.repository)} failed without an error`);
+}
+async function It(e, t, n, r, i) {
+	let a = {
+		batchSize: r?.batchSize === void 0 ? Mt.batchSize : r.batchSize,
+		includeRelated: r?.includeRelated === void 0 ? Mt.includeRelated : r.includeRelated
+	}, o = e.rxdb;
+	o.dispatchEvent(new l("push", t, n, a.includeRelated));
+	let s = e.pushInFlight.session(), c = [], f = () => {
+		i ? i.push(...c) : gn(e, c);
+	};
 	try {
-		it(i.batchSize);
-		let r = await ct(e, t, n, i, o);
-		return a.dispatchEvent(new c("push", t, n, {
+		Nt(a.batchSize);
+		let r;
+		try {
+			r = await Lt(e, t, n, a, s, c);
+		} finally {
+			f();
+		}
+		return o.dispatchEvent(new u("push", t, n, {
 			pushed: r.pushed,
 			compacted: r.compacted,
 			failed: r.failed
 		})), r;
 	} catch (e) {
-		throw a.dispatchEvent(new l("push", t, n, e)), e;
+		throw o.dispatchEvent(new d("push", t, n, e)), e;
 	} finally {
-		o.release();
+		s.release();
 	}
 }
-async function ct(e, t, n, r, i) {
-	let a = e.rxdb.config.entities.find((e) => {
-		let r = T(e);
+async function Lt(e, t, n, r, i, a) {
+	let o = e.rxdb.config.entities.find((e) => {
+		let r = A(e);
 		return r.namespace === t && r.name === n;
 	});
-	if (!a) throw new p(`Entity not found: ${t}:${n}`);
-	let o = T(a), s = await ie(e.rxdb, t, n, N(o, e.rxdb.config.sync));
-	if (s) throw new p(`Cannot push repository ${t}:${n}: ${s}.`);
-	return r.includeRelated ? await lt(e, t, n, r, i) : await Ct(e, t, n, r, i);
-}
-async function lt(e, t, n, r, i) {
-	let a = R(e.rxdb.config.entities.map((e) => T(e))), o = `${t}:${n}`;
-	if (!a.get(o)) throw new p(`Repository ${t}:${n} not found in dependency graph`);
-	let s = /* @__PURE__ */ new Set([o]), c = (e) => {
-		let t = a.get(e);
+	if (!o) throw new h(`Entity not found: ${t}:${n}`);
+	let s = A(o), c = await fe(e.rxdb, t, n, F(s, e.rxdb.entitySync));
+	if (c) throw new h(`Cannot push repository ${t}:${n}: ${c}.`);
+	return r.includeRelated ? await Rt(e, t, n, r, i, a) : await _n(e, t, n, r, i, a);
+}
+async function Rt(e, t, n, r, i, a) {
+	let o = z(e.rxdb.config.entities.map((e) => A(e))), s = `${t}:${n}`;
+	if (!o.get(s)) throw new h(`Repository ${t}:${n} not found in dependency graph`);
+	let c = /* @__PURE__ */ new Set([s]), l = (e) => {
+		let t = o.get(e);
 		if (t) for (let e of t.requiredBy) {
 			let t = `${e.namespace}:${e.entity}`;
-			s.has(t) || (s.add(t), c(t));
+			c.has(t) || (c.add(t), l(t));
 		}
 	};
-	c(o);
-	let l = (e) => Ke(a, e).filter((e) => s.has(F(e))), u = /* @__PURE__ */ new Map(), d = /* @__PURE__ */ new Map();
-	for (let t of pt) for (let n of l(t.action)) await ut(e, a, n, t, r, u, d, i);
-	let f = [], m = [];
-	for (let e of l("INSERT")) {
-		let t = u.get(F(e));
-		if (!t) throw new p(`Internal error: cascade node missing for ${F(e)}`);
-		let n = t.result ?? await St(t.plan);
-		f.push(n), n.error && m.push({
-			repository: e,
+	l(s);
+	let u = (e) => Pe(o, e).filter((e) => c.has(L(e))), d = /* @__PURE__ */ new Map(), f = /* @__PURE__ */ new Map();
+	for (let t of Ht) for (let n of u(t.action)) await zt(e, o, n, t, r, d, f, i);
+	let p = u("INSERT").map((e) => {
+		let t = d.get(L(e));
+		if (!t) throw new h(`Internal error: cascade node missing for ${L(e)}`);
+		return t;
+	}), m = await en(e, p.flatMap((e) => e.result ? [] : [e.plan]), a), g = [], _ = [];
+	for (let e of p) {
+		let t = e.repo, n = e.result ?? m.get(e.plan);
+		if (!n) throw new h(`Internal error: push result missing for ${L(t)}`);
+		g.push(n), n.error && _.push({
+			repository: t,
 			error: n.error
 		});
 	}
-	let h = f.find((e) => e.repository.namespace === t && e.repository.entity === n);
-	if (!h) throw new p("Internal error: target repository result not found");
-	return h.relatedResults = f.filter((e) => e !== h), h.failures = m, h.success || ot(h), h;
+	let v = g.find((e) => e.repository.namespace === t && e.repository.entity === n);
+	if (!v) throw new h("Internal error: target repository result not found");
+	return v.relatedResults = g.filter((e) => e !== v), v.failures = _, v.success || Ft(v), v;
 }
-async function ut(e, t, n, r, i, a, o, s) {
-	let c = F(n), l = a.get(c);
+async function zt(e, t, n, r, i, a, o, s) {
+	let c = L(n), l = a.get(c);
 	if (l || (l = { repo: n }, a.set(c, l)), l.result) return;
-	let u = Me(t, c, o, Ue(r.action));
+	let u = be(t, c, o, je(r.action));
 	if (u) {
-		let e = new f(n, u.dependency, u.cause);
+		let e = new m(n, u.dependency, u.cause);
 		l.result = {
-			...ft(l.plan),
+			...Vt(l.plan),
 			repository: n,
 			success: !1,
-			skipped: `dependency ${F(u.dependency)} failed`,
+			skipped: `dependency ${L(u.dependency)} failed`,
 			error: e
 		}, o.set(c, e);
 		return;
 	}
 	if (!l.plan) {
-		let t = await dt(e, n);
+		let t = await Bt(e, n);
 		if (t) {
 			l.result = {
-				...V(),
+				...H(),
 				repository: n,
 				success: !0,
 				skipped: t
@@ -1015,7 +1249,7 @@ async function ut(e, t, n, r, i, a, o, s) {
 			return;
 		}
 		try {
-			let t = await bt(e, n.namespace, n.entity, s);
+			let t = await Zt(e, n.namespace, n.entity, s);
 			if ("emptyResult" in t) {
 				l.result = {
 					...t.emptyResult,
@@ -1027,7 +1261,7 @@ async function ut(e, t, n, r, i, a, o, s) {
 		} catch (e) {
 			let t = e instanceof Error ? e : Error(String(e));
 			l.result = {
-				...V(),
+				...H(),
 				repository: n,
 				success: !1,
 				error: t,
@@ -1039,120 +1273,183 @@ async function ut(e, t, n, r, i, a, o, s) {
 			return;
 		}
 	}
-	await xt(l.plan, r.kinds, i.batchSize), l.plan.error && (l.result = await St(l.plan), o.set(c, l.plan.error));
+	await Qt(l.plan, r.kinds, i.batchSize), l.plan.error && (l.result = U(l.plan, l.plan.pushed, 0, l.plan.error), o.set(c, l.plan.error));
 }
-async function dt(e, t) {
+async function Bt(e, t) {
 	let n = e.rxdb.config.entities.find((e) => {
-		let n = T(e);
+		let n = A(e);
 		return n.namespace === t.namespace && n.name === t.entity;
 	});
-	if (!n) throw new p(`Internal error: entity not found for cascade node ${F(t)}`);
-	return ie(e.rxdb, t.namespace, t.entity, N(T(n), e.rxdb.config.sync));
+	if (!n) throw new h(`Internal error: entity not found for cascade node ${L(t)}`);
+	return fe(e.rxdb, t.namespace, t.entity, F(A(n), e.rxdb.entitySync));
 }
-function V() {
+function H() {
 	return {
 		pushed: 0,
+		rejected: 0,
 		failed: 0,
 		compacted: 0,
 		originalCount: 0,
 		failures: []
 	};
 }
-function ft(e) {
+function Vt(e) {
 	return e ? {
 		pushed: e.pushed,
+		rejected: 0,
 		failed: e.effectiveCount - e.pushed,
 		compacted: e.compacted,
 		originalCount: e.originalCount,
 		failures: []
-	} : V();
+	} : H();
 }
-var pt = [{
+var Ht = [{
 	action: "DELETE",
 	kinds: /* @__PURE__ */ new Set(["deletes"])
 }, {
 	action: "INSERT",
 	kinds: /* @__PURE__ */ new Set(["updates", "inserts"])
-}], mt = /* @__PURE__ */ new Set([
+}], Ut = /* @__PURE__ */ new Set([
 	"deletes",
 	"updates",
 	"inserts"
 ]);
-function ht(e, t) {
+function Wt(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = A(t), r = n.get(e) ?? [];
+		let { branchId: e } = t;
+		if (e === void 0) throw new h(`Internal error: unpushed change ${t.id} has no branchId`);
+		let r = n.get(e) ?? [];
 		r.push(t), n.set(e, r);
 	}
-	let r = [], i = (e, t) => {
-		for (let [i, a] of t) {
-			let t = n.get(i);
-			if (!t?.length) throw new p(`Missing source changes for compacted action: ${i}`);
-			r.push({
-				actionKind: e,
-				key: i,
-				action: a,
-				sourceChanges: t
+	return [...t].reverse().flatMap((e) => {
+		let t = n.get(e);
+		return t ? Gt(e, t) : [];
+	});
+}
+function Gt(e, t) {
+	let n = {
+		deletes: /* @__PURE__ */ new Map(),
+		updates: /* @__PURE__ */ new Map(),
+		inserts: /* @__PURE__ */ new Map()
+	};
+	return k(t.map((e) => ({
+		id: e.id,
+		namespace: e.namespace,
+		entity: e.entity,
+		entityId: e.entityId,
+		type: e.type,
+		branchId: e.branchId,
+		patch: e.patch,
+		inversePatch: e.inversePatch,
+		createdAt: e.createdAt,
+		updatedAt: e.updatedAt
+	})), n), Kt(e, t, n);
+}
+function Kt(e, t, n) {
+	let r = /* @__PURE__ */ new Map();
+	for (let e of t) {
+		let t = N(e), n = r.get(t) ?? [];
+		n.push(e), r.set(t, n);
+	}
+	let i = [], a = (t, n) => {
+		for (let [a, o] of n) {
+			let n = r.get(a);
+			if (!n?.length) throw new h(`Missing source changes for compacted action: ${a}`);
+			i.push({
+				branchId: e,
+				actionKind: t,
+				key: a,
+				action: o,
+				sourceChanges: n
 			});
 		}
 	};
-	return i("deletes", t.deletes), i("updates", t.updates), i("inserts", t.inserts), r;
+	return a("deletes", n.deletes), a("updates", n.updates), a("inserts", n.inserts), i;
 }
-function gt(e) {
+function qt(e) {
 	let t = {
 		deletes: /* @__PURE__ */ new Map(),
 		updates: /* @__PURE__ */ new Map(),
 		inserts: /* @__PURE__ */ new Map()
-	}, n = [], r = /* @__PURE__ */ new Map();
-	for (let i of e) {
-		t[i.actionKind].set(i.key, i.action);
-		for (let e of i.sourceChanges) n.push(e), r.set(e.id, [e]);
+	}, n = [];
+	for (let r of e) {
+		t[r.actionKind].set(r.key, r.action);
+		for (let e of r.sourceChanges) n.push(e);
 	}
 	return n.sort((e, t) => e.id - t.id), {
 		actions: t,
-		sourceChanges: n,
-		sourceChangesByLocalId: r
+		sourceChanges: n
 	};
 }
-function _t(e) {
-	return typeof e != "object" || !e ? [] : e.changeIdMapping ?? [];
+function Jt(e, t) {
+	let n = new Set(t.map((e) => e.id)), r = /* @__PURE__ */ new Set();
+	for (let t of e) {
+		if (!n.has(t.localId)) throw new h(`Remote merge result references unknown local change: ${t.localId}`);
+		if (r.has(t.localId)) throw new h(`Remote merge result duplicates local change: ${t.localId}`);
+		r.add(t.localId);
+	}
+	if (r.size !== n.size) {
+		let e = [...n].filter((e) => !r.has(e));
+		throw new h(`Remote merge result missing local changes: ${e.join(", ")}`);
+	}
 }
-function vt(e, t) {
-	let n = e.map(({ localId: e, remoteId: n }) => {
-		let r = t.get(e);
-		if (!r) throw new p(`Remote change mapping references unknown local change: ${e}`);
-		return {
-			remoteId: n,
-			sourceChanges: r
-		};
-	}), r = /* @__PURE__ */ new Map();
-	for (let { remoteId: e, sourceChanges: t } of n) for (let n of t) r.set(n, e);
-	return [...r].map(([e, t]) => ({
-		change: e,
-		remoteId: t
-	}));
+function Yt(e, t) {
+	let n = e.sourceChanges.map((e) => {
+		let n = t.get(e.id);
+		if (!n) throw new h(`Remote merge result missing local changes: ${e.id}`);
+		return n;
+	}), r = n.find((e) => e.status === "rejected");
+	if (r) {
+		if (n.some((e) => e.status === "applied")) throw new h(`Remote merge result splits entity ${e.key}: some source changes applied, some rejected`);
+		return r.rejection;
+	}
 }
-async function yt(e, t, n) {
-	return vt(_t(await e.mergeChanges(n.actions, t, n.sourceChanges)), n.sourceChangesByLocalId);
+async function Xt(e, t, n) {
+	let r = qt(n), i = await e.mergeChanges(r.actions, t, r.sourceChanges);
+	Jt(i.results, r.sourceChanges);
+	let a = new Map(i.results.map((e) => [e.localId, e])), o = new Map(r.sourceChanges.map((e) => [e.id, e])), s = {
+		applied: [],
+		rejected: []
+	};
+	for (let e of n) {
+		let t = Yt(e, a);
+		t && s.rejected.push({
+			entry: e,
+			rejection: t
+		});
+	}
+	for (let e of i.results) {
+		if (e.status !== "applied") continue;
+		let t = o.get(e.localId);
+		if (!t) throw new h(`Remote merge result references unknown local change: ${e.localId}`);
+		s.applied.push({
+			change: t,
+			remoteId: e.remoteId
+		});
+	}
+	return s;
 }
-async function bt(e, t, n, r) {
+async function Zt(e, t, n, r) {
 	let i = e.rxdb;
-	if (!i.config.sync?.remote?.adapter) throw new p("Remote adapter not configured.");
+	if (!i.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
 	await e.getRemoteRepositories();
-	let { adapter: a } = await e.getLocalRepositories(), o = await e.getCurrentBranch(), s = a.getRepository(g), c = e.rxdb.config.entities.find((e) => {
-		let r = T(e);
+	let { adapter: a } = await e.getLocalRepositories(), o = e.branchSwitchGeneration, s = await e.getCurrentBranch(), c = a.getRepository(v), l = e.rxdb.config.entities.find((e) => {
+		let r = A(e);
 		return r.namespace === t && r.name === n;
-	}), l = T(c), u = N(l, e.rxdb.config.sync), f = await D(s, {
+	});
+	if (!l) throw new h(`Entity not found: ${t}:${n}`);
+	let u = A(l), d = F(u, e.rxdb.entitySync), f = await M(c, {
 		namespace: t,
 		entity: n,
-		branchId: o.id,
-		syncType: u
-	}, () => i.entityManager.instantiate(g)), m = f.lastPushedChangeId, h = await L(e, o.id), _ = a.getRepository(d), v;
-	if (h.length === 1) v = await wt(_, h, m, t, [n]);
+		branchId: s.id,
+		syncType: d
+	}, () => i.entityManager.instantiate(v)), m = f.lastPushedChangeId, g = await ge(e, s.id), _ = a.getRepository(p), y;
+	if (g.length === 1) y = await vn(_, g, m, t, [n]);
 	else {
 		let e = m;
-		for (let r of h.slice(1)) {
-			let i = `${t}:${n}:${r}`, a = (await s.find({
+		for (let r of g.slice(1)) {
+			let i = `${t}:${n}:${r}`, a = (await c.find({
 				where: {
 					combinator: "and",
 					rules: [{
@@ -1169,129 +1466,294 @@ async function bt(e, t, n, r) {
 			}
 			(e === null || a < e) && (e = a);
 		}
-		v = await wt(_, h, e, t, [n]);
+		y = await vn(_, g, e, t, [n]);
 	}
-	let y = v.length;
-	if (y === 0) return { emptyResult: {
-		...V(),
+	let b = y.length;
+	if (b === 0) return { emptyResult: {
+		...H(),
 		repository: {
 			namespace: t,
 			entity: n
 		}
 	} };
-	let b = {
-		deletes: /* @__PURE__ */ new Map(),
-		updates: /* @__PURE__ */ new Map(),
-		inserts: /* @__PURE__ */ new Map()
-	};
-	S(v.map((e) => ({
-		id: e.id,
-		namespace: e.namespace,
-		entity: e.entity,
-		entityId: e.entityId,
-		type: e.type,
-		branchId: e.branchId,
-		patch: e.patch,
-		inversePatch: e.inversePatch,
-		createdAt: e.createdAt,
-		updatedAt: e.updatedAt
-	})), b);
-	let x = b.inserts.size + b.updates.size + b.deletes.size, C = y - x;
-	if (x === 0) {
-		let e = v.reduce((e, t) => t.id > e ? t.id : e, v[0].id);
-		return await s.update(f, {
+	let x = Wt(y, g), S = x.length, C = b - S;
+	if (S === 0) {
+		let e = y.reduce((e, t) => t.id > e ? t.id : e, y[0].id);
+		return await c.update(f, {
 			lastPushedChangeId: e,
 			updatedAt: /* @__PURE__ */ new Date()
 		}), { emptyResult: {
-			...V(),
+			...H(),
 			repository: {
 				namespace: t,
 				entity: n
 			},
-			compacted: y,
-			originalCount: y
+			compacted: b,
+			originalCount: b
 		} };
 	}
 	let { adapter: w } = await e.getRemoteRepositories();
-	return r.claim(`${t}:${n}`, v.reduce((e, t) => t.id > e ? t.id : e, v[0].id)), {
+	return r.claim(`${t}:${n}`, y.reduce((e, t) => t.id > e ? t.id : e, y[0].id)), {
 		repository: {
 			namespace: t,
 			entity: n
 		},
-		entries: ht(v, b),
-		localChanges: v,
+		entityType: l,
+		entries: x,
+		localChanges: y,
 		repoSync: f,
 		localAdapter: a,
 		remoteAdapter: w,
-		branchId: o.id,
-		originalCount: y,
-		effectiveCount: x,
+		branchId: s.id,
+		branchGeneration: o,
+		originalCount: b,
+		effectiveCount: S,
 		compacted: C,
 		pushed: 0,
-		remoteIdsByChange: /* @__PURE__ */ new Map()
+		remoteIdsByChange: /* @__PURE__ */ new Map(),
+		rejectedEntries: []
 	};
 }
-async function xt(e, t, n) {
+async function Qt(e, t, n) {
 	if (e.error) return;
 	let r = e.entries.filter((e) => t.has(e.actionKind));
 	if (r.length === 0) return;
 	let { namespace: i, entity: a } = e.repository;
-	for (let t = 0; t < r.length; t += n) {
-		let o = r.slice(t, t + n), s = gt(o);
-		try {
-			let t = await yt(e.remoteAdapter, e.branchId, s);
-			for (let { change: n, remoteId: r } of t) e.remoteIdsByChange.set(n, r);
-			e.pushed += o.length;
-		} catch (t) {
-			console.error(`Error pushing changes to remote for repository [${i}/${a}]:`, t), e.error = t instanceof Error ? t : Error(String(t));
-			return;
-		}
+	for (let { branchId: t, entries: o } of $t(r, n)) try {
+		let n = await Xt(e.remoteAdapter, t, o);
+		for (let { change: t, remoteId: r } of n.applied) e.remoteIdsByChange.set(t, r);
+		for (let t of n.rejected) e.rejectedEntries.push(t);
+		e.pushed += o.length - n.rejected.length;
+	} catch (t) {
+		console.error(`Error pushing changes to remote for repository [${i}/${a}]:`, t), e.error = t instanceof Error ? t : Error(String(t));
+		return;
 	}
 }
-async function St(e) {
-	let { repository: t, localChanges: n, repoSync: r, localAdapter: i, remoteIdsByChange: a, effectiveCount: o } = e, { namespace: s, entity: c } = t, l = e.pushed, u = e.error, d = o - l;
-	if (d === 0) {
-		let e = n.reduce((e, t) => t.id > e ? t.id : e, n[0].id), t = new Map([...a].map(([e]) => [e, e.remoteId])), f = {
-			lastPushedChangeId: r.lastPushedChangeId,
-			lastPushedAt: r.lastPushedAt,
-			updatedAt: r.updatedAt
-		}, p = /* @__PURE__ */ new Date();
-		try {
-			await i.transaction(async (t) => {
-				let n = [...a].map(([e, t]) => (e.remoteId = t, e));
-				n.length > 0 && await t.saveMany(n), await t.getRepository(g).update(r, {
-					lastPushedChangeId: e,
-					lastPushedAt: p,
-					updatedAt: p
-				});
-			});
-		} catch (e) {
-			for (let [e, n] of t) e.remoteId = n;
-			Object.assign(r, f), console.error(`Error saving push state for repository [${s}/${c}]:`, e), u = e instanceof Error ? e : Error(String(e)), l = 0, d = o;
-		}
+function $t(e, t) {
+	let n = [];
+	for (let r of e) {
+		let e = n.at(-1);
+		e?.branchId === r.branchId && e.entries.length < t ? e.entries.push(r) : n.push({
+			branchId: r.branchId,
+			entries: [r]
+		});
+	}
+	return n;
+}
+async function en(e, t, n) {
+	let r = /* @__PURE__ */ new Map(), i = [];
+	for (let e of t) e.effectiveCount - e.pushed - e.rejectedEntries.length > 0 ? r.set(e, U(e, e.pushed, 0, e.error)) : i.push(e);
+	if (i.length === 0) return r;
+	try {
+		let t = await tn(e, i);
+		for (let e of t) n.push(e);
+		for (let e of i) r.set(e, U(e, e.pushed, e.rejectedEntries.length, void 0));
+	} catch (e) {
+		let t = i.map((e) => L(e.repository)).join(", ");
+		console.error(`Error saving push state for repositories [${t}]:`, e);
+		let n = e instanceof Error ? e : Error(String(e));
+		for (let e of i) r.set(e, U(e, 0, 0, n));
 	}
+	return r;
+}
+function U(e, t, n, r) {
+	let { repository: i } = e, a = e.effectiveCount - t - n;
 	return {
-		repository: t,
-		success: d === 0,
-		error: u,
-		pushed: l,
-		failed: d,
+		repository: i,
+		success: a === 0,
+		error: r,
+		pushed: t,
+		rejected: n,
+		failed: a,
 		compacted: e.compacted,
 		originalCount: e.originalCount,
-		failures: u ? [{
-			repository: t,
-			error: u
+		failures: r ? [{
+			repository: i,
+			error: r
 		}] : []
 	};
 }
-async function Ct(e, t, n, r, i) {
-	let a = await bt(e, t, n, i);
-	if ("emptyResult" in a) return a.emptyResult;
-	await xt(a, mt, r.batchSize);
-	let o = await St(a);
-	return o.success || ot(o), o;
+async function tn(e, t) {
+	let n = [];
+	for (let e of t) n.push({
+		plan: e,
+		remoteRows: await cn(e)
+	});
+	let r = /* @__PURE__ */ new Date(), i = t.map(an);
+	try {
+		await t[0].localAdapter.transaction(async (i) => {
+			await sn(e, i, t);
+			let a = [];
+			for (let { plan: e, remoteRows: t } of n) await on(i, e, r), a.push(await dn(i, e, t));
+			for (let { removals: e } of [...a].reverse()) await fn(i, e);
+			for (let { restores: e } of a) await fn(i, e);
+			for (let e of t) await i.getRepository(v).update(e.repoSync, {
+				lastPushedChangeId: rn(e),
+				lastPushedAt: r,
+				updatedAt: r
+			});
+		});
+	} catch (e) {
+		for (let e of i) e();
+		throw e;
+	}
+	return t.flatMap((e) => hn(e.rejectedEntries, r));
+}
+function nn(e) {
+	return [...e.remoteIdsByChange.keys(), ...e.rejectedEntries.flatMap(({ entry: e }) => e.sourceChanges)];
+}
+function rn(e) {
+	return e.localChanges.reduce((e, t) => t.id > e ? t.id : e, e.localChanges[0].id);
+}
+function an(e) {
+	let { repoSync: t } = e, n = nn(e).map((e) => ({
+		change: e,
+		remoteId: e.remoteId,
+		rejectedAt: e.rejectedAt,
+		rejection: e.rejection
+	})), r = {
+		lastPushedChangeId: t.lastPushedChangeId,
+		lastPushedAt: t.lastPushedAt,
+		updatedAt: t.updatedAt
+	};
+	return () => {
+		for (let e of n) e.change.remoteId = e.remoteId, e.change.rejectedAt = e.rejectedAt, e.change.rejection = e.rejection;
+		Object.assign(t, r);
+	};
+}
+async function on(e, t, n) {
+	for (let [e, n] of t.remoteIdsByChange) e.remoteId = n;
+	for (let { entry: e, rejection: r } of t.rejectedEntries) for (let t of e.sourceChanges) t.rejectedAt = n, t.rejection = r;
+	let r = nn(t);
+	r.length > 0 && await e.saveMany(r);
+}
+async function sn(e, t, n) {
+	if (!n.some((e) => e.rejectedEntries.length > 0)) return;
+	let r = await E(t), i = e.branchSwitchGeneration, a = n.find((e) => e.branchId !== r.id || e.branchGeneration !== i);
+	if (a) throw new h(`Branch switched while pushing ${L(a.repository)} from branch ${a.branchId}; rejected receipts are not applied to active branch ${r.id}.`);
+}
+async function cn(e) {
+	let t = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
+	for (let { rejection: t } of e.rejectedEntries) {
+		let e = `${t.entity.namespace}:${t.entity.entity}`, r = n.get(e) ?? [];
+		r.push(t.entity.entityId), n.set(e, r);
+	}
+	for (let [r, i] of n) {
+		let n = await R(e.remoteAdapter.findByIds(r, i));
+		for (let e of n) t.set(`${r}:${String(e.id)}`, e);
+	}
+	return t;
+}
+function ln(e) {
+	let { namespace: t, entity: n, entityId: r } = e.entity;
+	return `${t}:${n}:${r}`;
+}
+var un = () => ({
+	deletes: /* @__PURE__ */ new Map(),
+	updates: /* @__PURE__ */ new Map(),
+	inserts: /* @__PURE__ */ new Map()
+});
+async function dn(e, t, n) {
+	let r = {
+		removals: un(),
+		restores: un()
+	};
+	if (t.rejectedEntries.length === 0) return r;
+	let { namespace: i, entity: a } = t.repository, o = await e.getRepository(p).find({ where: {
+		combinator: "and",
+		rules: [
+			{
+				field: "namespace",
+				operator: "=",
+				value: i
+			},
+			{
+				field: "entity",
+				operator: "=",
+				value: a
+			},
+			{
+				field: "entityId",
+				operator: "in",
+				value: oe(t.rejectedEntries.map(({ rejection: e }) => e.entity.entityId))
+			},
+			{
+				field: "id",
+				operator: ">",
+				value: rn(t)
+			},
+			{
+				field: "revertChangeId",
+				operator: "=",
+				value: null
+			},
+			{
+				field: "remoteId",
+				operator: "=",
+				value: null
+			},
+			{
+				field: "rejectedAt",
+				operator: "=",
+				value: null
+			}
+		]
+	} }), s = new Set(o.map((e) => N(e)));
+	for (let { entry: e, rejection: i } of t.rejectedEntries) s.has(e.key) || pn(r, e, n.get(ln(i)));
+	return r;
+}
+async function fn(e, t) {
+	t.inserts.size + t.updates.size + t.deletes.size !== 0 && (ne(e, {
+		file: "push-repository.ts",
+		symbol: "alignRejectedEntities",
+		intent: T.remote_sync
+	}), await e.mergeChanges(t, void 0, !0));
+}
+function pn(e, t, n) {
+	if (n) {
+		let { restores: r } = e;
+		(t.actionKind === "deletes" ? r.inserts : r.updates).set(t.key, {
+			patch: n,
+			inversePatch: null
+		});
+		return;
+	}
+	t.actionKind !== "deletes" && e.removals.deletes.set(t.key, {
+		patch: null,
+		inversePatch: null
+	});
+}
+var mn = {
+	deletes: "DELETE",
+	updates: "UPDATE",
+	inserts: "INSERT"
+};
+function hn(e, t) {
+	return e.map(({ entry: e, rejection: n }) => ({
+		namespace: n.entity.namespace,
+		entity: n.entity.entity,
+		entityId: n.entity.entityId,
+		op: mn[e.actionKind],
+		code: n.code,
+		reason: n.reason,
+		message: n.message,
+		...n.dependsOn ? { dependsOn: n.dependsOn } : {},
+		at: t,
+		changeIds: e.sourceChanges.map((e) => e.id)
+	}));
+}
+function gn(e, t) {
+	t.length > 0 && e.rxdb.syncState.reportRejections(t);
 }
-async function wt(e, t, n, r, i) {
+async function _n(e, t, n, r, i, a) {
+	let o = await Zt(e, t, n, i);
+	if ("emptyResult" in o) return o.emptyResult;
+	await Qt(o, Ut, r.batchSize);
+	let s = (await en(e, [o], a)).get(o);
+	if (!s) throw new h(`Internal error: push result missing for ${t}:${n}`);
+	return s.success || Ft(s), s;
+}
+async function vn(e, t, n, r, i) {
 	let a = [
 		{
 			field: "revertChangeId",
@@ -1303,6 +1765,11 @@ async function wt(e, t, n, r, i) {
 			operator: "=",
 			value: null
 		},
+		{
+			field: "rejectedAt",
+			operator: "=",
+			value: null
+		},
 		{
 			field: "namespace",
 			operator: "=",
@@ -1338,7 +1805,7 @@ async function wt(e, t, n, r, i) {
 }
 //#endregion
 //#region src/sync-repository.ts
-function Tt(e, t) {
+function yn(e, t) {
 	return {
 		repository: {
 			namespace: e,
@@ -1355,33 +1822,34 @@ function Tt(e, t) {
 		failures: []
 	};
 }
-function Et(e, t) {
+function bn(e, t) {
 	return {
 		repository: {
 			namespace: e,
 			entity: t
 		},
 		pushed: 0,
+		rejected: 0,
 		failed: 0,
 		compacted: 0,
 		originalCount: 0,
 		failures: []
 	};
 }
-function Dt(e, t, n) {
-	if (!(e instanceof m)) return e;
-	let r = Ye(e);
+function xn(e, t, n) {
+	if (!(e instanceof g)) return e;
+	let r = Le(e);
 	if (!r) return e;
 	let i = {
 		pullResult: r,
-		pushResult: Et(t, n),
+		pushResult: bn(t, n),
 		persistedProgress: r.persistedProgress,
 		historyInvalidated: r.historyInvalidated
 	};
-	return new m(i, e.cause);
+	return new g(i, e.cause);
 }
-function Ot(e, t, n, r) {
-	let i = e instanceof Error ? e : Error(String(e)), a = at(i), o = a === void 0 ? Et(n, r) : a, s = t.persistedProgress || o.pushed > 0;
+function Sn(e, t, n, r) {
+	let i = e instanceof Error ? e : Error(String(e)), a = Pt(i), o = a === void 0 ? bn(n, r) : a, s = t.persistedProgress || o.pushed > 0;
 	if (!s) return i;
 	let c = {
 		pullResult: t,
@@ -1389,140 +1857,140 @@ function Ot(e, t, n, r) {
 		persistedProgress: s,
 		historyInvalidated: t.historyInvalidated
 	};
-	return new m(c, i instanceof m ? i.cause : i);
+	return new g(c, i instanceof g ? i.cause : i);
 }
-async function kt(e, t, n, r) {
-	let i = e.rxdb, a = r?.pull?.includeRelated ?? r?.push?.includeRelated ?? !0;
-	i.dispatchEvent(new s("sync", t, n, a));
+async function Cn(e, t, n, r, i) {
+	let a = e.rxdb, o = r?.pull?.includeRelated ?? r?.push?.includeRelated ?? !0;
+	a.dispatchEvent(new l("sync", t, n, o));
 	try {
-		let a = await At(e, t, n, r), { pullResult: o, pushResult: s } = a, l = {
-			pulled: o.pulled,
-			pushed: s.pushed,
-			compacted: o.compacted + s.compacted,
-			failed: s.failed,
-			conflictsResolved: o.conflictsResolved,
-			conflictsDeferred: o.conflictsDeferred
+		let o = await wn(e, t, n, r, i), { pullResult: s, pushResult: c } = o, l = {
+			pulled: s.pulled,
+			pushed: c.pushed,
+			compacted: s.compacted + c.compacted,
+			failed: c.failed,
+			conflictsResolved: s.conflictsResolved,
+			conflictsDeferred: s.conflictsDeferred
 		};
-		return i.dispatchEvent(new c("sync", t, n, l)), a;
+		return a.dispatchEvent(new u("sync", t, n, l)), o;
 	} catch (e) {
-		throw i.dispatchEvent(new l("sync", t, n, e)), e;
+		throw a.dispatchEvent(new d("sync", t, n, e)), e;
 	}
 }
-async function At(e, t, n, r) {
-	let i = e.rxdb.config.entities.find((e) => {
-		let r = T(e);
+async function wn(e, t, n, r, i) {
+	let a = e.rxdb.config.entities.find((e) => {
+		let r = A(e);
 		return r.namespace === t && r.name === n;
 	});
-	if (!i) throw new p(`Entity not found: ${t}:${n}`);
-	let a = T(i), o = N(a, e.rxdb.config.sync);
-	if (o === "none") throw new p(`Cannot sync repository ${t}:${n}: syncType is 'none'. This entity is not configured for remote synchronization.`);
-	let s;
-	if ((r?.direction === "pull" || r?.direction === "sync" || !r?.direction) && M(o).pull) try {
-		s = await Ze(e, t, n, r?.pull);
+	if (!a) throw new h(`Entity not found: ${t}:${n}`);
+	let o = A(a), s = F(o, e.rxdb.entitySync);
+	if (s === "none") throw new h(`Cannot sync repository ${t}:${n}: syncType is 'none'. This entity is not configured for remote synchronization.`);
+	let c;
+	if ((r?.direction === "pull" || r?.direction === "sync" || !r?.direction) && P(s).pull) try {
+		c = await ze(e, t, n, r?.pull);
 	} catch (e) {
-		throw Dt(e, t, n);
+		throw xn(e, t, n);
 	}
-	else s = Tt(t, n);
-	let c;
-	if ((r?.direction === "push" || r?.direction === "sync" || !r?.direction) && M(o).push) try {
-		c = await st(e, t, n, r?.push);
+	else c = yn(t, n);
+	let l;
+	if ((r?.direction === "push" || r?.direction === "sync" || !r?.direction) && P(s).push) try {
+		l = await It(e, t, n, r?.push, i);
 	} catch (e) {
-		throw Ot(e, s, t, n);
+		throw Sn(e, c, t, n);
 	}
-	else c = Et(t, n);
+	else l = bn(t, n);
 	return {
-		pullResult: s,
-		pushResult: c,
-		persistedProgress: s.persistedProgress || c.pushed > 0,
-		historyInvalidated: s.historyInvalidated
+		pullResult: c,
+		pushResult: l,
+		persistedProgress: c.persistedProgress || l.pushed > 0,
+		historyInvalidated: c.historyInvalidated
 	};
 }
 //#endregion
 //#region src/bulk-sync.ts
-async function jt(e, t) {
+async function Tn(e, t) {
 	if (t.repositories && t.repositories.length > 0) return t.repositories;
 	let n = [];
 	for (let t of e.config.entities) {
-		let r = T(t), i = M(N(r, e.config.sync));
+		let r = A(t), i = P(F(r, e.entitySync));
 		if (!i.pull && !i.push) continue;
-		let a = await C(e, r.namespace, r.name);
-		P(a) && n.push({
+		let a = await re(e, r.namespace, r.name);
+		I(a) && n.push({
 			namespace: r.namespace,
 			entity: r.name
 		});
 	}
 	return n;
 }
-async function Mt(e, t, n) {
+async function En(e, t, n, r) {
 	try {
 		return {
 			repository: t,
 			success: !0,
-			result: await kt(e, t.namespace, t.entity, n)
+			result: await Cn(e, t.namespace, t.entity, n, r)
 		};
 	} catch (e) {
 		let n = e instanceof Error ? e : Error(String(e));
 		return {
 			repository: t,
 			success: !1,
-			result: n instanceof m ? n.result : void 0,
+			result: n instanceof g ? n.result : void 0,
 			error: n
 		};
 	}
 }
-async function Nt(e, t, n) {
-	let r = [];
-	for (let i of t) {
-		let t = await Mt(e, i, n);
-		r.push(t);
-	}
-	return r;
-}
-async function Pt(e, t, n, r) {
+async function Dn(e, t, n, r) {
 	let i = [];
-	for (let a = 0; a < t.length; a += r) {
-		let o = t.slice(a, a + r).map((t) => Mt(e, t, n)), s = await Promise.all(o);
-		i.push(...s);
+	for (let a of t) {
+		let t = await En(e, a, n, r);
+		i.push(t);
 	}
 	return i;
 }
-async function Ft(e, t = {}) {
-	let n = Date.now(), r = e.syncManager, i = await jt(e, t), a = {
+async function On(e, t, n, r, i) {
+	let a = [];
+	for (let o = 0; o < t.length; o += r) {
+		let s = t.slice(o, o + r).map((t) => En(e, t, n, i)), c = await Promise.all(s);
+		a.push(...c);
+	}
+	return a;
+}
+async function kn(e, t = {}) {
+	let n = Date.now(), r = e.syncManager, i = await Tn(e, t), a = {
 		direction: t.operation,
 		pull: t.pull,
 		push: t.push
 	}, o = t.concurrent ?? !1, s = t.concurrency ?? 3;
-	if (o && (!Number.isSafeInteger(s) || s < 1)) throw new p(`bulkSync: concurrency 必须是不小于 1 的安全整数，收到 ${String(s)}`);
-	let c;
-	c = o ? await Pt(r, i, a, s) : await Nt(r, i, a);
-	let l = c.filter((e) => e.success).length, u = c.filter((e) => !e.success).length, d = Date.now() - n;
+	if (o && (!Number.isSafeInteger(s) || s < 1)) throw new h(`bulkSync: concurrency 必须是不小于 1 的安全整数，收到 ${String(s)}`);
+	let c, l = [];
+	c = o ? await On(r, i, a, s, l) : await Dn(r, i, a, l), gn(r, l);
+	let u = c.filter((e) => e.success).length, d = c.filter((e) => !e.success).length, f = Date.now() - n;
 	return {
-		succeeded: l,
-		failed: u,
+		succeeded: u,
+		failed: d,
 		results: c,
-		durationMs: d
+		durationMs: f
 	};
 }
 //#endregion
 //#region src/check-repository-updates.ts
-async function It(e, t, n) {
+async function An(e, t, n) {
 	let r = {
 		namespace: t,
 		entity: n
 	}, i = e.config.entities.find((e) => {
-		let r = T(e);
+		let r = A(e);
 		return r.namespace === t && r.name === n;
 	});
 	if (!i) throw Error(`Entity not found: ${t}.${n}`);
-	let a = T(i);
-	if (!te(a, e.config.sync)) return {
+	let a = A(i);
+	if (!ue(a, e.entitySync)) return {
 		repository: r,
 		remoteLatestChangeId: 0,
 		localLastPullRemoteChangeId: null,
 		pendingCount: 0,
 		hasUpdates: !1
 	};
-	let o = e.syncManager, s = (await o.getCurrentBranch()).id, { adapter: c } = await o.getLocalRepositories(), l = c.getRepository(g), u = `${t}:${n}:${s}`, d = (await l.find({
+	let o = e.syncManager, s = (await o.getCurrentBranch()).id, { adapter: c } = await o.getLocalRepositories(), l = c.getRepository(v), u = `${t}:${n}:${s}`, d = (await l.find({
 		where: {
 			combinator: "and",
 			rules: [{
@@ -1534,36 +2002,36 @@ async function It(e, t, n) {
 		limit: 1
 	}))[0]?.lastPullRemoteChangeId ?? null, { adapter: f } = await o.getRemoteRepositories();
 	if (!f) throw Error("Remote adapter not configured");
-	let p = d ?? 0, m = await L(o, s), h = await Promise.all(m.map((e) => f.getChangeCount(p, [`${t}:${a.name}`], e))), _ = h.reduce((e, t) => e + t.count, 0);
+	let p = d ?? 0, m = await ge(o, s), h = await Promise.all(m.map((e) => f.getChangeCount(p, [`${t}:${a.name}`], e))), g = h.reduce((e, t) => e + t.count, 0);
 	return {
 		repository: r,
 		remoteLatestChangeId: h.reduce((e, t) => t.latestChangeId > e ? t.latestChangeId : e, 0),
 		localLastPullRemoteChangeId: d,
-		pendingCount: _,
-		hasUpdates: _ > 0
+		pendingCount: g,
+		hasUpdates: g > 0
 	};
 }
 //#endregion
 //#region src/cleanup-expired.ts
-async function Lt(e, t, n, r) {
+async function jn(e, t, n, r) {
 	let i = e.rxdb, { adapter: a } = await e.getLocalRepositories(), o = i.config.entities.find((e) => {
-		let r = T(e);
+		let r = A(e);
 		return r.namespace === t && r.name === n;
 	});
-	if (!o) throw new p(`Entity not found: ${t}:${n}`);
-	let s = T(o), c = N(s, i.config.sync), l = r?.filter;
+	if (!o) throw new h(`Entity not found: ${t}:${n}`);
+	let s = A(o), c = F(s, i.entitySync), l = r?.filter;
 	if (!l && c === "filter") {
-		let e = s.sync;
+		let e = ce(s, i.entitySync);
 		if (e?.remote?.filter) try {
 			l = e.remote.filter();
 		} catch (e) {
-			throw new p(`Filter function failed for ${t}:${n}: ${e instanceof Error ? e.message : String(e)}`);
+			throw new h(`Filter function failed for ${t}:${n}: ${e instanceof Error ? e.message : String(e)}`);
 		}
 	}
-	if (!l) throw new p(`No filter provided and entity ${t}:${n} does not have a Filter sync configuration.`);
-	let u = Rt(l), f = async (e, r) => {
+	if (!l) throw new h(`No filter provided and entity ${t}:${n} does not have a Filter sync configuration.`);
+	let u = Mn(l), d = async (e, r) => {
 		if (e.length === 0) return e;
-		let i = await r.getRepository(d).find({ where: {
+		let i = await r.getRepository(p).find({ where: {
 			combinator: "and",
 			rules: [
 				{
@@ -1581,6 +2049,11 @@ async function Lt(e, t, n, r) {
 					operator: "=",
 					value: null
 				},
+				{
+					field: "rejectedAt",
+					operator: "=",
+					value: null
+				},
 				{
 					field: "revertChangeId",
 					operator: "=",
@@ -1589,24 +2062,24 @@ async function Lt(e, t, n, r) {
 				{
 					field: "entityId",
 					operator: "in",
-					value: k(e.map((e) => e.id))
+					value: oe(e.map((e) => e.id))
 				}
 			]
-		} }), a = new Set(i.map((e) => j(e.entityId)));
-		return a.size === 0 ? e : e.filter((e) => !a.has(j(e.id)));
+		} }), a = new Set(i.map((e) => se(e.entityId)));
+		return a.size === 0 ? e : e.filter((e) => !a.has(se(e.id)));
 	};
 	if (r?.dryRun) {
-		let e = await f(await a.getRepository(o).find({ where: u }), a);
+		let e = await d(await a.getRepository(o).find({ where: u }), a);
 		return {
 			removed: e.length,
 			removedIds: e.map((e) => e.id)
 		};
 	}
 	return a.transaction(async (e) => {
-		let r = e.getRepository(o), i = await f(await r.find({ where: u }), e), a = i.map((e) => e.id);
+		let r = e.getRepository(o), i = await d(await r.find({ where: u }), e), a = i.map((e) => e.id);
 		if (a.length > 0) {
 			let r = /* @__PURE__ */ new Map();
-			for (let e of i) r.set(`${t}:${n}:${j(e.id)}`, {
+			for (let e of i) r.set(`${t}:${n}:${se(e.id)}`, {
 				patch: null,
 				inversePatch: null
 			});
@@ -1615,7 +2088,11 @@ async function Lt(e, t, n, r) {
 				updates: /* @__PURE__ */ new Map(),
 				inserts: /* @__PURE__ */ new Map()
 			};
-			await e.mergeChanges(a, void 0, !0);
+			ne(e, {
+				file: "cleanup-expired.ts",
+				symbol: "cleanupExpired",
+				intent: T.remote_sync
+			}), await e.mergeChanges(a, void 0, !0);
 		}
 		return {
 			removed: a.length,
@@ -1623,13 +2100,13 @@ async function Lt(e, t, n, r) {
 		};
 	});
 }
-function Rt(e) {
+function Mn(e) {
 	return {
 		combinator: e.combinator === "and" ? "or" : "and",
-		rules: e.rules.map((e) => "combinator" in e ? Rt(e) : zt(e))
+		rules: e.rules.map((e) => "combinator" in e ? Mn(e) : Nn(e))
 	};
 }
-function zt(e) {
+function Nn(e) {
 	let t = {
 		"=": "!=",
 		"!=": "=",
@@ -1652,7 +2129,7 @@ function zt(e) {
 		exists: "notExists",
 		notExists: "exists"
 	}[e.operator];
-	if (!t) throw new p(`Cannot invert operator: ${e.operator}`);
+	if (!t) throw new h(`Cannot invert operator: ${e.operator}`);
 	return {
 		...e,
 		operator: t
@@ -1660,8 +2137,8 @@ function zt(e) {
 }
 //#endregion
 //#region src/get-repository-sync-status.ts
-async function Bt(e, t, n, r, i) {
-	let { adapter: a } = await e.getLocalRepositories(), o = a.getRepository(d), s = [
+async function Pn(e, t, n, r, i) {
+	let { adapter: a } = await e.getLocalRepositories(), o = a.getRepository(p), s = [
 		{
 			field: "namespace",
 			operator: "=",
@@ -1682,6 +2159,11 @@ async function Bt(e, t, n, r, i) {
 			operator: "=",
 			value: null
 		},
+		{
+			field: "rejectedAt",
+			operator: "=",
+			value: null
+		},
 		{
 			field: "revertChangeId",
 			operator: "=",
@@ -1697,16 +2179,16 @@ async function Bt(e, t, n, r, i) {
 		rules: s
 	} })).length;
 }
-async function Vt(e, t, n) {
-	return (await It(e, t, n)).pendingCount;
+async function Fn(e, t, n) {
+	return (await An(e, t, n)).pendingCount;
 }
-async function Ht(e, t, n) {
+async function In(e, t, n) {
 	let r = e.config.entities.find((e) => {
-		let r = T(e);
+		let r = A(e);
 		return r.namespace === t && r.name === n;
 	});
 	if (!r) throw Error(`Entity not found: ${t}.${n}`);
-	let i = T(r), a = N(i, e.config.sync), o = M(a), s = e.syncManager, c = (await s.getCurrentBranch()).id, { adapter: l } = await s.getLocalRepositories(), u = l.getRepository(g), d = {
+	let i = A(r), a = F(i, e.entitySync), o = P(a), s = e.syncManager, c = (await s.getCurrentBranch()).id, { adapter: l } = await s.getLocalRepositories(), u = l.getRepository(v), d = {
 		combinator: "and",
 		rules: [{
 			field: "id",
@@ -1717,14 +2199,14 @@ async function Ht(e, t, n) {
 		where: d,
 		limit: 1
 	}), p = f.length > 0 ? f[0] : null, m = 0, h = 0;
-	return ne(i, e.config.sync) && (m = await Bt(s, t, n, c, p?.lastPushedChangeId ?? null)), te(i, e.config.sync) && (h = await Vt(e, t, n)), {
+	return o.push && (m = await Pn(s, t, n, c, p?.lastPushedChangeId ?? null)), o.pull && (h = await Fn(e, t, n)), {
 		repository: {
 			namespace: t,
 			entity: n
 		},
 		branchId: c,
 		syncType: a,
-		enabled: o.pull || o.push ? P(p) : !1,
+		enabled: o.pull || o.push ? I(p) : !1,
 		lastPushedChangeId: p?.lastPushedChangeId ?? null,
 		lastPushedAt: p?.lastPushedAt ?? null,
 		lastPulledAt: p?.lastPulledAt ?? null,
@@ -1735,10 +2217,10 @@ async function Ht(e, t, n) {
 }
 //#endregion
 //#region src/get-all-repository-sync-status.ts
-async function Ut(e, t) {
+async function Ln(e, t) {
 	let n = e.config.entities, r = [];
 	for (let t of n) {
-		let n = T(t), i = n.namespace, a = n.name, o = await Ht(e, i, a);
+		let n = A(t), i = n.namespace, a = n.name, o = await In(e, i, a);
 		r.push(o);
 	}
 	let i = r;
@@ -1746,9 +2228,9 @@ async function Ut(e, t) {
 }
 //#endregion
 //#region src/pull-batch.ts
-var Wt = 1e3;
-async function Gt(e, t) {
-	if (t?.fetchAll !== !0) return await Jt(e, t?.limit, t?.conflictResolver);
+var Rn = 1e3;
+async function zn(e, t) {
+	if (t?.fetchAll !== !0) return await Hn(e, t?.limit, t?.conflictResolver);
 	let n = {
 		pulled: 0,
 		compacted: 0,
@@ -1762,36 +2244,36 @@ async function Gt(e, t) {
 	}, r = (e) => {
 		n.pulled += e.pulled, n.compacted += e.compacted, n.applied += e.applied, n.conflictsResolved += e.conflictsResolved, n.conflictsDeferred += e.conflictsDeferred, n.hasMore = e.hasMore, n.persistedProgress ||= e.persistedProgress, n.historyInvalidated ||= e.historyInvalidated, n.failures.push(...e.failures);
 	};
-	for (let i = 0; i < Wt; i++) {
+	for (let i = 0; i < Rn; i++) {
 		let i;
 		try {
-			i = await Jt(e, t.limit, t.conflictResolver);
+			i = await Hn(e, t.limit, t.conflictResolver);
 		} catch (e) {
-			throw qt(e, n);
+			throw Vn(e, n);
 		}
 		if (r(i), !i.hasMore || i.pulled === 0) break;
 	}
 	return n;
 }
-var Kt = (e) => !e.persistedProgress;
-function qt(e, t) {
+var Bn = (e) => !e.persistedProgress;
+function Vn(e, t) {
 	let n = e instanceof Error ? e : Error(String(e));
-	return Kt(t) ? n : new m(t, n);
+	return Bn(t) ? n : new g(t, n);
 }
-async function Jt(e, t, n) {
+async function Hn(e, t, n) {
 	let r = e.rxdb, i = t ?? 1e3;
-	if (!r.config.sync?.remote?.adapter) throw new p("Remote adapter not configured.");
-	let { adapter: o } = await e.getRemoteRepositories(), { adapter: s } = await e.getLocalRepositories(), c = (await e.getCurrentBranch()).id, l = await L(e, c), u = s.getRepository(g), f = [];
+	if (!r.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
+	let { adapter: a } = await e.getRemoteRepositories(), { adapter: s } = await e.getLocalRepositories(), c = (await e.getCurrentBranch()).id, l = await ge(e, c), u = s.getRepository(v), d = [];
 	for (let e of r.config.entities) {
-		let t = T(e), n = N(t, r.config.sync);
-		if (!M(n).pull || n === "filter") continue;
-		let i = await D(u, {
+		let t = A(e), n = F(t, r.entitySync);
+		if (!P(n).pull || n === "filter") continue;
+		let i = await M(u, {
 			namespace: t.namespace,
 			entity: t.name,
 			branchId: c,
 			syncType: n
-		}, () => r.entityManager.instantiate(g));
-		P(i) && f.push({
+		}, () => r.entityManager.instantiate(v));
+		I(i) && d.push({
 			namespace: t.namespace,
 			entity: t.name,
 			syncId: i.id,
@@ -1800,7 +2282,7 @@ async function Jt(e, t, n) {
 			syncType: n
 		});
 	}
-	if (f.length === 0) return {
+	if (d.length === 0) return {
 		pulled: 0,
 		compacted: 0,
 		applied: 0,
@@ -1811,12 +2293,12 @@ async function Jt(e, t, n) {
 		historyInvalidated: !1,
 		failures: []
 	};
-	let m = Ge(R(r.config.entities.map((e) => T(e)))), h = new Map(f.map((e) => [`${e.namespace}:${e.entity}`, e])), _ = m.map((e) => h.get(`${e.namespace}:${e.entity}`)).filter((e) => e != null), v = i * _.length, y, b = _.map((e) => ({
+	let f = Ne(z(r.config.entities.map((e) => A(e)))), m = new Map(d.map((e) => [`${e.namespace}:${e.entity}`, e])), g = f.map((e) => m.get(`${e.namespace}:${e.entity}`)).filter((e) => e != null), _ = i * g.length, y, b = g.map((e) => ({
 		namespace: e.namespace,
 		entity: e.entity,
 		sinceId: e.lastPullRemoteChangeId
 	}));
-	y = o.pullChangesBatch ? await o.pullChangesBatch(b, v, l) : (await Promise.all(_.map((e) => Pe(o, {
+	y = a.pullChangesBatch ? await a.pullChangesBatch(b, _, l) : (await Promise.all(g.map((e) => ye(a, {
 		namespace: e.namespace,
 		entity: e.entity,
 		sinceId: e.lastPullRemoteChangeId,
@@ -1827,99 +2309,80 @@ async function Jt(e, t, n) {
 		let t = `${e.namespace}:${e.entity}`;
 		x.has(t) || x.set(t, []), x.get(t).push(e);
 	}
-	let C = 0, w = 0, E = 0, O = 0, k = !1, A = r.context.clientId, j = n === void 0 ? new a() : n;
+	let S = 0, C = 0, w = 0, E = 0, D = !1, ee = r.context.clientId, te = n === void 0 ? new o() : n;
 	return await s.transaction(async (e) => {
-		let t = e.getRepository(d), n = e.getRepository(g);
-		for (let a of _) {
+		let t = e.getRepository(p), n = e.getRepository(v);
+		for (let a of g) {
 			let o = (x.get(`${a.namespace}:${a.entity}`) ?? []).filter((e) => e.id > a.lastPullRemoteChangeId);
 			if (o.length === 0) continue;
-			C += o.length;
-			let s = [], l = [];
-			for (let e of o) e.clientId != null && e.clientId === A ? s.push(e) : l.push(e);
-			let u = s.filter((e) => e.localId != null);
-			if (u.length > 0) {
-				let e = u.map((e) => e.localId), n = await t.find({ where: {
-					combinator: "and",
-					rules: [{
-						field: "id",
-						operator: "in",
-						value: e
-					}, {
-						field: "remoteId",
-						operator: "=",
-						value: null
-					}]
-				} });
-				if (n.length > 0) {
-					let e = new Map(u.map((e) => [e.localId, e.id]));
-					for (let r of n) {
-						let n = e.get(r.id);
-						n != null && await t.update(r, { remoteId: n });
-					}
-				}
-			}
-			if (l.length > 0) {
-				let n = z();
-				S(l, n);
-				let i = B(n);
-				w += l.length - i;
-				let o = Ie(l, n), { applyActions: s, conflictsResolved: u } = await Be(o, await Le(t, a.namespace, a.entity, c, a.repoSync.lastPushedChangeId ?? null, [...new Set(o.map((e) => e.entityId))]), {
+			S += o.length;
+			let { ownChanges: s, otherChanges: l } = De(o, ee);
+			if (await Oe(t, s), l.length > 0) {
+				let n = B();
+				k(l, n);
+				let i = V(n);
+				C += l.length - i;
+				let o = Se(l, n), { applyActions: s, conflictsResolved: u } = await Ee(o, await Ce(t, a.namespace, a.entity, c, a.repoSync.lastPushedChangeId ?? null, [...new Set(o.map((e) => e.entityId))]), {
 					changeRepo: t,
-					conflictResolver: j,
+					conflictResolver: te,
 					dispatchEvent: (e) => r.dispatchEvent(e),
 					repoLabel: `${a.namespace}:${a.entity}`,
 					localClientId: r.context.clientId
 				});
-				O += u;
-				let d = B(s);
-				d > 0 && (await e.mergeChanges(s, void 0, !0), E += d);
+				E += u;
+				let d = V(s);
+				d > 0 && (ne(e, {
+					file: "pull-batch.ts",
+					symbol: "pullBatchOnce",
+					intent: T.remote_sync
+				}), await e.mergeChanges(s, void 0, !0), w += d);
 			}
-			let d = o.reduce((e, t) => t.id > e ? t.id : e, o[0].id);
+			let u = o.reduce((e, t) => t.id > e ? t.id : e, o[0].id);
 			a.repoSync = await n.update(a.repoSync, {
-				lastPullRemoteChangeId: d,
+				lastPullRemoteChangeId: u,
 				lastPulledAt: /* @__PURE__ */ new Date(),
 				updatedAt: /* @__PURE__ */ new Date()
-			}), o.length >= i && (k = !0);
+			}), o.length >= i && (D = !0);
 		}
 	}), {
-		pulled: C,
-		compacted: w,
-		applied: E,
-		hasMore: k,
-		conflictsResolved: O,
+		pulled: S,
+		compacted: C,
+		applied: w,
+		hasMore: D,
+		conflictsResolved: E,
 		conflictsDeferred: 0,
-		persistedProgress: C > 0,
-		historyInvalidated: E > 0,
+		persistedProgress: S > 0,
+		historyInvalidated: w > 0,
 		failures: []
 	};
 }
 //#endregion
 //#region src/pull.ts
-async function Yt(e, t) {
+async function Un(e, t) {
 	let n = e.rxdb;
-	if (!n.config.sync?.remote?.adapter) throw new p("Remote adapter not configured.");
-	n.dispatchEvent(new v("pull"));
+	if (!n.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
+	n.dispatchEvent(new S("pull"));
 	try {
 		let r;
-		return t?.repositoryFilter?.length ? r = await Qt(e, t) : (r = await Gt(e, {
+		return t?.repositoryFilter?.length ? r = await Kn(e, t) : (r = await zn(e, {
 			limit: t?.limit,
 			fetchAll: t?.fetchAll,
 			conflictResolver: t?.conflictResolver
-		}), await Xt(e, t, r)), n.dispatchEvent(new y("pull", r)), r;
+		}), await Wn(e, t, r)), n.dispatchEvent(new C("pull", r)), r;
 	} catch (e) {
-		throw n.dispatchEvent(new b("pull", e)), e;
+		throw n.dispatchEvent(new w("pull", e)), e;
 	}
 }
-async function Xt(e, t, n) {
+async function Wn(e, t, n) {
 	let r = e.rxdb;
 	for (let i of r.config.entities) {
-		let a = T(i), o = N(a, r.config.sync);
-		if (o !== "filter" || !M(o).pull) continue;
-		let s = await C(e.rxdb, a.namespace, a.name);
-		if (!P(s)) continue;
+		let a = A(i), o = F(a, r.entitySync);
+		if (o !== "filter" || !P(o).pull) continue;
+		let s = await re(e.rxdb, a.namespace, a.name);
+		if (!I(s)) continue;
 		let c;
 		try {
-			c = await Ze(e, a.namespace, a.name, {
+			c = await ze(e, a.namespace, a.name, {
 				limit: t?.limit,
 				fetchAll: t?.fetchAll,
 				conflictResolver: t?.conflictResolver,
@@ -1927,22 +2390,22 @@ async function Xt(e, t, n) {
 			});
 		} catch (e) {
 			let t = e instanceof Error ? e : Error(String(e));
-			t instanceof m && Zt(n, t.result), n.failures.push({
+			t instanceof g && Gn(n, t.result), n.failures.push({
 				repository: {
 					namespace: a.namespace,
 					entity: a.name
 				},
-				error: t instanceof m ? t.cause : t
+				error: t instanceof g ? t.cause : t
 			});
 			continue;
 		}
-		Zt(n, c), n.failures.push(...c.failures);
+		Gn(n, c), n.failures.push(...c.failures);
 	}
 }
-function Zt(e, t) {
+function Gn(e, t) {
 	e.pulled += t.pulled, e.compacted += t.compacted, e.applied += t.applied, e.conflictsResolved += t.conflictsResolved, e.conflictsDeferred += t.conflictsDeferred, e.hasMore ||= t.hasMore, e.persistedProgress ||= t.persistedProgress, e.historyInvalidated ||= t.historyInvalidated;
 }
-async function Qt(e, t) {
+async function Kn(e, t) {
 	let n = {
 		operation: "pull",
 		repositories: t.repositoryFilter?.map((e) => typeof e == "string" ? {
@@ -1968,19 +2431,19 @@ async function Qt(e, t) {
 	for (let e of r.results) {
 		let t = e.result?.pullResult;
 		if (t && (i.pulled += t.pulled, i.compacted += t.compacted, i.applied += t.applied, i.conflictsResolved += t.conflictsResolved, i.conflictsDeferred += t.conflictsDeferred, i.hasMore ||= t.hasMore, i.persistedProgress ||= t.persistedProgress, i.historyInvalidated ||= t.historyInvalidated), e.success) continue;
-		let n = e.error ?? new p(`Repository pull failed: ${e.repository.namespace}:${e.repository.entity}`);
+		let n = e.error ?? new h(`Repository pull failed: ${e.repository.namespace}:${e.repository.entity}`);
 		i.failures.push({
 			repository: e.repository,
-			error: n instanceof m ? n.cause : n
+			error: n instanceof g ? n.cause : n
 		});
 	}
 	let [a] = i.failures;
-	if (a) throw !i.persistedProgress && i.failures.length === 1 ? a.error : new m(i, a.error);
+	if (a) throw !i.persistedProgress && i.failures.length === 1 ? a.error : new g(i, a.error);
 	return i;
 }
 //#endregion
 //#region src/branch-change-id.ts
-var $t = async (e, t, n) => (await e.find({
+var qn = async (e, t, n) => (await e.find({
 	where: {
 		combinator: "and",
 		rules: [{
@@ -1990,18 +2453,18 @@ var $t = async (e, t, n) => (await e.find({
 		}]
 	},
 	limit: 1
-}))[0], en = async (e, t) => {
-	let n = await $t(e, "id", t);
-	if (!n) throw new p(`分支分叉点翻译失败：本地不存在 RxDBChange id=${t}，分支表与变更表已不一致`);
+}))[0], Jn = async (e, t) => {
+	let n = await qn(e, "id", t);
+	if (!n) throw new h(`分支分叉点翻译失败：本地不存在 RxDBChange id=${t}，分支表与变更表已不一致`);
 	return n.remoteId ?? null;
-}, tn = async (e, t) => (await $t(e, "remoteId", t))?.id ?? null;
+}, Yn = async (e, t) => (await qn(e, "remoteId", t))?.id ?? null;
 //#endregion
 //#region src/push-branch.ts
-async function nn(e) {
+async function Xn(e) {
 	let t = await e.getCurrentBranch();
-	if (!t || t.id === "main") return {
+	if (!t || t.id === s) return {
 		synced: 0,
-		skipped: t ? ["main"] : [],
+		skipped: t ? [s] : [],
 		forkPointPending: !1
 	};
 	let { adapter: n } = await e.getRemoteRepositories();
@@ -2010,29 +2473,29 @@ async function nn(e) {
 		skipped: [],
 		forkPointPending: !1
 	};
-	let { branchRepository: r, changeRepository: i } = await e.getLocalRepositories(), a = t.fromChangeId ?? null, o = a === null ? null : await en(i, a), s = a !== null && o === null, c = {
+	let { branchRepository: r, changeRepository: i } = await e.getLocalRepositories(), a = t.fromChangeId ?? null, o = a === null ? null : await Jn(i, a), c = a !== null && o === null, l = {
 		id: t.id,
 		fromChangeId: o,
 		local: t.local,
 		remote: !0,
 		parentId: t.parentId
-	}, l = await n.pushBranches([c]);
-	return l.synced > 0 && !t.remote && await r.update(t, {
+	}, u = await n.pushBranches([l]);
+	return u.synced > 0 && !t.remote && await r.update(t, {
 		remote: !0,
 		updatedAt: /* @__PURE__ */ new Date()
 	}), {
-		...l,
-		forkPointPending: s
+		...u,
+		forkPointPending: c
 	};
 }
 //#endregion
 //#region src/push.ts
-async function rn(e, t) {
+async function Zn(e, t) {
 	let n = e.rxdb;
-	if (!n.config.sync?.remote?.adapter) throw new p("Remote adapter not configured.");
-	n.dispatchEvent(new v("push"));
+	if (!n.config.sync?.remote?.adapter) throw new h("Remote adapter not configured.");
+	n.dispatchEvent(new S("push"));
 	try {
-		let r = await nn(e), i = {
+		let r = await Xn(e), i = {
 			operation: "push",
 			repositories: t?.repositoryFilter?.map((e) => typeof e == "string" ? {
 				namespace: "public",
@@ -2041,6 +2504,7 @@ async function rn(e, t) {
 			...t?.batchSize === void 0 ? {} : { push: { batchSize: t.batchSize } }
 		}, a = await e.bulkSync(i), o = {
 			pushed: 0,
+			rejected: 0,
 			failed: 0,
 			compacted: 0,
 			originalCount: 0,
@@ -2048,21 +2512,29 @@ async function rn(e, t) {
 		};
 		for (let e of a.results) {
 			let t = e.result?.pushResult;
-			if (t && (o.pushed += t.pushed, o.failed += t.failed, o.compacted += t.compacted, o.originalCount += t.originalCount), e.success) continue;
-			let n = e.error ?? new p(`Repository push failed: ${e.repository.namespace}:${e.repository.entity}`);
+			if (t && (o.pushed += t.pushed, o.rejected += t.rejected, o.failed += t.failed, o.compacted += t.compacted, o.originalCount += t.originalCount), e.success) continue;
+			let n = e.error ?? new h(`Repository push failed: ${e.repository.namespace}:${e.repository.entity}`);
 			o.failures.push({
 				repository: e.repository,
-				error: n instanceof m ? n.cause : n
+				error: n instanceof g ? n.cause : n
 			});
 		}
-		return r.forkPointPending && o.pushed > 0 && await nn(e), n.dispatchEvent(new y("push", o)), o;
+		return r.forkPointPending && o.pushed > 0 && await Xn(e), n.dispatchEvent(new C("push", o)), o;
 	} catch (e) {
-		throw n.dispatchEvent(new b("push", e)), e;
+		throw n.dispatchEvent(new w("push", e)), e;
 	}
 }
 //#endregion
 //#region src/sync-branches.ts
-function an(e, t) {
+function Qn(e) {
+	try {
+		return D(e), !0;
+	} catch (e) {
+		if (e instanceof a) return !1;
+		throw e;
+	}
+}
+function $n(e, t) {
 	let n = new Set(t), r = new Set(e.map((e) => e.id)), i = [], a = e;
 	for (; a.length > 0;) {
 		let e = a.filter((e) => {
@@ -2078,51 +2550,68 @@ function an(e, t) {
 			let t = e.parentId ?? null, n = t !== null && r.has(t) ? "cycle" : "missing parent";
 			return `'${e.id}' -> '${String(t)}' (${n})`;
 		}).join(", ");
-		throw new p(`syncBranches: 远端分支拓扑无法解析，整批放弃：${e}`);
+		throw new h(`syncBranches: 远端分支拓扑无法解析，整批放弃：${e}`);
 	}
 	return i;
 }
-async function on(e) {
+async function er(e) {
 	let { adapter: t } = await e.getRemoteRepositories();
 	if (!t.pullBranches) return {
 		created: 0,
 		updated: 0,
 		total: 0,
-		skipped: []
+		skipped: [],
+		skipReasons: {}
 	};
 	let n = await t.pullBranches();
 	if (n.length === 0) return {
 		created: 0,
 		updated: 0,
 		total: 0,
-		skipped: []
+		skipped: [],
+		skipReasons: {}
 	};
 	let { adapter: r } = await e.getLocalRepositories();
 	return r.transaction(async (e) => {
-		let t = e.getRepository(u), r = e.getRepository(d), i = await t.find({ where: {
+		let t = e.getRepository(f), r = e.getRepository(p), i = await t.find({ where: {
 			combinator: "and",
 			rules: []
-		} }), a = new Map(i.map((e) => [e.id, e])), o = 0, s = 0, c = [];
-		for (let e of an(n, new Set(a.keys()))) {
-			let n = a.get(e.id);
-			if (n) {
-				n.remote || (await t.update(n, {
+		} }), a = new Map(i.map((e) => [e.id, e])), o = 0, s = 0, c = [], l = /* @__PURE__ */ new Map(), u = (e, t) => {
+			c.push(e), l.set(e, t);
+		};
+		for (let e of $n(n, new Set(a.keys()))) {
+			let n = e.parentId ?? null;
+			if (n !== null && l.has(n)) {
+				u(e.id, {
+					cause: "ancestor-skipped",
+					ancestorId: n
+				});
+				continue;
+			}
+			if (!Qn(e.id)) {
+				u(e.id, { cause: "invalid-id" });
+				continue;
+			}
+			let i = a.get(e.id);
+			if (i) {
+				i.remote || (await t.update(i, {
 					remote: !0,
 					updatedAt: /* @__PURE__ */ new Date()
 				}), s++);
 				continue;
 			}
-			let i = e.fromChangeId ?? null, l = i === null ? null : await tn(r, i);
-			if (i !== null && l === null) {
-				c.push(e.id);
+			let c = e.fromChangeId ?? null, d = c === null ? null : await Yn(r, c);
+			if (c !== null && d === null) {
+				u(e.id, { cause: "unresolved-from-change-id" });
 				continue;
 			}
 			await t.create({
 				id: e.id,
 				activated: !1,
+				activeKey: null,
 				local: !1,
 				remote: !0,
-				fromChangeId: l,
+				fromChangeId: d,
 				parentId: e.parentId ?? null
 			}), o++;
 		}
@@ -2130,23 +2619,24 @@ async function on(e) {
 			created: o,
 			updated: s,
 			total: n.length,
-			skipped: c
+			skipped: c,
+			skipReasons: Object.fromEntries(l)
 		};
 	});
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isFunction.js
-function H(e) {
+function W(e) {
 	return typeof e == "function";
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/lift.js
-function sn(e) {
-	return H(e?.lift);
+function tr(e) {
+	return W(e?.lift);
 }
-function U(e) {
+function G(e) {
 	return function(t) {
-		if (sn(t)) return t.lift(function(t) {
+		if (tr(t)) return t.lift(function(t) {
 			try {
 				return e(t, this);
 			} catch (e) {
@@ -2158,22 +2648,22 @@ function U(e) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/tslib@2.8.1/node_modules/tslib/tslib.es6.mjs
-var cn = function(e, t) {
-	return cn = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(e, t) {
+var nr = function(e, t) {
+	return nr = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(e, t) {
 		e.__proto__ = t;
 	} || function(e, t) {
 		for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && (e[n] = t[n]);
-	}, cn(e, t);
+	}, nr(e, t);
 };
-function ln(e, t) {
+function rr(e, t) {
 	if (typeof t != "function" && t !== null) throw TypeError("Class extends value " + String(t) + " is not a constructor or null");
-	cn(e, t);
+	nr(e, t);
 	function n() {
 		this.constructor = e;
 	}
 	e.prototype = t === null ? Object.create(t) : (n.prototype = t.prototype, new n());
 }
-function un(e, t, n, r) {
+function ir(e, t, n, r) {
 	function i(e) {
 		return e instanceof n ? e : new n(function(t) {
 			t(e);
@@ -2200,7 +2690,7 @@ function un(e, t, n, r) {
 		c((r = r.apply(e, t || [])).next());
 	});
 }
-function dn(e, t) {
+function ar(e, t) {
 	var n = {
 		label: 0,
 		sent: function() {
@@ -2270,7 +2760,7 @@ function dn(e, t) {
 		};
 	}
 }
-function W(e) {
+function K(e) {
 	var t = typeof Symbol == "function" && Symbol.iterator, n = t && e[t], r = 0;
 	if (n) return n.call(e);
 	if (e && typeof e.length == "number") return { next: function() {
@@ -2281,7 +2771,7 @@ function W(e) {
 	} };
 	throw TypeError(t ? "Object is not iterable." : "Symbol.iterator is not defined.");
 }
-function G(e, t) {
+function q(e, t) {
 	var n = typeof Symbol == "function" && e[Symbol.iterator];
 	if (!n) return e;
 	var r = n.call(e), i, a = [], o;
@@ -2298,14 +2788,14 @@ function G(e, t) {
 	}
 	return a;
 }
-function K(e, t, n) {
+function J(e, t, n) {
 	if (n || arguments.length === 2) for (var r = 0, i = t.length, a; r < i; r++) (a || !(r in t)) && (a ||= Array.prototype.slice.call(t, 0, r), a[r] = t[r]);
 	return e.concat(a || Array.prototype.slice.call(t));
 }
-function q(e) {
-	return this instanceof q ? (this.v = e, this) : new q(e);
+function Y(e) {
+	return this instanceof Y ? (this.v = e, this) : new Y(e);
 }
-function fn(e, t, n) {
+function or(e, t, n) {
 	if (!Symbol.asyncIterator) throw TypeError("Symbol.asyncIterator is not defined.");
 	var r = n.apply(e, t || []), i, a = [];
 	return i = Object.create((typeof AsyncIterator == "function" ? AsyncIterator : Object).prototype), s("next"), s("throw"), s("return", o), i[Symbol.asyncIterator] = function() {
@@ -2336,7 +2826,7 @@ function fn(e, t, n) {
 		}
 	}
 	function l(e) {
-		e.value instanceof q ? Promise.resolve(e.value.v).then(u, d) : f(a[0][2], e);
+		e.value instanceof Y ? Promise.resolve(e.value.v).then(u, d) : f(a[0][2], e);
 	}
 	function u(e) {
 		c("next", e);
@@ -2348,10 +2838,10 @@ function fn(e, t, n) {
 		e(t), a.shift(), a.length && c(a[0][0], a[0][1]);
 	}
 }
-function pn(e) {
+function sr(e) {
 	if (!Symbol.asyncIterator) throw TypeError("Symbol.asyncIterator is not defined.");
 	var t = e[Symbol.asyncIterator], n;
-	return t ? t.call(e) : (e = typeof W == "function" ? W(e) : e[Symbol.iterator](), n = {}, r("next"), r("throw"), r("return"), n[Symbol.asyncIterator] = function() {
+	return t ? t.call(e) : (e = typeof K == "function" ? K(e) : e[Symbol.iterator](), n = {}, r("next"), r("throw"), r("return"), n[Symbol.asyncIterator] = function() {
 		return this;
 	}, n);
 	function r(t) {
@@ -2372,17 +2862,17 @@ function pn(e) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isArrayLike.js
-var mn = (function(e) {
+var cr = (function(e) {
 	return e && typeof e.length == "number" && typeof e != "function";
 });
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isPromise.js
-function hn(e) {
-	return H(e?.then);
+function lr(e) {
+	return W(e?.then);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/createErrorClass.js
-function gn(e) {
+function ur(e) {
 	var t = e(function(e) {
 		Error.call(e), e.stack = (/* @__PURE__ */ Error()).stack;
 	});
@@ -2390,7 +2880,7 @@ function gn(e) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/UnsubscriptionError.js
-var _n = gn(function(e) {
+var dr = ur(function(e) {
 	return function(t) {
 		e(this), this.message = t ? t.length + " errors occurred during unsubscription:\n" + t.map(function(e, t) {
 			return t + 1 + ") " + e.toString();
@@ -2399,7 +2889,7 @@ var _n = gn(function(e) {
 });
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/arrRemove.js
-function vn(e, t) {
+function fr(e, t) {
 	if (e) {
 		var n = e.indexOf(t);
 		0 <= n && e.splice(n, 1);
@@ -2407,7 +2897,7 @@ function vn(e, t) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/Subscription.js
-var yn = function() {
+var pr = function() {
 	function e(e) {
 		this.initialTeardown = e, this.closed = !1, this._parentage = null, this._finalizers = null;
 	}
@@ -2418,7 +2908,7 @@ var yn = function() {
 			var a = this._parentage;
 			if (a) {
 				if (this._parentage = null, Array.isArray(a)) try {
-					for (var o = W(a), s = o.next(); !s.done; s = o.next()) s.value.remove(this);
+					for (var o = K(a), s = o.next(); !s.done; s = o.next()) s.value.remove(this);
 				} catch (t) {
 					e = { error: t };
 				} finally {
@@ -2431,21 +2921,21 @@ var yn = function() {
 				else a.remove(this);
 			}
 			var c = this.initialTeardown;
-			if (H(c)) try {
+			if (W(c)) try {
 				c();
 			} catch (e) {
-				i = e instanceof _n ? e.errors : [e];
+				i = e instanceof dr ? e.errors : [e];
 			}
 			var l = this._finalizers;
 			if (l) {
 				this._finalizers = null;
 				try {
-					for (var u = W(l), d = u.next(); !d.done; d = u.next()) {
+					for (var u = K(l), d = u.next(); !d.done; d = u.next()) {
 						var f = d.value;
 						try {
-							xn(f);
+							hr(f);
 						} catch (e) {
-							i ??= [], e instanceof _n ? i = K(K([], G(i)), G(e.errors)) : i.push(e);
+							i ??= [], e instanceof dr ? i = J(J([], q(i)), q(e.errors)) : i.push(e);
 						}
 					}
 				} catch (e) {
@@ -2458,11 +2948,11 @@ var yn = function() {
 					}
 				}
 			}
-			if (i) throw new _n(i);
+			if (i) throw new dr(i);
 		}
 	}, e.prototype.add = function(t) {
 		if (t && t !== this) {
-			if (this.closed) xn(t);
+			if (this.closed) hr(t);
 			else {
 				if (t instanceof e) {
 					if (t.closed || t._hasParent(this)) return;
@@ -2479,64 +2969,64 @@ var yn = function() {
 		this._parentage = Array.isArray(t) ? (t.push(e), t) : t ? [t, e] : e;
 	}, e.prototype._removeParent = function(e) {
 		var t = this._parentage;
-		t === e ? this._parentage = null : Array.isArray(t) && vn(t, e);
+		t === e ? this._parentage = null : Array.isArray(t) && fr(t, e);
 	}, e.prototype.remove = function(t) {
 		var n = this._finalizers;
-		n && vn(n, t), t instanceof e && t._removeParent(this);
+		n && fr(n, t), t instanceof e && t._removeParent(this);
 	}, e.EMPTY = (function() {
 		var t = new e();
 		return t.closed = !0, t;
 	})(), e;
 }();
-yn.EMPTY;
-function bn(e) {
-	return e instanceof yn || e && "closed" in e && H(e.remove) && H(e.add) && H(e.unsubscribe);
+pr.EMPTY;
+function mr(e) {
+	return e instanceof pr || e && "closed" in e && W(e.remove) && W(e.add) && W(e.unsubscribe);
 }
-function xn(e) {
-	H(e) ? e() : e.unsubscribe();
+function hr(e) {
+	W(e) ? e() : e.unsubscribe();
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/config.js
-var J = {
+var X = {
 	onUnhandledError: null,
 	onStoppedNotification: null,
 	Promise: void 0,
 	useDeprecatedSynchronousErrorHandling: !1,
 	useDeprecatedNextContext: !1
-}, Y = {
+}, gr = {
 	setTimeout: function(e, t) {
-		var n = [...arguments].slice(2), r = Y.delegate;
-		return r?.setTimeout ? r.setTimeout.apply(r, K([e, t], G(n))) : setTimeout.apply(void 0, K([e, t], G(n)));
+		var n = [...arguments].slice(2), r = gr.delegate;
+		return r?.setTimeout ? r.setTimeout.apply(r, J([e, t], q(n))) : setTimeout.apply(void 0, J([e, t], q(n)));
 	},
 	clearTimeout: function(e) {
-		return (Y.delegate?.clearTimeout || clearTimeout)(e);
+		return (gr.delegate?.clearTimeout || clearTimeout)(e);
 	},
 	delegate: void 0
 };
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/reportUnhandledError.js
-function Sn(e) {
-	Y.setTimeout(function() {
-		var t = J.onUnhandledError;
+function _r(e) {
+	gr.setTimeout(function() {
+		var t = X.onUnhandledError;
 		if (t) t(e);
 		else throw e;
 	});
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/noop.js
-function Cn() {}
+function vr() {}
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/NotificationFactories.js
-var wn = (function() {
-	return Dn("C", void 0, void 0);
+var yr = (function() {
+	return Sr("C", void 0, void 0);
 })();
-function Tn(e) {
-	return Dn("E", void 0, e);
+function br(e) {
+	return Sr("E", void 0, e);
 }
-function En(e) {
-	return Dn("N", e, void 0);
+function xr(e) {
+	return Sr("N", e, void 0);
 }
-function Dn(e, t, n) {
+function Sr(e, t, n) {
 	return {
 		kind: e,
 		value: t,
@@ -2545,38 +3035,38 @@ function Dn(e, t, n) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/errorContext.js
-var X = null;
-function On(e) {
-	if (J.useDeprecatedSynchronousErrorHandling) {
-		var t = !X;
-		if (t && (X = {
+var Z = null;
+function Cr(e) {
+	if (X.useDeprecatedSynchronousErrorHandling) {
+		var t = !Z;
+		if (t && (Z = {
 			errorThrown: !1,
 			error: null
 		}), e(), t) {
-			var n = X, r = n.errorThrown, i = n.error;
-			if (X = null, r) throw i;
+			var n = Z, r = n.errorThrown, i = n.error;
+			if (Z = null, r) throw i;
 		}
 	} else e();
 }
-function kn(e) {
-	J.useDeprecatedSynchronousErrorHandling && X && (X.errorThrown = !0, X.error = e);
+function wr(e) {
+	X.useDeprecatedSynchronousErrorHandling && Z && (Z.errorThrown = !0, Z.error = e);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/Subscriber.js
-var An = function(e) {
-	ln(t, e);
+var Tr = function(e) {
+	rr(t, e);
 	function t(t) {
 		var n = e.call(this) || this;
-		return n.isStopped = !1, t ? (n.destination = t, bn(t) && t.add(n)) : n.destination = Ln, n;
+		return n.isStopped = !1, t ? (n.destination = t, mr(t) && t.add(n)) : n.destination = Nr, n;
 	}
 	return t.create = function(e, t, n) {
-		return new Pn(e, t, n);
+		return new kr(e, t, n);
 	}, t.prototype.next = function(e) {
-		this.isStopped ? In(En(e), this) : this._next(e);
+		this.isStopped ? Mr(xr(e), this) : this._next(e);
 	}, t.prototype.error = function(e) {
-		this.isStopped ? In(Tn(e), this) : (this.isStopped = !0, this._error(e));
+		this.isStopped ? Mr(br(e), this) : (this.isStopped = !0, this._error(e));
 	}, t.prototype.complete = function() {
-		this.isStopped ? In(wn, this) : (this.isStopped = !0, this._complete());
+		this.isStopped ? Mr(yr, this) : (this.isStopped = !0, this._complete());
 	}, t.prototype.unsubscribe = function() {
 		this.closed || (this.isStopped = !0, e.prototype.unsubscribe.call(this), this.destination = null);
 	}, t.prototype._next = function(e) {
@@ -2594,11 +3084,11 @@ var An = function(e) {
 			this.unsubscribe();
 		}
 	}, t;
-}(yn), jn = Function.prototype.bind;
-function Mn(e, t) {
-	return jn.call(e, t);
+}(pr), Er = Function.prototype.bind;
+function Dr(e, t) {
+	return Er.call(e, t);
 }
-var Nn = function() {
+var Or = function() {
 	function e(e) {
 		this.partialObserver = e;
 	}
@@ -2607,76 +3097,76 @@ var Nn = function() {
 		if (t.next) try {
 			t.next(e);
 		} catch (e) {
-			Z(e);
+			Ar(e);
 		}
 	}, e.prototype.error = function(e) {
 		var t = this.partialObserver;
 		if (t.error) try {
 			t.error(e);
 		} catch (e) {
-			Z(e);
+			Ar(e);
 		}
-		else Z(e);
+		else Ar(e);
 	}, e.prototype.complete = function() {
 		var e = this.partialObserver;
 		if (e.complete) try {
 			e.complete();
 		} catch (e) {
-			Z(e);
+			Ar(e);
 		}
 	}, e;
-}(), Pn = function(e) {
-	ln(t, e);
+}(), kr = function(e) {
+	rr(t, e);
 	function t(t, n, r) {
 		var i = e.call(this) || this, a;
-		if (H(t) || !t) a = {
+		if (W(t) || !t) a = {
 			next: t ?? void 0,
 			error: n ?? void 0,
 			complete: r ?? void 0
 		};
 		else {
 			var o;
-			i && J.useDeprecatedNextContext ? (o = Object.create(t), o.unsubscribe = function() {
+			i && X.useDeprecatedNextContext ? (o = Object.create(t), o.unsubscribe = function() {
 				return i.unsubscribe();
 			}, a = {
-				next: t.next && Mn(t.next, o),
-				error: t.error && Mn(t.error, o),
-				complete: t.complete && Mn(t.complete, o)
+				next: t.next && Dr(t.next, o),
+				error: t.error && Dr(t.error, o),
+				complete: t.complete && Dr(t.complete, o)
 			}) : a = t;
 		}
-		return i.destination = new Nn(a), i;
+		return i.destination = new Or(a), i;
 	}
 	return t;
-}(An);
-function Z(e) {
-	J.useDeprecatedSynchronousErrorHandling ? kn(e) : Sn(e);
+}(Tr);
+function Ar(e) {
+	X.useDeprecatedSynchronousErrorHandling ? wr(e) : _r(e);
 }
-function Fn(e) {
+function jr(e) {
 	throw e;
 }
-function In(e, t) {
-	var n = J.onStoppedNotification;
-	n && Y.setTimeout(function() {
+function Mr(e, t) {
+	var n = X.onStoppedNotification;
+	n && gr.setTimeout(function() {
 		return n(e, t);
 	});
 }
-var Ln = {
+var Nr = {
 	closed: !0,
-	next: Cn,
-	error: Fn,
-	complete: Cn
-}, Rn = (function() {
+	next: vr,
+	error: jr,
+	complete: vr
+}, Pr = (function() {
 	return typeof Symbol == "function" && Symbol.observable || "@@observable";
 })();
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/identity.js
-function zn(e) {
+function Fr(e) {
 	return e;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/pipe.js
-function Bn(e) {
-	return e.length === 0 ? zn : e.length === 1 ? e[0] : function(t) {
+function Ir(e) {
+	return e.length === 0 ? Fr : e.length === 1 ? e[0] : function(t) {
 		return e.reduce(function(e, t) {
 			return t(e);
 		}, t);
@@ -2692,8 +3182,8 @@ var Q = function() {
 		var n = new e();
 		return n.source = this, n.operator = t, n;
 	}, e.prototype.subscribe = function(e, t, n) {
-		var r = this, i = Un(e) ? e : new Pn(e, t, n);
-		return On(function() {
+		var r = this, i = zr(e) ? e : new kr(e, t, n);
+		return Cr(function() {
 			var e = r, t = e.operator, n = e.source;
 			i.add(t ? t.call(i, n) : n ? r._subscribe(i) : r._trySubscribe(i));
 		}), i;
@@ -2705,8 +3195,8 @@ var Q = function() {
 		}
 	}, e.prototype.forEach = function(e, t) {
 		var n = this;
-		return t = Vn(t), new t(function(t, r) {
-			var i = new Pn({
+		return t = Lr(t), new t(function(t, r) {
+			var i = new kr({
 				next: function(t) {
 					try {
 						e(t);
@@ -2721,13 +3211,13 @@ var Q = function() {
 		});
 	}, e.prototype._subscribe = function(e) {
 		return this.source?.subscribe(e);
-	}, e.prototype[Rn] = function() {
+	}, e.prototype[Pr] = function() {
 		return this;
 	}, e.prototype.pipe = function() {
-		return Bn([...arguments])(this);
+		return Ir([...arguments])(this);
 	}, e.prototype.toPromise = function(e) {
 		var t = this;
-		return e = Vn(e), new e(function(e, n) {
+		return e = Lr(e), new e(function(e, n) {
 			var r;
 			t.subscribe(function(e) {
 				return r = e;
@@ -2741,47 +3231,47 @@ var Q = function() {
 		return new e(t);
 	}, e;
 }();
-function Vn(e) {
-	return e ?? J.Promise ?? Promise;
+function Lr(e) {
+	return e ?? X.Promise ?? Promise;
 }
-function Hn(e) {
-	return e && H(e.next) && H(e.error) && H(e.complete);
+function Rr(e) {
+	return e && W(e.next) && W(e.error) && W(e.complete);
 }
-function Un(e) {
-	return e && e instanceof An || Hn(e) && bn(e);
+function zr(e) {
+	return e && e instanceof Tr || Rr(e) && mr(e);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isInteropObservable.js
-function Wn(e) {
-	return H(e[Rn]);
+function Br(e) {
+	return W(e[Pr]);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isAsyncIterable.js
-function Gn(e) {
-	return Symbol.asyncIterator && H(e?.[Symbol.asyncIterator]);
+function Vr(e) {
+	return Symbol.asyncIterator && W(e?.[Symbol.asyncIterator]);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/throwUnobservableError.js
-function Kn(e) {
+function Hr(e) {
 	return /* @__PURE__ */ TypeError("You provided " + (typeof e == "object" && e ? "an invalid object" : "'" + e + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/symbol/iterator.js
-function qn() {
+function Ur() {
 	return typeof Symbol != "function" || !Symbol.iterator ? "@@iterator" : Symbol.iterator;
 }
-var Jn = qn();
+var Wr = Ur();
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isIterable.js
-function Yn(e) {
-	return H(e?.[Jn]);
+function Gr(e) {
+	return W(e?.[Wr]);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/isReadableStreamLike.js
-function Xn(e) {
-	return fn(this, arguments, function() {
+function Kr(e) {
+	return or(this, arguments, function() {
 		var t, n, r, i;
-		return dn(this, function(a) {
+		return ar(this, function(a) {
 			switch (a.label) {
 				case 0: t = e.getReader(), a.label = 1;
 				case 1: a.trys.push([
@@ -2790,10 +3280,10 @@ function Xn(e) {
 					9,
 					10
 				]), a.label = 2;
-				case 2: return [4, q(t.read())];
-				case 3: return n = a.sent(), r = n.value, i = n.done, i ? [4, q(void 0)] : [3, 5];
+				case 2: return [4, Y(t.read())];
+				case 3: return n = a.sent(), r = n.value, i = n.done, i ? [4, Y(void 0)] : [3, 5];
 				case 4: return [2, a.sent()];
-				case 5: return [4, q(r)];
+				case 5: return [4, Y(r)];
 				case 6: return [4, a.sent()];
 				case 7: return a.sent(), [3, 2];
 				case 8: return [3, 10];
@@ -2803,50 +3293,50 @@ function Xn(e) {
 		});
 	});
 }
-function Zn(e) {
-	return H(e?.getReader);
+function qr(e) {
+	return W(e?.getReader);
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/observable/innerFrom.js
-function Qn(e) {
+function Jr(e) {
 	if (e instanceof Q) return e;
 	if (e != null) {
-		if (Wn(e)) return $n(e);
-		if (mn(e)) return er(e);
-		if (hn(e)) return tr(e);
-		if (Gn(e)) return rr(e);
-		if (Yn(e)) return nr(e);
-		if (Zn(e)) return ir(e);
+		if (Br(e)) return Yr(e);
+		if (cr(e)) return Xr(e);
+		if (lr(e)) return Zr(e);
+		if (Vr(e)) return $r(e);
+		if (Gr(e)) return Qr(e);
+		if (qr(e)) return ei(e);
 	}
-	throw Kn(e);
+	throw Hr(e);
 }
-function $n(e) {
+function Yr(e) {
 	return new Q(function(t) {
-		var n = e[Rn]();
-		if (H(n.subscribe)) return n.subscribe(t);
+		var n = e[Pr]();
+		if (W(n.subscribe)) return n.subscribe(t);
 		throw TypeError("Provided object does not correctly implement Symbol.observable");
 	});
 }
-function er(e) {
+function Xr(e) {
 	return new Q(function(t) {
 		for (var n = 0; n < e.length && !t.closed; n++) t.next(e[n]);
 		t.complete();
 	});
 }
-function tr(e) {
+function Zr(e) {
 	return new Q(function(t) {
 		e.then(function(e) {
 			t.closed || (t.next(e), t.complete());
 		}, function(e) {
 			return t.error(e);
-		}).then(null, Sn);
+		}).then(null, _r);
 	});
 }
-function nr(e) {
+function Qr(e) {
 	return new Q(function(t) {
 		var n, r;
 		try {
-			for (var i = W(e), a = i.next(); !a.done; a = i.next()) {
+			for (var i = K(e), a = i.next(); !a.done; a = i.next()) {
 				var o = a.value;
 				if (t.next(o), t.closed) return;
 			}
@@ -2862,28 +3352,28 @@ function nr(e) {
 		t.complete();
 	});
 }
-function rr(e) {
+function $r(e) {
 	return new Q(function(t) {
-		ar(e, t).catch(function(e) {
+		ti(e, t).catch(function(e) {
 			return t.error(e);
 		});
 	});
 }
-function ir(e) {
-	return rr(Xn(e));
+function ei(e) {
+	return $r(Kr(e));
 }
-function ar(e, t) {
+function ti(e, t) {
 	var n, r, i, a;
-	return un(this, void 0, void 0, function() {
+	return ir(this, void 0, void 0, function() {
 		var o, s;
-		return dn(this, function(c) {
+		return ar(this, function(c) {
 			switch (c.label) {
 				case 0: c.trys.push([
 					0,
 					5,
 					6,
 					11
-				]), n = pn(e), c.label = 1;
+				]), n = sr(e), c.label = 1;
 				case 1: return [4, n.next()];
 				case 2:
 					if (r = c.sent(), r.done) return [3, 4];
@@ -2912,10 +3402,10 @@ function ar(e, t) {
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/OperatorSubscriber.js
 function $(e, t, n, r, i) {
-	return new or(e, t, n, r, i);
+	return new ni(e, t, n, r, i);
 }
-var or = function(e) {
-	ln(t, e);
+var ni = function(e) {
+	rr(t, e);
 	function t(t, n, r, i, a, o) {
 		var s = e.call(this, t) || this;
 		return s.onFinalize = a, s.shouldUnsubscribe = o, s._next = n ? function(e) {
@@ -2949,19 +3439,19 @@ var or = function(e) {
 			e.prototype.unsubscribe.call(this), !n && ((t = this.onFinalize) == null || t.call(this));
 		}
 	}, t;
-}(An);
+}(Tr);
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/util/args.js
-function sr(e) {
+function ri(e) {
 	return e[e.length - 1];
 }
-function cr(e) {
-	return H(sr(e)) ? e.pop() : void 0;
+function ii(e) {
+	return W(ri(e)) ? e.pop() : void 0;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/map.js
-function lr(e, t) {
-	return U(function(n, r) {
+function ai(e, t) {
+	return G(function(n, r) {
 		var i = 0;
 		n.subscribe($(r, function(n) {
 			r.next(e.call(t, n, i++));
@@ -2970,8 +3460,8 @@ function lr(e, t) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js
-function ur(e, t) {
-	return t === void 0 && (t = zn), e ??= dr, U(function(n, r) {
+function oi(e, t) {
+	return t === void 0 && (t = Fr), e ??= si, G(function(n, r) {
 		var i, a = !0;
 		n.subscribe($(r, function(n) {
 			var o = t(n);
@@ -2979,13 +3469,13 @@ function ur(e, t) {
 		}));
 	});
 }
-function dr(e, t) {
+function si(e, t) {
 	return e === t;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/filter.js
-function fr(e, t) {
-	return U(function(n, r) {
+function ci(e, t) {
+	return G(function(n, r) {
 		var i = 0;
 		n.subscribe($(r, function(n) {
 			return e.call(t, n, i++) && r.next(n);
@@ -2994,19 +3484,19 @@ function fr(e, t) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/exhaustMap.js
-function pr(e, t) {
+function li(e, t) {
 	return t ? function(n) {
-		return n.pipe(pr(function(n, r) {
-			return Qn(e(n, r)).pipe(lr(function(e, i) {
+		return n.pipe(li(function(n, r) {
+			return Jr(e(n, r)).pipe(ai(function(e, i) {
 				return t(n, e, r, i);
 			}));
 		}));
-	} : U(function(t, n) {
+	} : G(function(t, n) {
 		var r = 0, i = null, a = !1;
 		t.subscribe($(n, function(t) {
 			i || (i = $(n, void 0, function() {
 				i = null, a && n.complete();
-			}), Qn(e(t, r++)).subscribe(i));
+			}), Jr(e(t, r++)).subscribe(i));
 		}, function() {
 			a = !0, !i && n.complete();
 		}));
@@ -3014,40 +3504,40 @@ function pr(e, t) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/esm5/internal/operators/withLatestFrom.js
-function mr() {
-	var e = [...arguments], t = cr(e);
-	return U(function(n, r) {
+function ui() {
+	var e = [...arguments], t = ii(e);
+	return G(function(n, r) {
 		for (var i = e.length, a = Array(i), o = e.map(function() {
 			return !1;
 		}), s = !1, c = function(t) {
-			Qn(e[t]).subscribe($(r, function(e) {
-				a[t] = e, !s && !o[t] && (o[t] = !0, (s = o.every(zn)) && (o = null));
-			}, Cn));
+			Jr(e[t]).subscribe($(r, function(e) {
+				a[t] = e, !s && !o[t] && (o[t] = !0, (s = o.every(Fr)) && (o = null));
+			}, vr));
 		}, l = 0; l < i; l++) c(l);
 		n.subscribe($(r, function(e) {
 			if (s) {
-				var n = K([e], G(a));
-				r.next(t ? t.apply(void 0, K([], G(n))) : n);
+				var n = J([e], q(a));
+				r.next(t ? t.apply(void 0, J([], q(n))) : n);
 			}
 		}));
 	});
 }
 //#endregion
 //#region src/sync-listeners.ts
-async function hr(e, t) {
+async function di(e, t) {
 	try {
-		return await t(), !0;
+		return await t();
 	} catch (t) {
 		return e.reportError(t), !1;
 	}
 }
-function gr(e) {
-	return e.rxdb.config.entities.filter((e) => !ee(e));
+function fi(e) {
+	return e.rxdb.config.entities.filter((e) => !le(e));
 }
-function _r(e) {
+function pi(e) {
 	let t = [];
-	for (let n of gr(e)) {
-		let r = T(n), i = M(N(r, e.rxdb.config.sync));
+	for (let n of fi(e)) {
+		let r = A(n), i = P(F(r, e.rxdb.entitySync));
 		i.offlineWrite && !i.push && t.push({
 			namespace: r.namespace,
 			entity: r.name
@@ -3055,44 +3545,46 @@ function _r(e) {
 	}
 	return t;
 }
-async function vr(e, t, n) {
-	let { syncState: r } = e.rxdb, i = await fe(e.rxdb, t, n);
+async function mi(e, t, n) {
+	let { syncState: r } = e.rxdb, i = await dt(e.rxdb, t, n);
 	for (let e of i.conflicts) r.reportConflict({
 		namespace: t,
 		entity: n,
 		entityId: e,
 		winner: "remote"
 	});
+	for (let e of i.failures) r.reportError(e.error);
+	return i.failures.length === 0;
 }
-async function yr(e, t) {
+async function hi(e, t) {
 	let { syncState: n } = e.rxdb, r = !0;
-	for (let { namespace: i, entity: a } of t) r = await hr(n, () => vr(e, i, a)) && r;
+	for (let { namespace: i, entity: a } of t) r = await di(n, () => mi(e, i, a)) && r;
 	return r;
 }
-async function br(e) {
+async function gi(e) {
 	try {
-		e.rxdb.syncState.reportOutboxCount(await ge(e.rxdb));
+		e.rxdb.syncState.reportOutboxCount(await ht(e.rxdb));
 	} catch {}
 }
-async function xr(e) {
-	let t = _r(e);
+async function _i(e) {
+	let t = pi(e);
 	if (t.length === 0) return;
 	let { syncState: n } = e.rxdb;
 	n.beginRound();
 	try {
-		await yr(e, t) && n.reportSuccess(), await br(e);
+		await hi(e, t) && n.reportSuccess(), await gi(e);
 	} finally {
 		n.endRound();
 	}
 }
-function Sr(e) {
-	let t = e.rxdb.connected$, n = ae([t, e.rxdb.reachability.online$]).pipe(lr(([e, t]) => e && t), ur());
-	return oe(n.pipe(fr((e) => e)), e.rxdb.reachability.wakeup$.pipe(mr(t), fr(([, e]) => e)));
+function vi(e) {
+	let t = e.rxdb.connected$, n = pe([t, e.rxdb.reachability.online$]).pipe(ai(([e, t]) => e && t), oi());
+	return me(n.pipe(ci((e) => e)), e.rxdb.reachability.wakeup$.pipe(ui(t), ci(([, e]) => e)));
 }
-function Cr(e) {
+function yi(e) {
 	let t = [], a = [];
 	if (e.rxdb.config.sync?.remote?.adapter) {
-		let n = Sr(e).pipe(pr(() => xr(e).catch((t) => {
+		let n = vi(e).pipe(li(() => _i(e).catch((t) => {
 			e.rxdb.syncState.reportError(t);
 		}))).subscribe();
 		t.push(n);
@@ -3106,7 +3598,7 @@ function Cr(e) {
 				let t = await o(n.entities);
 				t > 0 && e.history.incrementPullableCount(t);
 			} catch (e) {
-				se(e) || console.error(`[SyncManager] ${t} failed:`, e);
+				he(e) || console.error(`[SyncManager] ${t} failed:`, e);
 			}
 		})();
 	}, c = [
@@ -3131,20 +3623,28 @@ function Cr(e) {
 }
 //#endregion
 //#region src/sync-manager.utils.ts
-var wr = (e) => e?.historyInvalidated === !0 || (e?.pushResult?.pushed ?? 0) > 0, Tr = (e) => e instanceof m && wr(e.result), Er = (e) => e instanceof m ? e.result : void 0, Dr = class {
+var bi = (e) => e?.historyInvalidated === !0 || (e?.pushResult?.pushed ?? 0) > 0, xi = (e) => e instanceof g && bi(e.result), Si = (e) => e instanceof g ? e.result : void 0, Ci = class {
 	rxdb;
 	history;
 	#e = [];
 	#t = [];
+	#n = 0;
 	get pushInFlight() {
 		return this.history.pushInFlight;
 	}
+	get branchSwitchGeneration() {
+		return this.#n;
+	}
 	constructor(e, t) {
 		this.rxdb = e, this.history = t;
 	}
 	init() {
-		let { subscriptions: e, removers: t } = Cr(this);
+		let { subscriptions: e, removers: t } = yi(this);
 		this.#t.push(...e), this.#e.push(...t);
+		let n = () => {
+			this.#n += 1;
+		};
+		for (let e of [y, b]) this.rxdb.addEventListener(e, n), this.#e.push(() => this.rxdb.removeEventListener(e, n));
 	}
 	destroy() {
 		for (let e of this.#e) e();
@@ -3153,121 +3653,121 @@ var wr = (e) => e?.historyInvalidated === !0 || (e?.pushResult?.pushed ?? 0) > 0
 		this.#t.length = 0;
 	}
 	async getLocalRepositories() {
-		return E(this.rxdb);
+		return j(this.rxdb);
 	}
 	async getRemoteRepositories() {
-		return O(this.rxdb);
+		return ae(this.rxdb);
 	}
 	async getCurrentBranch() {
-		return w(this.rxdb);
+		return ie(this.rxdb);
 	}
 	async syncBranches() {
-		return on(this);
+		return er(this);
 	}
 	async pull(e) {
 		let t;
 		try {
-			t = await this.history.syncing(() => this.#n(e));
+			t = await this.history.syncing(() => this.#r(e));
 		} catch (e) {
-			throw Tr(e) && this.history.clearUndoHistory(), e;
+			throw xi(e) && this.history.clearUndoHistory(), e;
 		}
 		return t.historyInvalidated && this.history.clearUndoHistory(), t;
 	}
 	async push(e) {
-		let t = await this.history.syncing(() => rn(this, e));
+		let t = await this.history.syncing(() => Zn(this, e));
 		return t.pushed > 0 && this.history.clearUndoHistory(), t;
 	}
 	async sync(e) {
 		let t, n;
 		try {
 			n = await this.history.syncing(async () => {
-				t = await this.#n(e?.pull);
-				let n = await rn(this, e?.push);
+				t = await this.#r(e?.pull);
+				let n = await Zn(this, e?.push);
 				return {
 					pullResult: t,
 					pushResult: n
 				};
 			});
 		} catch (e) {
-			throw (t?.historyInvalidated === !0 || Tr(e)) && this.history.clearUndoHistory(), e;
+			throw (t?.historyInvalidated === !0 || xi(e)) && this.history.clearUndoHistory(), e;
 		}
 		return (n.pullResult.historyInvalidated || n.pushResult.pushed > 0) && this.history.clearUndoHistory(), n;
 	}
 	async pullRepository(e, t, n) {
 		let r;
 		try {
-			r = await this.history.syncing(() => Ze(this, e, t, n));
+			r = await this.history.syncing(() => ze(this, e, t, n));
 		} catch (e) {
-			throw Tr(e) && this.history.clearUndoHistory(), e;
+			throw xi(e) && this.history.clearUndoHistory(), e;
 		}
 		return r.historyInvalidated && this.history.clearUndoHistory(), r;
 	}
 	async pushRepository(e, t, n) {
-		let r = await this.history.syncing(() => st(this, e, t, n));
+		let r = await this.history.syncing(() => It(this, e, t, n));
 		return r.pushed > 0 && this.history.clearUndoHistory(), r;
 	}
 	async syncRepository(e, t, n) {
 		let r;
 		try {
-			r = await this.history.syncing(() => kt(this, e, t, n));
+			r = await this.history.syncing(() => Cn(this, e, t, n));
 		} catch (e) {
-			throw Tr(e) && this.history.clearUndoHistory(), e;
+			throw xi(e) && this.history.clearUndoHistory(), e;
 		}
 		return (r.pullResult.historyInvalidated || r.pushResult.pushed > 0) && this.history.clearUndoHistory(), r;
 	}
 	async cleanupExpired(e, t, n) {
-		return Lt(this, e, t, n);
+		return jn(this, e, t, n);
 	}
 	async checkRepositoryUpdates(e, t) {
-		return It(this.rxdb, e, t);
+		return An(this.rxdb, e, t);
 	}
 	async getRepositorySyncStatus(e, t) {
-		return Ht(this.rxdb, e, t);
+		return In(this.rxdb, e, t);
 	}
 	async getAllRepositorySyncStatus(e) {
-		return Ut(this.rxdb, e);
+		return Ln(this.rxdb, e);
 	}
 	async refreshPullableCount() {
-		let e = this.history.beginPullableSettlement(), t = (await Ut(this.rxdb)).reduce((e, t) => e + (t.enabled ? t.pullableCount : 0), 0);
+		let e = this.history.beginPullableSettlement(), t = (await Ln(this.rxdb)).reduce((e, t) => e + (t.enabled ? t.pullableCount : 0), 0);
 		return this.history.reconcilePullableCount(e, t), t;
 	}
 	async bulkSync(e) {
-		let t = await this.history.syncing(() => Ft(this.rxdb, e));
-		return t.results.some((e) => wr(e.result) || wr(Er(e.error))) && this.history.clearUndoHistory(), t;
+		let t = await this.history.syncing(() => kn(this.rxdb, e));
+		return t.results.some((e) => bi(e.result) || bi(Si(e.error))) && this.history.clearUndoHistory(), t;
 	}
 	getRepositoryDependencyGraph() {
-		return R(this.rxdb.config.entities.map((e) => T(e)));
+		return z(this.rxdb.config.entities.map((e) => A(e)));
 	}
 	getRepositorySyncOrder(e) {
-		return We(this.getRepositoryDependencyGraph(), e);
+		return Me(this.getRepositoryDependencyGraph(), e);
 	}
-	async #n(e) {
+	async #r(e) {
 		let t = this.history.beginPullableSettlement(), n;
 		try {
-			n = await Yt(this, e);
+			n = await Un(this, e);
 		} catch (e) {
-			let n = e instanceof m ? e.result : void 0;
+			let n = e instanceof g ? e.result : void 0;
 			throw this.history.settleAbortedPull(t, n ? n.pulled : 0), e;
 		}
 		return this.history.settlePull(t, e, n), n;
 	}
-}, Or = class extends h {
+}, wi = class extends _ {
 	lifecycle = "scoped";
 	inject = ["plugin:history"];
 	name = "sync";
 	install(e) {
-		let t = new Dr(this.rxdb, this.rxdb.versionManager.syncBridge);
+		let t = new Ci(this.rxdb, this.rxdb.versionManager.syncBridge);
 		e.acquire(() => () => t.destroy(), "sync:syncManager"), e.acquire(() => (Object.defineProperty(this.rxdb, "syncManager", {
 			value: t,
 			configurable: !0,
 			enumerable: !0
-		}), () => void Reflect.deleteProperty(this.rxdb, "syncManager")), "sync:slot"), this.rxdb.queryCacheOutbox({ pendingWriteIds: (e, t) => _e(this.rxdb, e, t) }, e), e.acquire(() => this.rxdb.reachability.watch(), "sync:reachability"), t.init(), e.acquire(() => this.rxdb.syncState.bindPullableRefresh(() => {
+		}), () => void Reflect.deleteProperty(this.rxdb, "syncManager")), "sync:slot"), this.rxdb.queryCacheOutbox({ pendingWriteIds: (e, t) => gt(this.rxdb, e, t) }, e), this.rxdb.branchMaterializationSource(ot(t), e), e.acquire(() => this.rxdb.reachability.watch(), "sync:reachability"), t.init(), e.acquire(() => this.rxdb.syncState.bindPullableRefresh(() => {
 			t.refreshPullableCount().catch((e) => {
 				let t = e instanceof Error ? e.message : String(e);
 				console.warn(`[RxDB Sync] 重算待拉数失败：${t}。`);
 			});
 		}), "sync:pullableRefresh");
 	}
-}, kr = (e) => new Or(e);
+}, Ti = (e) => new wi(e);
 //#endregion
-export { Or as RxDBPluginSync, Lt as cleanupExpired, ge as countQueryCacheOutbox, fe as flushQueryCacheOutbox, _e as pendingQueryCacheWriteIds, kr as rxDBPluginSync, on as syncBranches };
+export { wi as RxDBPluginSync, ht as countQueryCacheOutbox, dt as flushQueryCacheOutbox, gt as pendingQueryCacheWriteIds, Ti as rxDBPluginSync };