@aiao/rxdb-plugin-history 0.0.26 → 0.0.28

package/dist/index.js

@@ -1,8 +1,9 @@
-import { ENTITY_LOCAL_CREATE_EVENT as e, MergeBranchBeginEvent as t, MergeBranchCommitEvent as n, MergeBranchFailedEvent as r, REPOSITORY_SYNC_COMPLETE_EVENT as i, RxDBBranch as a, RxDBChange as o, RxDBError as s, RxDBPluginBase as c, RxDBSync as l, SwitchBranchBeginEvent as u, SwitchBranchCommitEvent as d, SwitchBranchRollbackEvent as f, TRANSACTION_BEGIN as p, TRANSACTION_COMMIT as m, TRANSACTION_ROLLBACK as h, buildPushableRepositoryRules as ee, getCurrentBranch as te, getEntityMetadata as g, getLocalSystemRepositories as ne, getRemoteSystemRepositories as re, getRxDBChangeKey as _, getRxDBEntityIdentityKey as v, isAdapterShutdownError as y, resolve_current_branch as ie } from "@aiao/rxdb";
-import { BehaviorSubject as b, EMPTY as ae, Observable as x, ReplaySubject as oe, Subject as se, catchError as ce, combineLatest as S, filter as C, firstValueFrom as w, map as T, shareReplay as E, switchMap as D, takeUntil as O } from "rxjs";
-import { isNil as k } from "@aiao/utils";
+import { ENTITY_LOCAL_CREATE_EVENT as e, MAIN_BRANCH_ID as t, MergeBranchBeginEvent as n, MergeBranchCommitEvent as r, MergeBranchFailedEvent as i, REPOSITORY_SYNC_COMPLETE_EVENT as a, RxDBBranch as o, RxDBChange as s, RxDBError as c, RxDBPluginBase as l, RxDBSync as u, SKIP_BRANCH_SWITCH_PREPARE as d, SwitchBranchBeginEvent as f, SwitchBranchCommitEvent as p, SwitchBranchRollbackEvent as m, TRANSACTION_BEGIN as h, TRANSACTION_COMMIT as g, TRANSACTION_ROLLBACK as _, TrustedWriteIntent as v, assertUsableBranchId as ee, buildPushableRepositoryRules as te, declareTrustedWrite as y, getCurrentBranch as ne, getEntityMetadata as b, getLocalSystemRepositories as re, getRemoteSystemRepositories as ie, getRxDBChangeKey as x, getRxDBEntityIdentityKey as S, isAdapterShutdownError as C, resolve_current_branch as ae, takeDeclaredWrite as oe } from "@aiao/rxdb";
+import { BehaviorSubject as w, EMPTY as se, NEVER as ce, Observable as le, ReplaySubject as ue, Subject as de, catchError as fe, combineLatest as T, filter as E, firstValueFrom as D, map as O, shareReplay as k, switchMap as A, takeUntil as j } from "rxjs";
+import { isNil as M } from "@aiao/utils";
 //#region src/create-branch.ts
-var le = async (e, t, n) => {
+var pe = async (e, t, n) => {
+	ee(t);
 	let { branchRepository: r, adapter: i } = await e.getLocalRepositories();
 	if ((await r.find({
 		where: {
@@ -14,13 +15,13 @@ var le = async (e, t, n) => {
 			}]
 		},
 		limit: 1
-	})).length) throw new s(`Branch id (${t}) already exists`);
+	})).length) throw new c(`Branch id (${t}) already exists`);
 	if (e.rxdb.config.sync?.remote?.adapter) {
 		let { adapter: n } = await e.getRemoteRepositories();
-		if (n.branchExists && await n.branchExists(t)) throw new s(`Branch id (${t}) already exists on remote`);
+		if (n.branchExists && await n.branchExists(t)) throw new c(`Branch id (${t}) already exists on remote`);
 	}
-	let c = await i.transaction(async (r) => {
-		let i = r.getRepository(a), s = r.getRepository(o);
+	let a = await i.transaction(async (r) => {
+		let i = r.getRepository(o), a = r.getRepository(s);
 		if ((await i.find({
 			where: {
 				combinator: "and",
@@ -34,7 +35,7 @@ var le = async (e, t, n) => {
 		})).length) return `Branch id (${t}) already exists`;
 		let c, l;
 		if (n) {
-			let e = (await s.find({
+			let e = (await a.find({
 				where: {
 					combinator: "and",
 					rules: [{
@@ -57,14 +58,19 @@ var le = async (e, t, n) => {
 				},
 				limit: 1
 			}))[0];
-		} else c = await ie(i, e.rxdb), l = await ue(s, c.id);
+		} else c = await ae(i, e.rxdb), l = await me(a, c.id);
 		if (!c) return "Source branch not found";
-		let u = e.rxdb.entityManager.instantiate(a);
-		return u.id = t, u.activated = !1, u.local = !0, u.remote = !1, u.fromChangeId = l?.id ?? null, u.parentId = c.id, await i.create(u), u;
+		let u = e.rxdb.entityManager.instantiate(o);
+		u.id = t, u.activated = !1, u.activeKey = null, u.local = !0, u.remote = !1, u.fromChangeId = l?.id ?? null, u.parentId = c.id, await i.create(u);
+		for (let n of e.rxdb.systemContributions) await n.writeBranchRows(e.rxdb.entityManager, {
+			executor: r,
+			branchId: t
+		});
+		return u;
 	});
-	if (typeof c == "string") throw new s(c);
-	return c;
-}, ue = async (e, t) => (await e.find({
+	if (typeof a == "string") throw new c(a);
+	return a;
+}, me = async (e, t) => (await e.find({
 	where: {
 		combinator: "and",
 		rules: [t ? {
@@ -86,14 +92,14 @@ var le = async (e, t, n) => {
 		sort: "desc"
 	}],
 	limit: 1
-}))[0], A = (e) => {
+}))[0], N = (e) => {
 	if (!e || typeof e != "object") return !1;
 	let t = "name" in e ? String(e.name) : "";
-	return ("errno" in e ? Number(e.errno) : void 0) === 44 || t === "AbortError" || y(e);
+	return ("errno" in e ? Number(e.errno) : void 0) === 44 || t === "AbortError" || C(e);
 };
 //#endregion
 //#region src/history-item-builder.ts
-function j(e) {
+function P(e) {
 	if (e.length === 1) {
 		let t = e[0];
 		return `${t.type === "INSERT" ? "创建" : t.type === "UPDATE" ? "更新" : "删除"} ${t.entity}`;
@@ -106,12 +112,12 @@ function j(e) {
 	let n = [];
 	return t.insert && n.push(`创建${t.insert}条`), t.update && n.push(`更新${t.update}条`), t.delete && n.push(`删除${t.delete}条`), `事务: ${n.join(", ")}`;
 }
-function M(e) {
+function F(e) {
 	let t = e[0], n = e.length, r = t.transactionId ?? null, i = t.createdAt, a = t.namespace, o = t.entity, s = r ? "TRANSACTION" : t.type, c = [
 		s,
-		v(t.entityId),
+		S(t.entityId),
 		i.getTime()
-	].join(":"), l = e.some((e) => k(e.revertChangeId) === !1), u = e.some((e) => k(e.redoInvalidatedAt) === !1);
+	].join(":"), l = e.some((e) => M(e.revertChangeId) === !1), u = e.some((e) => M(e.redoInvalidatedAt) === !1);
 	return {
 		transactionId: r,
 		changeId: e.reduce((e, t) => t.id > e ? t.id : e, e[0].id),
@@ -120,57 +126,57 @@ function M(e) {
 		type: s,
 		count: n,
 		createdAt: i,
-		description: j(e),
+		description: P(e),
 		namespace: a,
 		entity: o,
 		reverted: l,
 		redoInvalidated: u
 	};
 }
-function N(e) {
+function I(e) {
 	let t = [], n = [], r;
 	return e.forEach((e) => {
-		e.transactionId && e.transactionId === r ? n.push(e) : (r = e.transactionId, n.length &&= (t.push(M([...n])), 0), e.transactionId ? n.push(e) : t.push(M([e])));
-	}), n.length && t.push(M([...n])), t;
+		e.transactionId && e.transactionId === r ? n.push(e) : (r = e.transactionId, n.length &&= (t.push(F([...n])), 0), e.transactionId ? n.push(e) : t.push(F([e])));
+	}), n.length && t.push(F([...n])), t;
 }
 //#endregion
 //#region src/history-filters.ts
-var P = (e) => `${e.namespace}:${e.entity}`;
-function F(e, t) {
+var L = (e) => `${e.namespace}:${e.entity}`;
+function R(e, t) {
 	let n = new Map(t);
 	for (let t of e) {
 		if (t.lastPushedChangeId === null) continue;
-		let e = P(t), r = n.get(e);
+		let e = L(t), r = n.get(e);
 		r !== void 0 && r >= t.lastPushedChangeId || n.set(e, t.lastPushedChangeId);
 	}
 	return n;
 }
-function I(e, t) {
+function z(e, t) {
 	return t.type === "database" ? e : e.map((e) => {
 		let n = e.changes.filter((e) => t.type === "repository" ? e.namespace === t.namespace && e.entity === t.entity : e.namespace === t.namespace && e.entity === t.entity && e.entityId === t.entityId);
 		return n.length === 0 ? null : {
 			...e,
 			changes: n,
 			count: n.length,
-			description: j(n)
+			description: P(n)
 		};
 	}).filter((e) => e !== null);
 }
-function L(e, t, n = 0, r = null) {
+function B(e, t, n = 0, r = null) {
 	return e.filter((e) => !e.reverted && e.changes.every((e) => {
-		let i = e.remoteId == null, a = t.get(P(e)), o = a == null || e.id > a, s = e.id > n, c = r === null || e.createdAt.getTime() > r.getTime();
+		let i = e.remoteId == null, a = t.get(L(e)), o = a == null || e.id > a, s = e.id > n, c = r === null || e.createdAt.getTime() > r.getTime();
 		return i && o && s && c;
 	}));
 }
-function de(e) {
-	return e.type === "database" ? "database" : e.type === "repository" ? `${e.namespace}:${e.entity}` : `${e.namespace}:${e.entity}:${v(e.entityId)}`;
+function he(e) {
+	return e.type === "database" ? "database" : e.type === "repository" ? `${e.namespace}:${e.entity}` : `${e.namespace}:${e.entity}:${S(e.entityId)}`;
 }
 //#endregion
 //#region src/history-scope-api.ts
-function fe(e) {
+function ge(e) {
 	if (!e) return { type: "database" };
 	if (Object.getPrototypeOf(e) === Object.prototype && "type" in e) return e;
-	let t = g(e), n = "id" in e ? e.id : void 0, r = typeof n == "string" || typeof n == "number" || typeof n == "bigint" ? n : void 0;
+	let t = b(e), n = "id" in e ? e.id : void 0, r = typeof n == "string" || typeof n == "number" || typeof n == "bigint" ? n : void 0;
 	return r === void 0 ? {
 		type: "repository",
 		namespace: t.namespace,
@@ -182,8 +188,8 @@ function fe(e) {
 		entityId: r
 	};
 }
-function pe(e, t) {
-	let n = fe(t), r = de(n), i = e.history_cache.get(r);
+function _e(e, t) {
+	let n = ge(t), r = he(n), i = e.history_cache.get(r);
 	if (i) return i;
 	let a = () => {
 		let t = (e.history_ref_counts.get(r) || 0) - 1;
@@ -191,28 +197,28 @@ function pe(e, t) {
 	}, o = () => {
 		let t = (e.history_ref_counts.get(r) || 0) + 1;
 		e.history_ref_counts.set(r, t), e.history_cache.set(r, h);
-	}, s = (e) => new x((t) => {
+	}, s = (e) => new le((t) => {
 		o();
 		let n = e.subscribe(t);
 		return () => {
 			n.unsubscribe(), a();
 		};
-	}), c = e.histories$.pipe(T((e) => I(e, n)), E({
+	}), c = e.histories$.pipe(O((e) => z(e, n)), k({
 		bufferSize: 1,
 		refCount: !0
-	})), l = s(c), u = s(e.undoHistories$.pipe(T((e) => I(e, n)), E({
+	})), l = s(c), u = s(e.undoHistories$.pipe(O((e) => z(e, n)), k({
 		bufferSize: 1,
 		refCount: !0
-	}))), d = s(e.redoHistories$.pipe(T((e) => I(e, n)), E({
+	}))), d = s(e.redoHistories$.pipe(O((e) => z(e, n)), k({
 		bufferSize: 1,
 		refCount: !0
-	}))), f = s(c.pipe(T((e) => e.length), E({
+	}))), f = s(c.pipe(O((e) => e.length), k({
 		bufferSize: 1,
 		refCount: !0
-	}))), p = s(u.pipe(T((e) => e.length), E({
+	}))), p = s(u.pipe(O((e) => e.length), k({
 		bufferSize: 1,
 		refCount: !0
-	}))), m = s(d.pipe(T((e) => e.length), E({
+	}))), m = s(d.pipe(O((e) => e.length), k({
 		bufferSize: 1,
 		refCount: !0
 	}))), h = {
@@ -228,11 +234,11 @@ function pe(e, t) {
 			if (r.state === "cleared") return;
 			let { histories: i, lastPushedMap: a } = await e.fetchLatestHistories(r.boundary);
 			if (!e.isUndoSessionCurrent(r)) return;
-			let o = L(i, a, r.boundary.changeId, r.boundary.createdAfter), s = e.selectWholeTransactions(o, n, t);
+			let o = B(i, a, r.boundary.changeId, r.boundary.createdAfter), s = e.selectWholeTransactions(o, n, t);
 			s.length !== 0 && await e.applyUndoRedoHistories("undo", s, r);
 		}),
 		redo: (t = 1) => e.runSerialized(async () => {
-			let r = await w(e.redoHistories$), i = e.selectWholeTransactions(r, n, t);
+			let r = await D(e.redoHistories$), i = e.selectWholeTransactions(r, n, t);
 			i.length !== 0 && await e.applyUndoRedoHistories("redo", i);
 		})
 	};
@@ -240,22 +246,22 @@ function pe(e, t) {
 }
 //#endregion
 //#region src/history-undo-session.types.ts
-var R = {
+var V = {
 	changeId: 0,
 	createdAfter: null
 };
 //#endregion
 //#region src/pullable-count.ts
-function z(e, t) {
+function ve(e, t) {
 	return e?.repositoryFilter !== void 0 && e.repositoryFilter.length > 0 ? !1 : !t.hasMore && t.failures.length === 0;
 }
-function B(e, t) {
+function ye(e, t) {
 	return t.complete && !t.concurrent ? 0 : Math.max(0, e - t.pulled);
 }
 //#endregion
 //#region src/redo-stack.ts
-var me = 1e3, he = class {
-	#e = new b([]);
+var be = 1e3, xe = class {
+	#e = new w([]);
 	get items$() {
 		return this.#e.asObservable();
 	}
@@ -263,7 +269,7 @@ var me = 1e3, he = class {
 		return this.#e.value;
 	}
 	push(e) {
-		let t = [...e, ...this.#e.value], n = t.length > 1e3 ? t.slice(0, me) : t;
+		let t = [...e, ...this.#e.value], n = t.length > 1e3 ? t.slice(0, be) : t;
 		this.#e.next(n);
 	}
 	remove(e) {
@@ -276,35 +282,44 @@ var me = 1e3, he = class {
 };
 //#endregion
 //#region src/scope-selection.ts
-function V(e, t) {
+function H(e, t) {
 	return t.type === "database" ? !0 : e.namespace !== t.namespace || e.entity !== t.entity ? !1 : t.type === "repository" || e.entityId === t.entityId;
 }
-function ge(e, t) {
-	return e.changes.some((e) => V(e, t));
+function Se(e, t) {
+	return e.changes.some((e) => H(e, t));
 }
-function _e(e, t) {
-	return e.changes.every((e) => V(e, t));
+function Ce(e, t) {
+	return e.changes.every((e) => H(e, t));
 }
-function ve(e, t, n) {
-	let r = e.filter((e) => ge(e, t)).slice(0, Math.max(0, n)), i = [], a = [];
-	for (let e of r) _e(e, t) ? a.push(e) : i.push(e);
+function we(e, t, n) {
+	let r = e.filter((e) => Se(e, t)).slice(0, Math.max(0, n)), i = [], a = [];
+	for (let e of r) Ce(e, t) ? a.push(e) : i.push(e);
 	return {
 		crossScope: i,
 		selected: a
 	};
 }
-var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `${e.namespace}:${e.entity}` : `${e.namespace}:${e.entity}#${String(e.entityId)}`, be = (e, t) => {
+var Te = (e) => e.type === "database" ? "database" : e.type === "repository" ? `${e.namespace}:${e.entity}` : `${e.namespace}:${e.entity}#${String(e.entityId)}`, Ee = (e, t) => {
 	let n = /* @__PURE__ */ new Set();
-	for (let r of e) for (let e of r.changes) V(e, t) || n.add(t.type === "entity" ? `${e.namespace}:${e.entity}#${String(e.entityId)}` : `${e.namespace}:${e.entity}`);
+	for (let r of e) for (let e of r.changes) H(e, t) || n.add(t.type === "entity" ? `${e.namespace}:${e.entity}#${String(e.entityId)}` : `${e.namespace}:${e.entity}`);
 	return [...n].join(", ");
-}, H = class e extends s {
+}, U = class e extends c {
 	scope;
 	histories;
 	constructor(t, n) {
-		super(`Scoped history operation would split a transaction: scope ${ye(t)} also changes ${be(n, t)}. Use the database scope to apply the whole transaction.`), this.scope = t, this.histories = n, this.name = "RxDBCrossScopeTransactionError", Object.setPrototypeOf(this, e.prototype);
+		super(`Scoped history operation would split a transaction: scope ${Te(t)} also changes ${Ee(n, t)}. Use the database scope to apply the whole transaction.`), this.scope = t, this.histories = n, this.name = "RxDBCrossScopeTransactionError", Object.setPrototypeOf(this, e.prototype);
+	}
+}, W = (e) => e.fromChangeId ?? 0, G = (e, t) => {
+	let n = [e], r = /* @__PURE__ */ new Set([e.id]), i = e;
+	for (; i.parentId;) {
+		if (r.has(i.parentId)) throw new c(`Branch history is corrupt: cycle detected at branch '${i.id}' (parentId '${i.parentId}' already visited)`);
+		let e = t.get(i.parentId);
+		if (!e) throw new c(`Branch history is corrupt: branch '${i.id}' references missing parent '${i.parentId}'`);
+		r.add(e.id), n.push(e), i = e;
 	}
-}, U = (e) => e.fromChangeId ?? 0, xe = (e) => {
-	let { branches: t, currentBranch: n, nextBranch: r } = e, i = e.currentChangeId ?? U(n), a = e.nextChangeId ?? U(r);
+	return n;
+}, K = (e) => {
+	let { branches: t, currentBranch: n, nextBranch: r } = e, i = e.currentChangeId ?? W(n), a = e.nextChangeId ?? W(r);
 	if (i === a) return [];
 	if (n.id === r.id) return [{
 		branch: n,
@@ -313,89 +328,80 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 	}];
 	let o = /* @__PURE__ */ new Map();
 	for (let e of t) o.set(e.id, e);
-	let c = (e) => {
-		let t = [e], n = /* @__PURE__ */ new Set([e.id]), r = e;
-		for (; r.parentId;) {
-			if (n.has(r.parentId)) throw new s(`Branch history is corrupt: cycle detected at branch '${r.id}' (parentId '${r.parentId}' already visited)`);
-			let e = o.get(r.parentId);
-			if (!e) throw new s(`Branch history is corrupt: branch '${r.id}' references missing parent '${r.parentId}'`);
-			n.add(e.id), t.push(e), r = e;
-		}
-		return t;
-	}, l = c(n), u = c(r), d = null, f = -1;
-	for (let e = 0; e < l.length; e++) if (u.findIndex((t) => t.id === l[e].id) !== -1) {
-		d = l[e], f = e;
+	let s = G(n, o), c = G(r, o), l = null, u = -1;
+	for (let e = 0; e < s.length; e++) if (c.findIndex((t) => t.id === s[e].id) !== -1) {
+		l = s[e], u = e;
 		break;
 	}
-	let p = [];
-	if (d) {
-		for (let e = 0; e < f; e++) {
-			let t = l[e], n = e === 0 ? i : U(l[e - 1]), r = U(t);
-			n !== r && p.push({
+	let d = [];
+	if (l) {
+		for (let e = 0; e < u; e++) {
+			let t = s[e], n = e === 0 ? i : W(s[e - 1]), r = W(t);
+			n !== r && d.push({
 				branch: t,
 				fromChangeId: n,
 				toChangeId: r
 			});
 		}
-		let e = u.findIndex((e) => e.id === d.id);
+		let e = c.findIndex((e) => e.id === l.id);
 		if (e === 0) {
-			let e = f === 0 ? i : U(l[f - 1]), t = a;
-			e !== t && p.push({
-				branch: d,
+			let e = u === 0 ? i : W(s[u - 1]), t = a;
+			e !== t && d.push({
+				branch: l,
 				fromChangeId: e,
 				toChangeId: t
 			});
 		} else if (e > 0) {
-			let t = f === 0 ? i : U(l[f - 1]), n = U(u[e - 1]);
-			t !== n && p.push({
-				branch: d,
+			let t = u === 0 ? i : W(s[u - 1]), n = W(c[e - 1]);
+			t !== n && d.push({
+				branch: l,
 				fromChangeId: t,
 				toChangeId: n
 			});
 		}
-		let t = u.slice(0, e).reverse();
+		let t = c.slice(0, e).reverse();
 		for (let e = 0; e < t.length; e++) {
-			let n = t[e], r = U(n), i = e === t.length - 1 ? a : U(t[e + 1]);
-			r !== i && p.push({
+			let n = t[e], r = W(n), i = e === t.length - 1 ? a : W(t[e + 1]);
+			r !== i && d.push({
 				branch: n,
 				fromChangeId: r,
 				toChangeId: i
 			});
 		}
 	} else {
-		for (let e = 0; e < l.length; e++) {
-			let t = l[e], n = e === 0 ? i : U(l[e - 1]), r = U(t);
-			n !== r && p.push({
+		for (let e = 0; e < s.length; e++) {
+			let t = s[e], n = e === 0 ? i : W(s[e - 1]), r = W(t);
+			n !== r && d.push({
 				branch: t,
 				fromChangeId: n,
 				toChangeId: r
 			});
 		}
-		let e = l[l.length - 1], t = U(e);
-		t !== 0 && p.push({
+		let e = s[s.length - 1], t = W(e);
+		t !== 0 && d.push({
 			branch: e,
 			fromChangeId: t,
 			toChangeId: 0
 		});
-		let n = u[u.length - 1], r = u.length > 1 ? U(u[u.length - 2]) : a;
-		r !== 0 && p.push({
+		let n = c[c.length - 1], r = c.length > 1 ? W(c[c.length - 2]) : a;
+		r !== 0 && d.push({
 			branch: n,
 			fromChangeId: 0,
 			toChangeId: r
 		});
-		let o = u.slice(0, u.length - 1).reverse();
+		let o = c.slice(0, c.length - 1).reverse();
 		for (let e = 0; e < o.length; e++) {
-			let t = o[e], n = U(t), r = e === o.length - 1 ? a : U(o[e + 1]);
-			n !== r && p.push({
+			let t = o[e], n = W(t), r = e === o.length - 1 ? a : W(o[e + 1]);
+			n !== r && d.push({
 				branch: t,
 				fromChangeId: n,
 				toChangeId: r
 			});
 		}
 	}
-	return p;
-}, Se = async (e, t) => {
-	let { branchRepository: n, changeRepository: r } = await e.getLocalRepositories(), i = (await n.find({
+	return d;
+}, De = async (e, t) => q(await e.getLocalRepositories(), t), q = async (e, t) => {
+	let { branchRepository: n, changeRepository: r } = e, i = (await n.find({
 		where: {
 			combinator: "and",
 			rules: [{
@@ -406,17 +412,17 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 		},
 		limit: 1
 	}))[0];
-	if (!i) throw new s("Current branch not found");
+	if (!i) throw new c("Current branch not found");
 	let a = await n.find({ where: {
 		combinator: "and",
 		rules: []
 	} }), o = a.find((e) => e.id === t);
-	if (!o) throw new s(`Branch (${t}) not found`);
-	if (i.id === o.id) throw new s("Cannot switch to the same branch");
-	let c = await G(r, i.id), l = await G(r, o.id), u = xe({
+	if (!o) throw new c(`Branch (${t}) not found`);
+	if (i.id === o.id) throw new c("Cannot switch to the same branch");
+	let s = await Y(r, i.id), l = await Y(r, o.id), u = K({
 		branches: a,
 		currentBranch: i,
-		currentChangeId: c ? c.id : null,
+		currentChangeId: s ? s.id : null,
 		nextBranch: o,
 		nextChangeId: l ? l.id : null
 	}), d = {
@@ -456,10 +462,10 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 			value: t.fromChangeId
 		});
 		let f = await r.find(l);
-		o ? we(f, d) : a && Ce(f, d);
+		o ? ke(f, d) : a && Oe(f, d);
 	}
 	return d;
-}, Ce = (e, t) => W(e, !0, t), we = (e, t) => W(e, !1, t), W = (e, t, n = {
+}, Oe = (e, t) => J(e, !0, t), ke = (e, t) => J(e, !1, t), J = (e, t, n = {
 	deletes: /* @__PURE__ */ new Map(),
 	updates: /* @__PURE__ */ new Map(),
 	inserts: /* @__PURE__ */ new Map()
@@ -467,7 +473,7 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 	if (t) {
 		let t = [...e].sort((e, t) => e.id - t.id);
 		for (let e of t) {
-			let t = _(e);
+			let t = x(e);
 			switch (e.type) {
 				case "INSERT":
 					n.inserts.set(t, {
@@ -493,7 +499,7 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 	} else {
 		let t = [...e].sort((e, t) => t.id - e.id);
 		for (let e of t) {
-			let t = _(e);
+			let t = x(e);
 			switch (e.type) {
 				case "INSERT":
 					n.deletes.set(t, {
@@ -518,7 +524,7 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 		}
 	}
 	return n;
-}, G = async (e, t) => (await e.find({
+}, Y = async (e, t) => (await e.find({
 	where: {
 		combinator: "and",
 		rules: [{
@@ -536,8 +542,8 @@ var ye = (e) => e.type === "database" ? "database" : e.type === "repository" ? `
 		sort: "desc"
 	}],
 	limit: 1
-}))[0], K = (e) => e.getRepository(l);
-async function Te(e, t) {
+}))[0], X = (e) => e.getRepository(u);
+async function Ae(e, t) {
 	let { changeRepository: n, branchRepository: r } = await e.rxdb.versionManager.getLocalRepositories(), i = await r.find({ where: {
 		combinator: "and",
 		rules: [{
@@ -550,7 +556,7 @@ async function Te(e, t) {
 		histories: [],
 		lastPushedMap: /* @__PURE__ */ new Map()
 	};
-	let a = i[0], o = F(await K(await w(e.rxdb.localAdapter$)).find({ where: {
+	let a = i[0], o = R(await X(await D(e.rxdb.localAdapter$)).find({ where: {
 		combinator: "and",
 		rules: [{
 			field: "branchId",
@@ -571,7 +577,7 @@ async function Te(e, t) {
 		operator: ">",
 		value: t.changeId
 	}), {
-		histories: N(await n.find({
+		histories: I(await n.find({
 			where: {
 				combinator: "and",
 				rules: s
@@ -584,10 +590,10 @@ async function Te(e, t) {
 		lastPushedMap: o
 	};
 }
-async function Ee(e, t, n, r) {
+async function je(e, t, n, r) {
 	e.isUndoRedoInProgress = !0;
 	try {
-		let i = n.flatMap((e) => e.changes).sort((e, n) => t === "undo" ? n.id - e.id : e.id - n.id), a = W(i, t === "redo"), o = e.getNextRevertStateUpdatedAt(i);
+		let i = n.flatMap((e) => e.changes).sort((e, n) => t === "undo" ? n.id - e.id : e.id - n.id), a = J(i, t === "redo"), o = e.getNextRevertStateUpdatedAt(i);
 		if (t === "undo") {
 			let { adapter: t } = await e.rxdb.versionManager.getLocalRepositories(), n = await t.getRxDBChangeSequence(), r = /* @__PURE__ */ new Date();
 			i.forEach((e, t) => {
@@ -621,21 +627,28 @@ async function Ee(e, t, n, r) {
 		});
 		let { adapter: s } = await e.rxdb.versionManager.getLocalRepositories();
 		if (t === "undo" && (r === void 0 || !e.isUndoSessionCurrent(r))) return;
-		await s.switchBranch({ actions: a }), e.pushableCountTrigger$.next(Date.now()), e.setRevertStateWatermarks(i, t === "undo", o), t === "undo" ? e.pushToRedoStack(n) : e.removeFromRedoStack(n);
+		y(s, {
+			file: "undo-redo-apply.ts",
+			symbol: "applyUndoRedoHistories",
+			intent: v.undo_redo
+		}), await s.switchBranch({
+			actions: a,
+			prepare: d
+		}), e.pushableCountTrigger$.next(Date.now()), e.setRevertStateWatermarks(i, t === "undo", o), t === "undo" ? e.pushToRedoStack(n) : e.removeFromRedoStack(n);
 	} finally {
 		e.isUndoRedoInProgress = !1;
 	}
 }
-async function De(e) {
+async function Me(e) {
 	let t = ++e.pushableGeneration, n = (n) => {
 		t === e.pushableGeneration && e.pushableCount$.next(n);
 	};
 	try {
-		if (!await w(e.rxdb.connected$)) {
+		if (!await D(e.rxdb.connected$)) {
 			n(0);
 			return;
 		}
-		let t = K(await w(e.rxdb.localAdapter$)), r = e.rxdb.entityManager.getRepository(o), i = await w(e.rxdb.entityManager.getRepository(a).findOne({ where: {
+		let t = X(await D(e.rxdb.localAdapter$)), r = e.rxdb.entityManager.getRepository(s), i = await D(e.rxdb.entityManager.getRepository(o).findOne({ where: {
 			combinator: "and",
 			rules: [{
 				field: "activated",
@@ -647,19 +660,19 @@ async function De(e) {
 			n(0);
 			return;
 		}
-		let s = await t.find({ where: {
+		let a = await t.find({ where: {
 			combinator: "and",
 			rules: [{
 				field: "branchId",
 				operator: "=",
 				value: i.id
 			}]
-		} }), c = ee(e.rxdb.config.entities, e.rxdb.config.sync, s);
+		} }), c = te(e.rxdb.config.entities, e.rxdb.entitySync, a);
 		if (c.length === 0) {
 			n(0);
 			return;
 		}
-		n(await w(r.count({ where: {
+		n(await D(r.count({ where: {
 			combinator: "and",
 			rules: [
 				{
@@ -684,26 +697,26 @@ async function De(e) {
 			]
 		} })));
 	} catch (t) {
-		!e.destroyed && !y(t) && (console.error("[#updatePushableCount] error", t), e.errors$.next(t instanceof Error ? t : Error(String(t)))), n(0);
+		!e.destroyed && !C(t) && (console.error("[#updatePushableCount] error", t), e.errors$.next(t instanceof Error ? t : Error(String(t)))), n(0);
 	}
 }
 //#endregion
 //#region src/HistoryManager.ts
-var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
+var Z = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), Ne = class {
 	rxdb;
 	#e = [];
 	#t = !1;
 	#n;
 	#r;
-	#i = new oe(1);
+	#i = new ue(1);
 	#a = Promise.resolve();
-	#o = new b(0);
+	#o = new w(0);
 	#s = 0;
-	#c = new b(0);
+	#c = new w(0);
 	#l = 0;
-	#u = new b(0);
+	#u = new w(0);
 	#d = /* @__PURE__ */ new Map();
-	#f = new b(0);
+	#f = new w(0);
 	#p = 0;
 	#m;
 	#h = null;
@@ -712,15 +725,15 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 	#v = null;
 	#y = 0;
 	#b = null;
-	#x = new b({
+	#x = new w({
 		generation: 0,
 		state: "active",
-		boundary: R
+		boundary: V
 	});
 	isUndoRedoInProgress = !1;
 	isInvalidatingRedo = !1;
 	syncDepth = 0;
-	redoStack = new he();
+	redoStack = new xe();
 	history_cache = /* @__PURE__ */ new Map();
 	history_ref_counts = /* @__PURE__ */ new Map();
 	histories$;
@@ -728,7 +741,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 	redoHistories$;
 	undoCount$;
 	redoCount$;
-	errors$ = new se();
+	errors$ = new de();
 	pushableCount$;
 	pullableCount$;
 	count$;
@@ -737,21 +750,21 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 	}
 	constructor(e) {
 		this.rxdb = e, this.#n = this.#R(), this.#r = this.#z();
-		let t = e.entityManager.getRepository(a), n = e.entityManager.getRepository(o), r = t.findOne({ where: {
+		let t = e.entityManager.getRepository(o), n = e.entityManager.getRepository(s), r = this.rxdb.connected$.pipe(A((e) => e ? t.findOne({ where: {
 			combinator: "and",
 			rules: [{
 				field: "activated",
 				operator: "=",
 				value: !0
 			}]
-		} });
-		this.#e.push(r.pipe(O(this.#i)).subscribe({
+		} }) : ce));
+		this.#e.push(r.pipe(j(this.#i)).subscribe({
 			next: (e) => this.#E(e?.id ?? null),
 			error: (e) => this.#T("undo session 分支跟随的活跃分支流已中断", e)
-		})), this.#m = S({
+		})), this.#m = T({
 			connected: this.rxdb.connected$,
 			branch: r
-		}).pipe(C(({ connected: e, branch: t }) => e && !!t), D(({ branch: e }) => {
+		}).pipe(E(({ connected: e, branch: t }) => e && !!t), A(({ branch: e }) => {
 			let t = this.#M();
 			return n.findAll({
 				where: {
@@ -771,25 +784,25 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 					sort: "desc"
 				}]
 			});
-		}), O(this.#i));
-		let s = this.#m.pipe(T((e) => N(e)), E({
+		}), j(this.#i));
+		let i = this.#m.pipe(O((e) => I(e)), k({
 			bufferSize: 1,
 			refCount: !0
 		}));
-		this.histories$ = S([s, this.#f]).pipe(T(([e]) => this.#O(e)), E({
+		this.histories$ = T([i, this.#f]).pipe(O(([e]) => this.#O(e)), k({
 			bufferSize: 1,
 			refCount: !0
-		})), this.count$ = this.histories$.pipe(T((e) => e.length), E({
+		})), this.count$ = this.histories$.pipe(O((e) => e.length), k({
 			bufferSize: 1,
 			refCount: !0
-		})), this.undoHistories$ = S({
+		})), this.undoHistories$ = T({
 			histories: this.histories$,
 			undoSession: this.#x,
 			trigger: this.#u
-		}).pipe(D(async ({ histories: e, undoSession: t }) => {
+		}).pipe(A(async ({ histories: e, undoSession: t }) => {
 			if (t.state === "cleared") return [];
 			try {
-				let n = await w(this.rxdb.entityManager.getRepository(a).findOne({ where: {
+				let n = await D(this.rxdb.entityManager.getRepository(o).findOne({ where: {
 					combinator: "and",
 					rules: [{
 						field: "activated",
@@ -797,7 +810,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 						value: !0
 					}]
 				} }));
-				return n ? L(e, F(await K(await w(this.rxdb.localAdapter$)).find({ where: {
+				return n ? B(e, R(await X(await D(this.rxdb.localAdapter$)).find({ where: {
 					combinator: "and",
 					rules: [{
 						field: "branchId",
@@ -809,20 +822,20 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 				let t = e instanceof Error ? e : Error(String(e));
 				return this.errors$.next(t), [];
 			}
-		}), E({
+		}), k({
 			bufferSize: 1,
 			refCount: !0
-		})), this.redoHistories$ = this.redoStack.items$, this.undoCount$ = this.undoHistories$.pipe(T((e) => e.length), E({
+		})), this.redoHistories$ = this.redoStack.items$, this.undoCount$ = this.undoHistories$.pipe(O((e) => e.length), k({
 			bufferSize: 1,
 			refCount: !0
-		})), this.redoCount$ = this.redoHistories$.pipe(T((e) => e.length), E({
+		})), this.redoCount$ = this.redoHistories$.pipe(O((e) => e.length), k({
 			bufferSize: 1,
 			refCount: !0
 		})), this.pushableCount$ = this.#c.asObservable(), this.pullableCount$ = this.#o.asObservable();
-		let c = S({
+		let c = T({
 			connected: this.rxdb.connected$,
 			branch: r
-		}).pipe(C(({ connected: e, branch: t }) => e && !!t), D(({ branch: e }) => {
+		}).pipe(E(({ connected: e, branch: t }) => e && !!t), A(({ branch: e }) => {
 			let t = [
 				{
 					field: "branchId",
@@ -838,24 +851,29 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 					field: "remoteId",
 					operator: "=",
 					value: null
+				},
+				{
+					field: "rejectedAt",
+					operator: "=",
+					value: null
 				}
 			];
 			return n.count({ where: {
 				combinator: "and",
 				rules: t
-			} }).pipe(ce((e) => (this.#T("pushableCount 的变更计数查询", e), ae)));
+			} }).pipe(fe((e) => (this.#T("pushableCount 的变更计数查询", e), se)));
 		})).subscribe({
 			next: () => {
 				this.#L();
 			},
 			error: (e) => this.#T("pushableCount 重算的活跃分支流已中断", e)
 		});
-		this.#e.push(c), this.rxdb.addEventListener(i, this.#F), this.#L();
+		this.#e.push(c), this.rxdb.addEventListener(a, this.#F), this.#L();
 	}
 	destroy() {
 		this.#t = !0, this.#i.next(), this.#i.complete();
 		for (let e of this.#e) e.unsubscribe();
-		this.#e.length = 0, this.rxdb.removeEventListener(i, this.#F), this.#d.clear(), this.errors$.complete();
+		this.#e.length = 0, this.rxdb.removeEventListener(a, this.#F), this.#d.clear(), this.errors$.complete();
 	}
 	incrementPullableCount(e) {
 		this.#s++;
@@ -873,7 +891,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		this.#o.next(n);
 	}
 	settlePullableCount(e, t) {
-		this.#o.next(B(this.#o.value, {
+		this.#o.next(ye(this.#o.value, {
 			complete: t.complete,
 			concurrent: e !== this.#s,
 			pulled: t.pulled
@@ -910,7 +928,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		this.#v = t(this.#v ?? {
 			generation: 0,
 			state: "active",
-			boundary: R
+			boundary: V
 		});
 		let n = this.#b === null ? void 0 : this.#_.get(this.#b);
 		this.#x.next(n ?? this.#v), this.clearRedoStack();
@@ -921,7 +939,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		let r = e.filter((e) => Number.isSafeInteger(e) && e > 0);
 		if (t === void 0) {
 			if (r.length === 0) return;
-			let e = q(r);
+			let e = Z(r);
 			this.#w({
 				generation: n.generation,
 				state: "active",
@@ -933,7 +951,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 			return;
 		}
 		if (!(t.generation === null ? t.recordAt !== null && Number.isFinite(t.recordAt.getTime()) && t.recordAt.getTime() > n.clearedAt.getTime() : t.generation === n.generation)) return;
-		let i = r.length > 0 ? q(r) : null, a = i === null && (n.boundary.createdAfter === null || n.boundary.createdAfter.getTime() < n.clearedAt.getTime()) ? n.clearedAt : n.boundary.createdAfter;
+		let i = r.length > 0 ? Z(r) : null, a = i === null && (n.boundary.createdAfter === null || n.boundary.createdAfter.getTime() < n.clearedAt.getTime()) ? n.clearedAt : n.boundary.createdAfter;
 		this.#w({
 			generation: n.generation,
 			state: "active",
@@ -956,19 +974,26 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 	}
 	async invalidateRedoStack(e) {
 		return this.#j(async () => {
-			if (!(this.isUndoRedoInProgress || this.isInvalidatingRedo) && !(e?.length && e.every((e) => e <= this.#p))) {
+			if (!(e?.length && e.every((e) => e <= this.#p))) {
 				this.isInvalidatingRedo = !0;
 				try {
-					let e = await w(this.redoHistories$);
+					let e = await D(this.redoHistories$);
 					if (e.length === 0) return;
-					let t = e.flatMap((e) => e.changes), n = /* @__PURE__ */ new Date(), r = W([], !1), { adapter: i } = await this.rxdb.versionManager.getLocalRepositories();
+					let t = e.flatMap((e) => e.changes), n = /* @__PURE__ */ new Date(), r = J([], !1), { adapter: i } = await this.rxdb.versionManager.getLocalRepositories();
 					t.forEach((e) => {
 						let t = `rxdb:RxDBChange:${e.id}`;
 						r.updates.set(t, {
 							patch: { redoInvalidatedAt: n },
 							inversePatch: { redoInvalidatedAt: null }
 						});
-					}), await i.switchBranch({ actions: r }), this.clearRedoStack();
+					}), y(i, {
+						file: "HistoryManager.ts",
+						symbol: "invalidateRedoStack",
+						intent: v.redo_invalidation
+					}), await i.switchBranch({
+						actions: r,
+						prepare: d
+					}), this.clearRedoStack();
 				} catch (e) {
 					throw console.error("[HistoryManager] Failed to invalidate redo stack:", e), e;
 				} finally {
@@ -978,11 +1003,11 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		});
 	}
 	history(e) {
-		return pe(this.#n, e);
+		return _e(this.#n, e);
 	}
 	#S(e, t, n) {
-		let { crossScope: r, selected: i } = ve(e, t, n);
-		if (r.length > 0) throw new H(t, r);
+		let { crossScope: r, selected: i } = we(e, t, n);
+		if (r.length > 0) throw new U(t, r);
 		return i;
 	}
 	#C() {
@@ -992,7 +1017,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		this.#b !== null && this.#_.set(this.#b, e), this.#x.next(e);
 	}
 	#T(e, t) {
-		this.#t || y(t) || (console.error(`[HistoryManager] ${e}:`, t), this.errors$.next(t instanceof Error ? t : Error(String(t))));
+		this.#t || C(t) || (console.error(`[HistoryManager] ${e}:`, t), this.errors$.next(t instanceof Error ? t : Error(String(t))));
 	}
 	#E(e) {
 		if (e === this.#b || (this.#b === null && e !== null && !this.#_.has(e) && this.#_.set(e, this.#x.value), this.#b = e, e === null)) return;
@@ -1004,7 +1029,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		return t === null ? {
 			generation: e,
 			state: "active",
-			boundary: R
+			boundary: V
 		} : {
 			...t,
 			generation: e
@@ -1052,16 +1077,16 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		return this.#x.value === e;
 	}
 	async #P(e) {
-		return Te(this.#r, e);
+		return Ae(this.#r, e);
 	}
 	#F = () => {
 		this.#L(), this.#u.next(Date.now());
 	};
 	async #I(e, t, n) {
-		return Ee(this.#r, e, t, n);
+		return je(this.#r, e, t, n);
 	}
 	async #L() {
-		return De(this.#r);
+		return Me(this.#r);
 	}
 	#R() {
 		let e = this;
@@ -1135,52 +1160,56 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 			removeFromRedoStack: (t) => e.removeFromRedoStack(t)
 		};
 	}
-}, Y = async (e, t) => {
-	let { adapter: n } = await e.getLocalRepositories();
-	if (t === "main") throw new s("Cannot remove main branch");
-	let r = await n.transaction(async (e) => {
-		let n = e.getRepository(a), r = e.getRepository(o), i = (await n.find({
+}, Pe = async (e, n) => {
+	let { adapter: r } = await e.getLocalRepositories();
+	if (n === t) throw new c("Cannot remove main branch");
+	let i = await r.transaction(async (t) => {
+		let r = t.getRepository(o), i = t.getRepository(s), a = (await r.find({
 			where: {
 				combinator: "and",
 				rules: [{
 					field: "id",
 					operator: "=",
-					value: t
+					value: n
 				}]
 			},
 			limit: 1
 		}))[0];
-		if (!i) return `Branch '${t}' not found`;
-		if (i.activated) return `Cannot remove active branch '${t}'. Switch to another branch first.`;
-		if ((await n.find({
+		if (!a) return `Branch '${n}' not found`;
+		if (a.activated) return `Cannot remove active branch '${n}'. Switch to another branch first.`;
+		if ((await r.find({
 			where: {
 				combinator: "and",
 				rules: [{
 					field: "parentId",
 					operator: "=",
-					value: t
+					value: n
 				}, {
 					field: "id",
 					operator: "!=",
-					value: t
+					value: n
 				}]
 			},
 			limit: 1
-		}))?.length) return `Cannot remove branch '${t}' because it has child branches`;
-		let s = await r.find({ where: {
+		}))?.length) return `Cannot remove branch '${n}' because it has child branches`;
+		let c = await i.find({ where: {
 			combinator: "and",
 			rules: [{
 				field: "branchId",
 				operator: "=",
-				value: t
+				value: n
 			}]
 		} });
-		await e.removeMany([...s, i]);
+		for (let r of e.rxdb.systemContributions) await r.removeBranchRows({
+			executor: t,
+			branchId: n
+		});
+		await t.removeMany([...c, a]);
 	});
-	if (r) throw new s(r);
-}, Oe = async (e, t, n, r) => {
-	let i = r?.strategy ?? "squash", a = r?.deleteSource ?? !1, { branchRepository: o, changeRepository: c, adapter: l } = await e.getLocalRepositories();
-	if (t === n) throw new s(`Cannot merge branch '${t}' into itself`);
+	if (i) throw new c(i);
+}, Fe = async (e, t, n, r) => {
+	let i = r?.strategy ?? "squash", a = r?.deleteSource ?? !1, { branchRepository: o, changeRepository: s, adapter: l } = await e.getLocalRepositories();
+	if (t === n) throw new c(`Cannot merge branch '${t}' into itself`);
 	let u = (await o.find({
 		where: {
 			combinator: "and",
@@ -1192,8 +1221,8 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 		},
 		limit: 1
 	}))[0];
-	if (!u) throw new s(`Branch '${t}' not found`);
-	let d = await c.find({
+	if (!u) throw new c(`Branch '${t}' not found`);
+	let d = await s.find({
 		where: {
 			combinator: "and",
 			rules: [
@@ -1221,7 +1250,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 	}), f = async () => {
 		if (!a) return { deleted: !1 };
 		try {
-			return await Y(e, t), { deleted: !0 };
+			return await Pe(e, t), { deleted: !0 };
 		} catch (e) {
 			return {
 				deleted: !1,
@@ -1242,7 +1271,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 				deletes: /* @__PURE__ */ new Map(),
 				updates: /* @__PURE__ */ new Map(),
 				inserts: /* @__PURE__ */ new Map()
-			}, r = _(t);
+			}, r = x(t);
 			t.type === "INSERT" ? n.inserts.set(r, {
 				patch: t.patch,
 				inversePatch: null
@@ -1252,17 +1281,27 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 			}) : t.type === "DELETE" && n.deletes.set(r, {
 				patch: null,
 				inversePatch: t.inversePatch
+			}), y(e, {
+				file: "merge-branch.ts",
+				symbol: "merge_branch",
+				intent: v.merge_per_change
 			}), await e.mergeChanges(n, void 0, !1);
 		}
 	}), m = d.length;
 	else {
-		let e = W(d, !0), t = new Set(d.filter((e) => e.type === "INSERT").map((e) => _(e)));
+		let e = J(d, !0), t = new Set(d.filter((e) => e.type === "INSERT").map((e) => x(e)));
 		for (let n of t) e.deletes.has(n) && e.deletes.delete(n);
 		if (m = e.inserts.size + e.updates.size + e.deletes.size, m === 0) return p(0, await f());
-		await l.mergeChanges(e, void 0, !1);
+		await l.transaction(async (t) => {
+			y(t, {
+				file: "merge-branch.ts",
+				symbol: "merge_branch",
+				intent: v.merge_squash
+			}), await t.mergeChanges(e, void 0, !1);
+		}, !1);
 	}
 	return p(m, await f());
-}, X = class {
+}, Q = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = 0;
 	session() {
@@ -1288,7 +1327,7 @@ var q = (e) => e.reduce((e, t) => t < e ? t : e, Infinity), J = class {
 };
 //#endregion
 //#region src/restore-entity.ts
-async function ke(e, t, n) {
+async function Ie(e, t, n) {
 	let { changeRepository: r, adapter: i } = await e.getLocalRepositories(), a = await r.find({
 		where: {
 			combinator: "and",
@@ -1300,16 +1339,22 @@ async function ke(e, t, n) {
 		},
 		limit: 1
 	});
-	if (a.length === 0) throw new s(`RxDBChange not found: ${n.changeId}`);
+	if (a.length === 0) throw new c(`RxDBChange not found: ${n.changeId}`);
 	let o = a[0];
-	if (o.type !== "DELETE") throw new s(`Cannot restore from non-DELETE change (type=${o.type})`);
-	if (!o.inversePatch) throw new s(`RxDBChange ${n.changeId} has no inversePatch`);
-	let c = t.constructor, l = g(c), u = await e.getCurrentBranch();
-	if (o.namespace !== l.namespace || o.entity !== l.name) throw new s(`RxDBChange ${n.changeId} belongs to ${o.namespace}:${o.entity}, not ${l.namespace}:${l.name}`);
-	if (o.branchId != null && o.branchId !== u.id) throw new s(`RxDBChange ${n.changeId} belongs to branch '${o.branchId}', current branch is '${u.id}'`);
-	let d = W([o], !1);
-	await i.mergeChanges(d, void 0, !1);
-	let f = await i.getRepository(c).find({
+	if (o.type !== "DELETE") throw new c(`Cannot restore from non-DELETE change (type=${o.type})`);
+	if (!o.inversePatch) throw new c(`RxDBChange ${n.changeId} has no inversePatch`);
+	let s = t.constructor, l = b(s), u = await e.getCurrentBranch();
+	if (o.namespace !== l.namespace || o.entity !== l.name) throw new c(`RxDBChange ${n.changeId} belongs to ${o.namespace}:${o.entity}, not ${l.namespace}:${l.name}`);
+	if (o.branchId != null && o.branchId !== u.id) throw new c(`RxDBChange ${n.changeId} belongs to branch '${o.branchId}', current branch is '${u.id}'`);
+	let d = J([o], !1);
+	await i.transaction(async (e) => {
+		y(e, {
+			file: "restore-entity.ts",
+			symbol: "restore_entity",
+			intent: v.restore_entity
+		}), await e.mergeChanges(d, void 0, !1);
+	}, !1);
+	let f = await i.getRepository(s).find({
 		where: {
 			combinator: "and",
 			rules: [{
@@ -1320,18 +1365,18 @@ async function ke(e, t, n) {
 		},
 		limit: 1
 	});
-	if (!f[0]) throw new s(`Restore produced no row for ${l.namespace}:${l.name} id=${String(o.entityId)}`);
+	if (!f[0]) throw new c(`Restore produced no row for ${l.namespace}:${l.name} id=${String(o.entityId)}`);
 	return f[0];
 }
 //#endregion
 //#region src/sync-history-bridge.ts
-var Z = (e, t) => ({
+var Le = (e, t) => ({
 	pushInFlight: t,
 	syncing: (t) => e().syncing(t),
 	clearUndoHistory: () => e().clearUndoHistory(),
 	beginPullableSettlement: () => e().beginPullableSettlement(),
 	settlePull: (t, n, r) => e().settlePullableCount(t, {
-		complete: z(n, r),
+		complete: ve(n, r),
 		pulled: r.pulled
 	}),
 	settleAbortedPull: (t, n) => e().settlePullableCount(t, {
@@ -1340,14 +1385,14 @@ var Z = (e, t) => ({
 	}),
 	reconcilePullableCount: (t, n) => e().reconcilePullableCount(t, n),
 	incrementPullableCount: (t) => e().incrementPullableCount(t)
-}), Q = (e) => typeof e == "number" && Number.isSafeInteger(e) && e > 0 ? e : null, Ae = (e) => {
-	let t = Q(e.id);
-	return t === null ? typeof e.patch != "object" || e.patch === null || !("id" in e.patch) ? null : Q(e.patch.id) : t;
-}, je = (e) => {
+}), Re = (e) => typeof e == "number" && Number.isSafeInteger(e) && e > 0 ? e : null, ze = (e) => {
+	let t = Re(e.id);
+	return t === null ? typeof e.patch != "object" || e.patch === null || !("id" in e.patch) ? null : Re(e.patch.id) : t;
+}, Be = (e) => {
 	let t = null;
 	for (let n of e) n.recordAt instanceof Date && Number.isFinite(n.recordAt.getTime()) && (t === null || n.recordAt.getTime() < t.getTime()) && (t = n.recordAt);
 	return t;
-}, Me = class {
+}, Ve = class {
 	rxdb;
 	#e = [];
 	#t = 0;
@@ -1355,8 +1400,8 @@ var Z = (e, t) => ({
 	#r = !1;
 	#i = !1;
 	historyManager;
-	pushInFlight = new X();
-	syncBridge = Z(() => this.historyManager, this.pushInFlight);
+	pushInFlight = new Q();
+	syncBridge = Le(() => this.historyManager, this.pushInFlight);
 	get pushableCount$() {
 		return this.historyManager.pushableCount$;
 	}
@@ -1364,10 +1409,10 @@ var Z = (e, t) => ({
 		return this.historyManager.pullableCount$;
 	}
 	constructor(e) {
-		this.rxdb = e, this.historyManager = new J(this.rxdb);
+		this.rxdb = e, this.historyManager = new Ne(this.rxdb);
 	}
 	init() {
-		this.#i &&= (this.historyManager = new J(this.rxdb), !1);
+		this.#i &&= (this.historyManager = new Ne(this.rxdb), !1);
 		let t = () => {
 			if (!this.#r) {
 				this.#r = !0;
@@ -1380,20 +1425,20 @@ var Z = (e, t) => ({
 				}, t = () => {
 					this.#t = 0, this.#n = null;
 				};
-				this.rxdb.addEventListener(m, e), this.rxdb.addEventListener(h, t), this.#e.push(() => this.rxdb.removeEventListener(m, e), () => this.rxdb.removeEventListener(h, t));
+				this.rxdb.addEventListener(g, e), this.rxdb.addEventListener(_, t), this.#e.push(() => this.rxdb.removeEventListener(g, e), () => this.rxdb.removeEventListener(_, t));
 			}
 			this.#t === 0 && (this.#n = this.historyManager.undoSessionGeneration), this.#t += 1;
 		};
-		this.rxdb.addEventListener(p, t), this.#e.push(() => this.rxdb.removeEventListener(p, t));
+		this.rxdb.addEventListener(h, t), this.#e.push(() => this.rxdb.removeEventListener(h, t));
 		let n = (e) => {
 			let t = e.entities?.filter((e) => e.namespace === "rxdb" && e.entity === "RxDBChange") ?? [];
 			if (t.length > 0 && !this.historyManager.isExecutingUndoRedo()) {
 				let e = t.flatMap((e) => {
-					let t = Ae(e);
+					let t = ze(e);
 					return t === null ? [] : [t];
 				});
-				this.#a(this.historyManager.invalidateRedoStack(e), "invalidateRedoStack");
-				let n = je(t);
+				this.#l(this.historyManager.invalidateRedoStack(e), "invalidateRedoStack");
+				let n = Be(t);
 				this.#n !== null || n !== null ? this.historyManager.resetSyncCleared(e, {
 					generation: this.#n,
 					recordAt: n
@@ -1413,68 +1458,108 @@ var Z = (e, t) => ({
 		this.historyManager.clearAllUndoHistory(), this.historyManager.resetPullableCount();
 	}
 	async createBranch(e, t) {
-		return le(this, e, t);
+		return pe(this, e, t);
 	}
 	async removeBranch(e) {
-		return Y(this, e);
+		return Pe(this, e);
 	}
-	async switchBranch(e) {
-		if ((await this.getCurrentBranch())?.id === e) return;
-		let t = !1;
+	async switchBranch(e, t) {
+		let n = await this.getCurrentBranch();
+		if (n?.id === e) return;
+		let r = !1, i, a = !1;
 		try {
-			this.rxdb.dispatchEvent(new u(e));
-			let { adapter: n } = await this.getLocalRepositories(), r = await Se(this, e), i = await n.switchBranch({
+			if (this.rxdb.dispatchEvent(new f(e)), await this.#o(n?.id ?? null, e, t)) {
+				r = !0, this.#a(e);
+				return;
+			}
+			let { adapter: o } = await this.getLocalRepositories(), s = await De(this, e);
+			y(o, {
+				file: "VersionManager.ts",
+				symbol: "switchBranch",
+				intent: v.branch_materialization
+			}), i = o;
+			let l = await o.switchBranch({
 				branchId: e,
-				actions: r
+				actions: s,
+				prepare: async ({ executor: e, targetBranchId: r }) => {
+					a = !0, await this.#c(e, n?.id ?? null, r, t);
+				}
 			});
-			return t = !0, this.historyManager.clearRedoStack(), this.historyManager.setUndoBranch(e), this.rxdb.dispatchEvent(new d(e)), i;
-		} catch (n) {
-			throw t || this.rxdb.dispatchEvent(new f(e)), n;
+			if (r = !0, this.#a(e), !a) throw new c(`适配器 ${o.constructor.name} 的 switchBranch 没有调用 options.prepare：分支已经切到 ${e}，但这次切换一条前置条件都没校验过。适配器必须在解析出目标分支之后、动第一行之前 await 它（见 rxdb-adapter.ts › SwitchBranchOptions.prepare）。`);
+			return l;
+		} catch (t) {
+			throw i && oe(i), r || (this.rxdb.dispatchEvent(new m(e)), await this.#s(n?.id ?? null, e, t)), t;
 		}
 	}
-	async mergeBranch(e, i) {
+	async mergeBranch(e, t) {
 		let a = await this.getCurrentBranch();
-		if (!a) throw new s("No active branch found");
+		if (!a) throw new c("No active branch found");
 		let o = a.id;
 		try {
-			this.rxdb.dispatchEvent(new t(e, o));
-			let r = await Oe(this, e, o, i);
-			return r.merged > 0 && this.historyManager.clearUndoHistory(), this.rxdb.dispatchEvent(new n(e, o)), r;
+			this.rxdb.dispatchEvent(new n(e, o));
+			let i = await Fe(this, e, o, t);
+			return i.merged > 0 && this.historyManager.clearUndoHistory(), this.rxdb.dispatchEvent(new r(e, o)), i;
 		} catch (t) {
-			throw this.rxdb.dispatchEvent(new r(e, o)), t;
+			throw this.rxdb.dispatchEvent(new i(e, o)), t;
 		}
 	}
 	history(e) {
 		return this.historyManager.history(e);
 	}
 	async restoreEntity(e, t) {
-		return ke(this, e, t);
+		return Ie(this, e, t);
 	}
 	async getLocalRepositories() {
-		return ne(this.rxdb);
+		return re(this.rxdb);
 	}
 	async getRemoteRepositories() {
-		return re(this.rxdb);
+		return ie(this.rxdb);
 	}
 	async getCurrentBranch() {
-		return te(this.rxdb);
+		return ne(this.rxdb);
+	}
+	#a(e) {
+		this.historyManager.clearRedoStack(), this.historyManager.setUndoBranch(e), this.rxdb.dispatchEvent(new p(e));
+	}
+	async #o(e, t, n) {
+		for (let r of this.rxdb.systemContributions) if (await r.takeOverBranchSwitch({
+			currentBranchId: e,
+			targetBranchId: t,
+			preconditions: n
+		}) === "switched") return !0;
+		return !1;
+	}
+	async #s(e, t, n) {
+		for (let r of this.rxdb.systemContributions) await r.settleBranchSwitchFailure({
+			currentBranchId: e,
+			targetBranchId: t,
+			error: n
+		});
+	}
+	async #c(e, t, n, r) {
+		for (let i of this.rxdb.systemContributions) await i.prepareBranchSwitch({
+			executor: e,
+			currentBranchId: t,
+			targetBranchId: n,
+			preconditions: r
+		});
 	}
-	#a(e, t) {
+	#l(e, t) {
 		e.catch((e) => {
-			A(e) || console.error(`[VersionManager] ${t} failed:`, e);
+			N(e) || console.error(`[VersionManager] ${t} failed:`, e);
 		});
 	}
-}, $ = class extends c {
+}, $ = class extends l {
 	lifecycle = "scoped";
 	name = "history";
 	install(e) {
-		let t = new Me(this.rxdb);
+		let t = new Ve(this.rxdb);
 		e.acquire(() => (Object.defineProperty(this.rxdb, "versionManager", {
 			value: t,
 			configurable: !0,
 			enumerable: !0
 		}), () => void Reflect.deleteProperty(this.rxdb, "versionManager")), "history:slot"), e.acquire(() => () => t.destroy(), "history:versionManager"), t.init(), e.acquire(() => this.rxdb.syncState.bindPushableCount(t.pushableCount$), "history:pushableCount");
 	}
-}, Ne = (e) => new $(e);
+}, He = (e) => new $(e);
 //#endregion
-export { X as PushInFlightRegistry, H as RxDBCrossScopeTransactionError, $ as RxDBPluginHistory, A as isIgnorableDetachedVersionEventError, Ne as rxDBPluginHistory };
+export { Q as PushInFlightRegistry, U as RxDBCrossScopeTransactionError, $ as RxDBPluginHistory, q as compute_switch_branch_actions, G as find_branch_path_to_root, K as find_switch_branch_step, Y as get_branch_max_change, N as isIgnorableDetachedVersionEventError, He as rxDBPluginHistory };