@mengine/medeo-client 2.1.1-dsl.1 → 2.1.1-dsl.3

package/dist/{dsl-EV6kCdr6.js → dsl-Dm3Sq1fa.js}

@@ -1,4 +1,4 @@
-import { $ as assertRelation, A as hardenCidDescriptors, B as safeStringify, C as applySchemaToInferOptions, D as deepEqual, E as decodeNestedJsonValues, F as isObject, G as valuesEqual, H as stripUndefined, I as isObjectLike, J as getChildSchema, K as CID_KEY, L as isStateAndSchemaOfType, M as inferContainerTypeFromValue, N as insertChildToMap, O as defineCidProperty, P as isArrayLike, Q as assertId, R as isTreeID, S as applyEncode, T as containerIdToContainerType, U as tryInferContainerType, V as schemaToContainerType, W as tryUpdateToContainer, X as assertEntity, Y as getMapFieldSchema, Z as assertEntityPatch, _ as isLoroTreeSchema, at as assertRelationIdentity, b as validateSchema, c as isInvalidAtomic, ct as relationId, d as getDefaultValue, et as entityTables, f as isContainerSchema, g as isLoroMovableListSchema, h as isLoroMapSchema, it as validLanguage, j as hasTransform, k as getRootContainerByType, lt as resourceId, m as isLoroListSchema, n as textStyles, nt as mergeFields, o as medeoDslLoroShape, ot as assertResourceIdentity, p as isListLikeSchema, q as getChildContainerSchema, rt as relationTables, s as captionContentCodec, st as defaultIdFactory, t as DEFAULT_UNIT_TIME_MS, tt as isRecord, u as schema, v as isRootSchemaType, w as cidsEqual, x as applyDecode, y as schemaContainsIgnoreField, z as isValueOfContainerType } from "./video-draft-types-TXRv3wS6.js";
+import { $ as assertId, A as hardenCidDescriptors, B as safeStringify, C as applySchemaToInferOptions, D as deepEqual, E as decodeNestedJsonValues, F as isObject, G as valuesEqual, H as stripUndefined, I as isObjectLike, J as getChildSchema, K as CID_KEY, L as isStateAndSchemaOfType, M as inferContainerTypeFromValue, N as insertChildToMap, O as defineCidProperty, P as isArrayLike, Q as assertEntityPatch, R as isTreeID, S as applyEncode, T as containerIdToContainerType, U as tryInferContainerType, V as schemaToContainerType, W as tryUpdateToContainer, X as assertCaptionContent, Y as getMapFieldSchema, Z as assertEntity, _ as isLoroTreeSchema, at as isRecord, b as validateSchema, c as isInvalidAtomic, ct as relationTables, d as getDefaultValue, dt as assertResourceIdentity, et as assertPhoneme, f as isContainerSchema, ft as defaultIdFactory, g as isLoroMovableListSchema, h as isLoroMapSchema, it as entityTables, j as hasTransform, k as getRootContainerByType, lt as validLanguage, m as isLoroListSchema, mt as resourceId, n as textStyles, nt as assertTimeAnchor, o as medeoDslLoroShape, ot as mergeFields, p as isListLikeSchema, pt as relationId, q as getChildContainerSchema, rt as atomicFields, s as captionContentCodec, st as patchRow, t as DEFAULT_UNIT_TIME_MS, tt as assertRelation, u as schema, ut as assertRelationIdentity, v as isRootSchemaType, w as cidsEqual, x as applyDecode, y as schemaContainsIgnoreField, z as isValueOfContainerType } from "./video-draft-types-DvPeam87.js";
 import { Cursor, LoroDoc, LoroList, LoroMap, LoroMovableList, LoroText, LoroTree, isContainer, isContainerId } from "loro-crdt";
 import { Immer, setAutoFreeze } from "immer";
 //#region ../medeo-dsl/src/text.ts
@@ -12,20 +12,15 @@ function range(text, start, end) {
 	assertTextOffset(text, end);
 	if (start >= end) throw new Error("Expected a nonempty text range");
 }
-function assertMark(key, value, selected) {
-	if (key !== "language" && key !== "pauseMs") throw new Error(`Unsupported mark: ${key}`);
-	if (value === null) return;
-	if (key === "language" && !validLanguage(value)) throw new Error("Invalid language");
-	if (key === "pauseMs" && (selected !== " " || typeof value !== "number" || !Number.isSafeInteger(value) || value < 0)) throw new Error("pauseMs requires a nonnegative integer on one ordinary space");
+/** A script marks only what language a run is written in; how to say it belongs to its phonetic script. */
+function assertMark(key, value) {
+	if (key !== "language") throw new Error(`Unsupported mark: ${key}`);
+	if (value !== null && !validLanguage(value)) throw new Error("Invalid language");
 }
-function attributes(attrs, selected) {
+function attributes(attrs) {
 	if (!attrs) return;
-	const result = {};
-	for (const [key, value] of Object.entries(attrs)) {
-		assertMark(key, value, selected);
-		result[key] = key === "pauseMs" && value === 0 ? null : value;
-	}
-	return result;
+	for (const [key, value] of Object.entries(attrs)) assertMark(key, value);
+	return { ...attrs };
 }
 function previewDelta(text, delta) {
 	let offset = 0;
@@ -44,7 +39,7 @@ function previewDelta(text, delta) {
 		].includes(key))) throw new Error("Invalid text Delta operation");
 		if ("insert" in op) {
 			if (typeof op.insert !== "string") throw new Error("Only text insertions are supported");
-			const attrs = attributes(op.attributes, op.insert);
+			const attrs = attributes(op.attributes);
 			text = text.slice(0, offset) + op.insert + text.slice(offset);
 			normalized.push({
 				insert: op.insert,
@@ -56,7 +51,7 @@ function previewDelta(text, delta) {
 			if (!Number.isSafeInteger(length) || length < 0) throw new Error("Invalid Delta length");
 			assertTextOffset(text, offset + length);
 			if ("retain" in op) {
-				const attrs = attributes(op.attributes, text.slice(offset, offset + length));
+				const attrs = attributes(op.attributes);
 				normalized.push({
 					retain: length,
 					...attrs ? { attributes: attrs } : {}
@@ -91,11 +86,11 @@ function prepareTextEdits(text, edits) {
 					break;
 				case "mark":
 					range(text, edit.start, edit.end);
-					assertMark(edit.key, edit.value, text.slice(edit.start, edit.end));
+					assertMark(edit.key, edit.value);
 					break;
 				case "unmark":
 					range(text, edit.start, edit.end);
-					assertMark(edit.key, null, "");
+					assertMark(edit.key, null);
 					break;
 				case "delta": {
 					const result = previewDelta(text, edit.delta);
@@ -122,60 +117,73 @@ function requireEntity(rows, table, id) {
 	return row;
 }
 /**
-* Whether one relation row may stand among these rows: its fields, its derived ID, and what
-* its kind requires of each end. A row being linked need not be in `rows` yet. Caption content
-* selects text, so its range is checked against the body with {@link assertCaptionSelection}.
+* Whether one relation row may stand among these rows: its fields, its derived ID, and what its
+* kind requires of each end. A row being linked need not be in `rows` yet. Relations an entity
+* holds at most one of are fields of that entity; see {@link assertReferenceAdmitted}.
 */
 function assertRelationAdmitted(rows, table, id, value) {
 	assertId(id);
 	assertRelation(table, value);
 	assertRelationIdentity(table, id, value);
 	const v = value;
-	const require = (endpoint, id) => requireEntity(rows, endpoint, id);
 	switch (table) {
-		case "clip-source-relations":
-			require("clip-entities", v.clipId);
-			if (!rows["media-entities"][v.sourceId] && !rows["caption-entities"][v.sourceId]) throw new Error("Invalid Clip source");
-			break;
-		case "time-anchor-relations": {
-			require("clip-entities", v.from);
-			if (rows["timeline-entities"][v.to]) {
-				if (v.offsetMs < 0) throw new Error("Absolute offset must be nonnegative");
-			} else require("clip-entities", v.to);
-			const visited = /* @__PURE__ */ new Set();
-			let from = v.from;
-			while (true) {
-				if (visited.has(from)) throw new Error("Time anchor cycle");
-				visited.add(from);
-				const anchor = from === v.from ? v : rows["time-anchor-relations"][`ta:${from}`];
-				if (!isRecord(anchor) || typeof anchor.to !== "string") break;
-				from = anchor.to;
-			}
-			break;
-		}
-		case "caption-content-relations":
-			assertCaptionEndpoints(rows, v);
-			break;
-		case "caption-alignment-relations": {
-			require("caption-entities", v.captionId);
-			const media = require("media-entities", v.mediaId);
-			if (media.kind === "image" || v.startMs >= v.endMs || v.endMs > media.durationMs) throw new Error("Invalid source alignment");
-			break;
-		}
 		case "voice-timbre-relations":
-			if (require("media-entities", v.recordingId).kind !== "voiceover-recording") throw new Error("Timbre requires a voiceover recording");
-			require("voice-entities", v.voiceId);
+			if (requireEntity(rows, "media-entities", v.recordingId).kind !== "voiceover-recording") throw new Error("Timbre requires a voiceover recording");
+			requireEntity(rows, "voice-entities", v.voiceId);
 			break;
 		case "derived-from-relations":
 			for (const end of [v.entityId, v.sourceId]) if (!entityTables.some((t) => Object.hasOwn(rows[t], end))) throw new Error("Missing provenance endpoint");
 			break;
-		case "from-asset-relations":
-		case "to-asset-relations": {
-			require("audio-script-entities", v.audioScriptId);
-			const asset = require("asset-entities", v.assetId);
-			if (table === "to-asset-relations" && !asset.digest) throw new Error("Export Asset requires digest");
+	}
+}
+/** Entity fields that hold a single-valued relation, by the entity that owns it. */
+const referenceFields = {
+	"clip-entities": ["source", "anchor"],
+	"phonetic-script-entities": ["phoneme"],
+	"caption-entities": ["selection"]
+};
+/**
+* Whether a single-valued relation, stored as a field of the entity that owns it, may hold this
+* value among these rows. The owner need not be stored yet; an absent value unlinks it.
+* A caption selection's range is checked against the live body by whoever holds it.
+*/
+function assertReferenceAdmitted(rows, table, id, field, value) {
+	assertId(id);
+	const key = `${table}.${field}`;
+	if (value === void 0) {
+		if (key === "clip-entities.source" || key === "phonetic-script-entities.phoneme") throw new Error(`Missing required relation: ${key}`);
+		return;
+	}
+	switch (key) {
+		case "clip-entities.source":
+			assertId(value);
+			if (!Object.hasOwn(rows["media-entities"], value) && !Object.hasOwn(rows["caption-entities"], value)) throw new Error("Invalid Clip source");
+			break;
+		case "clip-entities.anchor": {
+			assertTimeAnchor(value);
+			const anchor = value;
+			if (Object.hasOwn(rows["timeline-entities"], anchor.to)) {
+				if (anchor.offsetMs < 0) throw new Error("Absolute offset must be nonnegative");
+				break;
+			}
+			requireEntity(rows, "clip-entities", anchor.to);
+			const visited = new Set([id]);
+			for (let next = anchor.to; typeof next === "string";) {
+				if (visited.has(next)) throw new Error("Time anchor cycle");
+				visited.add(next);
+				const clip = rows["clip-entities"][next];
+				next = isRecord(clip) && isRecord(clip.anchor) ? clip.anchor.to : void 0;
+			}
 			break;
 		}
+		case "caption-entities.selection":
+			assertCaptionContent(value);
+			requireEntity(rows, "audio-script-entities", value.audioScriptId);
+			break;
+		case "phonetic-script-entities.phoneme":
+			assertPhoneme(value);
+			requireEntity(rows, "audio-script-entities", value.audioScriptId);
+			break;
 	}
 }
 /** Both ends of a caption's selection exist: the caption and the script it selects from. */
@@ -261,8 +269,9 @@ function replacementPatch(before, after) {
 /**
 * Admission of one whole change, asked once before it is published. Only what the change touched
 * is checked, so an unrelated edit still lands in a merged document that holds invalid rows.
-* Containment and caption selections are checked by whoever holds the tree and the script bodies,
-* with `assertContainTree` and `assertCaptionSelection`.
+* Single-valued relations are fields of their owner and are checked when the owner's field is
+* touched. Containment and caption ranges are checked by whoever holds the tree and the script
+* bodies, with `assertContainTree` and `assertCaptionSelection`.
 */
 function assertChangeAdmitted(change) {
 	const { before, after } = change;
@@ -278,16 +287,15 @@ function assertChangeAdmitted(change) {
 			if (!isRecord(value)) throw new Error("Expected an entity object");
 			assertEntityPatch(table, Object.fromEntries([...fields].map((field) => [field, replacementPatch(old[field], value[field])])), old);
 		}
-		const marker = value.seqMarker;
+		const row = value;
+		for (const field of referenceFields[table] ?? []) if (!old || fields.has(field)) assertReferenceAdmitted(after, table, id, field, row[field]);
+		const marker = row.seqMarker;
 		if (table === "clip-entities" && (!old || fields.has("seqMarker")) && marker?.outMs <= marker?.inMs) throw new Error("Clip window must be nonempty");
 	}
 	if (change.entities.has("timeline-entities") && Object.keys(after["timeline-entities"]).length > 1) throw new Error("Document already has a Timeline");
-	for (const [table, ids] of change.relations) {
-		if (table === "caption-content-relations") continue;
-		for (const id of ids) {
-			const value = after[table][id];
-			if (value !== void 0) assertRelationAdmitted(after, table, id, value);
-		}
+	for (const [table, ids] of change.relations) for (const id of ids) {
+		const value = after[table][id];
+		if (value !== void 0) assertRelationAdmitted(after, table, id, value);
 	}
 }
 //#endregion
@@ -331,9 +339,9 @@ function resolveDslLayout(snapshot) {
 		const clips = [];
 		for (const child of node.children) {
 			const id = child.entityId, clip = snapshot["clip-entities"][id];
-			const sourceId = snapshot["clip-source-relations"][`cs:${id}`]?.sourceId;
-			const media = sourceId === void 0 ? void 0 : snapshot["media-entities"][sourceId];
-			const caption = sourceId === void 0 ? void 0 : snapshot["caption-entities"][sourceId];
+			const sourceId = clip.source;
+			const media = snapshot["media-entities"][sourceId];
+			const caption = snapshot["caption-entities"][sourceId];
 			const marker = clip.seqMarker;
 			let inMs = marker.inMs, outMs = marker.outMs;
 			const present = media !== void 0 || caption !== void 0;
@@ -347,7 +355,7 @@ function resolveDslLayout(snapshot) {
 			const rate = marker.rate ?? 1;
 			const duration = present ? Math.max(0, Math.round((outMs - inMs) / rate)) : 0;
 			if (!Number.isSafeInteger(duration)) projectionError("time-overflow", `clip-entities/${id}`, "Duration exceeds safe integer milliseconds");
-			const anchor = snapshot["time-anchor-relations"][`ta:${id}`];
+			const anchor = clip.anchor;
 			const placement = {
 				clipId: id,
 				trackId: node.entityId,
@@ -384,7 +392,7 @@ function resolveDslLayout(snapshot) {
 			}
 			seen.set(current, path.length);
 			path.push(current);
-			current = snapshot["time-anchor-relations"][`ta:${current}`]?.to;
+			current = snapshot["clip-entities"][current]?.anchor?.to;
 		}
 		for (const member of path) done.add(member);
 	}
@@ -393,7 +401,7 @@ function resolveDslLayout(snapshot) {
 	const position = (id) => {
 		const known = positions.get(id);
 		if (known) return known;
-		const clip = result.clips[id], anchor = snapshot["time-anchor-relations"][`ta:${id}`];
+		const clip = result.clips[id], anchor = snapshot["clip-entities"][id]?.anchor;
 		let value;
 		if (anchor && clip.mode === "anchored" && !cycle.has(id) && result.clips[anchor.to]) {
 			const parent = position(anchor.to);
@@ -500,14 +508,6 @@ function resolveDslLayout(snapshot) {
 		const a = track.clips[i];
 		for (const b of track.clips.slice(i + 1)) if (overlap(a, b)) diagnose("unresolved-overlap", b.clipId, `Overlaps ${a.clipId}; fixed positions, anchors and complete windows are retained`);
 	}
-	for (const [id, relation] of Object.entries(snapshot["caption-alignment-relations"])) {
-		const media = snapshot["media-entities"][relation.mediaId];
-		if (!media || media.kind === "image" || relation.endMs <= relation.startMs || relation.endMs > media.durationMs) result.diagnostics.push({
-			code: "invalid-caption-alignment",
-			path: `caption-alignment-relations/${id}`,
-			message: "No valid source alignment; the placed display window is retained"
-		});
-	}
 	return result;
 }
 function overlap(a, b) {
@@ -563,9 +563,10 @@ function timelineId(s) {
 /** Placement facts are authored only by explicit actions; projection never writes them back. */
 function placementMutations(s, clipId, placement) {
 	if (placement.kind === "sequential") return [{
-		type: "delete-relation",
-		table: "time-anchor-relations",
-		id: `ta:${clipId}`
+		type: "patch-entity",
+		table: "clip-entities",
+		id: clipId,
+		patch: { anchor: void 0 }
 	}];
 	const offset = placement.kind === "absolute" ? placement.startMs : placement.offsetMs;
 	if (!Number.isSafeInteger(offset) || placement.kind === "absolute" && offset < 0) throw new Error("Invalid placement time");
@@ -578,27 +579,31 @@ function placementMutations(s, clipId, placement) {
 		while (next && s["clip-entities"][next]) {
 			if (visited.has(next)) throw new Error("Cyclic time anchor");
 			visited.add(next);
-			next = s["time-anchor-relations"][`ta:${next}`]?.to;
+			next = s["clip-entities"][next]?.anchor?.to;
 		}
 		fallback = Math.max(0, resolveDslLayout(s).clips[target].startMs + offset);
 	}
 	if (!Number.isSafeInteger(fallback)) throw new Error("Invalid fallback time");
 	return [{
-		type: "set-relation",
-		table: "time-anchor-relations",
-		value: {
-			from: clipId,
+		type: "patch-entity",
+		table: "clip-entities",
+		id: clipId,
+		patch: { anchor: {
 			to: target,
 			offsetMs: offset,
 			fallback_abs_ms: fallback
-		}
+		} }
 	}];
 }
+/** Clips whose time anchor points at a Clip in `ids`, with that anchor. */
+function anchoredTo(s, ids) {
+	return Object.entries(s["clip-entities"]).flatMap(([id, clip]) => clip.anchor && ids.has(clip.anchor.to) ? [id] : []);
+}
 function detachChildren(s, ids) {
 	const layout = resolveDslLayout(s);
-	return Object.values(s["time-anchor-relations"]).flatMap((r) => ids.has(r.to) && !ids.has(r.from) && layout.clips[r.from] ? placementMutations(s, r.from, {
+	return anchoredTo(s, ids).flatMap((id) => !ids.has(id) && layout.clips[id] ? placementMutations(s, id, {
 		kind: "absolute",
-		startMs: layout.clips[r.from].startMs
+		startMs: layout.clips[id].startMs
 	}) : []);
 }
 function deleteClips(s, ids, policy) {
@@ -608,9 +613,9 @@ function deleteClips(s, ids, policy) {
 	const removed = new Set(ids);
 	if (policy === "cascade") {
 		const queue = [...ids];
-		for (let i = 0; i < queue.length; i++) for (const r of Object.values(s["time-anchor-relations"])) if (r.to === queue[i] && s["clip-entities"][r.from] && !removed.has(r.from)) {
-			removed.add(r.from);
-			queue.push(r.from);
+		for (let i = 0; i < queue.length; i++) for (const id of anchoredTo(s, new Set([queue[i]]))) if (!removed.has(id)) {
+			removed.add(id);
+			queue.push(id);
 		}
 	}
 	const mutations = policy === "detach" ? detachChildren(s, removed) : [];
@@ -620,14 +625,6 @@ function deleteClips(s, ids, policy) {
 			entityId: id
 		});
 		mutations.push({
-			type: "delete-relation",
-			table: "time-anchor-relations",
-			id: `ta:${id}`
-		}, {
-			type: "delete-relation",
-			table: "clip-source-relations",
-			id: `cs:${id}`
-		}, {
 			type: "delete-entity",
 			table: "clip-entities",
 			id
@@ -640,11 +637,10 @@ function deleteClips(s, ids, policy) {
 /** Batch edits validate against preceding prepared facts without touching the live document. */
 function updateClipsPlan(base, updates) {
 	uniqueIds(updates.map((update) => update.clipId));
-	const clips = { ...base["clip-entities"] }, anchors = { ...base["time-anchor-relations"] };
+	const clips = { ...base["clip-entities"] };
 	const preview = {
 		...base,
-		"clip-entities": clips,
-		"time-anchor-relations": anchors
+		"clip-entities": clips
 	};
 	const mutations = [];
 	for (const update of updates) {
@@ -660,9 +656,7 @@ function updateClipsPlan(base, updates) {
 		if (clip.seqMarker.fillTimeline && (windowChanged || Object.hasOwn(marker, "rate"))) throw new Error("BGM trim and speed are not enabled");
 		const next = mergeFields(clip, patch);
 		if (windowChanged) {
-			const sourceId = preview["clip-source-relations"][`cs:${update.clipId}`]?.sourceId;
-			if (!sourceId) throw new Error("Missing Clip source");
-			const source = requireSource(preview, sourceId, requireTrack(preview, trackOf(preview, update.clipId)).role);
+			const source = requireSource(preview, clip.source, requireTrack(preview, trackOf(preview, update.clipId)).role);
 			validateWindow(next.seqMarker, "durationMs" in source ? source.durationMs : void 0);
 		}
 		if (Object.keys(patch).length) mutations.push({
@@ -676,8 +670,7 @@ function updateClipsPlan(base, updates) {
 			trackOf(preview, update.clipId);
 			const changes = placementMutations(preview, update.clipId, update.placement);
 			mutations.push(...changes);
-			for (const change of changes) if (change.type === "set-relation" && change.table === "time-anchor-relations") anchors[`ta:${update.clipId}`] = change.value;
-			else if (change.type === "delete-relation") delete anchors[change.id];
+			for (const change of changes) if (change.type === "patch-entity" && change.table === "clip-entities") clips[update.clipId] = mergeFields(clips[update.clipId], change.patch);
 		}
 	}
 	return mutations;
@@ -724,7 +717,10 @@ function addClipsPlan(s, input, ids) {
 			marker.fillTimeline = true;
 		}
 		validateWindow(marker, duration);
-		const clip = { seqMarker: marker };
+		const clip = {
+			seqMarker: marker,
+			source: source.id
+		};
 		if (item.volume !== void 0) clip.volume = item.volume;
 		const id = ids[offset];
 		const result = [
@@ -735,14 +731,6 @@ function addClipsPlan(s, input, ids) {
 				id,
 				value: clip
 			},
-			{
-				type: "set-relation",
-				table: "clip-source-relations",
-				value: {
-					clipId: id,
-					sourceId: source.id
-				}
-			},
 			{
 				type: "insert-node",
 				entityId: id,
@@ -762,10 +750,9 @@ function moveClipsPlan(s, input) {
 	if (!Number.isSafeInteger(input.index) || input.index < 0 || input.index > target.length) throw new Error("Invalid insertion index");
 	for (const id of input.clipIds) {
 		trackOf(s, id);
-		if (s["time-anchor-relations"][`ta:${id}`]) throw new Error("Sequential reorder requires sequential Clips");
-		const source = s["clip-source-relations"][`cs:${id}`];
-		if (!source) throw new Error("Missing Clip source");
-		requireSource(s, source.sourceId, requireTrack(s, input.trackId).role);
+		const clip = requireClip(s, id);
+		if (clip.anchor) throw new Error("Sequential reorder requires sequential Clips");
+		requireSource(s, clip.source, requireTrack(s, input.trackId).role);
 	}
 	const mutations = input.onAnchored === "keepAbsolute" ? detachChildren(s, moved) : [];
 	const order = [...target];
@@ -783,7 +770,7 @@ function replaceSequencePlan(s, input, ids) {
 	uniqueIds(input.clipIds);
 	if (!input.clipIds.length || !input.clips.length) throw new Error("Replacement requires nonempty runs");
 	const trackId = trackOf(s, input.clipIds[0]), order = children(s, trackId), index = order.indexOf(input.clipIds[0]);
-	if (input.clipIds.some((id, i) => order[index + i] !== id || s["time-anchor-relations"][`ta:${id}`])) throw new Error("Expected an ordered contiguous sequential run");
+	if (input.clipIds.some((id, i) => order[index + i] !== id || s["clip-entities"][id]?.anchor)) throw new Error("Expected an ordered contiguous sequential run");
 	if (input.clips.some((c) => c.placement && c.placement.kind !== "sequential")) throw new Error("Replacement Clips must be sequential");
 	const mutations = addClipsPlan(s, {
 		trackId,
@@ -791,7 +778,7 @@ function replaceSequencePlan(s, input, ids) {
 		index
 	}, ids);
 	const removed = new Set(input.clipIds);
-	const anchors = { ...s["time-anchor-relations"] };
+	const clips = { ...s["clip-entities"] };
 	if (input.onAnchored === "remap") {
 		const begin = resolveDslLayout(s).clips[input.clipIds[0]].startMs;
 		const starts = [];
@@ -803,26 +790,30 @@ function replaceSequencePlan(s, input, ids) {
 			const marker = creation.value.seqMarker;
 			end += Math.round((marker.outMs - marker.inMs) / (marker.rate ?? 1));
 		}
-		for (const r of Object.values(s["time-anchor-relations"])) if (removed.has(r.to) && !removed.has(r.from)) {
-			const slot = input.clipIds.indexOf(r.to);
-			if (slot >= ids.length) continue;
+		for (const child of anchoredTo(s, removed)) {
+			const anchor = s["clip-entities"][child].anchor;
+			const slot = input.clipIds.indexOf(anchor.to);
+			if (removed.has(child) || slot >= ids.length) continue;
 			const value = {
-				from: r.from,
 				to: ids[slot],
-				offsetMs: r.offsetMs,
-				fallback_abs_ms: Math.max(0, starts[slot] + r.offsetMs)
+				offsetMs: anchor.offsetMs,
+				fallback_abs_ms: Math.max(0, starts[slot] + anchor.offsetMs)
 			};
 			mutations.push({
-				type: "set-relation",
-				table: "time-anchor-relations",
-				value
+				type: "patch-entity",
+				table: "clip-entities",
+				id: child,
+				patch: { anchor: value }
 			});
-			anchors[`ta:${r.from}`] = value;
+			clips[child] = {
+				...clips[child],
+				anchor: value
+			};
 		}
 	}
 	mutations.push(...deleteClips({
 		...s,
-		"time-anchor-relations": anchors
+		"clip-entities": clips
 	}, input.clipIds, "cascade"));
 	return mutations;
 }
@@ -830,26 +821,18 @@ function replaceSourcePlan(s, clipId, input) {
 	if (requireClip(s, clipId).seqMarker.fillTimeline) throw new Error("Use setBgm to replace a fill Clip");
 	const source = sourcePlan(s, input, trackOf(s, clipId));
 	validateWindow(input, "durationMs" in source.source ? source.source.durationMs : void 0);
-	return [
-		...source.mutations,
-		{
-			type: "patch-entity",
-			table: "clip-entities",
-			id: clipId,
-			patch: { seqMarker: {
+	return [...source.mutations, {
+		type: "patch-entity",
+		table: "clip-entities",
+		id: clipId,
+		patch: {
+			seqMarker: {
 				inMs: input.inMs,
 				outMs: input.outMs
-			} }
-		},
-		{
-			type: "set-relation",
-			table: "clip-source-relations",
-			value: {
-				clipId,
-				sourceId: source.id
-			}
+			},
+			source: source.id
 		}
-	];
+	}];
 }
 const produce = new Immer({
 	autoFreeze: false,
@@ -3895,6 +3878,21 @@ function resolveContent(doc, content) {
 		bodyId: text.id
 	};
 }
+/** Optional relation fields read apart from their row: an unreadable one is dropped, the row is kept. */
+const optionalReferences = {
+	"clip-entities": ["anchor"],
+	"caption-entities": ["selection"]
+};
+/** The entity a single-valued relation field points at, by the field's path. */
+function referenceTargets(table, row) {
+	const nested = (field, key) => isRecord(row[field]) ? row[field][key] : void 0;
+	switch (table) {
+		case "clip-entities": return [["source", row.source], ["anchor/to", nested("anchor", "to")]];
+		case "caption-entities": return [["selection/audioScriptId", nested("selection", "audioScriptId")]];
+		case "phonetic-script-entities": return [["phoneme/audioScriptId", nested("phoneme", "audioScriptId")]];
+		default: return [];
+	}
+}
 function readMedeoDsl(doc, state) {
 	const diagnostics = [];
 	const diagnostic = (code, path, error) => diagnostics.push({
@@ -3907,10 +3905,17 @@ function readMedeoDsl(doc, state) {
 	const richText = {};
 	for (const table of entityTables) for (const [id, raw] of Object.entries(state[table] ?? {})) try {
 		assertId(id);
-		assertEntity(table, raw);
-		const v = raw;
+		let v = raw;
+		for (const field of optionalReferences[table] ?? []) {
+			const value = v[field];
+			if (!isInvalidAtomic(value)) continue;
+			diagnostic("invalid-relation", `${table}/${id}/${field}`, value.reason);
+			const { [field]: _dropped, ...rest } = v;
+			v = rest;
+		}
+		assertEntity(table, v);
 		assertResourceIdentity(table, id, v);
-		entities[table][id] = raw;
+		entities[table][id] = v;
 		if (table === "audio-script-entities" || table === "caption-entities" && v.text !== void 0) {
 			const text = liveText(doc, id, table === "caption-entities");
 			if (!text) throw new Error("Missing live LoroText body");
@@ -3928,23 +3933,17 @@ function readMedeoDsl(doc, state) {
 		diagnostic("invalid-entity", `${table}/${id}`, error);
 	}
 	const entityIds = new Set(entityTables.flatMap((t) => Object.keys(entities[t])));
+	for (const table of entityTables) for (const [id, row] of Object.entries(entities[table])) for (const [path, target] of referenceTargets(table, row)) if (typeof target === "string" && !entityIds.has(target)) diagnostic("dangling-reference", `${table}/${id}/${path}`, `Missing entity ${target}`);
 	for (const table of relationTables) for (const [id, value] of Object.entries(state[table] ?? {})) try {
 		if (isInvalidAtomic(value)) throw new Error(value.reason);
 		assertRelation(table, value);
 		assertRelationIdentity(table, id, value);
 		relations[table][id] = value;
 		for (const key of [
-			"clipId",
-			"sourceId",
-			"from",
-			"to",
-			"captionId",
-			"audioScriptId",
-			"mediaId",
 			"recordingId",
 			"voiceId",
 			"entityId",
-			"assetId"
+			"sourceId"
 		]) {
 			const endpoint = value[key];
 			if (typeof endpoint === "string" && !entityIds.has(endpoint)) diagnostic("dangling-reference", `${table}/${id}/${key}`, `Missing entity ${endpoint}`);
@@ -3972,22 +3971,25 @@ function readMedeoDsl(doc, state) {
 		}];
 	});
 	const captionText = {};
-	for (const [id, content] of Object.entries(relations["caption-content-relations"])) try {
-		const resolved = resolveContent(doc, content);
-		if (resolved) captionText[content.captionId] = resolved;
-		else diagnostic("invalid-caption-content", `caption-content-relations/${id}`, "Cursor does not resolve in the current body");
-	} catch (error) {
-		diagnostic("invalid-caption-content", `caption-content-relations/${id}`, error);
-	}
 	for (const [id, caption] of Object.entries(entities["caption-entities"])) {
-		const hasReference = Object.hasOwn(relations["caption-content-relations"], `cc:${id}`) || Object.hasOwn(state["caption-content-relations"] ?? {}, `cc:${id}`);
-		if (hasReference && caption.text !== void 0) diagnostic("multiple-caption-sources", `caption-entities/${id}`, "Content reference takes precedence over inline text");
-		if (!hasReference && caption.text !== void 0 && richText[id]) captionText[id] = {
-			text: caption.text,
-			start: 0,
-			end: caption.text.length,
-			bodyId: richText[id].bodyId
-		};
+		if (caption.text !== void 0) {
+			if (Object.hasOwn(state["caption-entities"]?.[id] ?? {}, "selection")) diagnostic("multiple-caption-sources", `caption-entities/${id}`, "Inline text takes precedence over the content reference");
+			if (richText[id]) captionText[id] = {
+				text: caption.text,
+				start: 0,
+				end: caption.text.length,
+				bodyId: richText[id].bodyId
+			};
+			continue;
+		}
+		if (!caption.selection) continue;
+		try {
+			const resolved = resolveContent(doc, caption.selection);
+			if (resolved) captionText[id] = resolved;
+			else diagnostic("invalid-caption-content", `caption-entities/${id}/selection`, "Cursor does not resolve in the current body");
+		} catch (error) {
+			diagnostic("invalid-caption-content", `caption-entities/${id}/selection`, error);
+		}
 	}
 	return freezeSnapshot({
 		...entities,
@@ -4040,6 +4042,7 @@ var TransactionDraft = class {
 	relations = /* @__PURE__ */ new Map();
 	deleted = /* @__PURE__ */ new Set();
 	textPreviews = /* @__PURE__ */ new Map();
+	/** Captions whose selection the draft wrote; they are replayed natively in order with text edits. */
 	dirtyCaptions = /* @__PURE__ */ new Set();
 	removedCaptionTexts = /* @__PURE__ */ new Set();
 	treeChanged = false;
@@ -4137,6 +4140,7 @@ var TransactionDraft = class {
 				if (path.length === 1 && this.textPreviews.has(rowId)) throw new Error("Cannot delete or replace a body used in this transaction");
 			}
 			if (table === "caption-entities") {
+				if (path.length === 1 && isRecord(next) && Object.hasOwn(next, "selection") || path.length === 2 && key === "selection" || path[2] === "selection") this.dirtyCaptions.add(rowId);
 				const changesText = path.length === 1 || path.length === 2 && key === "text";
 				const nextText = path.length === 1 ? isRecord(next) ? next.text : void 0 : next;
 				if (changesText) {
@@ -4145,11 +4149,7 @@ var TransactionDraft = class {
 					if (initial?.text !== void 0 && nextText === void 0) this.removedCaptionTexts.add(rowId);
 				}
 			}
-			if (initial && [
-				"media-entities",
-				"asset-entities",
-				"voice-entities"
-			].includes(table)) {
+			if (initial && ["media-entities", "voice-entities"].includes(table)) {
 				for (const field of [
 					"system",
 					"key",
@@ -4169,7 +4169,6 @@ var TransactionDraft = class {
 			let ids = this.relations.get(table);
 			if (!ids) this.relations.set(table, ids = /* @__PURE__ */ new Set());
 			ids.add(rowId);
-			if (table === "caption-content-relations") this.dirtyCaptions.add(rowId);
 		}
 	}
 };
@@ -4224,6 +4223,7 @@ function changeTree(nodes, mutation, rows) {
 }
 //#endregion
 //#region src/dsl/document/mutations.ts
+const resourceTables = ["media-entities", "voice-entities"];
 /** Mutations are a convenience vocabulary over the same guarded draft and native command queue. */
 function applyMutations(tx, mutations) {
 	const rows = tx.draft;
@@ -4233,11 +4233,7 @@ function applyMutations(tx, mutations) {
 			case "create-entity": {
 				assertEntity(m.table, m.value);
 				const old = rows[m.table][m.id];
-				if (old && ![
-					"media-entities",
-					"voice-entities",
-					"asset-entities"
-				].includes(m.table)) throw new Error(`Entity already exists: ${m.id}`);
+				if (old && !resourceTables.includes(m.table)) throw new Error(`Entity already exists: ${m.id}`);
 				if (old) {
 					assertEntityPatch(m.table, m.value, old);
 					applyPatch(old, m.value);
@@ -4247,12 +4243,15 @@ function applyMutations(tx, mutations) {
 			case "patch-entity": {
 				const current = rows[m.table][m.id];
 				if (!current) throw new Error(`Missing entity: ${m.id}`);
-				assertEntityPatch(m.table, m.patch, current);
-				if (m.table === "clip-entities" && Object.hasOwn(m.patch, "seqMarker")) {
-					const { seqMarker, ...rest } = m.patch;
-					current.seqMarker = mergeFields(current.seqMarker, seqMarker ?? {});
-					applyPatch(current, rest);
-				} else applyPatch(current, m.patch);
+				const patch = m.patch;
+				assertEntityPatch(m.table, patch, current);
+				const atomic = atomicFields[m.table] ?? [];
+				const next = patchRow(m.table, current, patch);
+				const ordinary = {};
+				for (const key of Object.keys(patch)) if (!atomic.includes(key)) ordinary[key] = patch[key];
+				else if (next[key] === void 0) delete current[key];
+				else current[key] = next[key];
+				applyPatch(current, ordinary);
 				break;
 			}
 			case "delete-entity":
@@ -4261,11 +4260,8 @@ function applyMutations(tx, mutations) {
 			case "set-relation": {
 				assertRelation(m.table, m.value);
 				const id = relationId(m.table, m.value);
-				if (m.table === "time-anchor-relations" || m.table === "caption-content-relations") tx.draft[m.table][id] = m.value;
-				else {
-					rows[m.table][id] ??= {};
-					applyPatch(rows[m.table][id], m.value);
-				}
+				rows[m.table][id] ??= {};
+				applyPatch(rows[m.table][id], m.value);
 				break;
 			}
 			case "delete-relation":
@@ -4295,11 +4291,7 @@ function applyTextEdits(text, edits) {
 			text.delete(edit.at, edit.length);
 			break;
 		case "mark":
-			if (edit.key === "pauseMs" && edit.value === 0) text.unmark({
-				start: edit.start,
-				end: edit.end
-			}, edit.key);
-			else text.mark({
+			text.mark({
 				start: edit.start,
 				end: edit.end
 			}, edit.key, edit.value);
@@ -4317,10 +4309,9 @@ function applyTextEdits(text, edits) {
 }
 //#endregion
 //#region src/dsl/document/validation.ts
-/** One relation row by the DSL's rules; caption content must also resolve in the live body. */
-function validateRelation(doc, state, table, id, value) {
-	assertRelationAdmitted(state, table, id, value);
-	if (table !== "caption-content-relations") return;
+/** A caption selection by the DSL's rules, which must also select a nonempty run of the live body. */
+function validateSelection(doc, state, captionId, value) {
+	assertReferenceAdmitted(state, "caption-entities", captionId, "selection", value);
 	const resolved = resolveContent(doc, value);
 	if (!resolved || resolved.start === resolved.end) throw new Error("Expected a nonempty range in the current body");
 	captionContentCodec.encode(value);
@@ -4355,6 +4346,10 @@ function validateDraft(tracked) {
 }
 //#endregion
 //#region src/dsl/document/transact.ts
+function captionRow(doc, captionId) {
+	const row = doc.getMap("caption-entities").get(captionId);
+	return isContainer(row) && row.kind() === "Map" ? row : void 0;
+}
 /** Serialization happens before preparing any writes, so invalid/cyclic audit data cannot partly commit. */
 function auditOptions(audit) {
 	if (!audit || typeof audit.semantic_op !== "string" || !audit.semantic_op.length || !Object.hasOwn(audit, "payload")) throw new Error("A structured DSL audit is required");
@@ -4373,7 +4368,7 @@ const nativeHookSupport = /* @__PURE__ */ new WeakMap();
 /**
 * Every write relies on the patched Mirror's `applyNative` (patches/loro-mirror@2.3.3.patch). An
 * unpatched Mirror ignores the option and commits only the draft, silently dropping Text, ranges
-* and Caption relations. The patch runs the hook even for an empty draft without committing, so
+* and Caption selections. The patch runs the hook even for an empty draft without committing, so
 * probe each Mirror class once on a scratch document and refuse before the first real write.
 */
 function assertNativeHook(mirror) {
@@ -4420,9 +4415,16 @@ function runTransaction(doc, mirror, edit, options, setReject) {
 		};
 		const flushCaptions = () => {
 			for (const id of tracked.dirtyCaptions) {
-				const value = raw["caption-content-relations"][id];
+				const row = raw["caption-entities"][id];
+				if (!row) continue;
+				const value = row.selection;
+				const old = before["caption-entities"][id]?.selection;
+				if (isInvalidAtomic(value)) {
+					if (isInvalidAtomic(old) && old.raw === value.raw) continue;
+					throw new Error("Invalid Caption selection");
+				}
 				if (value !== void 0) {
-					validateRelation(doc, raw, "caption-content-relations", id, value);
+					validateSelection(doc, raw, id, value);
 					useBody(value.audioScriptId);
 				}
 				steps.push({
@@ -4501,7 +4503,7 @@ function runTransaction(doc, mirror, edit, options, setReject) {
 				}
 				validateDraft(tracked);
 				for (const step of steps) if (step.type === "text") requireEntity(raw, step.caption ? "caption-entities" : "audio-script-entities", step.scriptId);
-				const referenceIds = new Set(Object.keys(raw["caption-content-relations"]).map((id) => id.slice(3)));
+				const referenceIds = new Set(Object.entries(before["caption-entities"]).filter(([, caption]) => typeof caption === "object" && caption.selection !== void 0).map(([id]) => id));
 				const changedCaptions = /* @__PURE__ */ new Set();
 				for (const [id, fields] of tracked.entities.get("caption-entities") ?? []) if (fields.has("text")) changedCaptions.add(id);
 				for (const step of steps) {
@@ -4510,16 +4512,18 @@ function runTransaction(doc, mirror, edit, options, setReject) {
 						changedCaptions.add(step.selection.captionId);
 					}
 					if (step.type === "caption") {
-						const id = step.id.slice(3);
-						changedCaptions.add(id);
-						if (step.value) referenceIds.add(id);
-						else referenceIds.delete(id);
+						changedCaptions.add(step.id);
+						if (step.value) referenceIds.add(step.id);
+						else referenceIds.delete(step.id);
 					}
 					if (step.type === "text" && step.caption) changedCaptions.add(step.scriptId);
 				}
-				for (const id of changedCaptions) assertCaptionSource(raw["caption-entities"][id], referenceIds.has(id));
+				for (const id of changedCaptions) if (raw["caption-entities"][id]) assertCaptionSource(raw["caption-entities"][id], referenceIds.has(id));
 				for (const step of steps) if (step.type === "range") assertCaptionEndpoints(raw, step.selection);
-				else if (step.type === "caption" && step.value) assertCaptionEndpoints(raw, step.value);
+				else if (step.type === "caption" && step.value) assertCaptionEndpoints(raw, {
+					captionId: step.id,
+					audioScriptId: step.value.audioScriptId
+				});
 				for (const [id, fields] of tracked.entities.get("caption-entities") ?? []) {
 					const row = raw["caption-entities"][id];
 					if (fields.has("text") && row?.text !== void 0 && before["caption-entities"][id]?.text === void 0) {
@@ -4527,8 +4531,13 @@ function runTransaction(doc, mirror, edit, options, setReject) {
 						delete row.text;
 					}
 				}
-				for (const id of tracked.relations.get("caption-content-relations") ?? []) if (before["caption-content-relations"][id] === void 0) delete raw["caption-content-relations"][id];
-				else raw["caption-content-relations"][id] = before["caption-content-relations"][id];
+				for (const [id, fields] of tracked.entities.get("caption-entities") ?? []) {
+					const row = raw["caption-entities"][id];
+					if (!row || !fields.has("selection")) continue;
+					const old = before["caption-entities"][id];
+					if (old?.selection === void 0) delete row.selection;
+					else row.selection = old.selection;
+				}
 			});
 		} finally {
 			tracked.close();
@@ -4559,18 +4568,19 @@ function runTransaction(doc, mirror, edit, options, setReject) {
 				const { captionId, audioScriptId, start, end } = step.selection;
 				const text = bodyFor(audioScriptId);
 				const from = text?.getCursor(start, 0), to = text?.getCursor(end, 0);
-				if (!from || !to) throw new Error("Unable to construct prepared range");
-				doc.getMap("caption-content-relations").set(`cc:${captionId}`, captionContentCodec.encode({
-					captionId,
+				const row = captionRow(doc, captionId);
+				if (!from || !to || !row) throw new Error("Unable to construct prepared range");
+				row.set("selection", captionContentCodec.encode({
 					audioScriptId,
 					start: from,
 					end: to
 				}));
 			} else {
-				const relations = doc.getMap("caption-content-relations");
-				if (step.value === void 0) {
-					if (relations.get(step.id) !== void 0) relations.delete(step.id);
-				} else relations.set(step.id, captionContentCodec.encode(step.value));
+				const row = captionRow(doc, step.id);
+				if (step.value !== void 0) {
+					if (!row) throw new Error("Prepared Caption is missing");
+					row.set("selection", captionContentCodec.encode(step.value));
+				} else if (row?.get("selection") !== void 0) row.delete("selection");
 			}
 		}
 	});
@@ -4793,6 +4803,7 @@ function voiceoverPlan(s, input, result) {
 				rate: void 0,
 				fillTimeline: void 0
 			},
+			source: result.mediaId,
 			...input.volume === void 0 ? {} : { volume: input.volume }
 		}
 	} : {
@@ -4804,15 +4815,9 @@ function voiceoverPlan(s, input, result) {
 				inMs: 0,
 				outMs: input.media.durationMs
 			},
+			source: result.mediaId,
 			...input.volume === void 0 ? {} : { volume: input.volume }
 		}
-	}, {
-		type: "set-relation",
-		table: "clip-source-relations",
-		value: {
-			clipId: result.clipId,
-			sourceId: result.mediaId
-		}
 	});
 	if (!existing || trackOf(s, result.clipId) !== input.trackId) mutations.push({
 		type: existing ? "move-node" : "insert-node",
@@ -4822,13 +4827,14 @@ function voiceoverPlan(s, input, result) {
 	mutations.push(...placementMutations(s, result.clipId, input.placement));
 	uniqueIds(result.captionClipIds);
 	const retained = new Set(result.captionClipIds);
-	const oldCaptions = Object.values(s["time-anchor-relations"]).filter((r) => r.to === result.clipId && s["clip-entities"][r.from] && requireTrack(s, trackOf(s, r.from)).role === "caption").map((r) => r.from);
+	const oldCaptions = anchoredTo(s, new Set([result.clipId])).filter((id) => requireTrack(s, trackOf(s, id)).role === "caption");
 	mutations.push(...deleteClips(s, oldCaptions.filter((id) => !retained.has(id)), "cascade"));
-	const anchor = mutations.find((m) => m.type === "set-relation" && m.table === "time-anchor-relations" && m.value.from === result.clipId);
+	const placement = mutations.find((m) => m.type === "patch-entity" && m.table === "clip-entities" && m.id === result.clipId && "anchor" in m.patch);
+	const anchor = placement?.type === "patch-entity" && placement.table === "clip-entities" ? placement.patch.anchor : void 0;
 	const trackClips = resolveDslLayout(s).tracks.find((track) => track.trackId === input.trackId).clips;
 	const slot = trackClips.findIndex((clip) => clip.clipId === result.clipId);
 	const predecessor = trackClips.slice(0, slot < 0 ? trackClips.length : slot).findLast((clip) => clip.mode === "sequential" && !clip.fillTimeline);
-	const speechStart = anchor?.type === "set-relation" && anchor.table === "time-anchor-relations" ? anchor.value.fallback_abs_ms : predecessor ? predecessor.startMs + predecessor.durationMs : 0;
+	const speechStart = anchor?.fallback_abs_ms !== void 0 ? anchor.fallback_abs_ms : predecessor ? predecessor.startMs + predecessor.durationMs : 0;
 	input.captions.forEach((caption, i) => {
 		const clipId = result.captionClipIds[i], captionId = result.captionIds[i];
 		validateWindow({
@@ -4837,7 +4843,7 @@ function voiceoverPlan(s, input, result) {
 		}, input.media.durationMs);
 		const previous = s["clip-entities"][clipId];
 		if (previous && !oldCaptions.includes(clipId)) throw new Error("Cannot overwrite another use’s Caption Clip");
-		const previousSource = s["clip-source-relations"][`cs:${clipId}`]?.sourceId;
+		const previousSource = previous?.source;
 		const style = caption.style ?? (previousSource ? s["caption-entities"][previousSource]?.style : void 0);
 		mutations.push({
 			type: "create-entity",
@@ -4850,46 +4856,33 @@ function voiceoverPlan(s, input, result) {
 			audioScriptId: result.audioScriptId,
 			start: caption.range.start,
 			end: caption.range.end
-		}, {
-			type: "set-relation",
-			table: "caption-alignment-relations",
-			value: {
-				captionId,
-				mediaId: result.mediaId,
-				startMs: caption.startMs,
-				endMs: caption.startMs + caption.durationMs
-			}
-		}, previous ? {
+		});
+		const anchor = {
+			to: result.clipId,
+			offsetMs: caption.startMs,
+			fallback_abs_ms: speechStart + caption.startMs
+		};
+		const seqMarker = {
+			inMs: 0,
+			outMs: caption.durationMs
+		};
+		mutations.push(previous ? {
 			type: "patch-entity",
 			table: "clip-entities",
 			id: clipId,
-			patch: { seqMarker: {
-				inMs: 0,
-				outMs: caption.durationMs
-			} }
+			patch: {
+				seqMarker,
+				source: captionId,
+				anchor
+			}
 		} : {
 			type: "create-entity",
 			table: "clip-entities",
 			id: clipId,
-			value: { seqMarker: {
-				inMs: 0,
-				outMs: caption.durationMs
-			} }
-		}, {
-			type: "set-relation",
-			table: "clip-source-relations",
 			value: {
-				clipId,
-				sourceId: captionId
-			}
-		}, {
-			type: "set-relation",
-			table: "time-anchor-relations",
-			value: {
-				from: clipId,
-				to: result.clipId,
-				offsetMs: caption.startMs,
-				fallback_abs_ms: speechStart + caption.startMs
+				seqMarker,
+				source: captionId,
+				anchor
 			}
 		});
 		if (!previous || trackOf(s, clipId) !== input.captionTrackId) mutations.push({
@@ -4950,11 +4943,10 @@ var DslEditor = class {
 	/** index is measured in the target's children after removing the moved Clip. */
 	moveClip(clipId, trackId, index, options) {
 		const snapshot = this.dsl.getSnapshot();
-		requireClip(snapshot, clipId);
+		const clip = requireClip(snapshot, clipId);
 		const track = snapshot["track-entities"][trackId];
-		const source = snapshot["clip-source-relations"][`cs:${clipId}`];
-		if (!track || !source) throw new Error("Missing target Track or Clip source");
-		requireSource(snapshot, source.sourceId, track.role);
+		if (!track) throw new Error("Missing target Track or Clip source");
+		requireSource(snapshot, clip.source, track.role);
 		this.write("moveClip", {
 			clipId,
 			trackId,
@@ -4969,8 +4961,7 @@ var DslEditor = class {
 	trimClip(clipId, window, options) {
 		const snapshot = this.dsl.getSnapshot(), clip = requireClip(snapshot, clipId);
 		if (clip.seqMarker.fillTimeline) throw new Error("BGM trim is not enabled");
-		const sourceId = snapshot["clip-source-relations"][`cs:${clipId}`]?.sourceId;
-		const source = sourceId ? snapshot["media-entities"][sourceId] ?? snapshot["caption-entities"][sourceId] : void 0;
+		const source = snapshot["media-entities"][clip.source] ?? snapshot["caption-entities"][clip.source];
 		if (!source) throw new Error("Cannot trim a Clip with a missing source");
 		const patch = {};
 		if (window.inMs !== void 0) patch.inMs = window.inMs;
@@ -5083,9 +5074,10 @@ var DslEditor = class {
 		if (!caption) throw new Error("Missing Caption");
 		this.dsl.transact((tx) => {
 			tx.applyMutations([{
-				type: "delete-relation",
-				table: "caption-content-relations",
-				id: `cc:${captionId}`
+				type: "patch-entity",
+				table: "caption-entities",
+				id: captionId,
+				patch: { selection: void 0 }
 			}]);
 			if (caption.text === void 0) tx.draft["caption-entities"][captionId].text = text;
 			else if (caption.text !== text) tx.editCaptionText(captionId, [...caption.text.length ? [{
@@ -5227,37 +5219,28 @@ var DslEditor = class {
 			fillTimeline: true
 		};
 		const volume = input.volume === void 0 ? {} : { volume: input.volume };
-		const mutations = [
-			...source.mutations,
-			old ? {
-				type: "patch-entity",
-				table: "clip-entities",
-				id,
-				patch: {
-					seqMarker: {
-						...seqMarker,
-						rate: void 0
-					},
-					...volume
-				}
-			} : {
-				type: "create-entity",
-				table: "clip-entities",
-				id,
-				value: {
-					seqMarker,
-					...volume
-				}
-			},
-			{
-				type: "set-relation",
-				table: "clip-source-relations",
-				value: {
-					clipId: id,
-					sourceId: source.id
-				}
+		const mutations = [...source.mutations, old ? {
+			type: "patch-entity",
+			table: "clip-entities",
+			id,
+			patch: {
+				seqMarker: {
+					...seqMarker,
+					rate: void 0
+				},
+				source: source.id,
+				...volume
 			}
-		];
+		} : {
+			type: "create-entity",
+			table: "clip-entities",
+			id,
+			value: {
+				seqMarker,
+				source: source.id,
+				...volume
+			}
+		}];
 		if (!old) mutations.push({
 			type: "insert-node",
 			entityId: id,
@@ -5770,28 +5753,19 @@ function prepare(input, options) {
 				captionId: sourceId,
 				...selected
 			});
-			const speechId = caption.speech_part_id, mediaId = speechId ? mediaByPart.get(speechId) : void 0;
-			if (mediaId && caption.start_ms !== void 0) {
-				const startMs = milliseconds(caption.start_ms, `part_library/${id}/start_ms`), endMs = startMs + (caption.initial_duration_ms ?? outMs);
-				const media = imported.get(mediaId);
-				if ("durationMs" in media && endMs > startMs && endMs <= media.durationMs) mutations.push({
-					type: "set-relation",
-					table: "caption-alignment-relations",
-					value: {
-						captionId: sourceId,
-						mediaId,
-						startMs,
-						endMs
-					}
-				});
-				else diagnostics.push({
-					code: "invalid-caption-alignment",
-					path: `part_library/${id}`,
-					message: "Source interval is invalid; display window is retained without alignment"
-				});
-			}
 		}
 		if (outMs <= inMs || !sourceId) fail(`part_library/${id}`, "Expected a nonempty source window");
+		let anchor;
+		if (placement.role !== "video_clip") {
+			const host = hosts.get(id);
+			const speechId = part.caption?.speech_part_id;
+			const offsetMs = host?.offset ?? (speechId ? milliseconds(part.caption?.start_ms ?? 0, `part_library/${id}/start_ms`) : placement.abs);
+			anchor = {
+				to: host?.to ?? speechId ?? timelineId,
+				offsetMs,
+				fallback_abs_ms: placement.abs
+			};
+		}
 		mutations.push({
 			type: "create-entity",
 			table: "clip-entities",
@@ -5803,36 +5777,15 @@ function prepare(input, options) {
 					...speed ? { rate: speed.rate } : {},
 					...part.bgm ? { fillTimeline: true } : {}
 				},
+				source: sourceId,
+				...anchor === void 0 ? {} : { anchor },
 				...volume === void 0 ? {} : { volume }
 			}
-		}, {
-			type: "set-relation",
-			table: "clip-source-relations",
-			value: {
-				clipId: id,
-				sourceId
-			}
 		}, {
 			type: "insert-node",
 			entityId: id,
 			parentId: placement.trackId
 		});
-		if (placement.role !== "video_clip") {
-			const host = hosts.get(id);
-			const speechId = part.caption?.speech_part_id;
-			const to = host?.to ?? speechId ?? timelineId;
-			const offsetMs = host?.offset ?? (speechId ? milliseconds(part.caption?.start_ms ?? 0, `part_library/${id}/start_ms`) : placement.abs);
-			mutations.push({
-				type: "set-relation",
-				table: "time-anchor-relations",
-				value: {
-					from: id,
-					to,
-					offsetMs,
-					fallback_abs_ms: placement.abs
-				}
-			});
-		}
 	}
 	return {
 		timelineId,