@knkcs/contenthub-ui 0.4.0 → 0.5.0

package/dist/testing.js

@@ -1,37 +1,37 @@
-import { C as e, D as t, E as n, F as r, M as i, N as a, P as o, S as s, T as c, _ as l, b as u, f as d, g as f, h as p, i as ee, k as m, n as h, o as te, r as g, s as ne, t as re, u as ie, v as ae, w as _, x as oe, y as se } from "./heads-DqHmAW0n.js";
-import { Code as v, ConnectError as y } from "@connectrpc/connect";
-import { createHostMembers as b } from "@knkcs/anker/host";
+import { C as e, D as t, E as n, F as r, M as i, N as a, P as o, S as s, T as c, _ as l, b as u, f as d, g as f, h as p, i as ee, k as m, n as h, o as te, r as g, s as ne, t as re, u as ie, v as ae, w as _, x as v, y as oe } from "./heads-BrvZ_GYT.js";
+import { Code as y, ConnectError as b } from "@connectrpc/connect";
+import { createHostMembers as x } from "@knkcs/anker/host";
 //#region src/testing/fixtures.ts
-var x = "ws_stub", S = "user_stub", C = "user_ben", w = "2026-10-01T09:00:00.000Z";
-function T() {
+var S = "ws_stub", C = "user_stub", w = "user_ben", T = "2026-10-01T09:00:00.000Z";
+function E() {
 	return {
-		userId: S,
-		workspaceId: x,
-		members: b([{
-			userId: S,
+		userId: C,
+		workspaceId: S,
+		members: x([{
+			userId: C,
 			displayName: "Ada Editor",
 			email: "ada@example.com"
 		}, {
-			userId: C,
+			userId: w,
 			displayName: "Ben Reviewer",
 			email: "ben@example.com"
 		}])
 	};
 }
-function ce() {
+function se() {
 	return [{
 		id: "br_author",
 		name: "Being revised by the author",
-		createTime: w,
-		updateTime: w
+		createTime: T,
+		updateTime: T
 	}, {
 		id: "br_embargo",
 		name: "Embargoed until publication",
-		createTime: w,
-		updateTime: w
+		createTime: T,
+		updateTime: T
 	}];
 }
-function le() {
+function ce() {
 	return [
 		{
 			slug: "in_progress",
@@ -56,7 +56,7 @@ function le() {
 		}
 	];
 }
-function ue() {
+function le() {
 	return {
 		in_progress: ["in_review", "on_hold"],
 		in_review: [
@@ -68,7 +68,7 @@ function ue() {
 		on_hold: ["in_progress"]
 	};
 }
-function de() {
+function ue() {
 	return [
 		{
 			id: "cs_bgbl_270",
@@ -78,7 +78,7 @@ function de() {
 				reference: "BGBl. 2026 I Nr. 270"
 			},
 			state: "open",
-			createdBy: S,
+			createdBy: C,
 			createTime: "2026-09-30T08:00:00.000Z",
 			chains: [{
 				id: "chain_para_1",
@@ -111,7 +111,7 @@ function de() {
 			}],
 			dependsOnChangeSetIds: [],
 			status: "in_progress",
-			assigneeIds: [S],
+			assigneeIds: [C],
 			plannedReleases: [
 				{
 					id: "rls_p1_2",
@@ -171,19 +171,19 @@ function de() {
 				reference: "BGBl. 2026 I Nr. 255"
 			},
 			state: "open",
-			createdBy: C,
+			createdBy: w,
 			createTime: "2026-09-25T08:00:00.000Z",
 			chains: [],
 			dependsOnChangeSetIds: [],
 			status: "",
-			assigneeIds: [C],
+			assigneeIds: [w],
 			plannedReleases: []
 		},
 		{
 			id: "cs_correction_3",
 			name: "Correction of § 3",
 			state: "published",
-			createdBy: S,
+			createdBy: C,
 			createTime: "2026-09-01T08:00:00.000Z",
 			closeTime: "2026-09-02T08:00:00.000Z",
 			chains: [],
@@ -194,7 +194,7 @@ function de() {
 		}
 	];
 }
-function fe() {
+function de() {
 	return [{
 		id: "rc_print",
 		name: "Druckprobe",
@@ -209,7 +209,7 @@ function fe() {
 		independent: !0
 	}];
 }
-function pe() {
+function fe() {
 	return [
 		{
 			id: "col_bgb",
@@ -237,7 +237,7 @@ function pe() {
 		}
 	];
 }
-function me() {
+function pe() {
 	return [
 		{
 			id: "bp_commentary",
@@ -253,7 +253,7 @@ function me() {
 		}
 	];
 }
-function he() {
+function me() {
 	return [
 		{
 			id: "bpr_paragraph_2",
@@ -275,7 +275,7 @@ function he() {
 		}
 	];
 }
-function ge() {
+function he() {
 	let e = (e, t) => ({
 		field_type: "text",
 		config: {
@@ -311,7 +311,7 @@ function ge() {
 		}
 	};
 }
-function E() {
+function D() {
 	let e = "2026-09-01T08:00:00.000Z";
 	return {
 		id: "content_note_1",
@@ -341,7 +341,7 @@ function E() {
 		}]
 	};
 }
-function _e() {
+function ge() {
 	let e = "2001-11-01T08:00:00.000Z";
 	return {
 		id: "content_para_3",
@@ -372,7 +372,7 @@ function _e() {
 		}]
 	};
 }
-function ve() {
+function _e() {
 	let e = "2026-09-01T08:00:00.000Z";
 	return [
 		{
@@ -405,7 +405,7 @@ function ve() {
 			blueprintId: "bp_paragraph",
 			blueprintReleaseId: "bpr_paragraph_1",
 			collectionIds: ["col_bgb"],
-			assigneeIds: [S, C],
+			assigneeIds: [C, w],
 			main: {
 				revisionId: "rev_p1_main",
 				data: {
@@ -472,7 +472,7 @@ function ve() {
 					secondParentId: "",
 					blueprintReleaseId: "bpr_paragraph_1",
 					createTime: "2026-09-30T09:00:00.000Z",
-					author: S,
+					author: C,
 					cause: "save",
 					branchId: "br_para_1_b",
 					changeSetId: "cs_bgbl_270",
@@ -488,7 +488,7 @@ function ve() {
 					secondParentId: "",
 					blueprintReleaseId: "bpr_paragraph_1",
 					createTime: "2026-09-30T08:30:00.000Z",
-					author: C,
+					author: w,
 					cause: "save",
 					branchId: "br_para_1_a",
 					changeSetId: "cs_bgbl_270",
@@ -504,7 +504,7 @@ function ve() {
 					secondParentId: "",
 					blueprintReleaseId: "bpr_paragraph_1",
 					createTime: e,
-					author: S,
+					author: C,
 					cause: "create",
 					branchId: "br_para_1_main",
 					changeSetId: "cs_correction_3"
@@ -588,7 +588,7 @@ function ve() {
 			blueprintId: "bp_paragraph",
 			blueprintReleaseId: "bpr_paragraph_1",
 			collectionIds: ["col_stgb"],
-			assigneeIds: [C],
+			assigneeIds: [w],
 			main: {
 				revisionId: "rev_s211_main",
 				data: {
@@ -625,7 +625,7 @@ function ve() {
 }
 //#endregion
 //#region src/testing/stub-blueprint-source.ts
-function D(e = me(), t = he()) {
+function ve(e = pe(), t = me()) {
 	return {
 		async searchBlueprints({ query: t }) {
 			let n = t.trim().toLocaleLowerCase();
@@ -644,7 +644,11 @@ function D(e = me(), t = he()) {
 }
 //#endregion
 //#region src/testing/stub-client.ts
-function ye(e, t) {
+function ye(e) {
+	let t = /* @__PURE__ */ new Date(`${e}T00:00:00Z`);
+	return t.setUTCDate(t.getUTCDate() - 1), t.toISOString().slice(0, 10);
+}
+function be(e, t) {
 	let n = /* @__PURE__ */ new Date(`${e}T00:00:00Z`);
 	return n.setUTCDate(n.getUTCDate() + t), n.toISOString().slice(0, 10);
 }
@@ -655,21 +659,21 @@ function O(e, t, n) {
 	if (/[\u0000-\u001f\u007f]/.test(r)) throw new _(`${t} is one line of text`);
 	return r;
 }
-function be(e) {
+function xe(e) {
 	if (!/^\d{4}-\d{2}-\d{2}$/.test(e.date.trim())) throw new _(`source.date "${e.date}" is not a day as YYYY-MM-DD`);
 	return {
 		date: e.date.trim(),
 		reference: O(e.reference, "source.reference", 500)
 	};
 }
-function xe(e) {
+function Se(e) {
 	let t = e.trim();
 	if (t === "") throw new _("a Block Reason needs a name");
 	if ([...t].length > 200) throw new _("a Block Reason's name is at most 200 characters");
 	if (/[\u0000-\u001f\u007f]/.test(t)) throw new _("a Block Reason's name is one line of text");
 	return t;
 }
-function Se(e) {
+function Ce(e) {
 	let t = O(e.name, "a Required Check's name", 200);
 	if (e.scope !== "branch" && e.scope !== "change_set") throw new _("a Required Check's scope is Branch or Change Set");
 	let n = e.blueprintAccessors.map((e) => {
@@ -684,9 +688,9 @@ function Se(e) {
 		independent: e.independent
 	};
 }
-var Ce = "who records a Required Check can be narrowed only in authz.mode guardian: in workspace mode every member records every check (ADR 0017)", we = "this Change Set holds work you can't see: publishing, discarding or updating all of it needs you to see every Content in it", Te = "Restricted Collections need authz.mode guardian: in workspace mode a restriction could not be enforced (ADR 0017)";
+var we = "who records a Required Check can be narrowed only in authz.mode guardian: in workspace mode every member records every check (ADR 0017)", Te = "this Change Set holds work you can't see: publishing, discarding or updating all of it needs you to see every Content in it", Ee = "Restricted Collections need authz.mode guardian: in workspace mode a restriction could not be enforced (ADR 0017)";
 function k(e, t) {
-	return new y(`${e} ${t}: not found`, v.NotFound);
+	return new b(`${e} ${t}: not found`, y.NotFound);
 }
 var A = (e) => structuredClone(e);
 function j(e, t = {}) {
@@ -709,49 +713,55 @@ function j(e, t = {}) {
 		...t
 	};
 }
-function M(v = {}) {
-	let y = v.now ?? (() => "2026-10-01T09:00:00.000Z"), b = v.userId ?? "user_stub", x = v.statuses ?? le(), S = v.statusTransitions ?? ue(), C = (v.blockReasons ?? ce()).map((e) => ({ ...e })), w = (v.changeSets ?? de()).map(A), T = (v.collections ?? pe()).map((e) => ({ ...e })), E = structuredClone(v.contents ?? ve()), _e = v.blueprints ?? me(), D = v.blueprintReleases ?? he(), M = v.resolvedReleases ?? ge(), N = structuredClone(v.requiredChecks ?? fe()), P = v.authzMode ?? "guardian", De = new Set(v.withheld ?? []), F = (e) => {
-		if (De.has(e)) throw new r(we);
-	}, I = new Map(Object.entries(structuredClone(v.collectionGrants ?? {}))), L = new Map(Object.entries(structuredClone(v.recorders ?? {}))), Oe = (e) => L.get(e) ?? {
+function M(y = {}) {
+	let b = y.now ?? (() => "2026-10-01T09:00:00.000Z"), x = y.userId ?? "user_stub", S = y.statuses ?? ce(), C = y.statusTransitions ?? le(), w = (y.blockReasons ?? se()).map((e) => ({ ...e })), T = (y.changeSets ?? ue()).map(A), E = (y.collections ?? fe()).map((e) => ({ ...e })), D = structuredClone(y.contents ?? _e()), ge = y.blueprints ?? pe(), ve = y.blueprintReleases ?? me(), M = y.resolvedReleases ?? he(), N = structuredClone(y.requiredChecks ?? de()), P = y.authzMode ?? "guardian", Oe = new Set(y.withheld ?? []), ke = (e) => {
+		if (Oe.has(e)) throw new r(Te);
+	}, F = new Map(Object.entries(structuredClone(y.collectionGrants ?? {}))), I = new Map(Object.entries(structuredClone(y.recorders ?? {}))), Ae = (e) => I.get(e) ?? {
 		everyMember: !0,
 		userIds: []
-	}, ke = v.memberIds ?? ["user_stub", "user_ben"], Ae = v.admin ?? !0, R = structuredClone(v.editingSettings ?? {
+	}, je = y.memberIds ?? ["user_stub", "user_ben"], Me = y.admin ?? !0, Ne = y.editingSettings ?? {
 		editingMode: "change_sets",
 		editingBlock: !1
-	}), z = structuredClone(v.editingOverrides ?? []), je = (e) => ({
-		editingMode: e?.editingMode ?? R.editingMode,
-		editingBlock: e?.editingBlock ?? R.editingBlock
-	}), Me = (e) => ({
+	}, L = structuredClone({
+		...Ne,
+		forceGroup: Ne.forceGroup ?? []
+	}), R = structuredClone(y.editingOverrides ?? []), z = (e) => ({
+		editingMode: e?.editingMode ?? L.editingMode,
+		editingBlock: e?.editingBlock ?? L.editingBlock,
+		forceGroup: [...e?.forceGroup ?? L.forceGroup]
+	}), Pe = (e) => ({
 		...structuredClone(e),
-		effective: je(e)
-	}), Ne = [
+		forceGroup: e.forceGroup ?? null,
+		effective: z(e)
+	}), Fe = (e) => M[e.blueprintReleaseId]?.accessor || e.blueprintId, Ie = (e) => Me || e.includes(x), Le = (e) => [...new Set(e.map((e) => O(e, "a user id", 200)))].sort(), Re = [
 		"direct_edits",
 		"change_sets",
 		"both"
-	], Pe = () => {
-		if (!Ae) throw new ne("permission denied");
-	}, Fe = structuredClone(v.checkResults ?? []), Ie = v.publishBlockers ?? {}, Le = v.pendingMerges ?? {}, Re = structuredClone(v.conflicts ?? {}), B = /* @__PURE__ */ new Map(), ze = /* @__PURE__ */ new Map(), V = async (e, t, n) => {
+	], ze = () => {
+		if (!Me) throw new ne("permission denied");
+	}, Be = structuredClone(y.checkResults ?? []), Ve = y.publishBlockers ?? {}, He = y.pendingMerges ?? {}, Ue = structuredClone(y.conflicts ?? {}), We = new Set(y.behind ?? []), B = /* @__PURE__ */ new Map(), Ge = /* @__PURE__ */ new Map(), V = async (e, t, n) => {
 		if (!e) return n();
-		let r = JSON.stringify(t), i = ze.get(e);
+		let r = JSON.stringify(t), i = Ge.get(e);
 		if (i) {
 			if (i.asked !== r) throw new _(`idempotency key ${e} names another request`);
 			return structuredClone(i.answer);
 		}
 		let a = await n();
-		return ze.set(e, {
+		return Ge.set(e, {
 			asked: r,
 			answer: structuredClone(a)
 		}), a;
-	}, Be = /* @__PURE__ */ new Map(), Ve = /* @__PURE__ */ new Map(), H = 1, U = (e) => {
-		let t = E.find((t) => t.id === e);
+	}, Ke = /* @__PURE__ */ new Map(), qe = /* @__PURE__ */ new Map(), H = 1, U = (e) => {
+		let t = D.find((t) => t.id === e);
 		if (!t) throw k("Content", e);
 		return t;
 	}, W = (e) => structuredClone({
 		collectionIds: [...e.collectionIds].sort(),
 		assigneeIds: e.assigneeIds ?? [],
 		block: e.block,
-		archiveTime: e.archiveTime
-	}), He = () => y().slice(0, 10), G = (e) => M[e.blueprintReleaseId]?.dated ?? !1, K = (e) => {
+		archiveTime: e.archiveTime,
+		editingBlock: e.editingBlock
+	}), Je = () => b().slice(0, 10), G = (e) => M[e.blueprintReleaseId]?.dated ?? !1, K = (e) => {
 		let t = [...e.revisions ?? []], n = [...Object.entries(e.branches).map(([e, t]) => ({
 			...t,
 			changeSetId: e
@@ -767,7 +777,7 @@ function M(v = {}) {
 			secondParentId: "",
 			blueprintReleaseId: e.blueprintReleaseId,
 			createTime: r.revisionCreateTime,
-			author: b,
+			author: x,
 			cause: "create",
 			branchId: r.branchId,
 			changeSetId: r.changeSetId,
@@ -778,31 +788,31 @@ function M(v = {}) {
 		e.main,
 		e.inForce,
 		...Object.values(e.branches)
-	].find((e) => e?.revisionId === t)?.data ?? e.revisions?.find((e) => e.id === t)?.data, Ue = (e, t) => {
+	].find((e) => e?.revisionId === t)?.data ?? e.revisions?.find((e) => e.id === t)?.data, Ye = (e, t) => {
 		let n = (e) => e == null || e === "" || Array.isArray(e) && e.length === 0;
 		return (e ?? []).filter((e) => e.config.required === !0 && n(t[e.config.api_accessor])).map((e) => e.config.api_accessor);
 	}, J = (e) => {
 		if (e.archiveTime) throw new l(e.id);
-		if (e.block && !e.block.allowedUserIds.includes(b)) throw new ae(e.id, e.block.blockReasonId);
-	}, We = (e) => E.flatMap((t) => (t.edges ?? []).filter((n) => n.targetContentId === e && n.pinReleaseId === "" && t.inForce?.revisionId === n.sourceRevisionId).map((e) => ({
+		if (e.block && !e.block.allowedUserIds.includes(x)) throw new ae(e.id, e.block.blockReasonId);
+	}, Xe = (e) => D.flatMap((t) => (t.edges ?? []).filter((n) => n.targetContentId === e && n.pinReleaseId === "" && t.inForce?.revisionId === n.sourceRevisionId).map((e) => ({
 		edge: { ...e },
 		releaseId: t.inForce?.releaseId ?? ""
-	}))), Ge = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id), Ke = (e, t) => C.some((n) => n.name === e && n.id !== t), qe = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id), Y = (e) => {
-		let t = T.find((t) => t.id === e);
+	}))), Ze = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id), Qe = (e, t) => w.some((n) => n.name === e && n.id !== t), $e = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id), Y = (e) => {
+		let t = E.find((t) => t.id === e);
 		if (!t) throw k("Collection", e);
 		return t;
-	}, Je = (e, t, n) => T.some((r) => r.parentId === e && r.name === t && r.id !== n), Ye = (e) => {
-		if (P === "workspace") throw new m(Te);
+	}, et = (e, t, n) => E.some((r) => r.parentId === e && r.name === t && r.id !== n), tt = (e) => {
+		if (P === "workspace") throw new m(Ee);
 		if (!Y(e).restricted) throw new _(`Collection ${e} is open: only a Restricted Collection takes grants`);
-		let t = (I.get(e) ?? []).some((e) => e.userId === b && e.level === "owner");
-		if (!Ae && !t) throw new ne("only its owner or a workspace admin manages its grants");
-	}, Xe = (t) => {
-		if (P === "workspace") throw new e("required_check_recorders", Ce);
-		if (!Ae) throw new ne("permission denied");
+		let t = (F.get(e) ?? []).some((e) => e.userId === x && e.level === "owner");
+		if (!Me && !t) throw new ne("only its owner or a workspace admin manages its grants");
+	}, nt = (t) => {
+		if (P === "workspace") throw new e("required_check_recorders", we);
+		if (!Me) throw new ne("permission denied");
 		if (t === "") throw new _("required_check_id is required");
 		if (!N.some((e) => e.id === t)) throw k("Required Check", t);
-		return Oe(t);
-	}, Ze = async ({ changeSetId: e, branchId: t, expectedHeadId: n, data: r, fieldMask: a }) => {
+		return Ae(t);
+	}, rt = async ({ changeSetId: e, branchId: t, expectedHeadId: n, data: r, fieldMask: a }) => {
 		let o = Z(e).chains.find((e) => e.branches.some((e) => e.id === t)), s = o?.branches.find((e) => e.id === t);
 		if (!o || !s) throw k("Branch", t);
 		let c = U(o.contentId);
@@ -821,7 +831,7 @@ function M(v = {}) {
 			d = structuredClone(l);
 			for (let e of a) e in u ? d[e] = u[e] : delete d[e];
 		} else d = u;
-		return Qe({
+		return it({
 			changeSetId: e,
 			chain: o,
 			branch: s,
@@ -829,8 +839,8 @@ function M(v = {}) {
 			data: d,
 			cause: "save"
 		});
-	}, Qe = ({ changeSetId: e, chain: t, branch: n, c: r, data: i, cause: a, secondParentId: o = "" }) => {
-		let s = n.id, c = `rev_stub_${H++}`, l = y();
+	}, it = ({ changeSetId: e, chain: t, branch: n, c: r, data: i, cause: a, secondParentId: o = "" }) => {
+		let s = n.id, c = `rev_stub_${H++}`, l = b();
 		return r.revisions = [{
 			id: c,
 			contentId: r.id,
@@ -838,7 +848,7 @@ function M(v = {}) {
 			secondParentId: o,
 			blueprintReleaseId: r.blueprintReleaseId,
 			createTime: l,
-			author: b,
+			author: x,
 			cause: a,
 			branchId: s,
 			changeSetId: e,
@@ -859,7 +869,7 @@ function M(v = {}) {
 			revisionCreateTime: l,
 			releaseId: ""
 		};
-	}, $e = (e, t) => {
+	}, at = (e, t) => {
 		let n = Z(e), r = n.chains.find((e) => e.branches.some((e) => e.id === t)), i = r?.branches.find((e) => e.id === t);
 		if (!r || !i) throw k("Branch", t);
 		return {
@@ -868,8 +878,8 @@ function M(v = {}) {
 			branch: i,
 			c: U(r.contentId)
 		};
-	}, et = (e, t) => {
-		for (let n of w) for (let r of n.chains) {
+	}, ot = (e, t) => {
+		for (let n of T) for (let r of n.chains) {
 			let n = r.branches.find((t) => t.id === e);
 			if (!n) continue;
 			let i = {
@@ -882,33 +892,33 @@ function M(v = {}) {
 				fields: structuredClone(t.fields),
 				merged: structuredClone(t.merged)
 			};
-			B.set(e, i), n.hasPendingMerge = !0, delete Re[e];
+			B.set(e, i), n.hasPendingMerge = !0, delete Ue[e];
 			return;
 		}
 		throw k("Branch", e);
-	}, tt = (e) => {
+	}, st = (e) => {
 		B.delete(e);
-		for (let t of w) for (let n of t.chains) {
+		for (let t of T) for (let n of t.chains) {
 			let t = n.branches.find((t) => t.id === e);
 			t && (t.hasPendingMerge = !1);
 		}
-	}, nt = (e, t) => {
+	}, ct = (e, t) => {
 		let n = t.validityPeriod;
 		if (G(e)) {
 			if (!n || !g.test(n.firstDay)) throw new _("validity_period.first_day is required for Dated Content");
 			if (n.lastDay !== "" && (!g.test(n.lastDay) || n.lastDay < n.firstDay)) throw new _("validity_period.last_day is a day on or after first_day");
 		} else if (n) throw new _("validity_period is refused for undated Content");
-		let r = Ue(M[e.blueprintReleaseId]?.releaseSpec, t.releaseSpec ?? {}).map((e) => ({
+		let r = Ye(M[e.blueprintReleaseId]?.releaseSpec, t.releaseSpec ?? {}).map((e) => ({
 			source: "fieldkit",
 			code: "required",
 			path: `/${e}`
 		}));
-		if (r.length > 0) throw new se("the Release Spec values break the Blueprint Release", r);
+		if (r.length > 0) throw new oe("the Release Spec values break the Blueprint Release", r);
 		if (n && n.lastDay !== "") {
 			let r = (e.timeline ?? []).filter((e) => e.validityPeriod && e.validityPeriod.lastDay !== "" && n.firstDay <= e.validityPeriod.firstDay && e.validityPeriod.lastDay <= n.lastDay && !t.supersedesReleaseIds.includes(e.releaseId)).map((e) => e.releaseId);
 			if (r.length > 0) throw new u(e.id, r);
 		}
-	}, rt = (e, t) => {
+	}, lt = (e, t) => {
 		let n = e.plannedReleases.filter((e) => e.contentId === t.id && e.proposed), r = e.plannedReleases.filter((e) => !(e.contentId === t.id && e.proposed)), i = [], a = (e, r, a) => {
 			let o = n.find((t) => t.proposedForReleaseId === e.releaseId && t.splitFromReleaseId === a);
 			i.push({
@@ -931,23 +941,23 @@ function M(v = {}) {
 				let t = r.validityPeriod;
 				t && !e.supersedesReleaseIds.includes(r.releaseId) && t.firstDay < n.firstDay && (t.lastDay === "" || t.lastDay >= n.firstDay) && (a(r, {
 					firstDay: t.firstDay,
-					lastDay: ye(n.firstDay, -1)
+					lastDay: be(n.firstDay, -1)
 				}, ""), n.lastDay !== "" && (t.lastDay === "" || t.lastDay > n.lastDay) && a(r, {
-					firstDay: ye(n.lastDay, 1),
+					firstDay: be(n.lastDay, 1),
 					lastDay: t.lastDay
 				}, r.releaseId));
 			}
 		}
 		e.plannedReleases = [...r, ...i];
 	}, X = (e) => {
-		let t = w.find((t) => t.id === e);
+		let t = T.find((t) => t.id === e);
 		if (!t) throw k("Change Set", e);
 		return t;
 	}, Z = (e) => {
 		let t = X(e);
 		if (t.state !== "open") throw new p(t.state);
 		return t;
-	}, it = (e) => x.find((t) => t.slug === e)?.name ?? e, at = (e, t, n = /* @__PURE__ */ new Set()) => e === t || !n.has(e) && (n.add(e), (w.find((t) => t.id === e)?.dependsOnChangeSetIds ?? []).some((e) => at(e, t, n))), ot = (e) => [...e.chains.flatMap((e) => e.branches.map((t) => ({
+	}, ut = (e) => S.find((t) => t.slug === e)?.name ?? e, dt = (e, t, n = /* @__PURE__ */ new Set()) => e === t || !n.has(e) && (n.add(e), (T.find((t) => t.id === e)?.dependsOnChangeSetIds ?? []).some((e) => dt(e, t, n))), ft = (e) => [...e.chains.flatMap((e) => e.branches.map((t) => ({
 		key: t.id,
 		branchless: !1,
 		contentId: e.contentId,
@@ -957,8 +967,8 @@ function M(v = {}) {
 		branchless: !0,
 		contentId: e.contentId,
 		revision: e.revisionId
-	}))], st = (e) => E.find((t) => t.id === e)?.blueprintId, ct = (e, t) => e.blueprintAccessors.length === 0 || e.blueprintAccessors.includes(st(t) ?? ""), lt = (e) => {
-		let t = ot(e), n = (t, n) => Fe.filter((n) => n.changeSetId === e.id && n.requiredCheckId === t.id).filter((e) => (t.scope === "change_set" ? "" : Object.keys(e.heads)[0]) === n).reverse().map(({ changeSetId: e, ...t }) => structuredClone(t)), r = (e, t, n) => {
+	}))], pt = (e) => D.find((t) => t.id === e)?.blueprintId, mt = (e, t) => e.blueprintAccessors.length === 0 || e.blueprintAccessors.includes(pt(t) ?? ""), ht = (e) => {
+		let t = ft(e), n = (t, n) => Be.filter((n) => n.changeSetId === e.id && n.requiredCheckId === t.id).filter((e) => (t.scope === "change_set" ? "" : Object.keys(e.heads)[0]) === n).reverse().map(({ changeSetId: e, ...t }) => structuredClone(t)), r = (e, t, n) => {
 			let r = n[0], i = r ? !h(r.heads, t.heads) : !1;
 			return {
 				check: structuredClone(e),
@@ -969,7 +979,7 @@ function M(v = {}) {
 			};
 		}, i = [], a = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id);
 		for (let e of [...N].sort(a)) {
-			let a = t.filter((t) => ct(e, t.contentId));
+			let a = t.filter((t) => mt(e, t.contentId));
 			if (e.scope === "change_set") {
 				if (a.length === 0) continue;
 				let o = Object.fromEntries(t.map((e) => [e.key, e.revision]));
@@ -989,7 +999,7 @@ function M(v = {}) {
 			}, n(e, t.key)));
 		}
 		return i;
-	}, ut = (e, t) => {
+	}, gt = (e, t) => {
 		let n = [], r = re(e);
 		for (let r of e.chains) for (let e of r.branches) t[e.id] !== e.headRevisionId && n.push(j("moved_head", {
 			contentId: r.contentId,
@@ -1001,28 +1011,35 @@ function M(v = {}) {
 			branchId: e,
 			expectedHeadId: i
 		}));
+		for (let t of e.chains) for (let e of t.branches) We.has(e.id) && n.push(j("behind_base", {
+			contentId: t.contentId,
+			branchId: e.id
+		})), B.has(e.id) && n.push(j("pending_merge", {
+			contentId: t.contentId,
+			branchId: e.id
+		}));
 		for (let t of e.dependsOnChangeSetIds) {
-			let e = w.find((e) => e.id === t)?.state;
+			let e = T.find((e) => e.id === t)?.state;
 			e === "open" ? n.push(j("unpublished_dependency", { dependencyChangeSetId: t })) : e === "discarded" && n.push(j("discarded_dependency", { dependencyChangeSetId: t }));
 		}
-		for (let t of lt(e)) t.cleared || n.push(j("outstanding_check", {
+		for (let t of ht(e)) t.cleared || n.push(j("outstanding_check", {
 			requiredCheckId: t.check.id,
 			contentId: t.contentId,
 			branchId: t.branchId,
 			releaseId: t.releaseId
 		}));
 		for (let t of e.chains) {
-			let e = E.find((e) => e.id === t.contentId);
+			let e = D.find((e) => e.id === t.contentId);
 			for (let r of t.branches) {
 				let t = e && q(e, r.headRevisionId);
-				if (e && t) for (let i of Ue(M[e.blueprintReleaseId]?.fields, t)) n.push(j("missing_required_field", {
+				if (e && t) for (let i of Ye(M[e.blueprintReleaseId]?.fields, t)) n.push(j("missing_required_field", {
 					contentId: e.id,
 					revisionId: r.headRevisionId,
 					path: `/${i}`
 				}));
 			}
 		}
-		return [...n, ...structuredClone(Ie[e.id] ?? [])];
+		return [...n, ...structuredClone(Ve[e.id] ?? [])];
 	}, Q = (e) => {
 		let t = re(e);
 		return e.plannedReleases.filter((e) => !e.withheld).map((n) => ({
@@ -1036,34 +1053,145 @@ function M(v = {}) {
 			validityPeriod: n.validityPeriod ? { ...n.validityPeriod } : void 0
 		}));
 	};
-	for (let [e, t] of Object.entries(Re)) t.pending && et(e, t);
-	let $ = {
+	for (let [e, t] of Object.entries(Ue)) t.pending && ot(e, t);
+	let _t = (e, t) => {
+		for (let n of Object.keys(e)) n in t || delete e[n];
+		Object.assign(e, t);
+	}, vt = (e, t) => {
+		let n = e.chains[0], r = n?.branches[0], i = r?.effectiveOn ?? "";
+		if (!n || !r || !i) throw new _("the Direct Edit's Content is undated: no period to plan");
+		let a = U(n.contentId), o = a.timeline ?? [], s = o.find((e) => e.releaseId === r.carriedReleaseId), c = s?.validityPeriod && i <= e.createTime.slice(0, 10) ? s : void 0, l = c?.validityPeriod ? { ...c.validityPeriod } : {
+			firstDay: i,
+			lastDay: ""
+		};
+		if (t !== void 0) {
+			if (t !== "" && (!g.test(t) || t < l.firstDay)) throw new _("validity_last_day is YYYY-MM-DD, not before the first day");
+			l.lastDay = t;
+		}
+		let d = o.filter((e) => e.releaseId !== c?.releaseId && e.validityPeriod && l.lastDay !== "" && l.firstDay <= e.validityPeriod.firstDay && e.validityPeriod.lastDay !== "" && e.validityPeriod.lastDay <= l.lastDay).map((e) => e.releaseId);
+		if (d.length > 0) throw new u(a.id, d, !0);
+		let f = [];
+		!c && s?.validityPeriod && s.validityPeriod.firstDay < i && f.push({
+			id: `rls_stub_${H++}`,
+			contentId: a.id,
+			kind: "date_only",
+			branchId: "",
+			revisionId: s.revisionId,
+			validityPeriod: {
+				firstDay: s.validityPeriod.firstDay,
+				lastDay: ye(i)
+			},
+			supersedesReleaseIds: [s.releaseId],
+			proposed: !0,
+			proposedForReleaseId: s.releaseId,
+			splitFromReleaseId: "",
+			withheld: !1
+		});
+		let p = n.branches.slice(1).flatMap((e) => {
+			let t = o.find((t) => t.releaseId === e.carriedReleaseId);
+			return t ? [{
+				releaseId: t.releaseId,
+				validityPeriod: t.validityPeriod
+			}] : [];
+		});
+		return {
+			validityPeriod: l,
+			correctsReleaseId: c?.releaseId ?? "",
+			dateOnlyReleases: f,
+			laterWordings: p
+		};
+	}, yt = async (e, t, n, r = {}) => {
+		let i = e.id, a = e.chains[0], o = a?.branches[0];
+		if (!a || !o) throw Error(`Direct Edit ${i} has no Branch`);
+		let s = !!o.effectiveOn;
+		if (!s && (r.validityLastDay !== void 0 || (r.carryForward ?? []).length > 0)) throw new _("validity_last_day and carry_forward are for Dated Content");
+		if (e.state === "open") {
+			let t = s ? vt(e, r.validityLastDay) : void 0, c = e.plannedReleases.find((e) => e.branchId === o.id && !e.proposed);
+			if (c ? (n || t) && await $.updatePlannedRelease({
+				changeSetId: i,
+				plannedReleaseId: c.id,
+				releaseSpec: n,
+				validityPeriod: t?.validityPeriod
+			}) : await $.planRelease({
+				changeSetId: i,
+				branchId: o.id,
+				releaseSpec: n,
+				validityPeriod: t?.validityPeriod,
+				supersedesReleaseIds: t?.correctsReleaseId ? [t.correctsReleaseId] : void 0
+			}), t) {
+				let n = new Map((r.carryForward ?? []).map((e) => [e.releaseId, e.carry])), i = t.laterWordings.filter((e) => !n.has(e.releaseId));
+				if (i.length > 0) throw new _(`carry_forward has no answer for the later wordings ${i.map((e) => e.releaseId).join(", ")}`);
+				e.plannedReleases.push(...t.dateOnlyReleases);
+				for (let r of a.branches.slice(1)) {
+					let i = t.laterWordings.find((e) => e.releaseId === r.carriedReleaseId);
+					i && n.get(i.releaseId) && e.plannedReleases.push({
+						id: `rls_stub_${H++}`,
+						contentId: a.contentId,
+						kind: "revision",
+						branchId: r.id,
+						revisionId: "",
+						validityPeriod: i.validityPeriod,
+						supersedesReleaseIds: [i.releaseId],
+						proposed: !0,
+						proposedForReleaseId: i.releaseId,
+						splitFromReleaseId: "",
+						withheld: !1
+					});
+				}
+			}
+		}
+		let c = await $.publish({
+			id: i,
+			reviewedHeads: {
+				...re(e),
+				[o.id]: t
+			}
+		}), l = U(a.contentId);
+		l.editingBlock?.changeSetId === i && (l.editingBlock = void 0);
+		let u = l.branches[i], d = c.releases.find((e) => e.branchId === o.id), f = a.branches.length > 1;
+		if (u && d && !f && l.main?.revisionId !== u.revisionId) {
+			let { branchId: e, ...t } = structuredClone(u);
+			l.main = t, l.inForce = {
+				...structuredClone(t),
+				releaseId: d.id
+			}, l.timeline = [...l.timeline ?? [], {
+				ordinal: (l.timeline?.length ?? 0) + 1,
+				releaseId: d.id,
+				kind: "revision",
+				revisionId: u.revisionId,
+				blueprintReleaseId: l.blueprintReleaseId,
+				publishTime: c.publishTime,
+				first: !1
+			}];
+		}
+		return c;
+	}, $ = {
 		async listBlockReasons() {
-			return [...C].sort(Ge).map((e) => ({ ...e }));
+			return [...w].sort(Ze).map((e) => ({ ...e }));
 		},
 		async createBlockReason({ name: e }) {
-			let t = xe(e);
-			if (Ke(t)) throw new ie(t);
+			let t = Se(e);
+			if (Qe(t)) throw new ie(t);
 			let n = {
 				id: `br_stub_${H++}`,
 				name: t,
-				createTime: y(),
-				updateTime: y()
+				createTime: b(),
+				updateTime: b()
 			};
-			return C.push(n), { ...n };
+			return w.push(n), { ...n };
 		},
 		async renameBlockReason({ id: e, name: t }) {
-			let n = xe(t), r = C.find((t) => t.id === e);
+			let n = Se(t), r = w.find((t) => t.id === e);
 			if (!r) throw k("Block Reason", e);
-			if (Ke(n, e)) throw new ie(n);
-			return r.name = n, r.updateTime = y(), { ...r };
+			if (Qe(n, e)) throw new ie(n);
+			return r.name = n, r.updateTime = b(), { ...r };
 		},
 		async deleteBlockReason({ id: e }) {
-			if (!C.some((t) => t.id === e)) throw k("Block Reason", e);
-			C = C.filter((t) => t.id !== e);
+			if (!w.some((t) => t.id === e)) throw k("Block Reason", e);
+			w = w.filter((t) => t.id !== e);
 		},
 		async listChangeSets(e = {}) {
-			let t = w.filter((t) => (!e.state || t.state === e.state) && (!e.assigneeId || t.assigneeIds.includes(e.assigneeId)) && (!e.contentId || t.chains.some((t) => t.contentId === e.contentId)) && (!e.kind || (t.kind ?? "change_set") === e.kind) && (!e.editorId || t.editorId === e.editorId)), n = Math.min(e.pageSize || 50, 200), r = e.pageToken ? Number(e.pageToken) : 0;
+			let t = T.filter((t) => (!e.state || t.state === e.state) && (!e.assigneeId || t.assigneeIds.includes(e.assigneeId)) && (!e.contentId || t.chains.some((t) => t.contentId === e.contentId)) && (!e.kind || (t.kind ?? "change_set") === e.kind) && (!e.editorId || t.editorId === e.editorId)), n = Math.min(e.pageSize || 50, 200), r = e.pageToken ? Number(e.pageToken) : 0;
 			return {
 				changeSets: t.slice(r, r + n).map((e) => ({
 					...A(e),
@@ -1075,20 +1203,20 @@ function M(v = {}) {
 			};
 		},
 		async createChangeSet({ name: e, source: t }) {
-			let n = O(e, "name", 200), r = t ? be(t) : void 0, i = {
+			let n = O(e, "name", 200), r = t ? xe(t) : void 0, i = {
 				id: `cs_stub_${H++}`,
 				name: n,
 				source: r,
 				state: "open",
-				createdBy: b,
-				createTime: y(),
+				createdBy: x,
+				createTime: b(),
 				chains: [],
 				dependsOnChangeSetIds: [],
 				status: "",
 				assigneeIds: [],
 				plannedReleases: []
 			};
-			return w.unshift(i), A(i);
+			return T.unshift(i), A(i);
 		},
 		async getChangeSet(e) {
 			return A(X(e));
@@ -1097,17 +1225,17 @@ function M(v = {}) {
 			let i = Z(e);
 			if (t.length === 0) throw new _("update_mask is required");
 			let a = t.includes("name") ? O(n ?? "", "name", 200) : i.name, o = i.source;
-			return t.includes("source") && (o = r ? be(r) : void 0), i.name = a, i.source = o, A(i);
+			return t.includes("source") && (o = r ? xe(r) : void 0), i.name = a, i.source = o, A(i);
 		},
 		async setChangeSetStatus({ id: e, expectedStatus: t, status: n }) {
 			let r = Z(e);
 			if (r.status !== t) throw new a(r.status);
 			if (r.status === n) return A(r);
-			if (!x.some((e) => e.slug === n)) throw new _(`status "${n}" is not in the workspace's catalogue`);
-			if (x.some((e) => e.slug === r.status) && !(S[r.status] ?? []).includes(n)) throw new o({
+			if (!S.some((e) => e.slug === n)) throw new _(`status "${n}" is not in the workspace's catalogue`);
+			if (S.some((e) => e.slug === r.status) && !(C[r.status] ?? []).includes(n)) throw new o({
 				fromStatus: r.status,
 				toStatus: n,
-				reason: `There is no transition from ${it(r.status)} to ${it(n)}.`,
+				reason: `There is no transition from ${ut(r.status)} to ${ut(n)}.`,
 				requiresPermission: !1
 			});
 			return r.status = n, A(r);
@@ -1121,7 +1249,7 @@ function M(v = {}) {
 		async addDependency({ id: e, dependsOnId: t }) {
 			let n = Z(e), r = X(t);
 			if (r.state !== "open") throw new _(`Change Set ${t} is ${r.state}`);
-			if (at(t, e)) throw new _("the dependency would close a cycle");
+			if (dt(t, e)) throw new _("the dependency would close a cycle");
 			return n.dependsOnChangeSetIds.includes(t) || n.dependsOnChangeSetIds.push(t), A(n);
 		},
 		async removeDependency({ id: e, dependsOnId: t }) {
@@ -1131,8 +1259,8 @@ function M(v = {}) {
 		},
 		async validatePublish({ id: e, reviewedHeads: t }) {
 			let n = X(e);
-			F(e);
-			let r = Be.get(e);
+			ke(e);
+			let r = Ke.get(e);
 			if (r && h(r, t)) return {
 				blockers: [],
 				releases: Q(n),
@@ -1140,25 +1268,25 @@ function M(v = {}) {
 			};
 			if (n.state !== "open") throw new p(n.state);
 			return {
-				blockers: ut(n, t),
+				blockers: gt(n, t),
 				releases: Q(n),
 				published: !1
 			};
 		},
 		async publish({ id: e, reviewedHeads: n }) {
 			let r = X(e);
-			F(e);
-			let i = Be.get(e);
+			ke(e);
+			let i = Ke.get(e);
 			if (i && h(i, n)) return {
 				changeSet: A(r),
-				publishTime: r.closeTime ?? y(),
+				publishTime: r.closeTime ?? b(),
 				releases: Q(r)
 			};
 			if (r.state !== "open") throw new p(r.state);
-			let a = ut(r, n);
+			let a = gt(r, n);
 			if (a.length > 0) throw new t(a);
 			let o = Q(r);
-			return r.state = "published", r.closeTime = y(), Be.set(e, { ...n }), {
+			return r.state = "published", r.closeTime = b(), Ke.set(e, { ...n }), {
 				changeSet: A(r),
 				publishTime: r.closeTime,
 				releases: o
@@ -1171,15 +1299,15 @@ function M(v = {}) {
 				n,
 				r
 			], async () => {
-				let i = E.find((t) => (t.timeline ?? []).some((t) => t.releaseId === e));
+				let i = D.find((t) => (t.timeline ?? []).some((t) => t.releaseId === e));
 				if (!i) throw k("Release", e);
 				J(i);
 				let a = i.timeline ?? [], o = a.find((t) => t.releaseId === e);
 				if (!o?.validityPeriod || !G(i)) throw new _("undated Releases carry no Validity Period");
 				let { firstDay: c, lastDay: l = "" } = n;
 				if (!g.test(c) || l !== "" && (!g.test(l) || l < c)) throw new _("validity_period is YYYY-MM-DD, the last day not before the first");
-				let d = M[i.blueprintReleaseId]?.accessor ?? "", f = z.find((e) => e.blueprintAccessor === d);
-				if (je(f).editingMode === "change_sets") throw new s(i.id, d);
+				let d = M[i.blueprintReleaseId]?.accessor ?? "", f = R.find((e) => e.blueprintAccessor === d);
+				if (z(f).editingMode === "change_sets") throw new s(i.id, d);
 				let p = a.filter((t) => t.releaseId !== e && t.validityPeriod && c <= t.validityPeriod.firstDay && (l === "" || t.validityPeriod.lastDay !== "" && t.validityPeriod.lastDay <= l)).map((e) => e.releaseId);
 				if (p.length > 0) throw new u(i.id, p, !0);
 				let ee = {
@@ -1201,17 +1329,17 @@ function M(v = {}) {
 					id: `cs_stub_${H++}`,
 					name: r?.trim() || `Change of validity of ${i.id}`,
 					state: "open",
-					createdBy: b,
-					createTime: y(),
+					createdBy: x,
+					createTime: b(),
 					chains: [],
 					dependsOnChangeSetIds: [],
 					status: "",
 					assigneeIds: [],
 					plannedReleases: [ee]
-				}, h = ut(m, {});
+				}, h = gt(m, {});
 				if (h.length > 0) throw new t(h);
 				let te = Q(m);
-				return m.state = "published", m.closeTime = y(), w.unshift(m), Be.set(m.id, {}), i.timeline = a.map((t) => t.releaseId === e ? {
+				return m.state = "published", m.closeTime = b(), T.unshift(m), Ke.set(m.id, {}), i.timeline = a.map((t) => t.releaseId === e ? {
 					...t,
 					releaseId: ee.id,
 					kind: "date_only",
@@ -1219,7 +1347,7 @@ function M(v = {}) {
 						firstDay: c,
 						lastDay: l
 					},
-					publishTime: m.closeTime ?? y()
+					publishTime: m.closeTime ?? b()
 				} : t), {
 					changeSet: A(m),
 					publishTime: m.closeTime,
@@ -1234,20 +1362,32 @@ function M(v = {}) {
 				t
 			], async () => {
 				let n = Z(e);
-				t || F(e);
+				t || ke(e);
 				let r = t ? n.chains.filter((e) => e.id === t) : n.chains;
 				if (t && r.length === 0) throw k("Chain", t);
-				let i = structuredClone(Le[e] ?? []), a = [];
-				for (let e of r) for (let t of e.branches) {
-					let n = {
-						branchId: t.id,
-						contentId: e.contentId
-					}, r = Re[t.id];
-					B.has(t.id) ? a.push(n) : r && (et(t.id, r), i.push(n));
+				let i = structuredClone(He[e] ?? []), a = [], o = [];
+				for (let t of r) for (let n of t.branches) {
+					let r = {
+						branchId: n.id,
+						contentId: t.contentId
+					}, s = Ue[n.id];
+					if (B.has(n.id)) a.push(r);
+					else if (s) ot(n.id, s), i.push(r);
+					else if (We.has(n.id)) {
+						let r = U(t.contentId);
+						it({
+							changeSetId: e,
+							chain: t,
+							branch: n,
+							c: r,
+							data: structuredClone(q(r, n.headRevisionId) ?? {}),
+							cause: "merge"
+						}), We.delete(n.id), o.push(n.id);
+					}
 				}
 				return {
 					changeSet: A(n),
-					mergedBranchIds: [],
+					mergedBranchIds: o,
 					conflicted: i,
 					pending: a,
 					endedBranchIds: []
@@ -1256,10 +1396,10 @@ function M(v = {}) {
 		},
 		async discardChangeSet(e) {
 			let t = Z(e);
-			return F(e), t.state = "discarded", t.closeTime = y(), t.chains = [], A(t);
+			return ke(e), t.state = "discarded", t.closeTime = b(), t.chains = [], A(t);
 		},
 		async listCheckResults(e) {
-			return lt(X(e));
+			return ht(X(e));
 		},
 		async recordCheckResult({ changeSetId: e, requiredCheckId: t, heads: n, outcome: r, note: a }) {
 			let o = Z(e);
@@ -1267,9 +1407,9 @@ function M(v = {}) {
 			if ([...a].length > 2e3) throw new _(`a note is at most ${d} characters`);
 			let s = N.find((e) => e.id === t);
 			if (!s) throw k("Required Check", t);
-			let c = Oe(t);
-			if (P === "guardian" && !c.everyMember && !c.userIds.includes(b)) throw new f(`recording results of Required Check ${t} needs its recorder relation`);
-			let l = ot(o), u = Object.keys(n);
+			let c = Ae(t);
+			if (P === "guardian" && !c.everyMember && !c.userIds.includes(x)) throw new f(`recording results of Required Check ${t} needs its recorder relation`);
+			let l = ft(o), u = Object.keys(n);
 			if (s.scope === "branch" && u.length !== 1) throw new _("a Branch-scope result names one head");
 			if (s.scope === "change_set" && u.length !== l.length) throw new _("a Change Set-scope result names every head of the Change Set");
 			for (let e of u) {
@@ -1288,56 +1428,62 @@ function M(v = {}) {
 				heads: { ...n },
 				outcome: r,
 				note: a,
-				recordedBy: b,
-				recordTime: y()
+				recordedBy: x,
+				recordTime: b()
 			};
-			return Fe.push({
+			return Be.push({
 				...p,
 				changeSetId: e
 			}), structuredClone(p);
 		},
 		async getEditingSettings() {
-			let e = [...z].sort((e, t) => e.blueprintAccessor < t.blueprintAccessor ? -1 : 1);
+			let e = [...R].sort((e, t) => e.blueprintAccessor < t.blueprintAccessor ? -1 : 1);
 			return {
-				workspace: { ...R },
-				overrides: e.map(Me)
+				workspace: structuredClone(L),
+				overrides: e.map(Pe)
 			};
 		},
 		async getEffectiveEditingSettings(e) {
-			let t = z.find((t) => t.blueprintAccessor === e.trim());
+			let t = R.find((t) => t.blueprintAccessor === e.trim());
 			return {
-				effective: je(t),
+				effective: z(t),
 				editingModeOverridden: (t?.editingMode ?? null) !== null,
-				editingBlockOverridden: (t?.editingBlock ?? null) !== null
+				editingBlockOverridden: (t?.editingBlock ?? null) !== null,
+				forceGroupOverridden: (t?.forceGroup ?? null) !== null,
+				callerInForceGroup: Ie(z(t).forceGroup)
 			};
 		},
 		async setEditingSettings(e) {
-			if (Pe(), !Ne.includes(e.editingMode)) throw new _("the workspace's editing settings need an Editing Mode");
-			return R = { ...e }, { ...R };
-		},
-		async setBlueprintEditingOverride({ blueprintAccessor: e, editingMode: t, editingBlock: n }) {
-			Pe();
-			let r = O(e, "a Blueprint accessor", 200);
-			if (t === null && n === null) throw new _(`an override of "${r}" sets the Editing Mode, the Editing Block or both`);
-			let i = {
-				blueprintAccessor: r,
+			if (ze(), !Re.includes(e.editingMode)) throw new _("the workspace's editing settings need an Editing Mode");
+			return L = {
+				...e,
+				forceGroup: Le(e.forceGroup)
+			}, structuredClone(L);
+		},
+		async setBlueprintEditingOverride({ blueprintAccessor: e, editingMode: t, editingBlock: n, forceGroup: r }) {
+			ze();
+			let i = O(e, "a Blueprint accessor", 200);
+			if (t === null && n === null && r === null) throw new _(`an override of "${i}" sets the Editing Mode, the Editing Block, the Force Group or several`);
+			let a = {
+				blueprintAccessor: i,
 				editingMode: t,
-				editingBlock: n
+				editingBlock: n,
+				forceGroup: r === null ? null : Le(r)
 			};
-			return z = [...z.filter((e) => e.blueprintAccessor !== r), i], Me(i);
+			return R = [...R.filter((e) => e.blueprintAccessor !== i), a], Pe(a);
 		},
 		async deleteBlueprintEditingOverride({ blueprintAccessor: e }) {
-			Pe();
+			ze();
 			let t = e.trim();
-			if (!z.some((e) => e.blueprintAccessor === t)) throw k("an editing override of", t);
-			z = z.filter((e) => e.blueprintAccessor !== t);
+			if (!R.some((e) => e.blueprintAccessor === t)) throw k("an editing override of", t);
+			R = R.filter((e) => e.blueprintAccessor !== t);
 		},
 		async listRequiredChecks() {
 			let e = (e, t) => e.name < t.name ? -1 : e.name > t.name ? 1 : e.id < t.id ? -1 : +(e.id > t.id);
 			return structuredClone([...N].sort(e));
 		},
 		async createRequiredCheck(e) {
-			let t = Se(e);
+			let t = Ce(e);
 			if (N.some((e) => e.name === t.name)) throw new n(t.name);
 			let r = {
 				id: `rc_stub_${H++}`,
@@ -1346,36 +1492,36 @@ function M(v = {}) {
 			return N.push(r), structuredClone(r);
 		},
 		async updateRequiredCheck({ id: e, ...t }) {
-			let r = Se(t), i = N.find((t) => t.id === e);
+			let r = Ce(t), i = N.find((t) => t.id === e);
 			if (!i) throw k("Required Check", e);
 			if (N.some((t) => t.name === r.name && t.id !== e)) throw new n(r.name);
 			return Object.assign(i, r), structuredClone(i);
 		},
 		async deleteRequiredCheck({ id: e }) {
 			if (!N.some((t) => t.id === e)) throw k("Required Check", e);
-			N = N.filter((t) => t.id !== e), L.delete(e);
+			N = N.filter((t) => t.id !== e), I.delete(e);
 		},
 		async listRequiredCheckRecorders(e) {
-			return structuredClone(Xe(e));
+			return structuredClone(nt(e));
 		},
 		async grantRequiredCheckRecorder({ requiredCheckId: e, recorder: t }) {
-			let n = Xe(e);
+			let n = nt(e);
 			if ("everyMember" in t) {
-				L.set(e, {
+				I.set(e, {
 					...n,
 					everyMember: !0
 				});
 				return;
 			}
-			if (!ke.includes(t.userId)) throw new _(`user ${t.userId} is not a member of the workspace`);
-			L.set(e, {
+			if (!je.includes(t.userId)) throw new _(`user ${t.userId} is not a member of the workspace`);
+			I.set(e, {
 				...n,
 				userIds: [.../* @__PURE__ */ new Set([...n.userIds, t.userId])].sort()
 			});
 		},
 		async revokeRequiredCheckRecorder({ requiredCheckId: e, recorder: t }) {
-			let n = Xe(e);
-			L.set(e, "everyMember" in t ? {
+			let n = nt(e);
+			I.set(e, "everyMember" in t ? {
 				...n,
 				everyMember: !1
 			} : {
@@ -1386,7 +1532,7 @@ function M(v = {}) {
 		async searchBlueprints({ query: e }) {
 			let t = e.trim().toLocaleLowerCase();
 			return {
-				blueprints: _e.filter((e) => !e.archived).filter((e) => e.name.toLocaleLowerCase().includes(t)).filter((e) => D.some((t) => t.blueprintId === e.id)).map((e) => ({
+				blueprints: ge.filter((e) => !e.archived).filter((e) => e.name.toLocaleLowerCase().includes(t)).filter((e) => ve.some((t) => t.blueprintId === e.id)).map((e) => ({
 					id: e.id,
 					name: e.name
 				})),
@@ -1395,13 +1541,13 @@ function M(v = {}) {
 		},
 		async getBlueprints(e) {
 			if (e.length > 1e3) throw new _(`at most ${c} Blueprint ids`);
-			return _e.filter((t) => e.includes(t.id)).map((e) => ({
+			return ge.filter((t) => e.includes(t.id)).map((e) => ({
 				id: e.id,
 				name: e.name
 			}));
 		},
 		async listBlueprintReleases(e) {
-			return D.filter((t) => t.blueprintId === e).map((e) => ({
+			return ve.filter((t) => t.blueprintId === e).map((e) => ({
 				id: e.id,
 				blueprintId: e.blueprintId,
 				name: e.name ?? e.id,
@@ -1410,73 +1556,73 @@ function M(v = {}) {
 			}));
 		},
 		async listCollections() {
-			return [...T].sort(qe).map((e) => ({ ...e }));
+			return [...E].sort($e).map((e) => ({ ...e }));
 		},
 		async createCollection({ name: e, parentId: t = "", restricted: r = !1 }) {
 			let i = O(e, "a Collection's name", 200);
-			if (t !== "" && Y(t), r && P === "workspace") throw new m(Te);
-			if (Je(t, i)) throw new n(i);
+			if (t !== "" && Y(t), r && P === "workspace") throw new m(Ee);
+			if (et(t, i)) throw new n(i);
 			let a = {
 				id: `col_stub_${H++}`,
 				name: i,
 				parentId: t,
 				restricted: r
 			};
-			return T.push(a), r && I.set(a.id, [{
-				userId: b,
+			return E.push(a), r && F.set(a.id, [{
+				userId: x,
 				level: "owner"
 			}]), { ...a };
 		},
 		async renameCollection({ id: e, name: t }) {
 			let r = O(t, "a Collection's name", 200), i = Y(e);
-			if (Je(i.parentId, r, e)) throw new n(r);
+			if (et(i.parentId, r, e)) throw new n(r);
 			return i.name = r, { ...i };
 		},
 		async moveCollection({ id: e, parentId: t }) {
 			let r = Y(e);
 			for (let n = t; n !== ""; n = Y(n).parentId) if (n === e) throw new _(`Collection ${e} can't move under itself or a Collection under it`);
-			if (Je(t, r.name, e)) throw new n("");
+			if (et(t, r.name, e)) throw new n("");
 			return r.parentId = t, { ...r };
 		},
 		async removeCollection({ id: e }) {
-			if (Y(e), T.some((t) => t.parentId === e)) throw new _(`Collection ${e} has Collections under it: remove or move those first`);
-			T.splice(T.findIndex((t) => t.id === e), 1), I.delete(e);
+			if (Y(e), E.some((t) => t.parentId === e)) throw new _(`Collection ${e} has Collections under it: remove or move those first`);
+			E.splice(E.findIndex((t) => t.id === e), 1), F.delete(e);
 			let t = [];
-			for (let n of E) n.collectionIds.includes(e) && (n.collectionIds = n.collectionIds.filter((t) => t !== e), t.push(n.id));
+			for (let n of D) n.collectionIds.includes(e) && (n.collectionIds = n.collectionIds.filter((t) => t !== e), t.push(n.id));
 			return t;
 		},
 		async setCollectionRestricted({ id: e, restricted: t, acknowledgeDisclosure: n = !1 }) {
-			if (t && P === "workspace") throw new m(Te);
+			if (t && P === "workspace") throw new m(Ee);
 			let r = Y(e);
 			if (r.restricted === t) return { ...r };
 			if (!t && !n) throw new _(`unrestricting Collection ${e} discloses its Content to every viewer: confirm it with acknowledge_disclosure`);
-			return r.restricted = t, t ? I.set(e, [{
-				userId: b,
+			return r.restricted = t, t ? F.set(e, [{
+				userId: x,
 				level: "owner"
-			}]) : I.delete(e), { ...r };
+			}]) : F.delete(e), { ...r };
 		},
 		async listCollectionGrants(e) {
-			return Ye(e), structuredClone(I.get(e) ?? []).sort((e, t) => e.userId < t.userId ? -1 : +(e.userId > t.userId));
+			return tt(e), structuredClone(F.get(e) ?? []).sort((e, t) => e.userId < t.userId ? -1 : +(e.userId > t.userId));
 		},
 		async grantCollectionAccess({ collectionId: e, userId: t, level: n }) {
-			if (Ye(e), n !== "viewer" && n !== "editor") throw new _("a grant is viewer or editor");
-			if (!ke.includes(t)) throw new _(`${t} is not a member of the workspace`);
-			let r = I.get(e) ?? [];
-			r.some((e) => e.level === "owner" && e.userId === t) || I.set(e, [...r.filter((e) => e.userId !== t), {
+			if (tt(e), n !== "viewer" && n !== "editor") throw new _("a grant is viewer or editor");
+			if (!je.includes(t)) throw new _(`${t} is not a member of the workspace`);
+			let r = F.get(e) ?? [];
+			r.some((e) => e.level === "owner" && e.userId === t) || F.set(e, [...r.filter((e) => e.userId !== t), {
 				userId: t,
 				level: n
 			}]);
 		},
 		async revokeCollectionAccess({ collectionId: e, userId: t }) {
-			Ye(e), I.set(e, (I.get(e) ?? []).filter((e) => e.userId !== t || e.level === "owner"));
+			tt(e), F.set(e, (F.get(e) ?? []).filter((e) => e.userId !== t || e.level === "owner"));
 		},
 		async listContents(e = {}) {
 			let t = e.view ?? { kind: "main" }, n = (e.search ?? "").trim();
 			if (n !== "" && t.kind === "in_force") throw new _("filter.search: Editor Search covers Main and open Branch heads, never Releases");
 			if ([...n].length > 200) throw new _("filter.search is at most 200 characters");
-			if (e.collectionId && !T.some((t) => t.id === e.collectionId)) throw k("Collection", e.collectionId);
+			if (e.collectionId && !E.some((t) => t.id === e.collectionId)) throw k("Collection", e.collectionId);
 			t.kind === "change_set" && X(t.changeSetId);
-			let r = E.filter((e) => !e.archiveTime).filter((t) => !e.collectionId || t.collectionIds.includes(e.collectionId)).filter((t) => !e.blueprintIds?.length || e.blueprintIds.includes(t.blueprintId)).filter((t) => !e.assigneeId || (t.assigneeIds ?? []).includes(e.assigneeId)).sort((e, t) => e.id < t.id ? -1 : +(e.id > t.id)).flatMap((e) => ft(e, t, n)), i = Math.min(e.pageSize || 50, 200), a = e.pageToken ? Number(e.pageToken) : 0;
+			let r = D.filter((e) => !e.archiveTime).filter((t) => !e.collectionId || t.collectionIds.includes(e.collectionId)).filter((t) => !e.blueprintIds?.length || e.blueprintIds.includes(t.blueprintId)).filter((t) => !e.assigneeId || (t.assigneeIds ?? []).includes(e.assigneeId)).sort((e, t) => e.id < t.id ? -1 : +(e.id > t.id)).flatMap((e) => xt(e, t, n)), i = Math.min(e.pageSize || 50, 200), a = e.pageToken ? Number(e.pageToken) : 0;
 			return {
 				contents: r.slice(a, a + i),
 				nextPageToken: a + i < r.length ? String(a + i) : ""
@@ -1485,19 +1631,19 @@ function M(v = {}) {
 		async createContent({ changeSetId: e, blueprintReleaseId: t, copyFrom: n }) {
 			let r = Z(e), i = {}, a = t;
 			if (n) {
-				let e = "revisionId" in n ? n.revisionId : E.find((e) => e.inForce?.releaseId === n.releaseId)?.inForce?.revisionId, r = E.find((t) => e && q(t, e));
+				let e = "revisionId" in n ? n.revisionId : D.find((e) => e.inForce?.releaseId === n.releaseId)?.inForce?.revisionId, r = D.find((t) => e && q(t, e));
 				if (!r || !e) throw k("copy source", JSON.stringify(n));
 				i = structuredClone(q(r, e) ?? {}), a = t || r.blueprintReleaseId;
 			}
-			let o = D.find((e) => e.id === a);
-			if (!o) throw new se(`Blueprint Release ${a} can't be loaded`, [{
+			let o = ve.find((e) => e.id === a);
+			if (!o) throw new oe(`Blueprint Release ${a} can't be loaded`, [{
 				source: "contenthub",
 				code: "release_not_found",
 				path: ""
 			}]);
-			if (o.refusals?.length) throw new se(`Blueprint Release ${a} can't be loaded`, o.refusals.map((e) => ({ ...e })));
+			if (o.refusals?.length) throw new oe(`Blueprint Release ${a} can't be loaded`, o.refusals.map((e) => ({ ...e })));
 			let s = H++, c = `content_stub_${s}`, l = `br_stub_${s}`, u = `rev_stub_${s}`;
-			return E.push({
+			return D.push({
 				id: c,
 				blueprintId: o.blueprintId,
 				blueprintReleaseId: a,
@@ -1506,7 +1652,7 @@ function M(v = {}) {
 					branchId: l,
 					revisionId: u,
 					data: i,
-					revisionCreateTime: y()
+					revisionCreateTime: b()
 				} }
 			}), r.chains.push({
 				id: `chain_stub_${s}`,
@@ -1526,19 +1672,19 @@ function M(v = {}) {
 				data: structuredClone(i),
 				changeSetId: e,
 				branchId: l,
-				revisionCreateTime: y(),
+				revisionCreateTime: b(),
 				releaseId: ""
 			};
 		},
 		async saveRevision({ idempotencyKey: e, ...t }) {
-			if (!e) return Ze(t);
-			let n = JSON.stringify(t), r = Ve.get(e);
+			if (!e) return rt(t);
+			let n = JSON.stringify(t), r = qe.get(e);
 			if (r) {
 				if (r.asked !== n) throw new _(`idempotency key ${e} names another save`);
 				return structuredClone(r.content);
 			}
-			let i = await Ze(t);
-			return Ve.set(e, {
+			let i = await rt(t);
+			return qe.set(e, {
 				asked: n,
 				content: structuredClone(i)
 			}), i;
@@ -1549,10 +1695,10 @@ function M(v = {}) {
 				changeSetId: t
 			} : { kind: "main" };
 			if (n && !t) throw new _("branch_id names a Branch of a Change Set: give its change_set_id too");
-			let [a] = ft(r, i, "");
+			let [a] = xt(r, i, "");
 			if (!a) throw k("Content", e);
 			if (n && n !== a.branchId) {
-				let i = w.find((e) => e.id === t)?.chains.find((t) => t.contentId === e)?.branches.find((e) => e.id === n);
+				let i = T.find((e) => e.id === t)?.chains.find((t) => t.contentId === e)?.branches.find((e) => e.id === n);
 				if (!i) throw k("Branch", n);
 				let o = K(r).find((e) => e.id === i.headRevisionId), s = o?.data ?? (r.main?.revisionId === i.headRevisionId ? r.main.data : {});
 				a = {
@@ -1571,7 +1717,7 @@ function M(v = {}) {
 			};
 		},
 		async getTimeline(e) {
-			let t = U(e), n = (e) => w.find((t) => t.id === e)?.state === "open";
+			let t = U(e), n = (e) => T.find((t) => t.id === e)?.state === "open";
 			return structuredClone({
 				entries: t.timeline ?? [],
 				plannedReleases: (t.plannedReleases ?? []).filter((e) => n(e.changeSetId))
@@ -1584,7 +1730,7 @@ function M(v = {}) {
 				if (!t.main) throw k("Content", e.contentId);
 				r = K(t);
 			} else {
-				let t = E.find((t) => K(t).some((t) => t.branchId === e.branchId));
+				let t = D.find((t) => K(t).some((t) => t.branchId === e.branchId));
 				if (!t) throw k("Branch", e.branchId);
 				r = K(t).filter((t) => t.branchId === e.branchId);
 			}
@@ -1595,7 +1741,7 @@ function M(v = {}) {
 			};
 		},
 		async compare({ revisionId: e, base: t }) {
-			let n = E.find((t) => K(t).some((t) => t.id === e));
+			let n = D.find((t) => K(t).some((t) => t.id === e));
 			if (!n) throw k("Revision", e);
 			let r = K(n), i = r.find((t) => t.id === e), a;
 			if (t.kind === "revision") a = t.revisionId;
@@ -1638,14 +1784,14 @@ function M(v = {}) {
 					referrers: e.slice(i, i + t),
 					nextPageToken: i + t < e.length ? String(i + t) : ""
 				};
-			}, a = E.flatMap((t) => (t.edges ?? []).filter((n) => n.targetContentId === e && t.inForce?.revisionId === n.sourceRevisionId).map((e) => ({
+			}, a = D.flatMap((t) => (t.edges ?? []).filter((n) => n.targetContentId === e && t.inForce?.revisionId === n.sourceRevisionId).map((e) => ({
 				edge: { ...e },
 				releaseId: t.inForce?.releaseId ?? "",
 				changeSetId: "",
 				branchId: ""
 			})));
 			if (!t) return i(a);
-			let o = E.flatMap((t) => Object.entries(t.branches).flatMap(([n, r]) => w.find((e) => e.id === n)?.state === "open" ? (t.edges ?? []).filter((t) => t.targetContentId === e && t.sourceRevisionId === r.revisionId).map((e) => ({
+			let o = D.flatMap((t) => Object.entries(t.branches).flatMap(([n, r]) => T.find((e) => e.id === n)?.state === "open" ? (t.edges ?? []).filter((t) => t.targetContentId === e && t.sourceRevisionId === r.revisionId).map((e) => ({
 				edge: { ...e },
 				releaseId: "",
 				changeSetId: n,
@@ -1657,14 +1803,14 @@ function M(v = {}) {
 			let t;
 			if ("revisionId" in e) t = e.revisionId;
 			else {
-				for (let n of E) {
+				for (let n of D) {
 					let r = Object.values(n.branches).find((t) => t.branchId === e.branchId);
 					r && (t = r.revisionId);
 				}
 				if (!t) throw k("Branch", e.branchId);
 			}
-			return E.flatMap((e) => (e.edges ?? []).filter((e) => e.sourceRevisionId === t)).filter((e) => e.pinReleaseId !== "").flatMap((e) => {
-				let t = E.find((t) => t.id === e.targetContentId)?.inForce?.releaseId ?? "";
+			return D.flatMap((e) => (e.edges ?? []).filter((e) => e.sourceRevisionId === t)).filter((e) => e.pinReleaseId !== "").flatMap((e) => {
+				let t = D.find((t) => t.id === e.targetContentId)?.inForce?.releaseId ?? "";
 				return t === e.pinReleaseId ? [] : [{
 					edge: { ...e },
 					supersededByReleaseId: t,
@@ -1675,7 +1821,7 @@ function M(v = {}) {
 		async setContentCollections({ contentId: e, collectionIds: t }) {
 			let n = U(e), r = [...new Set(t)];
 			if (r.length > 100) throw new _("at most 100 Collections");
-			for (let e of r) if (!T.some((t) => t.id === e)) throw k("Collection", e);
+			for (let e of r) if (!E.some((t) => t.id === e)) throw k("Collection", e);
 			return n.collectionIds = r.sort(), [...n.collectionIds];
 		},
 		async setContentAssignees({ contentId: e, assigneeIds: t }) {
@@ -1686,98 +1832,186 @@ function M(v = {}) {
 		},
 		async blockContent({ contentId: e, blockReasonId: t, allowedUserIds: n }) {
 			let r = U(e);
-			if (!C.some((e) => e.id === t)) throw k("Block Reason", t);
+			if (!w.some((e) => e.id === t)) throw k("Block Reason", t);
 			if (new Set(n).size !== n.length) throw new _("each allowed user is given once");
 			return r.block = {
 				blockReasonId: t,
 				allowedUserIds: [...n],
-				blockedBy: b,
-				blockTime: y()
+				blockedBy: x,
+				blockTime: b()
 			}, W(r);
 		},
 		async unblockContent(e) {
 			let t = U(e);
+			if (!t.block && t.editingBlock) throw new _(`Content ${e} is being edited by ${t.editingBlock.editorId} in a Direct Edit: its Editing Block can't be lifted`);
 			return t.block = void 0, W(t);
 		},
 		async archiveContent(e) {
 			let t = U(e);
 			if (t.archiveTime) return W(t);
 			if (!t.main) throw new _(`Content ${e} is not published: discard its Change Set instead of archiving it`);
-			if (ee(t.timeline ?? [], He())) throw new _(`Content ${e} has a Release In Force today or later: end its force first`);
-			return t.archiveTime = y(), W(t);
+			if (ee(t.timeline ?? [], Je())) throw new _(`Content ${e} has a Release In Force today or later: end its force first`);
+			return t.archiveTime = b(), W(t);
 		},
 		async unarchiveContent(e) {
 			let t = U(e);
 			return t.archiveTime = void 0, W(t);
 		},
-		async openDirectEdit({ contentId: e, idempotencyKey: t }) {
-			return V(t, ["openDirectEdit", e], async () => {
-				let t = U(e), n = w.find((t) => t.kind === "direct_edit" && t.state === "open" && t.editorId === b && t.chains[0]?.contentId === e);
-				if (n) {
-					let [e] = ft(t, {
+		async openDirectEdit({ contentId: e, effectiveOn: t, idempotencyKey: n }) {
+			return V(n, [
+				"openDirectEdit",
+				e,
+				t
+			], async () => {
+				let n = U(e), r = T.find((t) => t.kind === "direct_edit" && t.state === "open" && t.editorId === x && t.chains[0]?.contentId === e);
+				if (r) {
+					let [e] = xt(n, {
 						kind: "change_set",
-						changeSetId: n.id
+						changeSetId: r.id
 					}, "");
 					return {
-						changeSet: A(n),
+						changeSet: A(r),
 						content: e,
 						reopened: !0
 					};
 				}
-				if (t.main && G(t)) throw new oe("dated_content", `Content ${e} is Dated: change it in a Change Set`, e);
-				let r = M[t.blueprintReleaseId]?.accessor || t.blueprintId, i = je(z.find((e) => e.blueprintAccessor === r)).editingMode;
-				if (t.main && i === "change_sets") throw new s(e, r, i);
-				let a = await $.startEditing({
+				let i = G(n);
+				if (!i && t) throw new _("effective_on is refused for undated Content");
+				let a = Fe(n), o = z(R.find((e) => e.blueprintAccessor === a)), c = o.editingMode;
+				if (n.main && c === "change_sets") throw new s(e, a, c);
+				if (n.editingBlock && n.editingBlock.editorId !== x) throw new v("editing_blocked", `Content ${e} is being edited by ${n.editingBlock.editorId} in a Direct Edit`, e, n.editingBlock.editorId);
+				let l = i ? t || Je() : void 0, u = await $.startEditing({
 					contentId: e,
-					changeSetName: `Direct Edit of ${e}`
-				}), o = X(a.changeSet.id);
-				return o.kind = "direct_edit", o.editorId = b, {
-					changeSet: A(o),
-					content: a.content,
+					changeSetName: `Direct Edit of ${e}`,
+					effectiveOn: l
+				}), d = X(u.changeSet.id);
+				d.kind = "direct_edit", d.editorId = x;
+				let f = d.chains[0];
+				if (l && f?.branches[0]) {
+					let e = n.timeline ?? [], t = (e) => !!e.validityPeriod && e.validityPeriod.firstDay <= l && (e.validityPeriod.lastDay === "" || l <= e.validityPeriod.lastDay), r = [...e].reverse().find(t);
+					f.branches[0].effectiveOn = l, f.branches[0].carriedReleaseId = r?.releaseId ?? "";
+					for (let t of e) !t.validityPeriod || t.validityPeriod.firstDay <= l || f.branches.push({
+						id: `br_stub_${H++}`,
+						position: f.branches.length,
+						kind: "carry_forward",
+						headRevisionId: t.revisionId,
+						effectiveOn: t.validityPeriod.firstDay,
+						carriedReleaseId: t.releaseId
+					});
+				}
+				return o.editingBlock && (n.editingBlock = {
+					editorId: x,
+					changeSetId: d.id,
+					blockTime: b()
+				}), {
+					changeSet: A(d),
+					content: u.content,
 					reopened: !1
 				};
 			});
 		},
-		async publishDirectEdit({ id: e, expectedHeadId: t, idempotencyKey: n }) {
-			return V(n, [
+		async previewDirectEditPublish({ id: e, validityLastDay: t }) {
+			let n = X(e);
+			if (n.kind !== "direct_edit") throw new v("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
+			return structuredClone(vt(n, t));
+		},
+		async publishDirectEdit({ id: e, expectedHeadId: t, releaseSpec: n, validityLastDay: r, carryForward: i, idempotencyKey: a }) {
+			return V(a, [
 				"publishDirectEdit",
 				e,
-				t
+				t,
+				n,
+				r,
+				i
 			], async () => {
-				let n = X(e);
-				if (n.kind !== "direct_edit") throw new oe("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
-				let r = n.chains[0], i = r?.branches[0];
-				if (!r || !i) throw Error(`Direct Edit ${e} has no Branch`);
-				n.state === "open" && !n.plannedReleases.some((e) => e.branchId === i.id) && await $.planRelease({
-					changeSetId: e,
-					branchId: i.id
-				});
-				let a = await $.publish({
-					id: e,
-					reviewedHeads: { [i.id]: t }
-				}), o = U(r.contentId), s = o.branches[e], c = a.releases.find((e) => e.branchId === i.id);
-				if (s && c && o.main?.revisionId !== s.revisionId) {
-					let { branchId: e, ...t } = structuredClone(s);
-					o.main = t, o.inForce = {
-						...structuredClone(t),
-						releaseId: c.id
-					}, o.timeline = [...o.timeline ?? [], {
-						ordinal: (o.timeline?.length ?? 0) + 1,
-						releaseId: c.id,
-						kind: "revision",
-						revisionId: s.revisionId,
-						blueprintReleaseId: o.blueprintReleaseId,
-						publishTime: a.publishTime,
-						first: !1
-					}];
+				let a = X(e);
+				if (a.kind !== "direct_edit") throw new v("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
+				let o = U(a.chains[0]?.contentId ?? ""), s = {
+					cs: structuredClone(a),
+					c: structuredClone(o)
+				};
+				try {
+					return await yt(a, t, n, {
+						validityLastDay: r,
+						carryForward: i
+					});
+				} catch (e) {
+					throw _t(a, s.cs), _t(o, s.c), e;
+				}
+			});
+		},
+		async saveAndPublishDirectEdit({ id: e, expectedHeadId: t, data: n, fieldMask: r, releaseSpec: i, validityLastDay: a, carryForward: o, idempotencyKey: s }) {
+			return V(s, [
+				"saveAndPublishDirectEdit",
+				e,
+				t,
+				n,
+				r,
+				i,
+				a,
+				o
+			], async () => {
+				let s = X(e);
+				if (s.kind !== "direct_edit") throw new v("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
+				let c = s.chains[0]?.branches[0];
+				if (!c) throw Error(`Direct Edit ${e} has no Branch`);
+				let l = U(s.chains[0]?.contentId ?? ""), u = {
+					cs: structuredClone(s),
+					c: structuredClone(l)
+				};
+				try {
+					let l = await rt({
+						changeSetId: e,
+						branchId: c.id,
+						expectedHeadId: t,
+						data: n,
+						fieldMask: r
+					});
+					return {
+						content: l,
+						outcome: await yt(s, l.revisionId, i, {
+							validityLastDay: a,
+							carryForward: o
+						})
+					};
+				} catch (e) {
+					throw _t(s, u.cs), _t(l, u.c), e;
 				}
-				return a;
 			});
 		},
 		async discardDirectEdit({ id: e, idempotencyKey: t }) {
 			return V(t, ["discardDirectEdit", e], async () => {
-				if (X(e).kind !== "direct_edit") throw new oe("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
-				return $.discardChangeSet(e);
+				if (X(e).kind !== "direct_edit") throw new v("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
+				let t = await $.discardChangeSet(e);
+				for (let t of D) t.editingBlock?.changeSetId === e && (t.editingBlock = void 0);
+				return t;
+			});
+		},
+		async forceDirectEdit({ id: e, idempotencyKey: t }) {
+			return V(t, ["forceDirectEdit", e], async () => {
+				let t = X(e);
+				if (t.kind !== "direct_edit") throw new v("not_a_direct_edit", `Change Set ${e} is not a Direct Edit`);
+				let n = t.chains[0]?.contentId ?? "", r = U(n);
+				if (t.state !== "open" || r.editingBlock?.changeSetId !== e) throw new v("no_editing_block", `Change Set ${e} holds no Editing Block`);
+				let i = z(R.find((e) => e.blueprintAccessor === Fe(r))).forceGroup;
+				if (!Ie(i)) throw new ne(`forcing the Editing Block of Content ${n} needs the Force Group`);
+				let a = T.find((e) => e.kind === "direct_edit" && e.state === "open" && e.editorId === x && e.chains[0]?.contentId === n);
+				if (a) throw new v("own_direct_edit", `you have a Direct Edit of Content ${n}, ${a.id}`, n);
+				let o = t.editorId ?? "";
+				t.editorId = x, r.editingBlock = {
+					editorId: x,
+					changeSetId: e,
+					blockTime: b()
+				};
+				let [s] = xt(r, {
+					kind: "change_set",
+					changeSetId: e
+				}, "");
+				return {
+					changeSet: A(t),
+					content: s,
+					previousEditorId: o
+				};
 			});
 		},
 		async startEditing({ contentId: e, changeSetId: t, effectiveOn: n = "", changeSetName: r = "" }) {
@@ -1787,7 +2021,7 @@ function M(v = {}) {
 			if (!G(i) && n !== "") throw new _("effective_on is refused for undated Content");
 			let a;
 			if (t) {
-				if (a = Z(t), a.kind === "direct_edit") throw new oe("one_branch", `Change Set ${t} is a Direct Edit`);
+				if (a = Z(t), a.kind === "direct_edit") throw new v("one_branch", `Change Set ${t} is a Direct Edit`);
 				if (a.chains.some((t) => t.contentId === e)) throw new _(`Content ${e} already has a Chain in this Change Set`);
 			} else {
 				let t = Object.values(i.main.data).filter((e) => typeof e == "string").slice(0, 2).join(" ");
@@ -1795,14 +2029,14 @@ function M(v = {}) {
 					id: `cs_stub_${H++}`,
 					name: r.trim() ? O(r, "change_set_name", 200) : t || e,
 					state: "open",
-					createdBy: b,
-					createTime: y(),
+					createdBy: x,
+					createTime: b(),
 					chains: [],
 					dependsOnChangeSetIds: [],
 					status: "",
 					assigneeIds: [],
 					plannedReleases: []
-				}, w.unshift(a);
+				}, T.unshift(a);
 			}
 			let o = H++, s = `br_stub_${o}`, c = {
 				...structuredClone(i.main),
@@ -1819,7 +2053,7 @@ function M(v = {}) {
 					headRevisionId: c.revisionId
 				}]
 			});
-			let [l] = ft(i, {
+			let [l] = xt(i, {
 				kind: "change_set",
 				changeSetId: a.id
 			}, "");
@@ -1848,7 +2082,7 @@ function M(v = {}) {
 			let r = U(t);
 			if (J(r), !G(r)) throw new _("a Repeal is for Dated Content");
 			if (!g.test(n)) throw new _("last_day is YYYY-MM-DD");
-			return dt(r, e, {
+			return bt(r, e, {
 				kind: "repeal",
 				validityPeriod: {
 					firstDay: te(r.timeline ?? [], n)?.validityPeriod?.firstDay ?? n,
@@ -1860,11 +2094,11 @@ function M(v = {}) {
 			Z(e);
 			let n = U(t);
 			if (J(n), G(n)) throw new _("a Withdrawal is for undated Content");
-			return dt(n, e, { kind: "withdrawal" });
+			return bt(n, e, { kind: "withdrawal" });
 		},
 		async planRelease({ idempotencyKey: e, ...t }) {
 			return V(e, ["planRelease", t], async () => {
-				let { changeSetId: e, branchId: n, validityPeriod: r, releaseSpec: i, supersedesReleaseIds: a } = t, { cs: o, chain: s, branch: c, c: l } = $e(e, n);
+				let { changeSetId: e, branchId: n, validityPeriod: r, releaseSpec: i, supersedesReleaseIds: a } = t, { cs: o, chain: s, branch: c, c: l } = at(e, n);
 				if (J(l), c.kind !== "editorial") throw new _("only an editorial Branch's head is released");
 				if (o.plannedReleases.some((e) => e.branchId === n)) throw new _(`Branch ${n} is planned already`);
 				let u = {
@@ -1881,7 +2115,7 @@ function M(v = {}) {
 					splitFromReleaseId: "",
 					withheld: !1
 				};
-				return nt(l, u), o.plannedReleases.push(u), rt(o, l), structuredClone(u);
+				return ct(l, u), o.plannedReleases.push(u), lt(o, l), structuredClone(u);
 			});
 		},
 		async updatePlannedRelease({ idempotencyKey: e, ...t }) {
@@ -1898,7 +2132,7 @@ function M(v = {}) {
 					...i ? { releaseSpec: structuredClone(i) } : {},
 					...a ? { supersedesReleaseIds: [...a] } : {}
 				};
-				return nt(l, u), o.plannedReleases[s] = u, rt(o, l), structuredClone(u);
+				return ct(l, u), o.plannedReleases[s] = u, lt(o, l), structuredClone(u);
 			});
 		},
 		async appendBranch({ idempotencyKey: e, ...t }) {
@@ -1932,7 +2166,7 @@ function M(v = {}) {
 				let { changeSetId: e, chainId: n } = t, r = Z(e), i = r.chains.find((e) => e.id === n);
 				if (!i) throw k("Chain", n);
 				if (i.born) throw new _("the Chain of Content born in the Change Set can't be dropped: discard the Change Set");
-				for (let e of i.branches) tt(e.id);
+				for (let e of i.branches) st(e.id);
 				return r.chains = r.chains.filter((e) => e.id !== n), r.plannedReleases = r.plannedReleases.filter((e) => e.contentId !== i.contentId), delete U(i.contentId).branches[e], A(r);
 			});
 		},
@@ -1942,7 +2176,7 @@ function M(v = {}) {
 		},
 		async resolveMerge({ idempotencyKey: e, ...t }) {
 			return V(e, ["resolveMerge", t], async () => {
-				let { changeSetId: e, branchId: n, expectedHeadId: r, resolutions: a } = t, { chain: o, branch: s, c } = $e(e, n), l = B.get(n);
+				let { changeSetId: e, branchId: n, expectedHeadId: r, resolutions: a } = t, { chain: o, branch: s, c } = at(e, n), l = B.get(n);
 				if (!l) throw new _(`Branch ${n} has no Pending Merge`);
 				if (s.headRevisionId !== r) throw new i({
 					contentId: c.id,
@@ -1957,7 +2191,7 @@ function M(v = {}) {
 					let t = l.fields.find((t) => t.path === e.path), n = "side" in e ? e.side === "ours" ? t.ours : t.theirs : e.value, r = e.path.replace(/^\//, "");
 					n === void 0 ? delete f[r] : f[r] = structuredClone(n);
 				}
-				let p = Qe({
+				let p = it({
 					changeSetId: e,
 					chain: o,
 					branch: s,
@@ -1966,17 +2200,17 @@ function M(v = {}) {
 					cause: "resolve",
 					secondParentId: l.theirsRevisionId
 				});
-				return tt(n), p;
+				return st(n), We.delete(n), p;
 			});
 		},
 		async abortMerge({ idempotencyKey: e, ...t }) {
 			return V(e, ["abortMerge", t], async () => {
-				if ($e(t.changeSetId, t.branchId), !B.has(t.branchId)) throw new _(`Branch ${t.branchId} has no Pending Merge`);
-				tt(t.branchId);
+				if (at(t.changeSetId, t.branchId), !B.has(t.branchId)) throw new _(`Branch ${t.branchId} has no Pending Merge`);
+				st(t.branchId);
 			});
 		},
 		async previewInForce({ contentId: e, changeSetId: t, validOn: n }) {
-			let r = Z(t), i = U(e), a = n || He(), o = r.chains.find((t) => t.contentId === e), s = (e) => !e.validityPeriod || e.validityPeriod.firstDay <= a && (e.validityPeriod.lastDay === "" || a <= e.validityPeriod.lastDay), c = r.plannedReleases.find((t) => t.contentId === e && t.kind !== "repeal" && s(t));
+			let r = Z(t), i = U(e), a = n || Je(), o = r.chains.find((t) => t.contentId === e), s = (e) => !e.validityPeriod || e.validityPeriod.firstDay <= a && (e.validityPeriod.lastDay === "" || a <= e.validityPeriod.lastDay), c = r.plannedReleases.find((t) => t.contentId === e && t.kind !== "repeal" && s(t));
 			if (c) {
 				let e = c.branchId ? o?.branches.find((e) => e.id === c.branchId)?.headRevisionId ?? "" : c.revisionId;
 				return {
@@ -2000,7 +2234,7 @@ function M(v = {}) {
 		}
 	};
 	return $;
-	function dt(e, t, n) {
+	function bt(e, t, n) {
 		let r = {
 			id: `rls_stub_${H++}`,
 			contentId: e.id,
@@ -2018,10 +2252,10 @@ function M(v = {}) {
 			plannedRelease: r
 		}], structuredClone({
 			plannedRelease: r,
-			gapReferrers: We(e.id)
+			gapReferrers: Xe(e.id)
 		});
 	}
-	function ft(e, t, n) {
+	function xt(e, t, n) {
 		let r = (t, n) => ({
 			id: e.id,
 			blueprintId: e.blueprintId,
@@ -2036,33 +2270,33 @@ function M(v = {}) {
 		if (t.kind === "in_force") return e.inForce ? [r(e.inForce, { releaseId: e.inForce.releaseId })] : [];
 		if (t.kind === "change_set") {
 			let i = e.branches[t.changeSetId];
-			return !i || n && !Ee(i.data, n) ? [] : [r(i, {
+			return !i || n && !De(i.data, n) ? [] : [r(i, {
 				changeSetId: t.changeSetId,
 				branchId: i.branchId
 			})];
 		}
 		if (!n) return e.main ? [r(e.main, {})] : [];
 		let i = [];
-		e.main && Ee(e.main.data, n) && i.push(r(e.main, {}));
-		for (let [t, a] of Object.entries(e.branches).sort(([, e], [, t]) => e.branchId < t.branchId ? -1 : 1)) w.find((e) => e.id === t)?.state === "open" && Ee(a.data, n) && i.push(r(a, {
+		e.main && De(e.main.data, n) && i.push(r(e.main, {}));
+		for (let [t, a] of Object.entries(e.branches).sort(([, e], [, t]) => e.branchId < t.branchId ? -1 : 1)) T.find((e) => e.id === t)?.state === "open" && De(a.data, n) && i.push(r(a, {
 			changeSetId: t,
 			branchId: a.branchId
 		}));
 		return i;
 	}
 }
-function Ee(e, t) {
+function De(e, t) {
 	let n = (e) => e.toLocaleLowerCase().replace(/\s+/g, " "), r = n(t);
 	return Object.values(e).some((e) => typeof e == "string" && n(e).includes(r));
 }
 //#endregion
 //#region src/testing/stub-status-source.ts
-function N(e = le()) {
+function N(e = ce()) {
 	return { async listChangeSetStatuses() {
 		return e.map((e) => ({ ...e }));
 	} };
 }
 //#endregion
-export { w as STUB_NOW, C as STUB_OTHER_USER_ID, S as STUB_USER_ID, x as STUB_WORKSPACE_ID, D as createStubBlueprintSource, M as createStubContenthubClient, N as createStubStatusSource, ce as stubBlockReasons, j as stubBlocker, he as stubBlueprintReleases, me as stubBlueprints, le as stubChangeSetStatuses, de as stubChangeSets, pe as stubCollections, ve as stubContents, T as stubIdentity, _e as stubRepealedContent, fe as stubRequiredChecks, ge as stubResolvedReleases, ue as stubStatusTransitions, E as stubUndatedContent };
+export { T as STUB_NOW, w as STUB_OTHER_USER_ID, C as STUB_USER_ID, S as STUB_WORKSPACE_ID, ve as createStubBlueprintSource, M as createStubContenthubClient, N as createStubStatusSource, se as stubBlockReasons, j as stubBlocker, me as stubBlueprintReleases, pe as stubBlueprints, ce as stubChangeSetStatuses, ue as stubChangeSets, fe as stubCollections, _e as stubContents, E as stubIdentity, ge as stubRepealedContent, de as stubRequiredChecks, he as stubResolvedReleases, le as stubStatusTransitions, D as stubUndatedContent };
 
 //# sourceMappingURL=testing.js.map