@mengine/medeo-client 2.0.1-alpha.23 → 2.0.1-alpha.25

package/dist/index.js

@@ -1,4 +1,4 @@
-import { $ as VideoDocumentValidationError, A as resolveEntityTimelineLayout, B as selectAudioScriptSegment, C as canonicalJson, Ct as effectiveVideoClipDurationMs, D as resolveFieldPath, Dt as videoDocumentMirrorSchema, E as assertFieldChanges, Et as recordEntries, F as assembleCaptionContent, G as createRelationId, H as variantBaseEntityIds, I as assembleEntityContent, J as buildInitialVideoDocument, K as hasSequence, L as assemblePhoneticScriptContent, M as validateEntityRelationTransition, N as decodeEntityRelationRows, O as projectEntityTimeline, Ot as base64ToBytes, P as ScriptCompositionError, Q as toVideoDocument, R as assembleScriptText, S as scriptSourceAssetOf, St as DEFAULT_UNIT_TIME_MS, T as applyFieldChanges, Tt as partUnionToDraft, U as isJsonObject, V as updateEntityFields, W as createEntityId, X as derivePositionFromAbs, Y as buildSpeechHostMap, Z as fromVideoDocument, _ as audioScriptAssetHash, _t as syncAggregatedClipsTimePosition, a as createMirrorVideoDocument, at as ensureLaneTrack, b as phoneticScriptAssetHash, bt as partDurationMs, c as DocumentMutationGuard, ct as laneTrackId, d as LoroEntityDraft, dt as arrangeMainTrackSeamlessly, et as assertValidVideoDocument, f as readEntityDocument, ft as fillMainTrackTimeGaps, g as audioScriptAssetFields, gt as resolveSpeechOverlapByShiftingVideos, h as audioScriptAssetContent, ht as resolveAllSpeechOverlaps, i as MirrorVideoDocumentAdapter, it as LANE_KINDS_IN_STACK_ORDER, j as EntityTimelineProjectionError, k as EntityProjectionGraph, kt as bytesToBase64, l as LORO_ENTITY_SCHEMA, lt as solveVideoDocument, m as entityOrderGroups, mt as recalculateTimelineDuration, n as createPlainMemoryAdapter, nt as partUnionSchema, o as createMirrorVideoDocumentAdapter, ot as findLaneTrack, p as readEntityRelationRecords, pt as reassignSpeechesToVideoClipsByTime, q as isMediaAssetVariantKind, r as generatePartId, rt as videoDocumentSchema, s as readVideoDocumentFromDraft, st as hasResolvedPlacement, t as PlainMemoryAdapter, tt as validateVideoDocument, u as LoroEntityDocument, ut as cascadeAfterVideoClipChanges, v as audioScriptAssetOf, vt as TIMELINE_SKELETON_DURATION_MS, w as equalJson, wt as speedOf, x as phoneticScriptAssetOf, xt as safeDurationMs, y as phoneticScriptAssetContent, yt as isEmptyVideoClip, z as findComposedAudioScript } from "./document-7Vi1AeQc.js";
+import { $ as fromVideoDocument, A as resolveEntityTimelineLayout, At as base64ToBytes, B as assembleScriptText, C as canonicalJson, Ct as safeDurationMs, D as resolveFieldPath, Dt as partUnionToDraft, E as assertFieldChanges, Et as speedOf, F as relationsTo, G as isJsonObject, H as selectAudioScriptSegment, I as ScriptCompositionError, J as hasSequence, K as createEntityId, L as assembleCaptionContent, M as validateEntityRelationTransition, N as decodeEntityRelationRows, O as projectEntityTimeline, Ot as recordEntries, P as relationsFrom, Q as derivePositionFromAbs, R as assembleEntityContent, S as scriptSourceAssetOf, St as partDurationMs, T as applyFieldChanges, Tt as effectiveVideoClipDurationMs, U as updateEntityFields, V as findComposedAudioScript, W as variantBaseEntityIds, X as buildInitialVideoDocument, Y as isMediaAssetVariantKind, Z as buildSpeechHostMap, _ as audioScriptAssetHash, _t as resolveAllSpeechOverlaps, a as createMirrorVideoDocument, at as videoDocumentSchema, b as phoneticScriptAssetHash, bt as TIMELINE_SKELETON_DURATION_MS, c as DocumentMutationGuard, ct as findLaneTrack, d as LoroEntityDraft, dt as solveVideoDocument, et as toVideoDocument, f as readEntityDocument, ft as cascadeAfterVideoClipChanges, g as audioScriptAssetFields, gt as recalculateTimelineDuration, h as audioScriptAssetContent, ht as reassignSpeechesToVideoClipsByTime, i as MirrorVideoDocumentAdapter, it as partUnionSchema, j as EntityTimelineProjectionError, jt as bytesToBase64, k as EntityProjectionGraph, kt as videoDocumentMirrorSchema, l as LORO_ENTITY_SCHEMA, lt as hasResolvedPlacement, m as entityOrderGroups, mt as fillMainTrackTimeGaps, n as createPlainMemoryAdapter, nt as assertValidVideoDocument, o as createMirrorVideoDocumentAdapter, ot as LANE_KINDS_IN_STACK_ORDER, p as readEntityRelationRecords, pt as arrangeMainTrackSeamlessly, q as createRelationId, r as generatePartId, rt as validateVideoDocument, s as readVideoDocumentFromDraft, st as ensureLaneTrack, t as PlainMemoryAdapter, tt as VideoDocumentValidationError, u as LoroEntityDocument, ut as laneTrackId, v as audioScriptAssetOf, vt as resolveSpeechOverlapByShiftingVideos, w as equalJson, wt as DEFAULT_UNIT_TIME_MS, x as phoneticScriptAssetOf, xt as isEmptyVideoClip, y as phoneticScriptAssetContent, yt as syncAggregatedClipsTimePosition, z as assemblePhoneticScriptContent } from "./document-Bx9xf40e.js";
 import { addSpeechesInputSchema, addVideoClipsInputSchema, adjustBgmVolumeInputSchema, adjustSpeechVolumeInputSchema, adjustVideoClipDurationInputSchema, adjustVideoClipVolumeInputSchema, changeSpeechScriptInputSchema, changeSpeechVoiceInputSchema, deleteBgmInputSchema, deleteSpeechesInputSchema, deleteVideoClipsInputSchema, moveSpeechesInputSchema, moveVideoClipsByAnchorInputSchema, moveVideoClipsInputSchema, replaceVideoClipContentInputSchema, replaceVideoClipSequenceInputSchema, setBgmInputSchema, setCaptionStyleInputSchema, setCaptionVisibilityInputSchema, setVideoClipSpeedShiftInputSchema, t as schemas_exports } from "./schemas.js";
 import { LoroDoc, UndoManager, VersionVector } from "loro-crdt";
 import { sha256 } from "@noble/hashes/sha2.js";
@@ -216,19 +216,34 @@ function findSseFrameBoundary(buffer) {
 //#endregion
 //#region src/entity-crdt/compile-rows.ts
 /** Lower a detached ordinary-object edit against its actual causal Loro baseline. */
-function compileEntityRows(snapshot, rows, validate) {
+function compileEntityRows(snapshot, rows, validate, options = {}) {
 	const doc = new LoroDoc();
 	doc.import(snapshot);
-	return applyEntityRows(new LoroEntityDocument(doc, validate), rows);
+	return applyEntityRows(new LoroEntityDocument(doc, validate), rows, options);
+}
+/** Publish final rows as imported causal operations, outside the caller's local undo history. */
+function publishEntityRows(editor, rows, options = {}) {
+	const from = editor.doc.oplogVersion();
+	const compiled = compileEntityRows(editor.doc.export({ mode: "snapshot" }), rows, void 0, options);
+	editor.import(compiled.update);
+	return {
+		update: editor.doc.export({
+			mode: "update",
+			from
+		}),
+		state: editor.snapshot()
+	};
 }
 /** Compile an edit on an existing peer, retaining its native local undo history. */
-function applyEntityRows(editor, rows) {
+function applyEntityRows(editor, rows, options = {}) {
 	const baseline = editor.snapshot();
 	const before = baseline.rows;
 	const oldEntities = new Map(before.entities.map((row) => [row.entityId, row]));
 	const newEntities = new Map(rows.entities.map((row) => [row.entityId, row]));
 	const oldRelations = new Map(before.relations.map((row) => [row.relationId, row]));
 	const newRelations = new Map(rows.relations.map((row) => [row.relationId, row]));
+	const oldClipContent = new Map(before.relations.filter((row) => row.relationKind === "contain" && oldEntities.get(row.endpoint0EntityId)?.entityKind === "clip").map((row) => [row.endpoint0EntityId, row.relationId]));
+	const newClipContent = new Map(rows.relations.filter((row) => row.relationKind === "contain" && newEntities.get(row.endpoint0EntityId)?.entityKind === "clip").map((row) => [row.endpoint0EntityId, row.relationId]));
 	if (newEntities.size !== rows.entities.length || newRelations.size !== rows.relations.length) throw new Error("Duplicate domain identity");
 	validateEntityRelationTransition(before, rows);
 	return {
@@ -255,28 +270,16 @@ function applyEntityRows(editor, rows) {
 					if (!equalJson(previous.payload, row.payload)) draft.replaceOwned(row.entityId, row.payload);
 				}
 			}
-			for (const row of rows.relations) {
-				if (oldRelations.has(row.relationId)) continue;
-				if (row.relationKind === "generated") draft.linkGenerated({
-					relationId: row.relationId,
-					outputEntityId: row.endpoint0EntityId,
-					inputEntityId: row.endpoint1EntityId,
-					trace: row.trace
-				});
-				else if (row.relationKind === "clip-anchor") draft.linkClipAnchor({
-					relationId: row.relationId,
-					childClipEntityId: row.endpoint0EntityId,
-					hostClipEntityId: row.endpoint1EntityId,
-					trace: row.trace
-				});
-				else draft.link(row);
-			}
+			for (const row of rows.relations) if (!oldRelations.has(row.relationId)) draft.link(row);
+			for (const [clipId, relationId] of newClipContent) if (oldClipContent.get(clipId) !== relationId) draft.selectClipContent(relationId);
 			const beforeOrder = entityOrderGroups(before), afterOrder = entityOrderGroups(rows);
 			for (const group of new Set([...beforeOrder.keys(), ...afterOrder.keys()])) {
 				const next = afterOrder.get(group) ?? [];
 				if (!equalJson(beforeOrder.get(group) ?? [], next)) draft.order(group, next);
 			}
 			for (const row of before.entities) if (!newEntities.has(row.entityId)) draft.delete(row.entityId);
+			for (const [slot, entityId] of Object.entries(options.projectAttachments ?? {})) draft.attach(slot, entityId);
+			for (const [clipEntityId, phoneticScriptEntityId] of Object.entries(options.phoneticScriptSelections ?? {})) draft.selectPhoneticScript(clipEntityId, phoneticScriptEntityId);
 		}),
 		state: editor.snapshot()
 	};
@@ -420,14 +423,14 @@ function ensureEditorFoundation(initial, idFactory = (prefix) => `${prefix}_${gl
 			};
 			entities.push(track);
 		}
-		const bindings = relations.filter((row) => row.relationKind === "timeline-track" && (row.endpoint0EntityId === track.entityId || row.endpoint1EntityId === track.entityId));
+		const bindings = relations.filter((row) => row.relationKind === "contain" && (row.endpoint0EntityId === track.entityId || row.endpoint1EntityId === track.entityId));
 		if (bindings.some((row) => row.endpoint0EntityId !== timeline.entityId && row.endpoint1EntityId !== timeline.entityId)) throw new EntityTimelineProjectionError(`Track ${track.entityId} belongs to another Timeline`);
 		if (bindings.length === 0) {
 			const relationId = createRelationId(idFactory("relation"));
 			if (relations.some((row) => row.relationId === relationId)) throw new Error(`Duplicate relation id ${relationId}`);
 			relations.push({
 				relationId,
-				relationKind: "timeline-track",
+				relationKind: "contain",
 				endpoint0EntityId: timeline.entityId,
 				endpoint1EntityId: track.entityId,
 				metadata: {},
@@ -450,10 +453,16 @@ function ensureEditorFoundation(initial, idFactory = (prefix) => `${prefix}_${gl
 //#endregion
 //#region src/entity-editor/entity-graph-http-client.ts
 const MENGINE_API_PREFIX = "/api/mengine/v1";
-const numericMarkerValidation$1 = { compareMarkerPoints: (_marker, _range, left, right) => {
-	if (typeof left !== "number" || !Number.isFinite(left) || typeof right !== "number" || !Number.isFinite(right)) throw new Error("entity-state requires finite numeric Marker coordinates");
-	return left < right ? -1 : left > right ? 1 : 0;
-} };
+var EntityGraphRevisionConflictError = class extends MengineHttpRequestError {
+	expectedRevision;
+	currentRevision;
+	constructor(expectedRevision, currentRevision, payload) {
+		super(409, payload);
+		this.expectedRevision = expectedRevision;
+		this.currentRevision = currentRevision;
+		this.name = "EntityGraphRevisionConflictError";
+	}
+};
 /** Browser-safe authenticated Loro client for a document's Entity graph. */
 var EntityGraphHttpClient = class {
 	options;
@@ -470,6 +479,8 @@ var EntityGraphHttpClient = class {
 	}
 	/**
 	* Compile edits against the original causal snapshot and publish native Loro operations.
+	* The base revision is sent as an optimistic precondition, so a stale adoption
+	* fails loudly instead of letting Loro choose between concurrent selections.
 	*
 	* Deletion intent is derived from baseline IDs omitted from `nextRows`, so a
 	* transient create-then-remove never becomes a request to delete unknown
@@ -480,13 +491,17 @@ var EntityGraphHttpClient = class {
 		const next = cloneAndValidateRows(nextRows);
 		assertMediaAssetWritePolicy(baseState.rows, next);
 		const compiled = compileEntityRows(base64ToBytes(baseState.loroSnapshot), next);
-		return this.commitUpdate(bytesToBase64(compiled.update));
+		return this.commitUpdate(bytesToBase64(compiled.update), baseState.revision);
 	}
-	/** Send the same prepared bytes on retry; never recompile an unconfirmed edit. */
-	async commitUpdate(update) {
+	/** Send prepared bytes directly; omit `expectedRevision` for immutable fact publication. */
+	async commitUpdate(update, expectedRevision) {
+		if (expectedRevision !== void 0 && !isNonNegativeSafeInteger(expectedRevision)) throw new Error("expectedRevision must be a nonnegative safe integer");
 		return this.request({
 			method: "POST",
-			body: JSON.stringify({ update })
+			body: JSON.stringify({
+				update,
+				...expectedRevision === void 0 ? {} : { expected_revision: expectedRevision }
+			})
 		});
 	}
 	async request(init) {
@@ -495,15 +510,26 @@ var EntityGraphHttpClient = class {
 			headers: this.transport.headers()
 		});
 		const payload = await safeReadJson(response);
-		if (!response.ok) throw new MengineHttpRequestError(response.status, payload);
+		if (!response.ok) throw parseRevisionConflict(response.status, payload) ?? new MengineHttpRequestError(response.status, payload);
 		return parseWireState(payload, this.options.docId);
 	}
 };
+function parseRevisionConflict(status, value) {
+	if (status !== 409 || !isRecord(value) || !isRecord(value.error) || value.error.code !== "revision_conflict") return;
+	const error = value.error;
+	if (typeof error.message !== "string" || !isNonNegativeSafeInteger(error.expected_revision) || !isNonNegativeSafeInteger(error.current_revision)) return;
+	return new EntityGraphRevisionConflictError(error.expected_revision, error.current_revision, { error: {
+		code: "revision_conflict",
+		message: error.message,
+		expected_revision: error.expected_revision,
+		current_revision: error.current_revision
+	} });
+}
 function parseWireState(value, expectedDocId) {
 	if (!isRecord(value) || typeof value.doc_id !== "string" || !isNonNegativeSafeInteger(value.revision)) throw new Error("Invalid entity-state response envelope");
 	if (value.doc_id !== expectedDocId) throw new Error(`Entity-state response doc_id mismatch: expected "${expectedDocId}"`);
 	const rows = parseWireRows(value.rows);
-	decodeEntityRelationRows(rows, numericMarkerValidation$1);
+	decodeEntityRelationRows(rows, {});
 	const attached = value.audio_script_entity_id;
 	if (attached !== null && typeof attached !== "string") throw new Error("Invalid document AudioScript identity");
 	if (typeof value.loro_snapshot !== "string") throw new Error("Missing causal Loro snapshot");
@@ -544,7 +570,7 @@ function parseWireRelation(value) {
 }
 function cloneAndValidateRows(rows) {
 	const clone = structuredClone(rows);
-	decodeEntityRelationRows(clone, numericMarkerValidation$1);
+	decodeEntityRelationRows(clone, {});
 	return clone;
 }
 function requiredString(value, field) {
@@ -568,10 +594,6 @@ async function safeReadJson(response) {
 }
 //#endregion
 //#region src/entity-editor/media-asset-import.ts
-const numericCoordinates = { compareMarkerPoints: (_marker, _range, left, right) => {
-	if (typeof left !== "number" || typeof right !== "number" || !Number.isFinite(left) || !Number.isFinite(right)) throw new Error("Media editor requires numeric coordinates");
-	return left - right;
-} };
 /**
 * Import at the editor boundary, not at asset generation time. Existing
 * provenance is retained.
@@ -587,17 +609,17 @@ function importMediaAsset(initial, fact, idFactory = (prefix) => `${prefix}_${gl
 		"image",
 		"video",
 		"audio",
-		"voiceover"
+		"voiceover-recording"
 	].includes(fact.kind)) throw new Error("Unsupported media kind");
 	if (fact.kind !== "image" && (!Number.isFinite(fact.durationMs) || fact.durationMs <= 0)) throw new Error(`${fact.kind} ${fact.assetId} requires its factual positive duration`);
-	if ((fact.kind === "audio" || fact.kind === "voiceover") && fact.storageKey.trim() === "") throw new Error(`${fact.kind} ${fact.assetId} requires its physical storage key`);
-	decodeEntityRelationRows(initial, numericCoordinates);
+	if ((fact.kind === "audio" || fact.kind === "voiceover-recording") && fact.storageKey.trim() === "") throw new Error(`${fact.kind} ${fact.assetId} requires its physical storage key`);
+	decodeEntityRelationRows(initial, {});
 	assertCanonicalEditorResources(initial);
 	const entities = structuredClone([...initial.entities]);
 	const relations = structuredClone([...initial.relations]);
-	const system = fact.kind === "voiceover" ? "memota-speech" : "memota";
+	const system = fact.kind === "voiceover-recording" ? "memota-speech" : "memota";
 	const entityKind = fact.kind;
-	const timbre = fact.kind === "voiceover" ? fact.voice : void 0;
+	const timbre = fact.kind === "voiceover-recording" ? fact.voice : void 0;
 	const durationMs = fact.kind === "image" ? null : fact.durationMs;
 	const asset = ensureAsset(entities, {
 		system,
@@ -628,12 +650,12 @@ function importMediaAsset(initial, fact, idFactory = (prefix) => `${prefix}_${gl
 		payload: { durationMs }
 	});
 	relations.push(assetLink(entityId, asset.entityId, idFactory));
-	if (fact.kind === "voiceover" && fact.phoneticScriptEntityId !== void 0) {
+	if (fact.kind === "voiceover-recording" && fact.phoneticScriptEntityId !== void 0) {
 		const phonetic = entities.find((row) => String(row.entityId) === fact.phoneticScriptEntityId);
 		if (phonetic?.entityKind !== "phonetic-script") throw new Error(`Voiceover ${fact.assetId} requires the PhoneticScript it was spoken from`);
 		relations.push({
 			relationId: createRelationId(idFactory("relation")),
-			relationKind: "phonetic-script-render",
+			relationKind: "derived-from",
 			endpoint0EntityId: entityId,
 			endpoint1EntityId: phonetic.entityId,
 			metadata: {},
@@ -645,7 +667,7 @@ function importMediaAsset(initial, fact, idFactory = (prefix) => `${prefix}_${gl
 		entities,
 		relations
 	};
-	decodeEntityRelationRows(rows, numericCoordinates);
+	decodeEntityRelationRows(rows, {});
 	assertCanonicalEditorResources(rows);
 	return {
 		rows,
@@ -788,19 +810,19 @@ var EntityTimelineEditor = class {
 		return cloneRows(this.state);
 	}
 	insertClip(input) {
-		const requestedOrder = input.clipPayload?.order;
+		const requestedOrder = input.order;
 		const order = typeof requestedOrder === "number" ? requestedOrder : nextSequentialOrder(this.state, createEntityId(input.trackEntityId));
 		return this.insertPlacedClip({
 			trackEntityId: input.trackEntityId,
 			contentEntityId: input.contentEntityId,
-			sourceRange: input.sourceRange,
-			duration: input.duration,
-			placement: input.targetRange === void 0 ? {
+			inMs: input.inMs,
+			outMs: input.outMs,
+			placement: input.startMs === void 0 ? {
 				kind: "sequential",
 				order
 			} : {
 				kind: "absolute",
-				targetRange: input.targetRange
+				startMs: input.startMs
 			},
 			clipPayload: input.clipPayload
 		});
@@ -812,31 +834,14 @@ var EntityTimelineEditor = class {
 		this.transact((draft) => {
 			const { marker } = requireClipTopology(draft, input.clipEntityId);
 			const payload = { ...cloneJsonObject(marker.payload, "Sequence Marker payload") };
-			if (input.sourceRange !== void 0) payload.sourceRange = cloneJsonValue(input.sourceRange, "sourceRange");
-			if (input.duration !== void 0) payload.duration = cloneJsonValue(input.duration, "duration");
-			if (Object.hasOwn(input, "targetRange")) if (input.targetRange === void 0) {
-				delete payload.targetRange;
-				if (!hasOutgoingClipAnchor(draft, input.clipEntityId)) {
-					const trackId = otherEndpoint(requireOneRelation(draft, createEntityId(input.clipEntityId), "track-clip"), input.clipEntityId);
-					const clipPayload = { ...cloneJsonObject(requireEntityKind(draft, input.clipEntityId, "clip").payload, "Clip payload") };
-					clipPayload.order ??= nextSequentialOrder(draft, trackId);
-					replaceEntity(draft, createEntityId(input.clipEntityId), {
-						...requireEntityKind(draft, input.clipEntityId, "clip"),
-						payload: clipPayload
-					});
-				}
-			} else {
-				payload.targetRange = cloneJsonValue(input.targetRange, "targetRange");
-				const clip = requireEntityKind(draft, input.clipEntityId, "clip");
-				const clipPayload = { ...cloneJsonObject(clip.payload, "Clip payload") };
-				delete clipPayload.order;
-				replaceEntity(draft, clip.entityId, {
-					...clip,
-					payload: clipPayload
-				});
-			}
-			if (Object.hasOwn(input, "timeRemapping")) if (input.timeRemapping === void 0) delete payload.timeRemapping;
-			else payload.timeRemapping = cloneJsonValue(input.timeRemapping, "timeRemapping");
+			if (input.inMs !== void 0) payload.inMs = finiteNonNegative(input.inMs, "inMs");
+			if (input.outMs !== void 0) payload.outMs = finitePositive(input.outMs, "outMs");
+			if (Object.hasOwn(input, "startMs")) if (input.startMs === void 0) {
+				delete payload.startMs;
+				if (!hasOutgoingClipAnchor(draft, input.clipEntityId)) {}
+			} else payload.startMs = finiteNonNegative(input.startMs, "startMs");
+			if (Object.hasOwn(input, "rate")) if (input.rate === void 0) delete payload.rate;
+			else payload.rate = finitePositive(input.rate, "linear speed rate");
 			replaceEntity(draft, marker.entityId, {
 				...marker,
 				payload
@@ -947,28 +952,18 @@ var EntityTimelineEditor = class {
 			const content = requireSequenceContent(draft, input.contentEntityId);
 			const payload = {
 				...cloneJsonObject(topology.marker.payload, "Sequence Marker payload"),
-				sourceRange: cloneJsonValue(input.sourceRange, "sourceRange"),
-				duration: cloneJsonValue(input.duration, "duration")
+				...requireWindow(input.inMs, input.outMs)
 			};
-			delete payload.targetRange;
-			delete payload.timeRemapping;
-			if (input.targetRange !== void 0) payload.targetRange = cloneJsonValue(input.targetRange, "targetRange");
-			if (input.timeRemapping !== void 0) payload.timeRemapping = cloneJsonValue(input.timeRemapping, "timeRemapping");
+			delete payload.startMs;
+			delete payload.rate;
+			if (input.startMs !== void 0) payload.startMs = finiteNonNegative(input.startMs, "startMs");
+			if (input.rate !== void 0) payload.rate = finitePositive(input.rate, "linear speed rate");
 			replaceEntity(draft, topology.marker.entityId, {
 				...topology.marker,
 				payload
 			});
-			if (!hasOutgoingClipAnchor(draft, topology.clip.entityId)) {
-				const clipPayload = { ...cloneJsonObject(topology.clip.payload, "Clip payload") };
-				if (input.targetRange === void 0) clipPayload.order ??= nextSequentialOrder(draft, otherEndpoint(topology.trackRelation, topology.clip.entityId));
-				else delete clipPayload.order;
-				replaceEntity(draft, topology.clip.entityId, {
-					...topology.clip,
-					payload: clipPayload
-				});
-			}
-			this.relinkRelation(draft, topology.markerContentRelation, {
-				endpoint0EntityId: topology.marker.entityId,
+			this.relinkRelation(draft, topology.contentRelation, {
+				endpoint0EntityId: topology.clip.entityId,
 				endpoint1EntityId: content.entityId
 			});
 		});
@@ -979,15 +974,11 @@ var EntityTimelineEditor = class {
 			const imported = importMediaAsset(draft, input.media, this.idFactory);
 			replaceRows(draft, imported.rows);
 			const track = this.ensureRoleTrack(draft, input.timelineEntityId, "video_clip");
-			const sourceRange = requirePositiveRange(input.sourceRange, "sourceRange");
+			const window = requireWindow(input.inMs, input.outMs);
 			const clipId = this.insertPlacedClipIntoDraft(draft, {
 				trackEntityId: track.entityId,
 				contentEntityId: imported.contentEntityId,
-				sourceRange,
-				duration: {
-					mode: "fixed",
-					value: sourceRange.end - sourceRange.start
-				},
+				...window,
 				placement: input.placement,
 				...input.clipEntityId === void 0 ? {} : { clipEntityId: input.clipEntityId },
 				...input.volume === void 0 ? {} : { clipPayload: { volume: requireVolume(input.volume) } }
@@ -1022,15 +1013,11 @@ var EntityTimelineEditor = class {
 			for (const [offset, clip] of input.clips.entries()) {
 				const imported = importMediaAsset(draft, clip.media, this.idFactory);
 				replaceRows(draft, imported.rows);
-				const sourceRange = requirePositiveRange(clip.sourceRange, "sourceRange");
+				const window = requireWindow(clip.inMs, clip.outMs);
 				created.push(this.insertPlacedClipIntoDraft(draft, {
 					trackEntityId: track.entityId,
 					contentEntityId: imported.contentEntityId,
-					sourceRange,
-					duration: {
-						mode: "fixed",
-						value: sourceRange.end - sourceRange.start
-					},
+					...window,
 					placement: {
 						kind: "sequential",
 						order: ordered.length + offset
@@ -1052,23 +1039,18 @@ var EntityTimelineEditor = class {
 			const topology = requireClipOnRole(draft, input.clipEntityId, "video_clip");
 			const imported = importMediaAsset(draft, input.media, this.idFactory);
 			replaceRows(draft, imported.rows);
-			const sourceRange = requirePositiveRange(input.sourceRange, "sourceRange");
+			const window = requireWindow(input.inMs, input.outMs);
 			const markerPayloadValue = {
 				...cloneJsonObject(topology.marker.payload, "Sequence Marker payload"),
-				sourceRange,
-				duration: {
-					mode: "fixed",
-					value: sourceRange.end - sourceRange.start
-				}
+				...window
 			};
-			delete markerPayloadValue.timeRemapping;
-			resizeAbsoluteTarget(markerPayloadValue, sourceRange.end - sourceRange.start);
+			delete markerPayloadValue.rate;
 			replaceEntity(draft, topology.marker.entityId, {
 				...topology.marker,
 				payload: markerPayloadValue
 			});
-			this.relinkRelation(draft, topology.markerContentRelation, {
-				endpoint0EntityId: topology.marker.entityId,
+			this.relinkRelation(draft, topology.contentRelation, {
+				endpoint0EntityId: topology.clip.entityId,
 				endpoint1EntityId: createEntityId(imported.contentEntityId)
 			});
 			this.resolveOneVoiceoverOverlap(draft);
@@ -1090,42 +1072,26 @@ var EntityTimelineEditor = class {
 	setClipSpeed(input) {
 		this.transact((draft) => {
 			const initialTopology = requireClipOnRole(draft, input.clipEntityId, "video_clip");
-			const content = requireSequenceContent(draft, otherEndpoint(initialTopology.markerContentRelation, initialTopology.marker.entityId));
+			const content = requireSequenceContent(draft, otherEndpoint(initialTopology.contentRelation, initialTopology.clip.entityId));
 			if (content.entityKind !== "video" && content.entityKind !== "image") throw new Error("Clip speed is supported only for Video or Image content");
 			const initialPayload = cloneJsonObject(initialTopology.marker.payload, "Sequence Marker payload");
-			const priorSource = requirePositiveRange(initialPayload.sourceRange, "sourceRange");
-			if (input.timeRemapping === null && initialPayload.timeRemapping === void 0) return;
+			const priorWindow = markerWindow(initialPayload);
+			if (input.rate === null && initialPayload.rate === void 0) return;
 			this.normalizeMainSequential(draft);
 			const topology = requireClipTopology(draft, input.clipEntityId);
 			const payload = { ...cloneJsonObject(topology.marker.payload, "Sequence Marker payload") };
-			let sourceRange = priorSource;
-			if (content.entityKind === "image" && initialPayload.timeRemapping === void 0 && input.timeRemapping !== null) sourceRange = {
-				start: 0,
-				end: markerDuration(initialPayload, priorSource)
-			};
-			if (input.timeRemapping === null) {
-				delete payload.timeRemapping;
-				payload.sourceRange = sourceRange;
-				payload.duration = {
-					mode: "fixed",
-					value: sourceRange.end - sourceRange.start
-				};
-			} else {
-				const rate = finitePositive(input.timeRemapping.rate, "linear speed rate");
-				const duration = Math.round((sourceRange.end - sourceRange.start) / rate);
+			const window = content.entityKind === "image" && initialPayload.rate === void 0 && input.rate !== null ? {
+				inMs: 0,
+				outMs: markerDuration(initialPayload, priorWindow)
+			} : priorWindow;
+			Object.assign(payload, window);
+			if (input.rate === null) delete payload.rate;
+			else {
+				const rate = finitePositive(input.rate, "linear speed rate");
+				const duration = Math.round((window.outMs - window.inMs) / rate);
 				if (duration <= 0 || !Number.isSafeInteger(duration)) throw new Error("Linear speed produces an invalid duration");
-				payload.sourceRange = sourceRange;
-				payload.duration = {
-					mode: "fixed",
-					value: duration
-				};
-				payload.timeRemapping = {
-					kind: "linear",
-					rate,
-					...input.timeRemapping.mode === void 0 ? {} : { mode: input.timeRemapping.mode }
-				};
+				payload.rate = rate;
 			}
-			resizeAbsoluteTarget(payload, markerDuration(payload, sourceRange));
 			replaceEntity(draft, topology.marker.entityId, {
 				...topology.marker,
 				payload
@@ -1137,21 +1103,15 @@ var EntityTimelineEditor = class {
 		this.transact((draft) => {
 			this.normalizeMainSequential(draft);
 			const topology = requireClipOnRole(draft, input.clipEntityId, "video_clip");
-			const content = requireSequenceContent(draft, otherEndpoint(topology.markerContentRelation, topology.marker.entityId));
+			const content = requireSequenceContent(draft, otherEndpoint(topology.contentRelation, topology.clip.entityId));
 			if (content.entityKind !== "video" && content.entityKind !== "image") throw new Error("Clip trimming is supported only for Video or Image content");
-			const sourceRange = requirePositiveRange(input.sourceRange, "sourceRange");
+			const window = requireWindow(input.inMs, input.outMs);
 			const payload = {
 				...cloneJsonObject(topology.marker.payload, "Sequence Marker payload"),
-				sourceRange
+				...window
 			};
-			const rate = linearRate(payload.timeRemapping);
-			const duration = Math.round((sourceRange.end - sourceRange.start) / rate);
+			const duration = markerDuration(payload, window);
 			if (duration <= 0 || !Number.isSafeInteger(duration)) throw new Error("Trim produces an invalid duration");
-			payload.duration = {
-				mode: "fixed",
-				value: duration
-			};
-			resizeAbsoluteTarget(payload, duration);
 			replaceEntity(draft, topology.marker.entityId, {
 				...topology.marker,
 				payload
@@ -1181,15 +1141,11 @@ var EntityTimelineEditor = class {
 				if (replacement.clipEntityId !== void 0 && oldIds.has(replacement.clipEntityId)) throw new Error("A replacement Clip id cannot reuse an Entity being removed");
 				const imported = importMediaAsset(draft, replacement.media, this.idFactory);
 				replaceRows(draft, imported.rows);
-				const sourceRange = requirePositiveRange(replacement.sourceRange, "sourceRange");
+				const window = requireWindow(replacement.inMs, replacement.outMs);
 				created.push(this.insertPlacedClipIntoDraft(draft, {
 					trackEntityId: track.entityId,
 					contentEntityId: imported.contentEntityId,
-					sourceRange,
-					duration: {
-						mode: "fixed",
-						value: sourceRange.end - sourceRange.start
-					},
+					...window,
 					placement: {
 						kind: "sequential",
 						order: temporaryOrder + offset
@@ -1223,10 +1179,14 @@ var EntityTimelineEditor = class {
 	deleteClip(input) {
 		this.transact((draft) => {
 			const topology = requireClipTopology(draft, input.clipEntityId);
-			assertOnlyStructuralIncidents(draft, topology.clip.entityId, new Set(["track-clip", "clip-marker"]));
-			assertOnlyStructuralIncidents(draft, topology.marker.entityId, new Set(["clip-marker", "marker-content"]));
-			const markerIsExclusive = incidentRelations(draft, topology.marker.entityId).filter((relation) => relation.relationKind === "clip-marker").length === 1;
-			const removedRelationIds = new Set([topology.trackRelation.relationId, topology.clipMarkerRelation.relationId]);
+			assertOnlyStructuralIncidents(draft, topology.clip.entityId, new Set(["contain", "marker"]));
+			assertOnlyStructuralIncidents(draft, topology.marker.entityId, new Set(["marker"]));
+			const markerIsExclusive = incidentRelations(draft, topology.marker.entityId).filter((relation) => relation.relationKind === "marker").length === 1;
+			const removedRelationIds = new Set([
+				topology.trackRelation.relationId,
+				topology.clipMarkerRelation.relationId,
+				topology.contentRelation.relationId
+			]);
 			if (markerIsExclusive) for (const relation of incidentRelations(draft, topology.marker.entityId)) removedRelationIds.add(relation.relationId);
 			draft.relations = draft.relations.filter((relation) => !removedRelationIds.has(relation.relationId));
 			draft.entities = draft.entities.filter((entity) => entity.entityId !== topology.clip.entityId && (!markerIsExclusive || entity.entityId !== topology.marker.entityId));
@@ -1247,28 +1207,20 @@ var EntityTimelineEditor = class {
 				if (placement === void 0) throw new Error(`Anchored child Clip "${childId}" is not placed`);
 				this.applyClipPlacement(draft, childId, {
 					kind: "absolute",
-					targetRange: {
-						start: placement.start,
-						end: placement.start + placement.duration
-					}
+					startMs: placement.start
 				});
 			}
 			else for (const target of targets) this.removeAnchoredDescendants(draft, target, targets);
 			for (const target of targets) this.removeClipGraph(draft, target);
-			normalizeSequentialOrders(draft);
 			if (includesVisual) this.resolveOneVoiceoverOverlap(draft);
 		});
 	}
 	updateClip(input) {
 		this.transact((draft) => {
 			const clip = requireEntityKind(draft, input.clipEntityId, "clip");
-			const priorOrder = clip.payload.order;
 			replaceEntity(draft, clip.entityId, {
 				...clip,
-				payload: {
-					...cloneJsonObject(input.payload, "Clip payload"),
-					...priorOrder === void 0 || Object.hasOwn(input.payload, "order") ? {} : { order: priorOrder }
-				}
+				payload: cloneJsonObject(input.payload, "Clip payload")
 			});
 		});
 	}
@@ -1278,13 +1230,13 @@ var EntityTimelineEditor = class {
 			const placement = input.placement ?? {
 				kind: "anchored",
 				hostClipEntityId: input.hostClipEntityId,
-				anchorOffset: input.anchorOffset
+				startMs: input.startMs
 			};
-			if (input.placement !== void 0 && (input.hostClipEntityId !== void 0 || input.anchorOffset !== void 0)) throw new Error("Specify voiceover placement or hostClipEntityId/anchorOffset, not both");
+			if (input.placement !== void 0 && (input.hostClipEntityId !== void 0 || input.startMs !== void 0)) throw new Error("Specify voiceover placement or hostClipEntityId/startMs, not both");
 			requireVolume(input.volume);
 			const imported = importMediaAsset(draft, input.media, this.idFactory);
 			replaceRows(draft, imported.rows);
-			const voiceover = requireEntityKind(draft, imported.contentEntityId, "voiceover");
+			const voiceover = requireEntityKind(draft, imported.contentEntityId, "voiceover-recording");
 			const phonetic = this.requireComposedPhoneticScript(draft, input.phoneticScriptEntityId);
 			this.ensurePhoneticRender(draft, voiceover.entityId, phonetic.entityId);
 			const speechTrack = this.ensureRoleTrack(draft, input.timelineEntityId, "speech");
@@ -1294,14 +1246,8 @@ var EntityTimelineEditor = class {
 				clipEntityId: input.voiceoverClipEntityId,
 				trackEntityId: speechTrack.entityId,
 				contentEntityId: voiceover.entityId,
-				sourceRange: {
-					start: 0,
-					end: input.media.durationMs
-				},
-				duration: {
-					mode: "fixed",
-					value: input.media.durationMs
-				},
+				inMs: 0,
+				outMs: input.media.durationMs,
 				placement,
 				clipPayload: { volume: input.volume }
 			});
@@ -1315,8 +1261,8 @@ var EntityTimelineEditor = class {
 						volume: input.volume
 					}
 				});
-				this.relinkRelation(draft, topology.markerContentRelation, {
-					endpoint0EntityId: topology.marker.entityId,
+				this.relinkRelation(draft, topology.contentRelation, {
+					endpoint0EntityId: topology.clip.entityId,
 					endpoint1EntityId: voiceover.entityId
 				});
 				this.applyClipPlacement(draft, topology.clip.entityId, placement);
@@ -1325,14 +1271,8 @@ var EntityTimelineEditor = class {
 					...placed.marker,
 					payload: {
 						...placed.marker.payload,
-						sourceRange: {
-							start: 0,
-							end: input.media.durationMs
-						},
-						duration: {
-							mode: "fixed",
-							value: input.media.durationMs
-						}
+						inMs: 0,
+						outMs: input.media.durationMs
 					}
 				});
 			}
@@ -1381,11 +1321,8 @@ var EntityTimelineEditor = class {
 				clipEntityId: input.bgmClipEntityId,
 				trackEntityId: track.entityId,
 				contentEntityId: imported.contentEntityId,
-				sourceRange: {
-					start: 0,
-					end: input.media.durationMs
-				},
-				duration: { mode: "from-source" },
+				inMs: 0,
+				outMs: input.media.durationMs,
 				placement: {
 					kind: "sequential",
 					order: 0
@@ -1397,7 +1334,7 @@ var EntityTimelineEditor = class {
 				...topology.marker,
 				payload: {
 					...topology.marker.payload,
-					durationPolicy: "timeline"
+					fillTimeline: true
 				}
 			});
 			return clipId;
@@ -1430,7 +1367,7 @@ var EntityTimelineEditor = class {
 			const assembled = new EntityProjectionGraph(draft);
 			for (const clip of clipsOnTrack(draft, track.entityId)) {
 				const topology = requireClipTopology(draft, clip.entityId);
-				const caption = requireEntityKind(draft, otherEndpoint(topology.markerContentRelation, topology.marker.entityId), "caption");
+				const caption = requireEntityKind(draft, otherEndpoint(topology.contentRelation, topology.clip.entityId), "caption");
 				const prior = assembled.entity(caption.entityId).payload.style;
 				const style = isJsonObject(prior) ? prior : {};
 				for (const updated of updateEntityFields(draft, caption.entityId, { style: {
@@ -1467,14 +1404,8 @@ var EntityTimelineEditor = class {
 			return this.insertPlacedClipIntoDraft(draft, {
 				trackEntityId: track.entityId,
 				contentEntityId: content.entityId,
-				sourceRange: {
-					start: 0,
-					end: durationMs
-				},
-				duration: {
-					mode: "fixed",
-					value: durationMs
-				},
+				inMs: 0,
+				outMs: durationMs,
 				placement: input.placement,
 				...input.captionClipEntityId === void 0 ? {} : { clipEntityId: input.captionClipEntityId }
 			});
@@ -1487,8 +1418,7 @@ var EntityTimelineEditor = class {
 		const clipId = input.clipEntityId === void 0 ? this.mintEntityId(draft) : requireAvailableEntityId(draft, input.clipEntityId);
 		const markerId = this.mintEntityId(draft);
 		const clipPayload = { ...cloneJsonObject(input.clipPayload ?? {}, "Clip payload") };
-		delete clipPayload.order;
-		const markerPlacement = applyPlacementPayload(clipPayload, input.placement);
+		const markerPlacement = applyPlacementPayload(input.placement);
 		const clip = {
 			entityId: clipId,
 			entityKind: "clip",
@@ -1498,13 +1428,12 @@ var EntityTimelineEditor = class {
 			entityId: markerId,
 			entityKind: "sequence-marker",
 			payload: markerPayload({
-				sourceRange: input.sourceRange,
-				duration: input.duration,
+				...requireWindow(input.inMs, input.outMs),
 				...markerPlacement
 			})
 		};
 		draft.entities.push(clip, marker);
-		draft.relations.push(this.createRelation(draft, "track-clip", track.entityId, clipId), this.createRelation(draft, "clip-marker", clipId, markerId), this.createRelation(draft, "marker-content", markerId, content.entityId));
+		draft.relations.push(this.createRelation(draft, "contain", track.entityId, clipId), this.createRelation(draft, "marker", clipId, markerId), this.createRelation(draft, "contain", clipId, content.entityId));
 		if (input.placement.kind === "anchored") {
 			const host = requireEntityKind(draft, input.placement.hostClipEntityId, "clip");
 			if (host.entityId === clipId) throw new Error("A Clip cannot anchor to itself");
@@ -1514,20 +1443,7 @@ var EntityTimelineEditor = class {
 	}
 	ensureRoleTrack(draft, timelineEntityId, role) {
 		const existing = findRoleTrack(draft, timelineEntityId, role);
-		if (existing !== void 0) {
-			if (existing.payload.order === void 0) {
-				const replacement = {
-					...existing,
-					payload: {
-						...existing.payload,
-						order: roleOrder[role]
-					}
-				};
-				replaceEntity(draft, existing.entityId, replacement);
-				return replacement;
-			}
-			return existing;
-		}
+		if (existing !== void 0) return existing;
 		const timeline = requireEntityKind(draft, timelineEntityId, "timeline");
 		const track = {
 			entityId: this.mintEntityId(draft),
@@ -1538,7 +1454,7 @@ var EntityTimelineEditor = class {
 			}
 		};
 		draft.entities.push(track);
-		draft.relations.push(this.createRelation(draft, "timeline-track", timeline.entityId, track.entityId));
+		draft.relations.push(this.createRelation(draft, "contain", timeline.entityId, track.entityId));
 		return track;
 	}
 	/** The existing pronunciation variant a voiceover consumes; composition is required. */
@@ -1549,13 +1465,13 @@ var EntityTimelineEditor = class {
 	}
 	/** Preserve the factual synthesis input as `[rendered Audio, PhoneticScript]`. */
 	ensurePhoneticRender(draft, voiceoverAudioEntityId, phoneticScriptEntityId) {
-		const renders = draft.relations.filter((relation) => relation.relationKind === "phonetic-script-render" && (relation.endpoint0EntityId === voiceoverAudioEntityId || relation.endpoint1EntityId === voiceoverAudioEntityId));
+		const renders = draft.relations.filter((relation) => relation.relationKind === "derived-from" && (relation.endpoint0EntityId === voiceoverAudioEntityId || relation.endpoint1EntityId === voiceoverAudioEntityId));
 		if (renders.length > 1) throw new Error(`Voiceover "${voiceoverAudioEntityId}" has multiple PhoneticScript render relations`);
 		if (renders[0] !== void 0) {
 			if (otherEndpoint(renders[0], voiceoverAudioEntityId) === phoneticScriptEntityId) return;
 			throw new Error(`Voiceover "${voiceoverAudioEntityId}" already has a different PhoneticScript synthesis input`);
 		}
-		draft.relations.push(this.createRelation(draft, "phonetic-script-render", voiceoverAudioEntityId, phoneticScriptEntityId));
+		draft.relations.push(this.createRelation(draft, "derived-from", voiceoverAudioEntityId, phoneticScriptEntityId));
 	}
 	reconcileVoiceoverCaptions(draft, voiceoverClipEntityId, phoneticScriptEntityId, captions) {
 		const audioScriptEntityId = requireComposedAudioScript(draft, phoneticScriptEntityId);
@@ -1586,24 +1502,18 @@ var EntityTimelineEditor = class {
 					clipEntityId: caption.captionClipEntityId,
 					trackEntityId: captionTrack.entityId,
 					contentEntityId: content.entityId,
-					sourceRange: {
-						start: 0,
-						end: durationMs
-					},
-					duration: {
-						mode: "fixed",
-						value: durationMs
-					},
+					inMs: 0,
+					outMs: durationMs,
 					placement: {
 						kind: "anchored",
 						hostClipEntityId: voiceoverClipEntityId,
-						anchorOffset: startMs
+						startMs
 					}
 				});
 				continue;
 			}
 			const topology = requireClipOnRole(draft, caption.captionClipEntityId, "caption");
-			const content = requireEntityKind(draft, otherEndpoint(topology.markerContentRelation, topology.marker.entityId), "caption");
+			const content = requireEntityKind(draft, otherEndpoint(topology.contentRelation, topology.clip.entityId), "caption");
 			const priorStyle = isJsonObject(content.payload.style) ? content.payload.style : {};
 			const style = caption.style === void 0 ? priorStyle : {
 				...priorStyle,
@@ -1622,17 +1532,16 @@ var EntityTimelineEditor = class {
 			this.applyClipPlacement(draft, topology.clip.entityId, {
 				kind: "anchored",
 				hostClipEntityId: voiceoverClipEntityId,
-				anchorOffset: startMs
+				startMs
 			});
 			const placed = requireClipTopology(draft, topology.clip.entityId);
+			const window = markerWindow(placed.marker.payload);
+			const rate = (window.outMs - window.inMs) / durationMs;
 			replaceEntity(draft, placed.marker.entityId, {
 				...placed.marker,
 				payload: {
 					...placed.marker.payload,
-					duration: {
-						mode: "fixed",
-						value: durationMs
-					}
+					...rate === 1 ? {} : { rate }
 				}
 			});
 		}
@@ -1640,7 +1549,7 @@ var EntityTimelineEditor = class {
 	ensureRoleTrackForClip(draft, clipEntityId, role) {
 		const topology = requireClipTopology(draft, clipEntityId);
 		const track = requireEntityKind(draft, otherEndpoint(topology.trackRelation, topology.clip.entityId), "track");
-		const timeline = requireEntityKind(draft, otherEndpoint(requireOneRelation(draft, track.entityId, "timeline-track"), track.entityId), "timeline");
+		const timeline = requireEntityKind(draft, otherEndpoint(requireOneContain(draft, track.entityId, "contained"), track.entityId), "timeline");
 		return this.ensureRoleTrack(draft, timeline.entityId, role);
 	}
 	/**
@@ -1649,13 +1558,13 @@ var EntityTimelineEditor = class {
 	*/
 	removeCaptionClipGraph(draft, clipEntityId) {
 		const topology = requireClipOnRole(draft, clipEntityId, "caption");
-		const caption = requireEntityKind(draft, otherEndpoint(topology.markerContentRelation, topology.marker.entityId), "caption");
+		const caption = requireEntityKind(draft, otherEndpoint(topology.contentRelation, topology.clip.entityId), "caption");
 		const contentRelations = incidentRelations(draft, caption.entityId);
-		const allowed = new Set(["caption-alignment", "marker-content"]);
+		const allowed = new Set(["caption-alignment", "contain"]);
 		const unsupported = contentRelations.filter((relation) => !allowed.has(relation.relationKind));
 		if (unsupported.length > 0) throw new Error(`Cannot delete Caption with unsupported Relation ${unsupported[0].relationId}`);
 		this.removeClipGraph(draft, clipEntityId);
-		if (incidentRelations(draft, caption.entityId).some((relation) => relation.relationKind === "marker-content")) return;
+		if (containing(draft, caption.entityId, "contained").length > 0) return;
 		const removed = new Set(incidentRelations(draft, caption.entityId).map((relation) => relation.relationId));
 		draft.relations = draft.relations.filter((relation) => !removed.has(relation.relationId));
 		draft.entities = draft.entities.filter((entity) => entity.entityId !== caption.entityId);
@@ -1703,10 +1612,7 @@ var EntityTimelineEditor = class {
 			const overlapMs = Math.round(prior.end - current.start);
 			for (const [visualIndex, clip] of videoTrack.clips.entries()) this.applyClipPlacement(draft, clip.clipEntityId, {
 				kind: "absolute",
-				targetRange: {
-					start: clip.start + (visualIndex >= hostIndex ? overlapMs : 0),
-					end: clip.start + clip.duration + (visualIndex >= hostIndex ? overlapMs : 0)
-				}
+				startMs: clip.start + (visualIndex >= hostIndex ? overlapMs : 0)
 			});
 			return;
 		}
@@ -1715,18 +1621,16 @@ var EntityTimelineEditor = class {
 		const topology = requireClipTopology(draft, clipEntityId);
 		const clipPayload = { ...cloneJsonObject(topology.clip.payload, "Clip payload") };
 		const markerPayloadValue = { ...cloneJsonObject(topology.marker.payload, "Sequence Marker payload") };
-		delete clipPayload.order;
-		delete markerPayloadValue.targetRange;
-		delete markerPayloadValue.anchorOffset;
+		delete markerPayloadValue.startMs;
 		const outgoingAnchors = draft.relations.filter((relation) => relation.relationKind === "clip-anchor" && relation.endpoint0EntityId === topology.clip.entityId);
 		const removed = new Set(outgoingAnchors.map((relation) => relation.relationId));
 		draft.relations = draft.relations.filter((relation) => !removed.has(relation.relationId));
-		if (placement.kind === "sequential") clipPayload.order = finiteNumber(placement.order, "Clip order");
-		else if (placement.kind === "absolute") markerPayloadValue.targetRange = cloneJsonValue(placement.targetRange, "targetRange");
+		if (placement.kind === "sequential") setClipOrder(draft, topology.clip.entityId, placement.order);
+		else if (placement.kind === "absolute") markerPayloadValue.startMs = finiteNonNegative(placement.startMs, "startMs");
 		else {
 			const host = requireEntityKind(draft, placement.hostClipEntityId, "clip");
 			if (host.entityId === topology.clip.entityId) throw new Error("A Clip cannot anchor to itself");
-			markerPayloadValue.anchorOffset = finiteNonNegative(placement.anchorOffset, "anchorOffset");
+			markerPayloadValue.startMs = finiteNonNegative(placement.startMs, "startMs");
 			draft.relations.push(this.createRelation(draft, "clip-anchor", topology.clip.entityId, host.entityId));
 		}
 		replaceEntity(draft, topology.clip.entityId, {
@@ -1741,14 +1645,10 @@ var EntityTimelineEditor = class {
 	reanchorAtAbsolute(draft, childClipEntityId, absoluteStart, layout) {
 		const hosts = layout.tracks.find((track) => track.role === "video_clip")?.clips.filter((clip) => clip.mode === "sequential") ?? [];
 		if (hosts.length === 0) {
-			const child = layout.clips.get(childClipEntityId);
-			if (child === void 0) throw new Error(`Clip "${childClipEntityId}" is not placed`);
+			if (layout.clips.get(childClipEntityId) === void 0) throw new Error(`Clip "${childClipEntityId}" is not placed`);
 			this.applyClipPlacement(draft, childClipEntityId, {
 				kind: "absolute",
-				targetRange: {
-					start: absoluteStart,
-					end: absoluteStart + child.duration
-				}
+				startMs: absoluteStart
 			});
 			return;
 		}
@@ -1756,7 +1656,7 @@ var EntityTimelineEditor = class {
 		this.applyClipPlacement(draft, childClipEntityId, {
 			kind: "anchored",
 			hostClipEntityId: host.clipEntityId,
-			anchorOffset: Math.max(0, Math.round(absoluteStart - host.start))
+			startMs: Math.max(0, Math.round(absoluteStart - host.start))
 		});
 	}
 	removeAnchoredDescendants(draft, hostClipEntityId, scheduled) {
@@ -1773,12 +1673,12 @@ var EntityTimelineEditor = class {
 	removeClipGraph(draft, clipEntityId) {
 		const topology = requireClipTopology(draft, clipEntityId);
 		assertOnlyStructuralIncidents(draft, topology.clip.entityId, new Set([
-			"track-clip",
-			"clip-marker",
+			"contain",
+			"marker",
 			"clip-anchor"
 		]));
-		assertOnlyStructuralIncidents(draft, topology.marker.entityId, new Set(["clip-marker", "marker-content"]));
-		const markerIsExclusive = incidentRelations(draft, topology.marker.entityId).filter((relation) => relation.relationKind === "clip-marker").length === 1;
+		assertOnlyStructuralIncidents(draft, topology.marker.entityId, new Set(["marker"]));
+		const markerIsExclusive = incidentRelations(draft, topology.marker.entityId).filter((relation) => relation.relationKind === "marker").length === 1;
 		const removed = new Set(incidentRelations(draft, topology.clip.entityId).map((relation) => relation.relationId));
 		if (markerIsExclusive) for (const relation of incidentRelations(draft, topology.marker.entityId)) removed.add(relation.relationId);
 		draft.relations = draft.relations.filter((relation) => !removed.has(relation.relationId));
@@ -1824,7 +1724,7 @@ var EntityTimelineEditor = class {
 	}
 };
 function validateFinalRows(rows) {
-	decodeEntityRelationRows(rows, numericMarkerValidation);
+	decodeEntityRelationRows(rows, {});
 	assertCanonicalEditorResources(rows);
 	validateTimelineHierarchy(rows);
 }
@@ -1832,13 +1732,13 @@ function validateTimelineHierarchy(rows) {
 	for (const entity of rows.entities) {
 		if (entity.entityKind === "track") requireTrackTimeline(rows, entity.entityId);
 		if (entity.entityKind !== "clip") continue;
-		const trackRelations = incidentRelations(rows, entity.entityId).filter((relation) => relation.relationKind === "track-clip");
+		const trackRelations = containing(rows, entity.entityId, "contained");
 		if (trackRelations.length !== 1) throw new Error(`Clip Entity "${entity.entityId}" must belong to exactly one Track`);
 		requireEntityKind(rows, otherEndpoint(trackRelations[0], entity.entityId), "track");
 	}
 }
 function requireTrackTimeline(rows, trackEntityId) {
-	const timelineRelations = incidentRelations(rows, trackEntityId).filter((relation) => relation.relationKind === "timeline-track");
+	const timelineRelations = containing(rows, createEntityId(trackEntityId), "contained");
 	if (timelineRelations.filter((relation) => {
 		const otherId = otherEndpoint(relation, trackEntityId);
 		return rows.entities.some((entity) => entity.entityId === otherId && entity.entityKind === "timeline");
@@ -1846,20 +1746,36 @@ function requireTrackTimeline(rows, trackEntityId) {
 }
 function requireClipTopology(rows, clipEntityId) {
 	const clip = requireEntityKind(rows, clipEntityId, "clip");
-	const trackRelation = requireOneRelation(rows, clip.entityId, "track-clip");
+	const trackRelation = requireOneContain(rows, clip.entityId, "contained");
 	requireEntityKind(rows, otherEndpoint(trackRelation, clip.entityId), "track");
-	const clipMarkerRelation = requireOneRelation(rows, clip.entityId, "clip-marker");
+	const clipMarkerRelation = requireOneRelation(rows, clip.entityId, "marker");
 	const marker = requireEntityKind(rows, otherEndpoint(clipMarkerRelation, clip.entityId), "sequence-marker");
-	const markerContentRelation = requireOneRelation(rows, marker.entityId, "marker-content");
-	requireSequenceContent(rows, otherEndpoint(markerContentRelation, marker.entityId));
+	const contentRelation = requireOneContain(rows, clip.entityId, "container");
+	requireSequenceContent(rows, otherEndpoint(contentRelation, clip.entityId));
 	return {
 		clip,
 		marker,
 		trackRelation,
 		clipMarkerRelation,
-		markerContentRelation
+		contentRelation
 	};
 }
+/**
+* One `contain` Relation with this entity on the stated side.
+*
+* A Clip is contained by its Track and contains its content; a Track is
+* contained by the Timeline and contains its Clips. Both are `contain`, so the
+* endpoint position is the only thing that tells them apart.
+*/
+function requireOneContain(rows, entityId, side) {
+	const matches = containing(rows, entityId, side);
+	if (matches.length !== 1) throw new Error(`Entity "${entityId}" must be the ${side} of exactly one contain Relation`);
+	return matches[0];
+}
+/** `contain` is ordered, so a lookup says which side it wants. */
+function containing(rows, entityId, side) {
+	return (side === "container" ? relationsFrom : relationsTo)(rows.relations, "contain", entityId);
+}
 function requireOneRelation(rows, entityId, relationKind) {
 	const matches = incidentRelations(rows, entityId).filter((relation) => relation.relationKind === relationKind);
 	if (matches.length !== 1) throw new Error(`Entity "${entityId}" must have exactly one ${relationKind} Relation`);
@@ -1898,40 +1814,47 @@ function hasOutgoingClipAnchor(rows, clipEntityId) {
 function outgoingAnchorChildren(rows, hostIds) {
 	return rows.relations.filter((relation) => relation.relationKind === "clip-anchor" && hostIds.has(relation.endpoint1EntityId)).map((relation) => String(relation.endpoint0EntityId));
 }
-function applyPlacementPayload(clipPayload, placement) {
-	if (placement.kind === "sequential") {
-		clipPayload.order = finiteNumber(placement.order, "Clip order");
-		return {};
-	}
-	if (placement.kind === "absolute") return { targetRange: cloneJsonValue(placement.targetRange, "targetRange") };
-	return { anchorOffset: finiteNonNegative(placement.anchorOffset, "anchorOffset") };
+/** What the placement puts on the Marker; a sequential one puts nothing there. */
+function applyPlacementPayload(placement) {
+	if (placement.kind === "sequential") return {};
+	return { startMs: finiteNonNegative(placement.startMs, "startMs") };
 }
 function requireAvailableEntityId(rows, value) {
 	const entityId = createEntityId(value);
 	if (rows.entities.some((entity) => entity.entityId === entityId)) throw new Error(`Entity id "${entityId}" already exists`);
 	return entityId;
 }
+/**
+* Put a Clip at `order` among the Clips its Track contains.
+*
+* Where a Clip sits is the position of its membership Relation, so moving one
+* is moving that Relation — nothing on the Clip changes, and there are no
+* sibling positions left to keep in step.
+*/
 function setClipOrder(rows, clipEntityId, order) {
-	const clip = requireEntityKind(rows, clipEntityId, "clip");
-	replaceEntity(rows, clip.entityId, {
-		...clip,
-		payload: {
-			...clip.payload,
-			order
-		}
-	});
-}
-function normalizeSequentialOrders(rows) {
-	for (const track of rows.entities.filter((entity) => entity.entityKind === "track")) rows.relations.filter((relation) => relation.relationKind === "track-clip" && relation.endpoint0EntityId === track.entityId).map((relation) => rows.entities.find((entity) => entity.entityId === relation.endpoint1EntityId)).filter((entity) => entity?.entityKind === "clip" && typeof entity.payload.order === "number").sort((left, right) => Number(left.payload.order) - Number(right.payload.order)).forEach((clip, order) => setClipOrder(rows, clip.entityId, order));
+	const membership = relationsTo(rows.relations, "contain", clipEntityId)[0];
+	if (membership === void 0) throw new Error(`Clip "${clipEntityId}" is contained by no Track`);
+	const slots = [];
+	const siblings = [];
+	for (const [index, relation] of rows.relations.entries()) {
+		if (relation.relationKind !== "contain" || relation.endpoint0EntityId !== membership.endpoint0EntityId) continue;
+		slots.push(index);
+		siblings.push(relation);
+	}
+	const from = siblings.indexOf(membership);
+	const moved = siblings.filter((relation) => relation !== membership);
+	moved.splice(Math.max(0, Math.min(order, moved.length)), 0, membership);
+	if (from < 0) return;
+	slots.forEach((slot, at) => rows.relations[slot] = moved[at]);
 }
 function findRoleTrack(rows, timelineEntityId, role) {
 	const timeline = requireEntityKind(rows, timelineEntityId, "timeline");
-	const tracks = incidentRelations(rows, timeline.entityId).filter((relation) => relation.relationKind === "timeline-track").map((relation) => requireEntityKind(rows, otherEndpoint(relation, timeline.entityId), "track")).filter((track) => track.payload.role === role);
+	const tracks = containing(rows, timeline.entityId, "container").map((relation) => requireEntityKind(rows, otherEndpoint(relation, timeline.entityId), "track")).filter((track) => track.payload.role === role);
 	if (tracks.length > 1) throw new Error(`Timeline "${timelineEntityId}" has multiple ${role} Tracks`);
 	return tracks[0];
 }
 function clipsOnTrack(rows, trackEntityId) {
-	return incidentRelations(rows, trackEntityId).filter((relation) => relation.relationKind === "track-clip").map((relation) => requireEntityKind(rows, otherEndpoint(relation, trackEntityId), "clip"));
+	return containing(rows, trackEntityId, "container").map((relation) => requireEntityKind(rows, otherEndpoint(relation, trackEntityId), "clip"));
 }
 function clipRole(rows, clipEntityId) {
 	const topology = requireClipTopology(rows, clipEntityId);
@@ -1964,35 +1887,27 @@ function requireVolume(value) {
 	if (volume < -60 || volume > 20) throw new Error("Clip volume must be between -60 and 20 dB");
 	return volume;
 }
-function requirePositiveRange(value, label) {
-	if (!isJsonObject(value)) throw new Error(`${label} must be an object`);
-	const start = finiteNonNegative(value.start, `${label}.start`);
-	const end = finitePositive(value.end, `${label}.end`);
-	if (!Number.isSafeInteger(start) || !Number.isSafeInteger(end) || end <= start) throw new Error(`${label} must be a positive whole-millisecond range`);
+function requireWindow(inMs, outMs, label = "Sequence Marker") {
+	const start = finiteNonNegative(inMs, `${label} inMs`);
+	const end = finitePositive(outMs, `${label} outMs`);
+	if (!Number.isSafeInteger(start) || !Number.isSafeInteger(end) || end <= start) throw new Error(`${label} must state a positive whole-millisecond window`);
 	return {
-		start,
-		end
+		inMs: start,
+		outMs: end
 	};
 }
-function markerDuration(payload, sourceRange) {
-	const duration = payload.duration;
-	if (!isJsonObject(duration)) throw new Error("Sequence Marker duration must be an object");
-	if (duration.mode === "from-source") return sourceRange.end - sourceRange.start;
-	if (duration.mode !== "fixed") throw new Error("Sequence Marker duration mode is unsupported");
-	return finitePositive(duration.value, "Sequence Marker fixed duration");
-}
-function linearRate(value) {
-	if (value === void 0) return 1;
-	if (!isJsonObject(value) || value.kind !== "linear") throw new Error("Only linear Clip time remapping is supported");
-	return finitePositive(value.rate, "linear speed rate");
-}
-function resizeAbsoluteTarget(payload, duration) {
-	if (payload.targetRange === void 0) return;
-	const target = requirePositiveRange(payload.targetRange, "targetRange");
-	payload.targetRange = {
-		start: target.start,
-		end: target.start + duration
-	};
+function markerWindow(payload) {
+	return requireWindow(payload.inMs, payload.outMs);
+}
+/**
+* How long the Clip runs. The window and the rate are the only stored facts;
+* the played length follows from them rather than being kept in step by hand.
+*/
+function markerDuration(payload, window = markerWindow(payload)) {
+	return Math.round((window.outMs - window.inMs) / markerRate(payload));
+}
+function markerRate(payload) {
+	return payload.rate === void 0 ? 1 : finitePositive(payload.rate, "linear speed rate");
 }
 function replaceRows(rows, replacement) {
 	rows.entities = structuredClone([...replacement.entities]);
@@ -2003,9 +1918,9 @@ function finiteNonNegative(value, label) {
 	if (result < 0) throw new Error(`${label} must be non-negative`);
 	return result;
 }
+/** How many Clips the Track already holds — the index a new one lands at. */
 function nextSequentialOrder(rows, trackEntityId) {
-	const orders = rows.relations.filter((relation) => relation.relationKind === "track-clip" && relation.endpoint0EntityId === trackEntityId).map((relation) => rows.entities.find((entity) => entity.entityId === relation.endpoint1EntityId)?.payload.order).filter((order) => typeof order === "number" && Number.isFinite(order));
-	return orders.length === 0 ? 0 : Math.max(...orders) + 1;
+	return relationsFrom(rows.relations, "contain", trackEntityId).length;
 }
 function otherEndpoint(relation, entityId) {
 	if (relation.endpoint0EntityId === entityId) return relation.endpoint1EntityId;
@@ -2025,19 +1940,12 @@ function cloneJsonObject(value, label) {
 	if (!isJsonObject(cloned)) throw new Error(`${label} must contain only JSON values`);
 	return cloned;
 }
-function cloneJsonValue(value, label) {
-	return cloneJsonObject({ value }, label).value;
-}
 function cloneRows(rows) {
 	return {
 		entities: rows.entities.map((entity) => structuredClone(entity)),
 		relations: rows.relations.map((relation) => structuredClone(relation))
 	};
 }
-const numericMarkerValidation = { compareMarkerPoints: (_marker, _range, left, right) => {
-	if (typeof left !== "number" || !Number.isFinite(left) || typeof right !== "number" || !Number.isFinite(right)) throw new Error("Sequence Marker points must use finite numeric coordinates");
-	return left - right;
-} };
 //#endregion
 //#region src/entity-editor/revise-audio-script.ts
 /** Revise text as an independent authored document, never as a version-family mutation. */
@@ -2054,26 +1962,8 @@ function reviseAudioScript(rows, input) {
 		...input,
 		captionUsages: input.captionUsages ?? []
 	});
-	const prior = rows.relations.filter((r) => r.relationKind === "generated" && r.trace.command === "revise-audio-script" && r.trace.editId === input.editId);
-	if (prior.length) {
-		if (prior.length !== 1 || prior[0].trace.signature !== signature) throw new Error("AudioScript edit identity conflict");
-		const captionUsages = (input.captionUsages ?? []).map((usage, index) => {
-			const edge = rows.relations.find((r) => r.relationKind === "marker-content" && r.trace.command === "revise-audio-script" && r.trace.editId === input.editId && r.trace.usageIndex === index);
-			if (!edge || edge.endpoint0EntityId !== usage.markerEntityId) throw new Error("Caption usage conflict after revision");
-			return {
-				clipEntityId: usage.clipEntityId,
-				markerEntityId: usage.markerEntityId,
-				previousCaptionEntityId: usage.captionEntityId,
-				captionEntityId: String(edge.endpoint1EntityId)
-			};
-		});
-		return {
-			rows,
-			audioScriptEntityId: String(prior[0].endpoint0EntityId),
-			captionUsages,
-			changed: false
-		};
-	}
+	const prior = rows.relations.filter((r) => r.relationKind === "derived-from" && r.trace.command === "revise-audio-script" && r.trace.editId === input.editId);
+	if (prior.length && (prior.length !== 1 || prior[0].trace.signature !== signature)) throw new Error("AudioScript edit identity conflict");
 	const source = rows.entities.find((row) => row.entityId === input.sourceAudioScriptEntityId);
 	if (source?.entityKind !== "audio-script") throw new Error("AudioScript source is missing");
 	assembleScriptText({
@@ -2094,39 +1984,37 @@ function reviseAudioScript(rows, input) {
 			text
 		};
 	});
-	if (!changedSegments.size) return {
-		rows,
-		audioScriptEntityId: source.entityId,
-		captionUsages: [],
-		changed: false
-	};
+	if (!changedSegments.size) {
+		if (prior.length) throw new Error("AudioScript edit identity conflict");
+		return {
+			rows,
+			audioScriptEntityId: source.entityId,
+			captionUsages: [],
+			changed: false
+		};
+	}
 	delete payload.assetContentHash;
 	const id = hash(input.editId);
 	const audioScriptEntityId = createEntityId(`entity_script_revision_${id}`);
-	const result = {
-		entities: [...rows.entities, {
-			entityId: audioScriptEntityId,
-			entityKind: "audio-script",
-			payload
-		}],
-		relations: [...rows.relations, {
-			relationId: createRelationId(`relation_script_revision_${id}`),
-			relationKind: "generated",
-			endpoint0EntityId: audioScriptEntityId,
-			endpoint1EntityId: source.entityId,
-			metadata: {},
-			trace: {
-				command: "revise-audio-script",
-				editId: input.editId,
-				signature
-			}
-		}]
+	const audioScript = {
+		entityId: audioScriptEntityId,
+		entityKind: "audio-script",
+		payload
+	};
+	const provenance = {
+		relationId: createRelationId(`relation_script_revision_${id}`),
+		relationKind: "derived-from",
+		endpoint0EntityId: audioScriptEntityId,
+		endpoint1EntityId: source.entityId,
+		metadata: {},
+		trace: {
+			command: "revise-audio-script",
+			editId: input.editId,
+			signature
+		}
 	};
-	const entities = [...result.entities];
-	let relations = [...result.relations];
-	const captionUsages = [];
 	const selectedMarkers = /* @__PURE__ */ new Set();
-	for (const [index, usage] of (input.captionUsages ?? []).entries()) {
+	const planCaption = (usage, index, targetAudioScriptEntityId) => {
 		if (selectedMarkers.has(usage.markerEntityId)) throw new Error("Duplicate caption usage");
 		selectedMarkers.add(usage.markerEntityId);
 		const caption = rows.entities.find((row) => row.entityId === usage.captionEntityId);
@@ -2137,52 +2025,131 @@ function reviseAudioScript(rows, input) {
 		if (isJsonObject(selection) && selection.textRange !== void 0 && typeof selection.segmentId === "string" && changedSegments.has(selection.segmentId) && usage.selection === void 0) throw new Error("Changed partial Caption requires an explicit selection");
 		const bases = caption.payload.baseEntityIds;
 		if (!Array.isArray(bases) || !bases.includes(source.entityId)) throw new Error("Caption requires a direct AudioScript base");
-		const clipMarkers = rows.relations.filter((r) => r.relationKind === "clip-marker" && r.endpoint0EntityId === usage.clipEntityId);
-		const markerContents = rows.relations.filter((r) => r.relationKind === "marker-content" && r.endpoint0EntityId === usage.markerEntityId);
-		const markerOwners = rows.relations.filter((r) => (r.relationKind === "clip-marker" || r.relationKind === "axvideo-marker") && r.endpoint1EntityId === usage.markerEntityId);
-		if (clipMarkers.length !== 1 || clipMarkers[0].endpoint1EntityId !== usage.markerEntityId || markerOwners.length !== 1 || markerContents.length !== 1 || markerContents[0].endpoint1EntityId !== usage.captionEntityId) throw new Error("Caption usage conflict");
+		const clipMarkers = rows.relations.filter((r) => r.relationKind === "marker" && r.endpoint0EntityId === usage.clipEntityId);
+		const clipContents = rows.relations.filter((r) => r.relationKind === "contain" && r.endpoint0EntityId === usage.clipEntityId);
+		const markerOwners = rows.relations.filter((r) => r.relationKind === "marker" && r.endpoint1EntityId === usage.markerEntityId);
+		if (clipMarkers.length !== 1 || clipMarkers[0].endpoint1EntityId !== usage.markerEntityId || markerOwners.length !== 1 || clipContents.length !== 1) throw new Error("Caption usage conflict");
 		const newCaptionId = createEntityId(`entity_caption_revision_${id}_${index}`);
-		const clone = {
-			...caption,
-			entityId: newCaptionId,
-			payload: {
-				...structuredClone(caption.payload),
-				baseEntityIds: bases.map((base) => base === source.entityId ? audioScriptEntityId : base),
-				...usage.selection === void 0 ? {} : { selection: structuredClone(usage.selection) }
-			}
-		};
-		entities.push(clone);
-		assembleCaptionContent({
-			entities,
-			relations
-		}, newCaptionId);
-		relations = relations.filter((r) => r.relationId !== markerContents[0].relationId);
-		relations.push({
-			...markerContents[0],
+		return {
+			clone: {
+				...caption,
+				entityId: newCaptionId,
+				payload: {
+					...structuredClone(caption.payload),
+					baseEntityIds: bases.map((base) => base === source.entityId ? targetAudioScriptEntityId : base),
+					...usage.selection === void 0 ? {} : { selection: structuredClone(usage.selection) }
+				}
+			},
+			clipContent: clipContents[0],
+			newCaptionId,
 			relationId: createRelationId(`relation_caption_revision_${id}_${index}`),
-			endpoint1EntityId: newCaptionId,
 			trace: {
 				command: "revise-audio-script",
 				editId: input.editId,
 				usageIndex: index
 			}
+		};
+	};
+	if (prior.length) {
+		const currentAudioScriptEntityId = prior[0].endpoint0EntityId;
+		if (!equalJson(prior[0], {
+			...provenance,
+			relationId: prior[0].relationId,
+			endpoint0EntityId: currentAudioScriptEntityId
+		})) throw new Error("AudioScript edit identity conflict");
+		const preservedScripts = rows.entities.filter((row) => row.entityId === currentAudioScriptEntityId);
+		const preservedScript = preservedScripts[0]?.entityKind === "audio-script" ? {
+			...preservedScripts[0],
+			payload: Object.fromEntries(Object.entries(preservedScripts[0].payload).filter(([key]) => key !== "assetContentHash"))
+		} : preservedScripts[0];
+		if (preservedScripts.length !== 1 || !equalJson(preservedScript, {
+			...audioScript,
+			entityId: currentAudioScriptEntityId
+		})) throw new Error("AudioScript edit identity conflict");
+		let relations = [...rows.relations];
+		let changed = false;
+		const captionUsages = [];
+		for (const [index, usage] of (input.captionUsages ?? []).entries()) {
+			const plan = planCaption(usage, index, currentAudioScriptEntityId);
+			const preservedCaptions = rows.entities.filter((row) => row.entityId === plan.newCaptionId);
+			if (preservedCaptions.length !== 1 || !equalJson(preservedCaptions[0], plan.clone)) throw new Error("Caption usage conflict after revision");
+			const plannedEdge = {
+				relationId: plan.relationId,
+				relationKind: "contain",
+				endpoint0EntityId: plan.clipContent.endpoint0EntityId,
+				endpoint1EntityId: plan.newCaptionId,
+				metadata: structuredClone(plan.clipContent.metadata),
+				trace: plan.trace
+			};
+			if (plan.clipContent.relationId === plan.relationId) {
+				if (!equalJson(plan.clipContent, plannedEdge)) throw new Error("Caption usage conflict after revision");
+			} else {
+				if (plan.clipContent.endpoint1EntityId !== usage.captionEntityId) throw new Error("Caption usage conflict after revision");
+				relations = relations.filter((row) => row.relationId !== plan.clipContent.relationId);
+				relations.push(plannedEdge);
+				changed = true;
+			}
+			captionUsages.push({
+				clipEntityId: usage.clipEntityId,
+				markerEntityId: usage.markerEntityId,
+				previousCaptionEntityId: usage.captionEntityId,
+				captionEntityId: plan.newCaptionId
+			});
+		}
+		if (!changed) return {
+			rows,
+			audioScriptEntityId: currentAudioScriptEntityId,
+			captionUsages,
+			changed: false
+		};
+		const revised = {
+			entities: rows.entities,
+			relations
+		};
+		decodeAndValidate(rows, revised);
+		return {
+			rows: revised,
+			audioScriptEntityId: currentAudioScriptEntityId,
+			captionUsages,
+			changed: true
+		};
+	}
+	const result = {
+		entities: [...rows.entities, audioScript],
+		relations: [...rows.relations, provenance]
+	};
+	const entities = [...result.entities];
+	let relations = [...result.relations];
+	const captionUsages = [];
+	for (const [index, usage] of (input.captionUsages ?? []).entries()) {
+		const plan = planCaption(usage, index, audioScriptEntityId);
+		if (plan.clipContent.endpoint1EntityId !== usage.captionEntityId) throw new Error("Caption usage conflict");
+		entities.push(plan.clone);
+		assembleCaptionContent({
+			entities,
+			relations
+		}, plan.newCaptionId);
+		relations = relations.filter((r) => r.relationId !== plan.clipContent.relationId);
+		relations.push({
+			relationId: plan.relationId,
+			relationKind: "contain",
+			endpoint0EntityId: plan.clipContent.endpoint0EntityId,
+			endpoint1EntityId: plan.newCaptionId,
+			metadata: structuredClone(plan.clipContent.metadata),
+			trace: plan.trace
 		});
 		captionUsages.push({
 			clipEntityId: usage.clipEntityId,
 			markerEntityId: usage.markerEntityId,
 			previousCaptionEntityId: usage.captionEntityId,
-			captionEntityId: newCaptionId
+			captionEntityId: plan.newCaptionId
 		});
 	}
 	const revised = {
 		entities,
 		relations
 	};
-	decodeEntityRelationRows(revised, { compareMarkerPoints: (_marker, _range, left, right) => {
-		if (typeof left !== "number" || typeof right !== "number" || !Number.isFinite(left) || !Number.isFinite(right)) throw new Error("Sequence Marker points must use finite numeric coordinates");
-		return left - right;
-	} });
-	validateEntityRelationTransition(rows, revised);
+	decodeAndValidate(rows, revised);
 	return {
 		rows: revised,
 		audioScriptEntityId,
@@ -2190,6 +2157,10 @@ function reviseAudioScript(rows, input) {
 		changed: true
 	};
 }
+function decodeAndValidate(previous, revised) {
+	decodeEntityRelationRows(revised, {});
+	validateEntityRelationTransition(previous, revised);
+}
 function hash(value) {
 	return bytesToHex(sha256(new TextEncoder().encode(canonicalJson(value))));
 }
@@ -2264,7 +2235,7 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 				relations
 			}, {
 				assetId: speech.origin_speech_id,
-				kind: "voiceover",
+				kind: "voiceover-recording",
 				durationMs: speech.media_duration_ms,
 				storageKey: speech.audio_storage_key,
 				voice: {
@@ -2302,7 +2273,7 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 			...oldTrack.is_hidden === void 0 ? {} : { hidden: oldTrack.is_hidden }
 		}, oldTrack.id);
 		trackIds.set(oldTrack, track);
-		link("timeline-track", timeline, track);
+		link("contain", timeline, track);
 	}
 	for (const oldTrack of legacy.tracks ?? []) {
 		const track = trackIds.get(oldTrack);
@@ -2312,7 +2283,7 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 			const volume = part.video_clip?.volume ?? part.speech?.volume ?? part.bgm?.volume;
 			const clip = addEntity("clip", {
 				...volume === void 0 ? {} : { volume },
-				...item.time_position.mode === "sequential" && !(role === "video_clip" && normalizedMainRanges !== void 0) || role === "bgm" ? { order: role === "bgm" ? 0 : order } : {}
+				order: role === "bgm" ? 0 : order
 			}, item.part_id);
 			let content = contentByPartId.get(item.part_id);
 			let duration;
@@ -2323,37 +2294,21 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 				const fact = facts.get(video.origin_media_id);
 				const rate = speedOf(video.speed_shift);
 				markerPayload = {
-					sourceRange: {
-						start: video.play_in,
-						end: video.play_out
-					},
-					duration: {
-						mode: "fixed",
-						value: duration
-					},
-					...(fact.kind === "image" || fact.kind === "video") && video.speed_shift !== void 0 ? { timeRemapping: {
-						kind: "linear",
-						mode: video.speed_shift?.mode ?? "constant",
-						rate
-					} } : {}
+					inMs: video.play_in,
+					outMs: video.play_out,
+					...(fact.kind === "image" || fact.kind === "video") && video.speed_shift !== void 0 ? { rate } : {}
 				};
 			} else if (part.speech !== void 0) {
 				duration = part.speech.media_duration_ms;
 				markerPayload = {
-					sourceRange: {
-						start: 0,
-						end: duration
-					},
-					duration: {
-						mode: "fixed",
-						value: duration
-					}
+					inMs: 0,
+					outMs: duration
 				};
 			} else if (part.caption !== void 0) {
 				const caption = part.caption;
 				duration = caption.initial_duration_ms;
 				const voiceover = contentByPartId.get(caption.speech_part_id);
-				const render = relations.find((relation) => relation.relationKind === "phonetic-script-render" && relation.endpoint0EntityId === voiceover);
+				const render = relations.find((relation) => relation.relationKind === "derived-from" && relation.endpoint0EntityId === voiceover);
 				const phonetic = entities.find((entity) => entity.entityId === render?.endpoint1EntityId);
 				const script = phonetic === void 0 ? void 0 : composedAudioScript(phonetic, entities);
 				if (script === void 0) fail("Legacy Caption has no composed AudioScript");
@@ -2375,14 +2330,8 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 					...caption.style === void 0 ? {} : { style: toEntityCaptionStyle(caption.style) }
 				});
 				markerPayload = {
-					sourceRange: {
-						start: 0,
-						end: duration
-					},
-					duration: {
-						mode: "fixed",
-						value: duration
-					}
+					inMs: 0,
+					outMs: duration
 				};
 			} else {
 				const bgm = part.bgm;
@@ -2390,35 +2339,25 @@ function migrateLegacyTimelineToEntities(legacy, assetFacts, initial = {
 				if (fact.kind !== "audio") fail(`Legacy BGM ${item.part_id} requires an audio fact`);
 				duration = fact.durationMs;
 				markerPayload = {
-					sourceRange: {
-						start: 0,
-						end: duration
-					},
-					duration: { mode: "from-source" },
-					durationPolicy: "timeline"
+					inMs: 0,
+					outMs: duration,
+					fillTimeline: true
 				};
 			}
 			if (content === void 0) fail(`Migration could not resolve content for ${item.part_id}`);
 			const normalizedMainRange = role === "video_clip" ? normalizedMainRanges?.get(item.part_id) : void 0;
 			if (normalizedMainRange !== void 0) markerPayload = {
 				...markerPayload,
-				targetRange: normalizedMainRange
+				startMs: normalizedMainRange.start
 			};
-			else if (item.time_position.mode === "absolute" && role !== "bgm") markerPayload = {
+			else if (item.time_position.mode === "absolute" && role !== "bgm" || item.time_position.mode === "anchored") markerPayload = {
 				...markerPayload,
-				targetRange: {
-					start: item.time_position.offsetMs,
-					end: item.time_position.offsetMs + duration
-				}
-			};
-			else if (item.time_position.mode === "anchored") markerPayload = {
-				...markerPayload,
-				anchorOffset: item.time_position.offsetMs
+				startMs: item.time_position.offsetMs
 			};
 			const marker = addEntity("sequence-marker", markerPayload);
-			link("track-clip", track, clip);
-			link("clip-marker", clip, marker);
-			link("marker-content", marker, content);
+			link("contain", track, clip);
+			link("marker", clip, marker);
+			link("contain", clip, content);
 			if (item.time_position.mode === "anchored") link("clip-anchor", clip, item.time_position.anchorPartId);
 		}
 	}
@@ -2439,7 +2378,8 @@ function assertEntityProjectionPreservesLegacy(legacy, projection, rows) {
 		for (const part of Object.values(view.part_library ?? {})) {
 			const speech = part.speech;
 			if (speech?.phoneme_script === null) delete speech.phoneme_script;
-			if (speech !== void 0) delete speech.origin_asset_system;
+			const speed = part.video_clip?.speed_shift;
+			if (speed !== void 0) delete speed.mode;
 		}
 		return { view };
 	};
@@ -2455,22 +2395,21 @@ function assertEntityProjectionPreservesLegacy(legacy, projection, rows) {
 		const sequentialOrders = [];
 		for (const item of oldTrack.items ?? []) {
 			const clip = rows.entities.find((row) => row.entityId === item.part_id && row.entityKind === "clip");
-			const binding = rows.relations.filter((row) => row.relationKind === "clip-marker" && row.endpoint0EntityId === item.part_id && rows.entities.some((entity) => entity.entityId === row.endpoint1EntityId && entity.entityKind === "sequence-marker"));
+			const binding = rows.relations.filter((row) => row.relationKind === "marker" && row.endpoint0EntityId === item.part_id && rows.entities.some((entity) => entity.entityId === row.endpoint1EntityId && entity.entityKind === "sequence-marker"));
 			const marker = rows.entities.find((row) => row.entityId === binding[0]?.endpoint1EntityId && row.entityKind === "sequence-marker");
 			if (clip === void 0 || binding.length !== 1 || marker === void 0) fail("Migration must preserve Clip/Marker placement identity");
 			const anchors = rows.relations.filter((row) => row.relationKind === "clip-anchor" && row.endpoint0EntityId === clip.entityId);
 			const normalizedMainRange = oldTrack.parts_kind === "video_clip" ? normalizedMainRanges?.get(item.part_id) : void 0;
 			if (normalizedMainRange !== void 0) {
-				if (clip.payload.order !== void 0 || !isExactRange(marker.payload.targetRange, normalizedMainRange) || marker.payload.anchorOffset !== void 0 || anchors.length !== 0) fail("Migration must preserve the legacy overlap-normalized main Track");
+				if (marker.payload.startMs !== normalizedMainRange.start || anchors.length !== 0) fail("Migration must preserve the legacy overlap-normalized main Track");
 			} else if (oldTrack.parts_kind === "bgm") {
-				if (clip.payload.order !== 0 || marker.payload.targetRange !== void 0 || marker.payload.anchorOffset !== void 0 || marker.payload.durationPolicy !== "timeline" || anchors.length !== 0) fail("Migration must preserve timeline-filling BGM semantics");
+				if (clip.payload.order !== 0 || marker.payload.startMs !== void 0 || marker.payload.fillTimeline !== true || anchors.length !== 0) fail("Migration must preserve timeline-filling BGM semantics");
 			} else if (item.time_position.mode === "sequential") {
-				if (marker.payload.targetRange !== void 0 || marker.payload.anchorOffset !== void 0 || typeof clip.payload.order !== "number" || !Number.isFinite(clip.payload.order) || anchors.length !== 0) fail("Migration must preserve sequential placement semantics");
+				if (marker.payload.startMs !== void 0 || typeof clip.payload.order !== "number" || !Number.isFinite(clip.payload.order) || anchors.length !== 0) fail("Migration must preserve sequential placement semantics");
 				sequentialOrders.push(clip.payload.order);
 			} else if (item.time_position.mode === "absolute") {
-				const target = marker.payload.targetRange;
-				if (clip.payload.order !== void 0 || !isRangeStartingAt(target, item.time_position.offsetMs) || marker.payload.anchorOffset !== void 0 || anchors.length !== 0) fail("Migration must preserve absolute placement semantics");
-			} else if (clip.payload.order !== void 0 || marker.payload.targetRange !== void 0 || marker.payload.anchorOffset !== item.time_position.offsetMs || anchors.length !== 1 || anchors[0].endpoint1EntityId !== item.time_position.anchorPartId) fail("Migration must preserve anchored placement semantics");
+				if (marker.payload.startMs !== item.time_position.offsetMs || anchors.length !== 0) fail("Migration must preserve absolute placement semantics");
+			} else if (marker.payload.startMs !== item.time_position.offsetMs || anchors.length !== 1 || anchors[0].endpoint1EntityId !== item.time_position.anchorPartId) fail("Migration must preserve anchored placement semantics");
 		}
 		if (sequentialOrders.some((order, index) => index > 0 && order <= sequentialOrders[index - 1])) fail("Migration must preserve sequential Clip order");
 	}
@@ -2711,7 +2650,7 @@ function requirePart(document, partId) {
 	return part;
 }
 function ensureSpeechPhoneticChain(voiceoverAudioEntityId, audioScriptText, phonemeScript, entities, relations, addEntity, link, documentAudioScriptEntityId) {
-	const renders = relations.filter((relation) => relation.relationKind === "phonetic-script-render" && relation.endpoint0EntityId === voiceoverAudioEntityId);
+	const renders = relations.filter((relation) => relation.relationKind === "derived-from" && relation.endpoint0EntityId === voiceoverAudioEntityId);
 	if (renders.length > 1) fail(`Voiceover ${voiceoverAudioEntityId} has ambiguous PhoneticScript provenance`);
 	if (renders.length === 1) {
 		const phonetic = entities.find((entity) => entity.entityId === renders[0].endpoint1EntityId && entity.entityKind === "phonetic-script");
@@ -2739,7 +2678,7 @@ function ensureSpeechPhoneticChain(voiceoverAudioEntityId, audioScriptText, phon
 		baseEntityIds: [script.entityId],
 		...phonemeScript === void 0 ? {} : { phonemeScript }
 	});
-	link("phonetic-script-render", voiceoverAudioEntityId, phonetic);
+	link("derived-from", voiceoverAudioEntityId, phonetic);
 	return phonetic;
 }
 function composedAudioScript(phonetic, entities) {
@@ -2801,12 +2740,6 @@ function assertCaptionStyle(style) {
 		"position_y"
 	], "Caption style");
 }
-function isRangeStartingAt(value, expectedStart) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) && value.start === expectedStart;
-}
-function isExactRange(value, expected) {
-	return value !== null && typeof value === "object" && !Array.isArray(value) && value.start === expected.start && value.end === expected.end;
-}
 function requireFinite(value, label) {
 	if (typeof value !== "number" || !Number.isFinite(value)) fail(`${label} must be finite`);
 	return value;
@@ -5314,4 +5247,4 @@ function serverCovers(serverVV, target) {
 	return covers(server, target);
 }
 //#endregion
-export { DEFAULT_UNIT_TIME_MS, EntityGraphHttpClient, EntityTimelineEditor, EntityTimelineProjectionError, IMPLEMENTED_SEMANTIC_OP_KINDS, LANE_KINDS_IN_STACK_ORDER, LORO_ENTITY_SCHEMA, LoroEntityDocument, LoroEntityDraft, ManualSyncDoc, MedeoHttpDocStorage, MemoryDocStorage, MengineAckFailedError, MengineDocSession, MengineHttpClient, MengineHttpRequestError, MenginePushRejectedError, MirrorVideoDocumentAdapter, PlainMemoryAdapter, SchemaValidator, ScriptCompositionError, SemanticEditor, TIMELINE_SKELETON_DURATION_MS, ValidationError, VideoDocumentValidationError, applyEntityRows, applyFieldChanges, arrangeMainTrackSeamlessly, assembleCaptionContent, assembleEntityContent, assemblePhoneticScriptContent, assembleScriptText, assertCanonicalEditorResources, assertEntityProjectionPreservesLegacy, assertFieldChanges, assertMediaAssetWritePolicy, assertValidVideoDocument, audioScriptAssetContent, audioScriptAssetFields, audioScriptAssetHash, audioScriptAssetOf, base64ToBytes, buildInitialVideoDocument, buildSpeechHostMap, bytesToBase64, cascadeAfterVideoClipChanges, compileEntityRows, createEditSandbox, createMirrorVideoDocument, createMirrorVideoDocumentAdapter, createPlainMemoryAdapter, decodeDocVersionMark, derivePositionFromAbs, effectiveVideoClipDurationMs, encodeDocVersionMark, ensureEditorFoundation, ensureLaneTrack, fillMainTrackTimeGaps, findComposedAudioScript, findLaneTrack, fromVideoDocument, generatePartId, getAt, hostForAbsMs, importMediaAsset, isEmptyVideoClip, isImplementedSemanticOpKind, isMap, laneTrackId, mainTrackRanges, migrateLegacyTimelineToEntities, partDurationMs, partUnionSchema, phoneticScriptAssetContent, phoneticScriptAssetHash, phoneticScriptAssetOf, prepareCaptionContent, projectEntityTimeline, readDocumentAudioScript, readEntityDocument, readEntityRelationRecords, readMainTrackItems, readMengineEventStream, readPart, readPartDurationMs, readVideoDocumentFromDraft, reassignSpeechesToVideoClipsByTime, recalculateTimelineDuration, relativePositionForAbs, replayJournal, resolveAllSpeechOverlaps, resolveEntityTimelineLayout, resolveFieldPath, resolveSpeechOverlapByShiftingVideos, reviseAudioScript, safeDurationMs, schemas_exports as schemas, scriptSourceAssetOf, selectAudioScriptSegment, snapshotToPlain, solveVideoDocument, speedOf, syncAggregatedClipsTimePosition, toVideoDocument, validateVideoDocument, videoDocumentMirrorSchema, videoDocumentSchema };
+export { DEFAULT_UNIT_TIME_MS, EntityGraphHttpClient, EntityGraphRevisionConflictError, EntityTimelineEditor, EntityTimelineProjectionError, IMPLEMENTED_SEMANTIC_OP_KINDS, LANE_KINDS_IN_STACK_ORDER, LORO_ENTITY_SCHEMA, LoroEntityDocument, LoroEntityDraft, ManualSyncDoc, MedeoHttpDocStorage, MemoryDocStorage, MengineAckFailedError, MengineDocSession, MengineHttpClient, MengineHttpRequestError, MenginePushRejectedError, MirrorVideoDocumentAdapter, PlainMemoryAdapter, SchemaValidator, ScriptCompositionError, SemanticEditor, TIMELINE_SKELETON_DURATION_MS, ValidationError, VideoDocumentValidationError, applyEntityRows, applyFieldChanges, arrangeMainTrackSeamlessly, assembleCaptionContent, assembleEntityContent, assemblePhoneticScriptContent, assembleScriptText, assertCanonicalEditorResources, assertEntityProjectionPreservesLegacy, assertFieldChanges, assertMediaAssetWritePolicy, assertValidVideoDocument, audioScriptAssetContent, audioScriptAssetFields, audioScriptAssetHash, audioScriptAssetOf, base64ToBytes, buildInitialVideoDocument, buildSpeechHostMap, bytesToBase64, cascadeAfterVideoClipChanges, compileEntityRows, createEditSandbox, createMirrorVideoDocument, createMirrorVideoDocumentAdapter, createPlainMemoryAdapter, decodeDocVersionMark, derivePositionFromAbs, effectiveVideoClipDurationMs, encodeDocVersionMark, ensureEditorFoundation, ensureLaneTrack, fillMainTrackTimeGaps, findComposedAudioScript, findLaneTrack, fromVideoDocument, generatePartId, getAt, hostForAbsMs, importMediaAsset, isEmptyVideoClip, isImplementedSemanticOpKind, isMap, laneTrackId, mainTrackRanges, migrateLegacyTimelineToEntities, partDurationMs, partUnionSchema, phoneticScriptAssetContent, phoneticScriptAssetHash, phoneticScriptAssetOf, prepareCaptionContent, projectEntityTimeline, publishEntityRows, readDocumentAudioScript, readEntityDocument, readEntityRelationRecords, readMainTrackItems, readMengineEventStream, readPart, readPartDurationMs, readVideoDocumentFromDraft, reassignSpeechesToVideoClipsByTime, recalculateTimelineDuration, relativePositionForAbs, replayJournal, resolveAllSpeechOverlaps, resolveEntityTimelineLayout, resolveFieldPath, resolveSpeechOverlapByShiftingVideos, reviseAudioScript, safeDurationMs, schemas_exports as schemas, scriptSourceAssetOf, selectAudioScriptSegment, snapshotToPlain, solveVideoDocument, speedOf, syncAggregatedClipsTimePosition, toVideoDocument, validateVideoDocument, videoDocumentMirrorSchema, videoDocumentSchema };