@mengine/medeo-client 2.0.1-alpha.22 → 2.0.1-alpha.24

package/dist/{document-BB8U25jt.js → document-Ct11SMBS.js}

@@ -1446,6 +1446,20 @@ function emptyLaneTracks() {
 	}));
 }
 //#endregion
+//#region ../medeo-dsl/src/field-merge.ts
+const FIELD_MERGE = Object.freeze({
+	/** One segment reference, narrowed by an optional code-point range. */
+	selection: "atomic",
+	textRange: "atomic",
+	/** Collaborative text, merged by code point. */
+	text: "text",
+	phonemeScript: "text",
+	/** Element identity is the segment id, so inserts and moves survive each other. */
+	segments: "list",
+	segmentRanges: "list",
+	baseEntityIds: "list"
+});
+//#endregion
 //#region ../medeo-dsl/src/entities.ts
 /**
 * What every known entity kind declares.
@@ -1467,12 +1481,6 @@ function emptyLaneTracks() {
 * flowed, is the `from-asset` / `to-asset` Relation's answer alone.
 */
 const ENTITY_KINDS = Object.freeze({
-	axvideo: Object.freeze([
-		"Container",
-		"Sequence",
-		"Visual",
-		"Audible"
-	]),
 	timeline: Object.freeze(["Container"]),
 	track: Object.freeze(["Container"]),
 	clip: Object.freeze(["Container"]),
@@ -1488,7 +1496,7 @@ const ENTITY_KINDS = Object.freeze({
 		"Audible",
 		"MediaFile"
 	]),
-	voiceover: Object.freeze([
+	"voiceover-recording": Object.freeze([
 		"Sequence",
 		"Audible",
 		"MediaFile"
@@ -1500,7 +1508,6 @@ const ENTITY_KINDS = Object.freeze({
 	]),
 	voice: Object.freeze(["Container", "IPBound"]),
 	"sequence-marker": Object.freeze([]),
-	viewport: Object.freeze([]),
 	"audio-script": Object.freeze(["SegmentText", "MediaFile"]),
 	"phonetic-script": Object.freeze(["SegmentText", "MediaFile"]),
 	caption: Object.freeze([
@@ -1533,7 +1540,7 @@ function isSequenceFields(value) {
 	return duration === null || typeof duration === "number" && Number.isSafeInteger(duration) && duration > 0;
 }
 function isMediaAssetVariantKind(kind) {
-	return kind === "video" || kind === "image" || kind === "audio" || kind === "voiceover";
+	return kind === "video" || kind === "image" || kind === "audio" || kind === "voiceover-recording";
 }
 function isKnownEntityKind(kind) {
 	return Object.hasOwn(ENTITY_KINDS, kind);
@@ -1805,7 +1812,7 @@ function entityToRow(entity) {
 //#region ../medeo-dsl/src/invariants.ts
 /** An entity is made from at most one Asset; two would leave its bytes ambiguous. */
 /** Validates one complete set of entities and its authoritative Relation rows. */
-function validateEntityRelationSet(entityRefs, index, options) {
+function validateEntityRelationSet(entityRefs, index) {
 	const { entities, issues } = collectRelatedEntities(entityRefs, index);
 	const entityIds = new Set(entities.map((entity) => entity.entityId));
 	const rows = {
@@ -1829,17 +1836,13 @@ function validateEntityRelationSet(entityRefs, index, options) {
 		if (current.entityKind === "sequence-marker") {
 			const marker = entity;
 			issues.push(...validateMarkerUse(entity, index));
-			issues.push(...validateMarkerRanges(marker, {
-				source: (left, right) => options.compareMarkerPoints(marker, "source", left, right),
-				target: (left, right) => options.compareMarkerPoints(marker, "target", left, right)
-			}));
-			issues.push(...validateMarkerSourceBounds(marker, index, (left, right) => options.compareMarkerPoints(marker, "source", left, right)));
+			issues.push(...validateMarkerRanges(marker));
+			issues.push(...validateMarkerSourceBounds(marker, index));
 		}
 		if (current.entityKind === "clip") {
 			issues.push(...validateClipAdmission(entity, index));
 			issues.push(...validateClipPlacement(entity, index));
 		}
-		if (current.entityKind === "axvideo") issues.push(...validateAXVideoAdmission(entity, index));
 		if (current.entityKind === "caption") issues.push(...validateCaptionComposition(entity, index, entities));
 		if (current.entityKind === "phonetic-script") issues.push(...validatePhoneticComposition(entity, index, entities));
 		issues.push(...validateSequenceComposition(entity));
@@ -1848,18 +1851,16 @@ function validateEntityRelationSet(entityRefs, index, options) {
 	return issues;
 }
 function validateMarkerUse(marker, index) {
-	const relations = [...index.relationsOf(marker)];
-	const clipEdges = ofKind(relations, "clip-marker");
-	const axVideoEdges = ofKind(relations, "axvideo-marker");
-	const contentEdges = ofKind(relations, "marker-content");
-	const timelineEdges = ofKind(relations, "marker-timeline");
-	const scriptEdges = ofKind(relations, "audio-script-marker");
+	const markerEdges = ofKind([...index.relationsOf(marker)], "marker");
+	const markedKind = (relation) => relation.other(marker)?.deref()?.current().entityKind;
+	const clipEdges = markerEdges.filter((relation) => markedKind(relation) === "clip");
+	const scriptEdges = markerEdges.filter((relation) => markedKind(relation) === "audio-script");
 	const issues = [];
 	if (scriptEdges.length > 0) {
-		if (clipEdges.length + axVideoEdges.length + contentEdges.length + timelineEdges.length > 0) issues.push({
+		if (clipEdges.length > 0) issues.push({
 			code: "marker_container_xor",
 			entityId: marker.entityId,
-			message: "An AudioScript annotation Marker must not carry Clip, AXVideo, content, or Timeline relations"
+			message: "An AudioScript annotation Marker must not carry Clip or content relations"
 		});
 		const ranges = marker.current().segmentRanges;
 		if (!ranges?.length) issues.push({
@@ -1886,64 +1887,44 @@ function validateMarkerUse(marker, index) {
 		entityId: marker.entityId,
 		message: "segmentRanges belongs to an AudioScript annotation Marker, not a display Marker"
 	});
-	if (clipEdges.length + axVideoEdges.length !== 1) issues.push({
+	if (clipEdges.length !== 1) issues.push({
 		code: "marker_container_xor",
 		entityId: marker.entityId,
-		message: "Sequence Marker must have exactly one Clip XOR AXVideo container relation"
-	});
-	if (contentEdges.length + timelineEdges.length !== 1) issues.push({
-		code: "marker_content_xor",
-		entityId: marker.entityId,
-		message: "Sequence Marker must have exactly one Sequence content XOR Timeline relation"
-	});
-	if (clipEdges.length === 1 && timelineEdges.length === 1 || axVideoEdges.length === 1 && contentEdges.length === 1) issues.push({
-		code: "marker_pair_mismatch",
-		entityId: marker.entityId,
-		message: "Only Clip+Content or AXVideo+Timeline Marker relation pairs are valid"
+		message: "A display Sequence Marker belongs to exactly one Clip"
 	});
 	return issues;
 }
 function validateClipAdmission(clip, index) {
-	const markerEdges = ofKind([...index.relationsOf(clip)], "clip-marker");
+	const markerEdges = markersOn(clip, index);
 	if (markerEdges.length !== 1) return [{
 		code: "clip_marker_cardinality",
 		entityId: clip.entityId,
 		message: "Clip must have exactly one authoritative Clip-Marker Relation"
 	}];
-	const marker = markerEdges[0]?.other(clip)?.deref();
-	if (marker == null) return [{
+	if (markerEdges[0]?.other(clip)?.deref() == null) return [{
 		code: "clip_content_cardinality",
 		entityId: clip.entityId,
-		message: "Clip must resolve one live Sequence Marker and one content Relation"
+		message: "Clip must resolve one live Sequence Marker"
 	}];
-	const contentEdges = ofKind([...index.relationsOf(marker)], "marker-content");
+	const contentEdges = holds(clip, index);
 	if (contentEdges.length !== 1) return [{
 		code: "clip_content_cardinality",
 		entityId: clip.entityId,
-		message: "Clip Marker must resolve exactly one content Relation"
+		message: "Clip must contain exactly one content entity"
 	}];
-	const content = contentEdges[0]?.other(marker)?.deref()?.current();
+	const content = contentEdges[0]?.other(clip)?.deref()?.current();
 	if (content == null) return [{
 		code: "clip_content_cardinality",
 		entityId: clip.entityId,
-		message: "Clip Marker content Relation must resolve one live entity"
+		message: "Clip content Relation must resolve one live entity"
 	}];
 	if (!hasSequence(content)) return [{
 		code: "clip_content_not_sequence",
 		entityId: clip.entityId,
-		message: `Clip Marker resolves to non-Sequence entity "${content.entityId}"`
+		message: `Clip contains non-Sequence entity "${content.entityId}"`
 	}];
 	return [];
 }
-function validateAXVideoAdmission(axVideo, index) {
-	const markerEdges = ofKind([...index.relationsOf(axVideo)], "axvideo-marker");
-	if (markerEdges.length === 1 && markerEdges[0]?.other(axVideo)?.deref() != null) return [];
-	return [{
-		code: "axvideo_marker_cardinality",
-		entityId: axVideo.entityId,
-		message: "AXVideo must have exactly one live AXVideo-Marker Relation"
-	}];
-}
 /** Validate a Caption against the complete entity set, including its directly held bases. */
 function validateCaptionComposition(caption, index, entities = []) {
 	return validateVariantComposition(caption, index, entities, "caption");
@@ -1970,33 +1951,30 @@ function validateVariantComposition(variant, index, entities, kind) {
 	return issues;
 }
 function validateClipPlacement(clip, index) {
-	const marker = ofKind([...index.relationsOf(clip)], "clip-marker")[0]?.other(clip)?.deref();
+	const marker = markersOn(clip, index)[0]?.other(clip)?.deref();
 	if (marker?.current().entityKind !== "sequence-marker") return [];
 	const markerValue = marker.current();
 	const anchors = ofKind([...index.relationsOf(clip)], "clip-anchor").filter((relation) => relation.endpoints[0].deref() === clip);
-	const hasOrder = clip.current().order !== void 0;
-	const hasTarget = markerValue.targetRange !== void 0;
-	const hasAnchorOffset = markerValue.anchorOffset !== void 0;
+	const hasStart = markerValue.startMs !== void 0;
 	const issues = [];
 	if (anchors.length > 1) issues.push({
 		code: "clip_anchor_cardinality",
 		entityId: clip.entityId,
 		message: "A Clip may follow at most one host Clip"
 	});
-	const hasAnchor = anchors.length === 1;
-	if (hasAnchor && (!hasAnchorOffset || hasOrder || hasTarget) || !hasAnchor && (hasAnchorOffset || Number(hasOrder) + Number(hasTarget) !== 1)) issues.push({
+	if (anchors.length > 0 && !hasStart) issues.push({
 		code: "clip_placement_invalid",
 		entityId: clip.entityId,
-		message: "Clip placement must be exactly one of Clip.order, Marker.targetRange, or clip-anchor with Marker.anchorOffset"
+		message: "A Clip following a host states startMs, the offset inside that host"
 	});
-	if (markerValue.durationPolicy === "timeline") {
-		const content = ofKind([...index.relationsOf(marker)], "marker-content")[0]?.other(marker)?.deref()?.current();
-		const track = ofKind([...index.relationsOf(clip)], "track-clip")[0]?.other(clip)?.deref()?.current();
+	if (markerValue.fillTimeline === true) {
+		const content = holds(clip, index)[0]?.other(clip)?.deref()?.current();
+		const track = heldBy(clip, index)[0]?.other(clip)?.deref()?.current();
 		const trackRole = track?.entityKind === "track" ? track.role : void 0;
-		if (content?.entityKind !== "audio" || trackRole !== "bgm" || !hasOrder && !hasTarget) issues.push({
+		if (content?.entityKind !== "audio" || trackRole !== "bgm") issues.push({
 			code: "timeline_duration_policy_invalid",
 			entityId: marker.entityId,
-			message: "Marker durationPolicy \"timeline\" is only valid for ordered or absolutely placed Audio Clips on the bgm Track"
+			message: "Marker fillTimeline is only valid for ordered or absolutely placed Audio Clips on the bgm Track"
 		});
 	}
 	return issues;
@@ -2028,34 +2006,28 @@ function validateClipAnchorCycles(entities, index) {
 	}
 	return issues;
 }
-function validateMarkerRanges(marker, compare) {
-	const current = marker.current();
-	const issues = [];
-	if (!(compare.source(current.sourceRange.start, current.sourceRange.end) < 0)) issues.push({
+function validateMarkerRanges(marker) {
+	const { inMs, outMs } = marker.current();
+	if (Number.isFinite(inMs) && Number.isFinite(outMs) && outMs > inMs) return [];
+	return [{
 		code: "marker_source_range_empty",
 		entityId: marker.entityId,
-		message: "Sequence Marker sourceRange must be a non-empty half-open interval"
-	});
-	if (current.targetRange != null && !(compare.target(current.targetRange.start, current.targetRange.end) < 0)) issues.push({
-		code: "marker_target_range_empty",
-		entityId: marker.entityId,
-		message: "Sequence Marker targetRange must be a non-empty half-open interval"
-	});
-	return issues;
+		message: "Sequence Marker outMs must be a finite millisecond value greater than inMs"
+	}];
 }
-function validateMarkerSourceBounds(marker, index, compare) {
-	const contentEdges = ofKind([...index.relationsOf(marker)], "marker-content");
+function validateMarkerSourceBounds(marker, index) {
+	const clip = markedBy(marker, index)[0]?.other(marker)?.deref();
+	if (clip == null) return [];
+	const contentEdges = holds(clip, index);
 	if (contentEdges.length !== 1) return [];
-	const content = contentEdges[0]?.other(marker)?.deref()?.current();
+	const content = contentEdges[0]?.other(clip)?.deref()?.current();
 	if (content == null || !hasSequence(content)) return [];
-	const sourceRange = marker.current().sourceRange;
-	const startVsOrigin = compare(sourceRange.start, 0);
-	const endVsDuration = content.durationMs == null ? void 0 : compare(sourceRange.end, content.durationMs);
-	if (!Number.isNaN(startVsOrigin) && startVsOrigin >= 0 && (endVsDuration == null || !Number.isNaN(endVsDuration) && endVsDuration <= 0)) return [];
+	const { inMs, outMs } = marker.current();
+	if (inMs >= 0 && (content.durationMs == null || outMs <= content.durationMs)) return [];
 	return [{
 		code: "marker_source_out_of_bounds",
 		entityId: marker.entityId,
-		message: `Sequence Marker sourceRange must stay within content "${content.entityId}" duration`
+		message: "Sequence Marker in and out points must stay inside the length its content states"
 	}];
 }
 function validateSequenceComposition(entity) {
@@ -2102,21 +2074,20 @@ function validateKnownEntityPayload(entity) {
 			"extent",
 			"sampling",
 			"coordinateSpace",
-			"sourceRange",
-			"targetRange",
-			"duration",
+			"inMs",
+			"outMs",
 			"startMs",
-			"endMs"
+			"rate"
 		]) if (Object.hasOwn(value, key)) problems.push(`${key} is not intrinsic script data; assign an annotation Marker instead`);
 	}
 	switch (entity.entityKind) {
 		case "track":
 			validateOptionalField(value, "hidden", "boolean", problems);
 			validateOptionalField(value, "role", "string", problems);
-			validateOptionalFiniteNumber(value, "order", problems);
 			break;
 		case "video":
 		case "audio":
+		case "voiceover-recording":
 			validateDurationPayload(value, "own", problems);
 			break;
 		case "caption":
@@ -2130,12 +2101,7 @@ function validateKnownEntityPayload(entity) {
 			validateDurationPayload(value, "none", problems);
 			break;
 		case "axvideo":
-			for (const retired of [
-				"extent",
-				"sampling",
-				"coordinateSpace",
-				"durationMs"
-			]) if (Object.hasOwn(value, retired)) problems.push(`${retired} is derived from the Timeline, not stored`);
+			validateDurationPayload(value, "none", problems);
 			break;
 		case "sequence-marker":
 			validateMarkerPayload(value, problems);
@@ -2149,7 +2115,6 @@ function validateKnownEntityPayload(entity) {
 		case "timeline":
 		case "viewport": break;
 		case "clip":
-			validateOptionalFiniteNumber(value, "order", problems);
 			validateOptionalFiniteNumber(value, "volume", problems);
 			if (typeof value.volume === "number" && (value.volume < -60 || value.volume > 20)) problems.push("volume must be decibels between -60 and 20");
 			break;
@@ -2183,17 +2148,16 @@ function validateDurationPayload(value, expected, problems) {
 	if (!isPositiveInteger(duration)) problems.push("durationMs must be positive whole milliseconds");
 }
 function validateMarkerPayload(value, problems) {
-	validateRange(value.sourceRange, "sourceRange", true, problems);
-	if (Object.hasOwn(value, "targetRange") && value.targetRange !== void 0) validateRange(value.targetRange, "targetRange", true, problems);
-	const duration = value.duration;
-	if (!isRecord(duration)) problems.push("duration must be an object");
-	else if (duration.mode === "fixed") {
-		if (!Object.hasOwn(duration, "value") || duration.value === void 0) problems.push("duration.value is required when duration.mode is \"fixed\"");
-	} else if (duration.mode !== "from-source") problems.push("duration.mode must be \"from-source\" or \"fixed\"");
-	if (value.anchorOffset === void 0 && Object.hasOwn(value, "anchorOffset")) problems.push("anchorOffset cannot be undefined when present");
-	if (value.durationPolicy !== void 0 && value.durationPolicy !== "timeline") problems.push("durationPolicy must be \"timeline\" when present");
+	if (!isWholeMilliseconds(value.inMs) || value.inMs < 0) problems.push("inMs must be whole milliseconds at or after zero");
+	if (!isWholeMilliseconds(value.outMs)) problems.push("outMs must be whole milliseconds");
+	if (Object.hasOwn(value, "startMs") && (!isWholeMilliseconds(value.startMs) || value.startMs < 0)) problems.push("startMs must be whole milliseconds at or after zero when present");
+	if (Object.hasOwn(value, "rate") && (typeof value.rate !== "number" || !(value.rate > 0))) problems.push("rate must be a positive number when present");
+	if (Object.hasOwn(value, "fillTimeline") && value.fillTimeline !== true) problems.push("fillTimeline is stated only as true");
 	if (value.segmentRanges !== void 0) validateSegmentRanges(value.segmentRanges, problems);
 }
+function isWholeMilliseconds(value) {
+	return typeof value === "number" && Number.isSafeInteger(value);
+}
 /** Annotation Marker time values are directly assigned facts; no cross-references are allowed. */
 function validateSegmentRanges(value, problems) {
 	if (!Array.isArray(value)) {
@@ -2292,19 +2256,10 @@ function validateCaptionPayload(value, problems) {
 		"strokeColor"
 	]) if (style[key] !== void 0 && typeof style[key] !== "string") problems.push(`style.${key} must be a string`);
 }
-function validateRange(value, path, required, problems) {
-	if (!isRecord(value)) {
-		if (required) problems.push(`${path} must be an object`);
-		return;
-	}
-	if (!Object.hasOwn(value, "start") || value.start === void 0) problems.push(`${path}.start is required`);
-	if (!Object.hasOwn(value, "end") || value.end === void 0) problems.push(`${path}.end is required`);
-}
 /** Phonetic variants store pronunciation fields only; base text stays in the AudioScript. */
 function validatePhoneticScriptPayload(value, problems) {
 	if (value.segments !== void 0) validateScriptPayload(value, problems);
 	if (value.phonemeScript !== void 0 && (typeof value.phonemeScript !== "string" || value.phonemeScript.trim() === "")) problems.push("phonemeScript must be a non-empty string when present");
-	if (value.prosody !== void 0 && !isRecord(value.prosody)) problems.push("prosody must be an object when present");
 }
 function validateScriptPayload(value, problems) {
 	if (!Array.isArray(value.segments)) {
@@ -2321,9 +2276,8 @@ function validateScriptPayload(value, problems) {
 			"endMs",
 			"start_ms",
 			"end_ms",
-			"sourceRange",
-			"targetRange",
-			"duration"
+			"inMs",
+			"outMs"
 		]) if (Object.hasOwn(segment, key)) problems.push(`segments[${index}].${key} is timing; attach an AudioScript annotation Marker instead`);
 		if (typeof segment.segmentId !== "string") problems.push(`segments[${index}].segmentId must be a string`);
 		if (typeof segment.text !== "string") problems.push(`segments[${index}].text must be a string`);
@@ -2378,11 +2332,11 @@ function isOwnedLocalEntityValuePath(entityKind, path) {
 	if ([
 		"video",
 		"audio",
+		"voiceover-recording",
 		"image",
-		"caption",
-		"axvideo"
+		"caption"
 	].includes(entityKind) && /^durationMs$/.test(path)) return true;
-	if (entityKind === "sequence-marker" && /^(?:durationPolicy|duration\.mode|timeRemapping\.(?:kind|mode))$/.test(path)) return true;
+	if (entityKind === "sequence-marker" && /^(?:fillTimeline|rate)$/.test(path)) return true;
 	if ((entityKind === "sequence-marker" || entityKind === "caption") && /^segmentRanges\[\d+\]\.segmentId$/.test(path)) return true;
 	if (entityKind === "asset" && /^(?:system|key|storageKey)$/.test(path)) return true;
 	if (entityKind === "voice" && /^voice\.(?:system|key|name)$/.test(path)) return true;
@@ -2450,19 +2404,57 @@ function expectedDurationShape(kind) {
 function isPositiveInteger(value) {
 	return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
 }
+/** Marker edges where this entity is what the Marker is marked on. */
+function markersOn(target, index) {
+	return ofKind([...index.relationsOf(target)], "marker").filter((relation) => relation.endpoints[0].deref()?.entityId === target.entityId);
+}
+/** Marker edges seen from the Marker itself. */
+function markedBy(marker, index) {
+	return ofKind([...index.relationsOf(marker)], "marker").filter((relation) => relation.endpoints[1].deref()?.entityId === marker.entityId);
+}
+/** Contain edges where this entity is the Container. */
+function holds(container, index) {
+	return ofKind([...index.relationsOf(container)], "contain").filter((relation) => relation.endpoints[0].deref()?.entityId === container.entityId);
+}
+/** Contain edges where this entity is what a Container holds. */
+function heldBy(contained, index) {
+	return ofKind([...index.relationsOf(contained)], "contain").filter((relation) => relation.endpoints[1].deref()?.entityId === contained.entityId);
+}
 function ofKind(relations, kind) {
 	return relations.filter((relation) => relation.kind === kind);
 }
 //#endregion
 //#region ../medeo-dsl/src/relation-specs.ts
-const timelineTrackRelationSpec = emptySpec("timeline-track", "timeline", "track");
-const trackClipRelationSpec = emptySpec("track-clip", "track", "clip");
-const clipMarkerRelationSpec = emptySpec("clip-marker", "clip", "sequence-marker");
-const axVideoMarkerRelationSpec = emptySpec("axvideo-marker", "axvideo", "sequence-marker");
-const markerTimelineRelationSpec = emptySpec("marker-timeline", "sequence-marker", "timeline");
-const markerContentRelationSpec = Object.freeze({
-	kind: "marker-content",
-	validateEndpoints: (endpoints) => hasMarkerAndSequence(endpoints),
+/**
+* What a Container holds. Which pairs are legal is the Container's own rule:
+* a Timeline holds Tracks, a Track holds Clips, and a Clip — the placement
+* itself — holds content that declares Sequence.
+*/
+const containRelationSpec = Object.freeze({
+	kind: "contain",
+	ordered: true,
+	sequenced: true,
+	validateEndpoints: (endpoints) => containerAdmits(endpoints[0].current(), endpoints[1].current()),
+	validateMetadata: isEmptyMetadata
+});
+function containerAdmits(container, contained) {
+	if (!declaresKind(container.entityKind, "Container")) return false;
+	if (container.entityKind === "timeline") return contained.entityKind === "track";
+	if (container.entityKind === "track") return contained.entityKind === "clip";
+	if (container.entityKind === "clip") return hasSequence(contained);
+	return false;
+}
+/**
+* A point marked on endpoint 0's timeline. A Clip takes a display Marker — the
+* window and placement it plays its content through; an AudioScript takes an
+* annotation Marker — assigned per-Segment times. What the Marker means is the
+* marked entity's own business.
+*/
+const markerRelationSpec = Object.freeze({
+	kind: "marker",
+	ordered: true,
+	sequenced: false,
+	validateEndpoints: (endpoints) => (endpoints[0].current().entityKind === "clip" || endpoints[0].current().entityKind === "audio-script") && endpoints[1].current().entityKind === "sequence-marker",
 	validateMetadata: isEmptyMetadata
 });
 /**
@@ -2476,6 +2468,8 @@ const markerContentRelationSpec = Object.freeze({
 */
 const fromAssetRelationSpec = Object.freeze({
 	kind: "from-asset",
+	ordered: true,
+	sequenced: false,
 	validateEndpoints: (endpoints) => hasExactlyOneAsset(endpoints),
 	validateMetadata: isAssetBinding
 });
@@ -2496,117 +2490,87 @@ const fromAssetRelationSpec = Object.freeze({
 */
 const toAssetRelationSpec = Object.freeze({
 	kind: "to-asset",
+	ordered: true,
+	sequenced: false,
 	validateEndpoints: (endpoints) => hasExactlyOneAsset(endpoints),
 	validateMetadata: isAssetBinding
 });
-/** `generated(output, input)` means endpoint 0 was generated from endpoint 1. */
-const generatedRelationSpec = Object.freeze({
-	kind: "generated",
-	validateEndpoints: (endpoints) => endpoints.every((endpoint) => isGeneratedMedia(endpoint.current())),
+/** Media a generated medium can be made from, and a transcript can be read off. */
+const MEDIA_VARIANT_KINDS = [
+	"video",
+	"image",
+	"audio",
+	"voiceover-recording"
+];
+const MEDIA_AUDIBLE_KINDS = [
+	"video",
+	"audio",
+	"voiceover-recording"
+];
+/**
+* What a thing was made from: a Voiceover Recording from the Phonetic Script it
+* was spoken from, a transcribed Audio Script from the media it was read off, a
+* generated medium from the media it was made with. Endpoint 0 is the product,
+* endpoint 1 what it came from.
+*/
+const derivedFromRelationSpec = Object.freeze({
+	kind: "derived-from",
+	ordered: true,
+	sequenced: false,
+	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(MEDIA_VARIANT_KINDS), new Set(MEDIA_VARIANT_KINDS)) || hasKinds(endpoints, new Set(["voiceover-recording"]), new Set(["phonetic-script"])) || hasKinds(endpoints, new Set(["audio-script"]), new Set(MEDIA_AUDIBLE_KINDS)),
 	validateMetadata: isEmptyMetadata
 });
 const captionAlignmentRelationSpec = Object.freeze({
 	kind: "caption-alignment",
-	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["caption"]), new Set(["voiceover"])),
+	ordered: true,
+	sequenced: false,
+	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["caption"]), new Set(["voiceover-recording"])),
 	validateMetadata: isCaptionAlignmentMetadata
 });
 /** `clip-anchor(child, host)` means endpoint 0 follows endpoint 1. */
 const clipAnchorRelationSpec = Object.freeze({
 	kind: "clip-anchor",
+	ordered: true,
+	sequenced: false,
 	validateEndpoints: (endpoints) => endpoints[0].current().entityKind === "clip" && endpoints[1].current().entityKind === "clip",
 	validateMetadata: isEmptyMetadata
 });
 /**
-* The Voiceover and the PhoneticScript it was spoken from; kinds determine
-* roles regardless of endpoint positions.
-*
-* Every Voiceover must carry one: which words were said, and how, is the only
-* thing that makes speech reproducible, and a Voiceover that cannot answer it
-* is refused when its plan is built.
-*/
-const phoneticScriptRenderRelationSpec = Object.freeze({
-	kind: "phonetic-script-render",
-	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["voiceover"]), new Set(["phonetic-script"])),
-	validateMetadata: isEmptyMetadata
-});
-/**
 * The timbre identity a Voiceover was synthesized with. Voice stays an
 * identity: it never carries the audio itself, so the link between the two is a
 * Relation rather than one shared entity, and several takes can name one voice.
 */
 const voiceTimbreRelationSpec = Object.freeze({
 	kind: "voice-timbre",
-	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["voiceover"]), new Set(["voice"])),
-	validateMetadata: isEmptyMetadata
-});
-/** AudioScript was transcribed from Audio, Video, or recorded Voice; kinds determine roles. */
-const audioScriptSourceRelationSpec = Object.freeze({
-	kind: "audio-script-source",
-	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["audio-script"]), new Set([
-		"audio",
-		"voiceover",
-		"video"
-	])),
-	validateMetadata: isEmptyMetadata
-});
-/**
-* `audio-script-marker(script, marker)` attaches an annotation Sequence Marker
-* whose `segmentRanges` hold directly assigned per-Segment time values. The
-* script keeps no Sequence and no Clip admission; annotation Markers cannot
-* enter Clip/AXVideo use chains (enforced by the marker-use invariant).
-*/
-const audioScriptMarkerRelationSpec = Object.freeze({
-	kind: "audio-script-marker",
-	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["audio-script"]), new Set(["sequence-marker"])),
+	ordered: true,
+	sequenced: false,
+	validateEndpoints: (endpoints) => hasKinds(endpoints, new Set(["voiceover-recording"]), new Set(["voice"])),
 	validateMetadata: isEmptyMetadata
 });
 /** Built-in kinds are reserved; callers may add specs only under new names. */
 const builtInRelationSpecs = Object.freeze([
-	timelineTrackRelationSpec,
-	trackClipRelationSpec,
-	clipMarkerRelationSpec,
-	markerContentRelationSpec,
-	axVideoMarkerRelationSpec,
-	markerTimelineRelationSpec,
+	containRelationSpec,
+	markerRelationSpec,
 	fromAssetRelationSpec,
 	toAssetRelationSpec,
-	generatedRelationSpec,
+	derivedFromRelationSpec,
 	captionAlignmentRelationSpec,
 	clipAnchorRelationSpec,
-	phoneticScriptRenderRelationSpec,
-	voiceTimbreRelationSpec,
-	audioScriptSourceRelationSpec,
-	audioScriptMarkerRelationSpec
+	voiceTimbreRelationSpec
 ]);
-function emptySpec(kind, a, b) {
-	return metadataSpec(kind, a, b, isEmptyMetadata);
-}
-function metadataSpec(kind, a, b, validateMetadata) {
-	return Object.freeze({
-		kind,
-		validateEndpoints: (endpoints) => hasKinds(endpoints, new Set([a]), new Set([b])),
-		validateMetadata
-	});
-}
+/**
+* Endpoint 0 is one of `aKinds` and endpoint 1 one of `bKinds`.
+*
+* Positional, because every built-in kind is ordered: a reversed row states a
+* different fact, not the same one written backwards.
+*/
 function hasKinds(endpoints, aKinds, bKinds) {
-	const first = endpoints[0].current().entityKind;
-	const second = endpoints[1].current().entityKind;
-	return aKinds.has(first) && bKinds.has(second) || aKinds.has(second) && bKinds.has(first);
-}
-function hasMarkerAndSequence(endpoints) {
-	const first = endpoints[0].current();
-	const second = endpoints[1].current();
-	return first.entityKind === "sequence-marker" && hasSequence(second) || second.entityKind === "sequence-marker" && hasSequence(first);
+	return aKinds.has(endpoints[0].current().entityKind) && bKinds.has(endpoints[1].current().entityKind);
 }
-/** Exactly one end is the Asset, so the other end is unambiguously the bound entity. */
+/** `(entity, asset)`: the bound entity first, the Asset naming its bytes second. */
 function hasExactlyOneAsset(endpoints) {
-	const kinds = endpoints.map((endpoint) => endpoint.current().entityKind);
-	const assets = kinds.map((kind) => kind === "asset");
-	if (assets[0] === assets[1]) return false;
-	return declaresKind(assets[0] ? kinds[1] : kinds[0], "MediaFile");
-}
-function isGeneratedMedia(entity) {
-	return entity.entityKind === "video" || entity.entityKind === "image" || entity.entityKind === "audio" || entity.entityKind === "voiceover";
+	const bound = endpoints[0].current().entityKind;
+	return endpoints[1].current().entityKind === "asset" && bound !== "asset" && declaresKind(bound, "MediaFile");
 }
 function isEmptyMetadata(value) {
 	return isJsonObject(value) && Object.keys(value).length === 0;
@@ -2619,6 +2583,18 @@ function isAssetBinding(value) {
 function isCaptionAlignmentMetadata(value) {
 	return isJsonObject(value) && Object.hasOwn(value, "alignment");
 }
+/** Whether this kind's Relations are ordered among themselves inside one container. */
+function isSequencedRelationKind(kind) {
+	return builtInRelationSpecs.find((spec) => spec.kind === kind)?.sequenced ?? false;
+}
+/** Relations of `kind` where `entityId` is endpoint 0 — the container, the product, the child. */
+function relationsFrom(relations, kind, entityId) {
+	return relations.filter((row) => row.relationKind === kind && row.endpoint0EntityId === entityId);
+}
+/** Relations of `kind` where `entityId` is endpoint 1 — what is contained, the source, the host. */
+function relationsTo(relations, kind, entityId) {
+	return relations.filter((row) => row.relationKind === kind && row.endpoint1EntityId === entityId);
+}
 //#endregion
 //#region ../medeo-dsl/src/relations.ts
 function createEntityRef(entity) {
@@ -2671,16 +2647,15 @@ var BiRelationIndex = class {
 	canonicalRefs = /* @__PURE__ */ new Map();
 	byRelationId = /* @__PURE__ */ new Map();
 	link(input) {
-		if (input.spec.kind === "generated") throw new Error("Author generated Relations with linkGenerated({ output, input })");
-		if (input.spec.kind === "clip-anchor" || input.spec.kind === "phonetic-script-render" || input.spec.kind === "audio-script-source") throw new Error(`Author ordered ${input.spec.kind} Relations with the dedicated role-named method`);
+		if (input.spec.kind === "derived-from" || input.spec.kind === "clip-anchor") throw new Error(`Author ordered ${input.spec.kind} Relations with the dedicated role-named method`);
 		return this.linkValidated(input);
 	}
-	/** Author `generated(output, input)` without exposing positional arguments. */
-	linkGenerated(input) {
+	/** Author `derived-from(product, source)` without exposing positional arguments. */
+	linkDerivedFrom(input) {
 		return this.linkValidated({
 			relationId: input.relationId,
-			spec: generatedRelationSpec,
-			endpoints: [input.output, input.input],
+			spec: derivedFromRelationSpec,
+			endpoints: [input.product, input.source],
 			metadata: {},
 			trace: input.trace
 		});
@@ -2695,26 +2670,6 @@ var BiRelationIndex = class {
 			trace: input.trace
 		});
 	}
-	/** Author `phonetic-script-render(output, phoneticScript)` without exposing positional arguments. */
-	linkPhoneticScriptRender(input) {
-		return this.linkValidated({
-			relationId: input.relationId,
-			spec: phoneticScriptRenderRelationSpec,
-			endpoints: [input.output, input.phoneticScript],
-			metadata: {},
-			trace: input.trace
-		});
-	}
-	/** Author `audio-script-source(script, source)` without exposing positional arguments. */
-	linkAudioScriptSource(input) {
-		return this.linkValidated({
-			relationId: input.relationId,
-			spec: audioScriptSourceRelationSpec,
-			endpoints: [input.script, input.source],
-			metadata: {},
-			trace: input.trace
-		});
-	}
 	/**
 	* Rehydrate a persisted row after resolving its spec and endpoint refs.
 	*
@@ -2730,7 +2685,6 @@ var BiRelationIndex = class {
 		this.assertRelationIdAvailable(input.relationId);
 		const builtInSpec = builtInSpecByKind.get(input.spec.kind);
 		if (builtInSpec != null && builtInSpec !== input.spec) throw new Error(`Relation kind "${input.spec.kind}" must use its built-in specification`);
-		if (isForbiddenAuthoritativeRelation(input.spec.kind, input.endpoints)) throw new Error("A direct Clip-Content Relation is derived-only and cannot be authoritative");
 		if (!input.spec.validateEndpoints(input.endpoints)) throw new Error(`Relation "${input.spec.kind}" received invalid endpoints`);
 		if (!input.spec.validateMetadata(input.metadata)) throw new Error(`Relation "${input.spec.kind}" received invalid metadata`);
 		this.assertCanonicalRefAvailable(first);
@@ -2779,12 +2733,6 @@ var BiRelationIndex = class {
 	}
 };
 const builtInSpecByKind = new Map(builtInRelationSpecs.map((spec) => [spec.kind, spec]));
-function isForbiddenAuthoritativeRelation(kind, endpoints) {
-	if (kind === "clip-content") return true;
-	const first = endpoints[0].current();
-	const second = endpoints[1].current();
-	return first.entityKind === "clip" && hasSequence(second) || second.entityKind === "clip" && hasSequence(first);
-}
 //#endregion
 //#region ../medeo-dsl/src/entity-relation-rows.ts
 var InvalidEntityRelationRowsError = class extends Error {
@@ -2873,7 +2821,7 @@ function decodeEntityRelationRows(rows, options) {
 			issues.push(errorMessage(error));
 		}
 	}
-	if (issues.length === 0) for (const issue of validateEntityRelationSet([...entitiesById.values()], relationIndex, options)) issues.push(`${issue.code}: ${issue.message}`);
+	if (issues.length === 0) for (const issue of validateEntityRelationSet([...entitiesById.values()], relationIndex)) issues.push(`${issue.code}: ${issue.message}`);
 	if (issues.length > 0) throw new InvalidEntityRelationRowsError(issues);
 	return {
 		entitiesById,
@@ -2986,7 +2934,7 @@ var EntityProjectionGraph = class {
 	timeline;
 	constructor(rows) {
 		this.rows = rows;
-		const decoded = decodeEntityRelationRows(rows, { compareMarkerPoints: (_marker, _range, left, right) => finite(left, "range point") - finite(right, "range point") });
+		const decoded = decodeEntityRelationRows(rows, {});
 		this.entities = new Map([...decoded.entitiesById.values()].map((ref) => [String(ref.entityId), entityToRow(ref.current())]));
 		const roots = [...this.entities.values()].filter((row) => row.entityKind === "timeline");
 		if (roots.length !== 1) fail("compatibility projection requires exactly one Timeline");
@@ -3000,6 +2948,13 @@ var EntityProjectionGraph = class {
 	adjacent(id, kind) {
 		return [...new Set(this.rows.relations.filter((row) => row.relationKind === kind && (row.endpoint0EntityId === id || row.endpoint1EntityId === id)).map((row) => row.endpoint0EntityId === id ? row.endpoint1EntityId : row.endpoint0EntityId))].map((entityId) => this.entity(entityId));
 	}
+	/** What this entity contains, as opposed to what contains it. */
+	holds(id) {
+		return this.rows.relations.filter((row) => row.relationKind === "contain" && row.endpoint0EntityId === id).map((row) => this.entity(row.endpoint1EntityId));
+	}
+	heldBy(id) {
+		return this.rows.relations.filter((row) => row.relationKind === "contain" && row.endpoint1EntityId === id).map((row) => this.entity(row.endpoint0EntityId));
+	}
 	one(id, relation, kind) {
 		const values = this.adjacent(id, relation);
 		if (values.length !== 1 || kind !== void 0 && values[0]?.entityKind !== kind) fail(`entity ${id} requires exactly one ${relation}${kind === void 0 ? "" : ` to ${kind}`}`);
@@ -3023,52 +2978,44 @@ function resolveEntityTimelineLayout(rows) {
 function resolveGraphLayout(graph) {
 	const facts = /* @__PURE__ */ new Map();
 	const seenRoles = /* @__PURE__ */ new Set();
-	const tracks = graph.adjacent(graph.timeline.entityId, "timeline-track").map((track) => {
+	const tracks = graph.holds(graph.timeline.entityId).map((track) => {
 		const role = track.payload.role;
 		if (track.entityKind !== "track" || typeof role !== "string" || !Object.hasOwn(roleOrder, role)) fail(`unsupported compatibility Track role on ${track.entityId}`);
 		if (seenRoles.has(role)) fail(`The compatibility editor supports only one ${role} Track`);
 		seenRoles.add(role);
 		const typedRole = role;
 		if (track.payload.hidden !== void 0 && typeof track.payload.hidden !== "boolean") fail("Track hidden must be boolean");
-		const order = track.payload.order === void 0 ? roleOrder[typedRole] : finite(track.payload.order, "Track order");
-		const trackFacts = graph.adjacent(track.entityId, "track-clip").map((clip) => {
-			if (clip.entityKind !== "clip" || graph.adjacent(clip.entityId, "track-clip").length !== 1) fail(`Clip ${clip.entityId} must belong to exactly one Track`);
-			const marker = graph.one(clip.entityId, "clip-marker", "sequence-marker");
-			const content = graph.one(marker.entityId, "marker-content");
-			const expected = typedRole === "video_clip" ? ["image", "video"] : typedRole === "speech" ? ["voiceover"] : typedRole === "caption" ? ["caption"] : ["audio"];
+		const order = roleOrder[typedRole];
+		const trackFacts = graph.holds(track.entityId).map((clip, clipIndex) => {
+			if (clip.entityKind !== "clip" || graph.heldBy(clip.entityId).length !== 1) fail(`Clip ${clip.entityId} must belong to exactly one Track`);
+			const marker = graph.one(clip.entityId, "marker", "sequence-marker");
+			const held = graph.holds(clip.entityId);
+			if (held.length !== 1) fail(`Clip ${clip.entityId} must contain exactly one content entity`);
+			const content = held[0];
+			const expected = typedRole === "video_clip" ? ["image", "video"] : typedRole === "speech" ? ["voiceover-recording"] : typedRole === "caption" ? ["caption"] : ["audio"];
 			if (!expected.includes(content.entityKind)) fail(`${typedRole} Track accepts ${expected.join(" or ")}, got ${content.entityKind}`);
-			const source = range(marker.payload.sourceRange, "sourceRange");
-			const durationFact = marker.payload.duration;
-			if (!object(durationFact)) fail(`Marker ${marker.entityId} requires duration`);
-			const duration = positive(durationFact.mode === "from-source" ? source.end - source.start : durationFact.value, "duration");
+			const inMs = milliseconds(marker.payload.inMs, "inMs");
+			const outMs = milliseconds(marker.payload.outMs, "outMs");
+			const rate = marker.payload.rate === void 0 ? 1 : positive(marker.payload.rate, "rate");
+			const duration = positive(Math.round((outMs - inMs) / rate), "duration");
 			if (!Number.isSafeInteger(duration)) fail("Compatibility duration must be whole milliseconds");
-			const fillTimeline = marker.payload.durationPolicy === "timeline";
-			if (marker.payload.durationPolicy !== void 0 && (!fillTimeline || typedRole !== "bgm")) fail("durationPolicy is only supported for timeline-filling background Audio");
+			const fillTimeline = marker.payload.fillTimeline === true;
+			if (marker.payload.fillTimeline !== void 0 && (!fillTimeline || typedRole !== "bgm")) fail("fillTimeline is only supported for timeline-filling background Audio");
 			const anchors = graph.rows.relations.filter((row) => row.relationKind === "clip-anchor" && row.endpoint0EntityId === clip.entityId);
 			if (anchors.length > 1) fail(`Clip ${clip.entityId} has multiple anchors`);
-			const target = marker.payload.targetRange === void 0 ? void 0 : range(marker.payload.targetRange, "targetRange");
+			const startMs = marker.payload.startMs === void 0 ? void 0 : milliseconds(marker.payload.startMs, "startMs");
 			const anchorId = anchors[0]?.endpoint1EntityId;
 			let mode;
 			let absoluteStart;
 			let anchorOffset;
-			let clipOrder;
 			if (anchorId !== void 0) {
-				if (target !== void 0) fail(`Anchored Marker ${marker.entityId} cannot also have targetRange`);
+				if (startMs === void 0) fail(`Anchored Marker ${marker.entityId} requires startMs inside its host`);
 				mode = "anchored";
-				anchorOffset = milliseconds(marker.payload.anchorOffset, "anchorOffset");
-			} else {
-				if (marker.payload.anchorOffset !== void 0) fail(`Marker ${marker.entityId} has anchorOffset without a clip-anchor Relation`);
-				if (target !== void 0) {
-					mode = "absolute";
-					absoluteStart = milliseconds(target.start, "target start");
-					milliseconds(target.end, "target end");
-					if (Math.abs(target.end - target.start - duration) > 1e-6) fail(`Marker ${marker.entityId} targetRange must match its effective duration`);
-				} else {
-					mode = "sequential";
-					if (clip.payload.order === void 0) fail(`Clip ${clip.entityId} has no placement: targetRange or explicit order is required`);
-					clipOrder = finite(clip.payload.order, "Clip order");
-				}
-			}
+				anchorOffset = startMs;
+			} else if (startMs !== void 0) {
+				mode = "absolute";
+				absoluteStart = startMs;
+			} else mode = "sequential";
 			const fact = {
 				clip,
 				marker,
@@ -3077,7 +3024,7 @@ function resolveGraphLayout(graph) {
 				role: typedRole,
 				duration,
 				mode,
-				order: clipOrder,
+				order: clipIndex,
 				absoluteStart,
 				anchorId,
 				anchorOffset,
@@ -3087,8 +3034,7 @@ function resolveGraphLayout(graph) {
 			return fact;
 		});
 		if (typedRole === "bgm" && trackFacts.length > 1) fail("The compatibility editor supports only one background Audio Clip");
-		const sequential = trackFacts.filter((fact) => fact.mode === "sequential").sort((left, right) => left.order - right.order);
-		if (new Set(sequential.map((fact) => fact.order)).size !== sequential.length) fail("sequential Clips must have distinct order values");
+		const sequential = trackFacts.filter((fact) => fact.mode === "sequential");
 		sequential.forEach((fact, index) => {
 			fact.predecessor = sequential[index - 1]?.clip.entityId;
 		});
@@ -3181,7 +3127,7 @@ function projectEntityTimeline(rows) {
 		if (!volume.success) fail("Clip volume must be decibels between -60 and 20");
 		if (track.role === "video_clip") {
 			const asset = mediaAssetFacts(graph, content);
-			const source = range(marker.payload.sourceRange, "sourceRange");
+			const source = markerWindow(marker);
 			const external = externalLocator(asset, "memota");
 			const speed = videoSpeed(content, marker, placement);
 			parts[clip.entityId] = { video_clip: {
@@ -3197,9 +3143,9 @@ function projectEntityTimeline(rows) {
 			const asset = mediaAssetFacts(graph, content);
 			requireUntrimmedAudio(content, marker, placement);
 			const external = externalLocator(asset, "memota-speech");
-			const renderEdges = graph.adjacent(content.entityId, "phonetic-script-render");
+			const renderEdges = graph.adjacent(content.entityId, "derived-from");
 			const timbreEdges = graph.adjacent(content.entityId, "voice-timbre");
-			const assembled = renderEdges.length > 0 || timbreEdges.length > 0 ? assemblePhoneticScriptContent(rows, graph.one(content.entityId, "phonetic-script-render", "phonetic-script").entityId) : void 0;
+			const assembled = renderEdges.length > 0 || timbreEdges.length > 0 ? assemblePhoneticScriptContent(rows, graph.one(content.entityId, "derived-from", "phonetic-script").entityId) : void 0;
 			if (timbreEdges.length > 1) fail("A voiceover resolves at most one Voice identity");
 			const voice = timbreEdges.length === 0 ? void 0 : graph.one(content.entityId, "voice-timbre", "voice").payload.voice;
 			if (voice !== void 0 && (!object(voice) || voice.system !== "voice-library" || typeof voice.key !== "string")) fail("Voice must use an explicit voice-library locator");
@@ -3210,7 +3156,7 @@ function projectEntityTimeline(rows) {
 				media_duration_ms: placement.duration,
 				audio_storage_key: storageKey(asset),
 				origin_speech_id: external.key,
-				audio_script: assembled?.text ?? (graph.adjacent(content.entityId, "audio-script-source").length > 0 ? assembleScriptText(graph.one(content.entityId, "audio-script-source", "audio-script")) : ""),
+				audio_script: assembled?.text ?? (graph.adjacent(content.entityId, "derived-from").length > 0 ? assembleScriptText(graph.one(content.entityId, "derived-from", "audio-script")) : ""),
 				volume: volume.data,
 				voice: object(voice) ? {
 					id: typeof voice.key === "string" ? voice.key : void 0,
@@ -3222,7 +3168,6 @@ function projectEntityTimeline(rows) {
 			const assembled = assembleCaptionContent(rows, content.entityId);
 			const text = assembled.text;
 			const cues = captionDisplayCues(assembled, marker, placement.duration);
-			if (marker.payload.timeRemapping !== void 0) fail("Caption timeRemapping is not supported by this reader");
 			const style = captionStyle(content.payload.style);
 			const anchor = placement.anchorClipEntityId === void 0 ? void 0 : layout.clips.get(placement.anchorClipEntityId);
 			const anchoredToSpeech = anchor !== void 0 && trackRoleOf(layout, anchor.trackEntityId) === "speech";
@@ -3239,9 +3184,9 @@ function projectEntityTimeline(rows) {
 		} else {
 			const asset = mediaAssetFacts(graph, content);
 			const external = externalLocator(asset, "memota");
-			if (marker.payload.durationPolicy !== "timeline") fail("Background Audio requires an explicit timeline-fill durationPolicy");
-			if (marker.payload.timeRemapping !== void 0) fail("BGM timeRemapping is not supported by this reader");
-			const source = range(marker.payload.sourceRange, "sourceRange");
+			if (marker.payload.fillTimeline !== true) fail("Background Audio requires an explicit fillTimeline");
+			if (marker.payload.rate !== void 0) fail("BGM rate is not supported by this reader");
+			const source = markerWindow(marker);
 			if (source.start !== 0 || content.payload.durationMs !== source.end) fail("Background Audio compatibility requires the complete source");
 			parts[clip.entityId] = { bgm: {
 				id: clip.entityId,
@@ -3329,22 +3274,26 @@ function captionStyle(value) {
 	return style;
 }
 function requireUntrimmedAudio(content, marker, placement) {
-	const source = range(marker.payload.sourceRange, "sourceRange");
-	if (source.start !== 0 || content.payload.durationMs !== source.end || placement.duration !== source.end || marker.payload.timeRemapping !== void 0) fail("Voiceover compatibility requires the complete, unremapped take");
+	const source = markerWindow(marker);
+	if (source.start !== 0 || content.payload.durationMs !== source.end || placement.duration !== source.end || marker.payload.rate !== void 0) fail("Voiceover compatibility requires the complete, unremapped take");
+}
+/** The Marker's window, in the {start,end} shape this compatibility reader speaks. */
+function markerWindow(marker) {
+	return range({
+		start: marker.payload.inMs,
+		end: marker.payload.outMs
+	}, "Sequence Marker window");
 }
 function videoSpeed(content, marker, placement) {
-	const remapping = marker.payload.timeRemapping;
-	if (content.entityKind === "image" && remapping === void 0) return void 0;
-	const source = range(marker.payload.sourceRange, "sourceRange");
-	if (remapping !== void 0) {
-		if (!object(remapping) || remapping.kind !== "linear") fail("unsupported timeRemapping on " + marker.entityId);
-		if (Object.keys(remapping).some((key) => key !== "kind" && key !== "rate" && key !== "mode")) fail("Unsupported linear timeRemapping fields");
-		const rate = positive(remapping.rate, "linear remapping rate");
-		if (Math.round((source.end - source.start) / rate) !== placement.duration) fail("timeRemapping on " + marker.entityId + " must agree with Marker duration");
-		if (remapping.mode !== void 0 && typeof remapping.mode !== "string") fail("Linear remapping mode must be a string");
+	const stated = marker.payload.rate;
+	if (content.entityKind === "image" && stated === void 0) return void 0;
+	const source = markerWindow(marker);
+	if (stated !== void 0) {
+		const rate = positive(stated, "linear speed rate");
+		if (Math.round((source.end - source.start) / rate) !== placement.duration) fail("rate on " + marker.entityId + " must agree with Marker duration");
 		return {
 			category: "linear",
-			mode: typeof remapping.mode === "string" ? remapping.mode : "constant",
+			mode: "constant",
 			config: { linear: { speed: rate } }
 		};
 	}
@@ -3359,7 +3308,7 @@ function videoSpeed(content, marker, placement) {
 function captionDisplayCues(assembled, marker, duration) {
 	const ranges = assembled.caption.payload.segmentRanges;
 	if (!Array.isArray(ranges)) return void 0;
-	const source = range(marker.payload.sourceRange, "Caption sourceRange");
+	const source = markerWindow(marker);
 	const scale = duration / (source.end - source.start);
 	return assembled.segments.flatMap((segment) => {
 		const timing = ranges.find((entry) => object(entry) && entry.segmentId === segment.segmentId);
@@ -3383,23 +3332,11 @@ function captionDisplayCues(assembled, marker, duration) {
 }
 //#endregion
 //#region src/entity-crdt/field-changes.ts
-const atomicFields = new Set([
-	"sequence",
-	"sourceRange",
-	"targetRange",
-	"duration",
-	"durationMs",
-	"timeRemapping",
-	"textRange",
-	"selection",
-	"external"
-]);
-const textFields = new Set(["text", "phonemeScript"]);
-const orderedFields = new Set([
-	"segments",
-	"segmentRanges",
-	"baseEntityIds"
-]);
+/** Merge behaviour is declared with the field shapes in @mengine/medeo-dsl. */
+const merge = (key) => FIELD_MERGE[key];
+const atomicFields = { has: (key) => merge(key) === "atomic" };
+const textFields = { has: (key) => merge(key) === "text" };
+const orderedFields = { has: (key) => merge(key) === "list" };
 const unsafeKeys = new Set([
 	"__proto__",
 	"prototype",
@@ -3687,27 +3624,24 @@ function phoneticScriptAssetOf(rows, entityId) {
 }
 //#endregion
 //#region src/entity-crdt/ordering.ts
-/** Domain order is scoped by membership; relation storage has no global order. */
+/**
+* Domain order is scoped by membership: the members of one container, in the
+* order their `contain` Relations sit in the rows.
+*
+* Nothing carries a copy of its own position, so this reads the order rather
+* than deriving it — the rows are already in it.
+*/
 function entityOrderGroups(rows) {
 	const entities = new Map(rows.entities.map((row) => [String(row.entityId), row]));
 	const groups = /* @__PURE__ */ new Map();
 	for (const relation of rows.relations) {
-		const childKind = relation.relationKind === "timeline-track" ? "track" : relation.relationKind === "track-clip" ? "clip" : null;
-		if (!childKind) continue;
-		const endpoints = [relation.endpoint0EntityId, relation.endpoint1EntityId];
-		const childId = endpoints.find((id) => entities.get(id)?.entityKind === childKind);
-		if (!childId) continue;
-		const child = entities.get(childId);
-		if (typeof child.payload.order !== "number") continue;
-		const parent = endpoints.find((id) => id !== childId);
-		const values = groups.get(parent) ?? [];
-		values.push({
-			id: childId,
-			order: child.payload.order
-		});
-		groups.set(parent, values);
+		if (!isSequencedRelationKind(relation.relationKind)) continue;
+		const childKind = entities.get(String(relation.endpoint1EntityId))?.entityKind;
+		if (childKind !== "track" && childKind !== "clip") continue;
+		const parent = String(relation.endpoint0EntityId);
+		groups.set(parent, [...groups.get(parent) ?? [], String(relation.endpoint1EntityId)]);
 	}
-	return new Map([...groups].map(([parent, values]) => [parent, values.sort((a, b) => a.order - b.order || (a.id < b.id ? -1 : a.id > b.id ? 1 : 0)).map((item) => item.id)]));
+	return groups;
 }
 function ordering(doc) {
 	const map = doc.getMap("medeo").get("ordering");
@@ -3776,12 +3710,7 @@ function content(map) {
 	return requireMap(map, "content").toJSON();
 }
 function entityContent(doc, key) {
-	const payload = content(workspace(doc, key));
-	const order = entityOrdinal(doc, key);
-	return order === void 0 ? payload : {
-		...payload,
-		order
-	};
+	return content(workspace(doc, key));
 }
 function bases(map) {
 	const links = requireMap(map, "bases");
@@ -3858,6 +3787,7 @@ function readEntityDocument(doc, allowSelectionConflicts = false) {
 			trace: requireMap(map, "trace").toJSON()
 		});
 	}
+	sortSequencedRelations(doc, relations);
 	const project = {};
 	for (const [key, value] of Object.entries(section(doc, "attachments").toJSON())) {
 		if (typeof value !== "string") throw new Error(`Invalid project attachment ${key}`);
@@ -4393,6 +4323,30 @@ function materialize(doc, allowSelectionConflicts = false) {
 	const project = section(doc, "project");
 	for (const [slot, id] of Object.entries(state.project)) if (project.get(slot) !== id) project.set(slot, id);
 }
+/**
+* Put each container's sequenced Relations in the order its native list states.
+*
+* Per container, never across: a Timeline's Tracks and a Track's Clips are two
+* separate orders, and sorting them together would interleave them.
+*/
+function sortSequencedRelations(doc, relations) {
+	const containers = /* @__PURE__ */ new Map();
+	for (const [slot, relation] of relations.entries()) {
+		if (!isSequencedRelationKind(relation.relationKind)) continue;
+		const container = String(relation.endpoint0EntityId);
+		const ordinal = entityOrdinal(doc, family(doc, String(relation.endpoint1EntityId))) ?? slot;
+		containers.set(container, [...containers.get(container) ?? [], {
+			slot,
+			relation,
+			ordinal
+		}]);
+	}
+	for (const members of containers.values()) {
+		const slots = members.map((member) => member.slot);
+		const ordered = [...members].sort((left, right) => left.ordinal - right.ordinal);
+		slots.forEach((slot, at) => relations[slot] = ordered[at].relation);
+	}
+}
 //#endregion
 //#region src/document/document-mutation-guard.ts
 /**
@@ -4728,4 +4682,4 @@ function createPlainMemoryAdapter(document, options) {
 	return new PlainMemoryAdapter(document, options);
 }
 //#endregion
-export { partUnionSchema as $, decodeEntityRelationRows as A, isJsonObject as B, applyFieldChanges as C, recordEntries as Ct, EntityProjectionGraph as D, projectEntityTimeline as E, bytesToBase64 as Et, assembleScriptText as F, buildInitialVideoDocument as G, createRelationId as H, findComposedAudioScript as I, fromVideoDocument as J, buildSpeechHostMap as K, selectAudioScriptSegment as L, assembleCaptionContent as M, assembleEntityContent as N, resolveEntityTimelineLayout as O, assemblePhoneticScriptContent as P, validateVideoDocument as Q, updateEntityFields as R, equalJson as S, partUnionToDraft as St, resolveFieldPath as T, base64ToBytes as Tt, hasSequence as U, createEntityId as V, isMediaAssetVariantKind as W, VideoDocumentValidationError as X, toVideoDocument as Y, assertValidVideoDocument as Z, audioScriptAssetOf as _, partDurationMs as _t, createMirrorVideoDocument as a, laneTrackId as at, phoneticScriptAssetOf as b, effectiveVideoClipDurationMs as bt, DocumentMutationGuard as c, arrangeMainTrackSeamlessly as ct, LoroEntityDraft as d, recalculateTimelineDuration as dt, videoDocumentSchema as et, readEntityDocument as f, resolveAllSpeechOverlaps as ft, audioScriptAssetHash as g, isEmptyVideoClip as gt, audioScriptAssetFields as h, TIMELINE_SKELETON_DURATION_MS as ht, MirrorVideoDocumentAdapter as i, hasResolvedPlacement as it, ScriptCompositionError as j, EntityTimelineProjectionError as k, LORO_ENTITY_SCHEMA as l, fillMainTrackTimeGaps as lt, audioScriptAssetContent as m, syncAggregatedClipsTimePosition as mt, createPlainMemoryAdapter as n, ensureLaneTrack as nt, createMirrorVideoDocumentAdapter as o, solveVideoDocument as ot, entityOrderGroups as p, resolveSpeechOverlapByShiftingVideos as pt, derivePositionFromAbs as q, generatePartId as r, findLaneTrack as rt, readVideoDocumentFromDraft as s, cascadeAfterVideoClipChanges as st, PlainMemoryAdapter as t, LANE_KINDS_IN_STACK_ORDER as tt, LoroEntityDocument as u, reassignSpeechesToVideoClipsByTime as ut, phoneticScriptAssetContent as v, safeDurationMs as vt, assertFieldChanges as w, videoDocumentMirrorSchema as wt, scriptSourceAssetOf as x, speedOf as xt, phoneticScriptAssetHash as y, DEFAULT_UNIT_TIME_MS as yt, variantBaseEntityIds as z };
+export { assertValidVideoDocument as $, decodeEntityRelationRows as A, updateEntityFields as B, applyFieldChanges as C, speedOf as Ct, EntityProjectionGraph as D, base64ToBytes as Dt, projectEntityTimeline as E, videoDocumentMirrorSchema as Et, assembleEntityContent as F, hasSequence as G, isJsonObject as H, assemblePhoneticScriptContent as I, buildSpeechHostMap as J, isMediaAssetVariantKind as K, assembleScriptText as L, relationsTo as M, ScriptCompositionError as N, resolveEntityTimelineLayout as O, bytesToBase64 as Ot, assembleCaptionContent as P, VideoDocumentValidationError as Q, findComposedAudioScript as R, equalJson as S, effectiveVideoClipDurationMs as St, resolveFieldPath as T, recordEntries as Tt, createEntityId as U, variantBaseEntityIds as V, createRelationId as W, fromVideoDocument as X, derivePositionFromAbs as Y, toVideoDocument as Z, audioScriptAssetOf as _, TIMELINE_SKELETON_DURATION_MS as _t, createMirrorVideoDocument as a, findLaneTrack as at, phoneticScriptAssetOf as b, safeDurationMs as bt, DocumentMutationGuard as c, solveVideoDocument as ct, LoroEntityDraft as d, fillMainTrackTimeGaps as dt, validateVideoDocument as et, readEntityDocument as f, reassignSpeechesToVideoClipsByTime as ft, audioScriptAssetHash as g, syncAggregatedClipsTimePosition as gt, audioScriptAssetFields as h, resolveSpeechOverlapByShiftingVideos as ht, MirrorVideoDocumentAdapter as i, ensureLaneTrack as it, relationsFrom as j, EntityTimelineProjectionError as k, LORO_ENTITY_SCHEMA as l, cascadeAfterVideoClipChanges as lt, audioScriptAssetContent as m, resolveAllSpeechOverlaps as mt, createPlainMemoryAdapter as n, videoDocumentSchema as nt, createMirrorVideoDocumentAdapter as o, hasResolvedPlacement as ot, entityOrderGroups as p, recalculateTimelineDuration as pt, buildInitialVideoDocument as q, generatePartId as r, LANE_KINDS_IN_STACK_ORDER as rt, readVideoDocumentFromDraft as s, laneTrackId as st, PlainMemoryAdapter as t, partUnionSchema as tt, LoroEntityDocument as u, arrangeMainTrackSeamlessly as ut, phoneticScriptAssetContent as v, isEmptyVideoClip as vt, assertFieldChanges as w, partUnionToDraft as wt, scriptSourceAssetOf as x, DEFAULT_UNIT_TIME_MS as xt, phoneticScriptAssetHash as y, partDurationMs as yt, selectAudioScriptSegment as z };