rapier-markdown-kit 1.2.3 → 1.2.5

package/dist/kit/ledger/journal-records.mjs

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MIT
+import {fields, scalar, plainPrototype} from './data.mjs';
 
 const _RAPIER_TRANSACTION_ACTOR_LIMIT = 160;
 const _RAPIER_TRANSACTION_OPERATION_LIMIT = 96;
@@ -32,32 +33,15 @@ function _rapierTransformSplices(text, splices, inverse = false) {
 }
 
 function _rapierPlainLedgerData(record) {
-	try {
-		const active = new Set(), pending = [[record, false]];
-		while (pending.length) {
-			const [value, leaving] = pending.pop();
-			if (leaving) { active.delete(value); continue; }
-			if (value === null || typeof value === 'boolean') continue;
-			if (typeof value === 'string') { if (/[\uD800-\uDFFF]/u.test(value)) return false; continue; }
-			if (typeof value === 'number') { if (!Number.isFinite(value) || Object.is(value, -0)) return false; continue; }
-			if (!value || typeof value !== 'object' || active.has(value)) return false;
-			const array = Array.isArray(value), proto = Object.getPrototypeOf(value);
-			if (!array && proto !== null && (Object.getPrototypeOf(proto) !== null ||
-				Object.getOwnPropertyDescriptor(proto, 'constructor')?.value?.name !== 'Object')) return false;
-			const keys = Reflect.ownKeys(value);
-			if (array && keys.length !== value.length + 1) return false;
-			active.add(value); pending.push([value, true]);
-			for (const key of keys) {
-				if (array && key === 'length') continue;
-				if (typeof key !== 'string' || ['__proto__', 'constructor', 'prototype'].includes(key) ||
-					(array && (!Number.isSafeInteger(Number(key)) || Number(key) < 0 || Number(key) >= value.length || String(Number(key)) !== key))) return false;
-				const field = Object.getOwnPropertyDescriptor(value, key);
-				if (!field || !Object.hasOwn(field, 'value') || !field.enumerable) return false;
-				pending.push([field.value, false]);
-			}
-		}
-		return true;
-	} catch (_) { return false; }
+	const active = new Set();
+	const walk = (value, depth) => {
+		if (scalar(value)) return;
+		const {descriptors, keys} = fields(value, depth, active, false);
+		active.add(value);
+		for (const key of keys) walk(descriptors[key].value, depth + 1);
+		active.delete(value);
+	};
+	try { walk(record, 0); return true; } catch (_) { return false; }
 }
 
 const _rapierMetadataValue = (key, value) => key === 'filename'
@@ -156,9 +140,16 @@ function _rapierRecordSplices(entry, ledger) {
 }
 
 // Source identifies a retained checkpoint even when host revision numbers differ.
+// The History Slider compares now → earlier: that answer is the earlier → now walk, inverted.
 function journalOperations(before, after, journal) {
 	if (typeof before !== 'string' || typeof after !== 'string' || !Array.isArray(journal)) return;
 	if (before === after) return [];
+	const forward = journalWalk(before, after, journal);
+	if (forward) return forward;
+	return journalWalk(after, before, journal)?.reverse().map(({pos, removed, inserted}) => ({pos, removed: inserted, inserted: removed}));
+}
+
+function journalWalk(before, after, journal) {
 	try {
 		let text = after;
 		const lookup = _rapierRecordIndex(journal), groups = [];
@@ -480,8 +471,7 @@ const _rapierPrepareHistoryRecords = (() => {
 			// input later cannot retroactively certify an earlier view of its properties.
 			frame.frozen = frame.immutable = Object.isFrozen(value);
 			const array = Array.isArray(value), proto = Object.getPrototypeOf(value);
-			if (!array && proto !== null && (Object.getPrototypeOf(proto) !== null ||
-				Object.getOwnPropertyDescriptor(Object.getOwnPropertyDescriptor(proto, 'constructor')?.value || {}, 'name')?.value !== 'Object')) throw Error('history_data');
+			if (!array && !plainPrototype(proto)) throw Error('history_data');
 			const descriptors = Object.getOwnPropertyDescriptors(value), keys = Reflect.ownKeys(descriptors);
 			if (array && keys.length !== descriptors.length.value + 1) throw Error('history_data');
 			for (const key of keys) {
@@ -588,7 +578,12 @@ function _rapierCheckLedgerRecord(record, prior, documentAuthority, maxDocumentB
 		const own = Array.isArray(record.splices), navigation = !!(record.transaction?.reverts || record.transaction?.reapplies);
 		if ((!own && !navigation) || (own && record.splices.length > 64) ||
 			(record.transaction?.reverts && record.transaction?.reapplies)) return false;
-		if (metadata === undefined || (!splices?.length && !Object.values(metadata || {}).some(pair => pair.before !== pair.after) && !semantic) ||
+		const metadataChanged = Object.values(metadata || {}).some(pair => pair.before !== pair.after);
+		// An identical concurrent replacement keeps its authored rows and an empty
+		// physical splice. The origin proof, not this gate, shows the effect is already present.
+		const coincidentWitness = !splices?.length && record.beforeHash === record.afterHash &&
+			record.authored && _rapierValidAuthored(record.authored) && record.authored.splices.some(row => row.removed.length);
+		if (metadata === undefined || (!splices?.length && !metadataChanged && !semantic && !coincidentWitness) ||
 			(record.beforeHash === record.afterHash && splices?.length) ||
 			(record.beforeHash !== record.afterHash && !splices?.length) ||
 			((record.transaction?.sourceTransactionId || record.transaction?.sourceTransactionIds?.length || navigation) && !semantic)) return false;

package/dist/kit/ledger/merge.mjs

@@ -3,7 +3,7 @@ import {readLedger, exportLedger, rootAfter} from './format.mjs';
 import {_rapierTransformSplices, _rapierTransformMetadata, _rapierMetadataDelta, _rapierHistoryEffects, _rapierMetadataState} from './journal-records.mjs';
 import {mergeText} from './text-merge.mjs';
 import {transposeAuthored, authoredPlacements} from './transport.mjs';
-import {parseWill} from '../../agent/will.mjs';
+import {parseWill, stripOneTerminator} from '../../agent/will.mjs';
 import {sha256} from './hash.mjs';
 import {canonicalJSON, fault} from './data.mjs';
 // The same interval transport used by the agent kernel, now shared with the public ledger.
@@ -46,6 +46,16 @@ function actFingerprint(record, effects) {
     metadata: references.length ? null : Object.fromEntries(Object.entries(record.metadata || {}).map(([key, pair]) => [key, pair.after]))}));
 }
 const mergeIdentity = (localDigest, incomingDigest) => 'merge:' + sha256(canonicalJSON([localDigest, incomingDigest]));
+// One physical replacement can carry two authored acts when both removed the same
+// units and wrote the same text. An empty list is the act that does not repeat it.
+function coincidentEffect(origin, left, right) {
+  const authored = origin?.splices;
+  if (!authored?.some(row => row.removed.length)) return false;
+  const same = (rows, expected) => rows.length === expected.length && rows.every((row, index) =>
+    row.pos === expected[index].pos && row.removed === expected[index].removed && row.inserted === expected[index].inserted);
+  const lists = [left, right];
+  return lists.every(rows => !rows.length || same(rows, authored)) && lists.some(rows => same(rows, authored));
+}
 function checkpointList(read) {
   const list = [{root: read.ledger.start.root, text: read.ledger.start.text, metadata: read.ledger.start.metadata,
     revision: read.ledger.start.revision, identity: null, index: 0}], records = read.ledger.records;
@@ -58,10 +68,18 @@ function checkpointList(read) {
   }
   return list;
 }
+// Keep and append regions with their intents, and the kept text: what the other copy may not change unseen.
 function kept(text) {
   const will = parseWill(text);
   if (will.fault) return {fault: will.fault, text};
-  return will.regions.filter(region => region.law === 'keep').map(region => text.slice(region.start, region.end));
+  return will.regions.filter(region => region.law !== 'edit').map(({law, intent, start, end}) =>
+    law === 'keep' ? {law, intent, text: text.slice(start, end)} : {law, intent});
+}
+// Every append region of `from` still begins its counterpart in `to`.
+function appended(from, to) {
+  const regions = text => parseWill(text).regions.filter(region => region.law === 'append');
+  const was = regions(from), now = regions(to), core = (text, region) => stripOneTerminator(text.slice(region.start, region.end));
+  return was.length === now.length && was.every((region, index) => core(to, now[index]).startsWith(core(from, region)));
 }
 // A retained suffix can reuse a prefix only when an existing ledger proves its
 // exact source, metadata, revision and path root. Export then rechecks the whole
@@ -104,7 +122,11 @@ export function merge(first, second) {
         conflicts: [{kind: 'identity', code: 'act_order_conflict', actId: record.transaction.id}],
         review: {required: true, base: ours.text, proposed: theirs.text}};
     if (local && (canonicalJSON(local.splices) !== canonicalJSON(record.splices) ||
-        canonicalJSON(local.metadata || {}) !== canonicalJSON(record.metadata || {}))) unproved.add(record.transaction.id);
+        canonicalJSON(local.metadata || {}) !== canonicalJSON(record.metadata || {}))) {
+      const metadataSame = canonicalJSON(local.metadata || {}) === canonicalJSON(record.metadata || {});
+      if (!(metadataSame && coincidentEffect(localOrigins.get(local.transaction.id), local.splices, record.splices)))
+        unproved.add(record.transaction.id);
+    }
   }
   const a = checkpointList(ours), b = checkpointList(theirs);
   // A synthetic conflict act has one identity derived from both original envelopes.
@@ -192,7 +214,8 @@ export function merge(first, second) {
   }
   // Kept text arriving from the other copy waits for the person; this copy's own kept edits merge like any other.
   const incomingKept = canonicalJSON(kept(theirs.text));
-  const keepDiffers = incomingKept !== canonicalJSON(kept(ours.text)) && incomingKept !== canonicalJSON(kept(common.text));
+  const keepDiffers = incomingKept !== canonicalJSON(kept(ours.text)) && incomingKept !== canonicalJSON(kept(common.text)) ||
+    !appended(common.text, theirs.text) && !appended(ours.text, theirs.text);
   let conflicted = keepDiffers && unseen.length > 0, incomingSource = common.text;
   if (!conflicted) for (const record of incoming) {
     const beforeSource = incomingSource;
@@ -239,19 +262,31 @@ export function merge(first, second) {
       return settled(theirs);
     }
   }
-  let conflicts = [];
   if (conflicted) {
     if (unseen.length !== incoming.length) return refused('history', 'record_transport_conflict');
     if (incomingFields.size) return metadataConflict('record_transport_conflict', {fields: [...incomingFields]});
-    // Restart from the original local head: partially transported records never leak into a conflict result.
-    records.splice(ours.ledger.records.length); text = ours.text; metadata = {...ours.metadata}; root = ours.root;
+    // A display of both alternatives is not an accepted history. The caller's envelope
+    // stays whole; neither original act is replaced by a synthetic copy.
     const merged = mergeText(keepDiffers ? null : common.text, ours.text, theirs.text, {oursId: 'copy-' + ours.ledger.sha256.slice(0, 16), theirsId: 'copy-' + theirs.ledger.sha256.slice(0, 16)});
-    conflicts = merged.conflicts;
-    // Text equality cannot replace the unproved original acts with a clean receipt.
-    if (!conflicts.length) return refused('history', 'record_transport_conflict');
-    if (merged.text !== text) append([{pos: 0, removed: text, inserted: merged.text}], {transaction: {
-      id: mergeIdentity(ours.ledger.sha256, theirs.ledger.sha256), actor: {kind: 'system', id: 'merge'}, transport: 'platform', operation: 'document.merge', requestId: null,
-      affectedBlockIds: [], createdAt: null}});
+    if (!merged.conflicts.length) return refused('history', 'record_transport_conflict');
+    return {text: ours.text, metadata: ours.metadata, ledger: ours.ledger, clean: false,
+      conflicts: merged.conflicts.map(row => ({...row, code: 'text_overlap_unpreserved'})),
+      review: {required: true, base: ours.text, proposed: theirs.text}};
+  }
+  let conflicts = [];
+  // The act that keeps the physical splice needs the same authored origin as its
+  // witness. Copy it onto this result only; the caller's record stays untouched.
+  if (records.some(row => !row.splices.length && row.authored?.splices?.some(splice => splice.removed.length))) {
+    const origins = authoredPlacements(ours.ledger.start.text, records);
+    for (let index = 0; index < records.length; index++) {
+      const record = records[index];
+      if (record.authored) continue;
+      const origin = origins.get(record.transaction.id);
+      if (!origin?.splices.some(splice => splice.removed.length)) continue;
+      const key = canonicalJSON(origin);
+      if (records.some(other => other.transaction.id !== record.transaction.id && canonicalJSON(origins.get(other.transaction.id)) === key))
+        records[index] = {...record, authored: origin};
+    }
   }
   const ledger = exportLedger({text, metadata, records, documentAuthority: ours.ledger.documentAuthority, root,
     revision: records.at(-1)?.transaction.revision ?? ours.revision, complete: ours.complete});

package/dist/kit/ledger/text-merge.mjs

@@ -151,39 +151,81 @@ function textUnits(text) {
 	return out;
 }
 
-function textEdits(base, side) {
-	const n = base.length, m = side.length;
-	if ((n + 1) * (m + 1) > 1000000) return null;
-	const width = m + 1, score = new Uint32Array((n + 1) * width);
+const TEXT_WINDOW_CELLS = 1000000, TEXT_CELLS = 4000000;
+// One window's authored matches, or false when two optimal alignments disagree on any of them.
+function textWindowMatches(base, side, b0, b1, s0, s1, out, budget) {
+	const n = b1 - b0, m = s1 - s0, cells = (n + 1) * (m + 1);
+	if (cells > TEXT_WINDOW_CELLS || (budget.cells -= cells) < 0) return false;
+	// Only authored units score; a blank line matches only beside a matched neighbour.
+	const width = m + 1, score = new Uint32Array(cells), content = i => !textSpace(base[b0 + i]), same = (i, j) => base[b0 + i] === side[s0 + j];
 	for (let i = n - 1; i >= 0; i--) for (let j = m - 1; j >= 0; j--) {
 		const p = i * width + j;
-		score[p] = base[i] === side[j] ? score[p + width + 1] + 1 : Math.max(score[p + width], score[p + 1]);
+		score[p] = content(i) && same(i, j) ? score[p + width + 1] + 1 : Math.max(score[p + width], score[p + 1]);
+	}
+	const meaningful = [];
+	for (let i = 0, j = 0; i < n && j < m;) {
+		const p = i * width + j; if (!score[p]) break;
+		if (content(i) && same(i, j) && score[p] === score[p + width + 1] + 1) meaningful.push([i++, j++]);
+		else if (score[p + width] >= score[p + 1]) i++; else j++;
 	}
-	const walk = () => {
-		const pairs = []; let i = 0, j = 0;
-		while (i < n && j < m) {
-			const value = score[i * width + j]; if (!value) break;
-			if (base[i] === side[j]) { pairs.push([i++, j++]); continue; }
-			if (score[(i + 1) * width + j] >= score[i * width + j + 1]) i++; else j++;
-		}
-		return pairs;
-	};
-	const pairs = walk(), meaningful = pairs.filter(([i]) => !textSpace(base[i]));
 	// Every optimal path must agree on every authored anchor, not just two greedy walks.
-	const seen = new Uint32Array(score.length); seen.fill(0xffffffff); seen[0] = 0;
+	const seen = new Uint32Array(cells); seen.fill(0xffffffff); seen[0] = 0;
 	for (let i = 0; i <= n; i++) for (let j = 0; j <= m; j++) {
 		const p = i * width + j, at = seen[p]; if (at === 0xffffffff) continue;
 		const visit = (next, count) => { if (seen[next] !== 0xffffffff && seen[next] !== count) return false; seen[next] = count; return true; };
-		if (i < n && score[p + width] === score[p] && !visit(p + width, at)) return null;
-		if (j < m && score[p + 1] === score[p] && !visit(p + 1, at)) return null;
-		if (i < n && j < m && base[i] === side[j] && score[p] === score[p + width + 1] + 1) {
-			const content = !textSpace(base[i]);
-			if (content && (meaningful[at]?.[0] !== i || meaningful[at]?.[1] !== j)) return null;
-			if (!visit(p + width + 1, at + (content ? 1 : 0))) return null;
+		if (i < n && score[p + width] === score[p] && !visit(p + width, at)) return false;
+		if (j < m && score[p + 1] === score[p] && !visit(p + 1, at)) return false;
+		if (i < n && j < m && content(i) && same(i, j) && score[p] === score[p + width + 1] + 1) {
+			if (meaningful[at]?.[0] !== i || meaningful[at]?.[1] !== j) return false;
+			if (!visit(p + width + 1, at + 1)) return false;
 		}
 	}
-	if (seen[n * width + m] !== meaningful.length) return null;
-	const edits = []; let i = 0, j = 0;
+	if (seen[n * width + m] !== meaningful.length) return false;
+	for (const [i, j] of meaningful) out.push([b0 + i, s0 + j]);
+	return true;
+}
+
+// A window too large to prove whole splits only at authored units found once on each side of it:
+// such a unit names its own occurrence. The strict rule above still decides every window between them.
+function textMatches(base, side, b0, b1, s0, s1, out, budget) {
+	if ((b1 - b0 + 1) * (s1 - s0 + 1) <= TEXT_WINDOW_CELLS) return textWindowMatches(base, side, b0, b1, s0, s1, out, budget);
+	const once = (units, from, to) => {
+		const found = new Map();
+		for (let k = from; k < to; k++) if (!textSpace(units[k])) found.set(units[k], found.has(units[k]) ? -1 : k);
+		return found;
+	};
+	const inBase = once(base, b0, b1), pairs = [];
+	for (const [unit, j] of once(side, s0, s1)) { const i = inBase.get(unit); if (j >= 0 && i >= 0) pairs.push([i, j]); }
+	// The longest run of them in the same order on both sides.
+	const tails = [], prev = new Int32Array(pairs.length);
+	for (let k = 0; k < pairs.length; k++) {
+		let lo = 0, hi = tails.length;
+		while (lo < hi) { const mid = (lo + hi) >>> 1; if (pairs[tails[mid]][0] < pairs[k][0]) lo = mid + 1; else hi = mid; }
+		prev[k] = lo ? tails[lo - 1] : -1; tails[lo] = k;
+	}
+	if (!tails.length) return false;
+	const chain = [];
+	for (let k = tails[tails.length - 1]; k >= 0; k = prev[k]) chain.push(pairs[k]);
+	let i = b0, j = s0;
+	for (const [bi, sj] of chain.reverse()) {
+		if (!textMatches(base, side, i, bi, j, sj, out, budget)) return false;
+		out.push([bi, sj]); i = bi + 1; j = sj + 1;
+	}
+	return textMatches(base, side, i, b1, j, s1, out, budget);
+}
+
+function textEdits(base, side) {
+	const n = base.length, m = side.length, meaningful = [];
+	if (!textMatches(base, side, 0, n, 0, m, meaningful, {cells: TEXT_CELLS})) return null;
+	const pairs = [];
+	let i = 0, j = 0;
+	for (let k = 0; k < meaningful.length; k++) {
+		const [bi, sj] = meaningful[k], [ni, nj] = meaningful[k + 1] || [n, m];
+		if (bi > i && sj > j && textSpace(base[bi - 1]) && base[bi - 1] === side[sj - 1]) pairs.push([bi - 1, sj - 1]);
+		pairs.push([bi, sj]); i = bi + 1; j = sj + 1;
+		if (i < ni && j < nj && textSpace(base[i]) && base[i] === side[j]) pairs.push([i++, j++]);
+	}
+	const edits = []; i = 0; j = 0;
 	for (const [bi, sj] of [...pairs, [n, m]]) {
 		if (i !== bi || j !== sj) edits.push({start: i, end: bi, text: side.slice(j, sj).join('')});
 		i = bi + 1; j = sj + 1;
@@ -234,11 +276,13 @@ function textEnvelope(id, variants) {
 	return out + '<!-- /note-conflict:v1 -->\n';
 }
 
-function textDeclarations(text) {
-	text = textUnits(text).filter(unit => !textEnvelopeAt(unit)).join('');
+// Takes the text's units, scanned once by the caller; a text without conflict envelopes is not scanned again.
+function textDeclarations(units) {
+	const kept = units.filter(unit => !textEnvelopeAt(unit)).map(unit =>
+		textFence(unit.split(/\r\n|\r|\n/, 1)[0].replace(/^\ufeff/, '')) ? '\n' : unit), text = kept.join('');
 	// A definition can move a destination/title onto the next unindented line, or span its label.
 	const definitions = text.match(/^\ufeff? {0,3}\[(?:\\.|[^\]\\])+\]:[^\r\n]*(?:(?:\r\n|\r|\n)(?![ 	]*(?:\r\n|\r|\n|$))[^\r\n]*)*/gm) || [];
-	const continuations = textUnits(text).filter(unit => /^\ufeff? {0,3}\[\^/.test(unit));
+	const continuations = (kept.length === units.length ? kept : textUnits(text)).filter(unit => /^\ufeff? {0,3}\[\^/.test(unit));
 	return [...definitions, ...continuations, ...(text.match(/<!--[\s\S]*?(?:-->|$)/g) || [])].join('\0');
 }
 
@@ -284,10 +328,12 @@ export function mergeText(base, ours, theirs, options = {}) {
 		conflicts.push({kind, base: before, variants, start, end: start + block.length, block});
 		text += block;
 	};
+	const [units, oursUnits, theirsUnits] = base === null ? [] : [base, ours, theirs].map(textUnits);
+	const declared = base !== null && textDeclarations(units);
 	if (base === null) conflict(null, ours, theirs, 'no-ancestor');
-	else if (textDeclarations(ours) !== textDeclarations(base) || textDeclarations(theirs) !== textDeclarations(base)) conflict(base, ours, theirs, 'document-bindings');
+	else if (textDeclarations(oursUnits) !== declared || textDeclarations(theirsUnits) !== declared) conflict(base, ours, theirs, 'document-bindings');
 	else {
-		const units = textUnits(base), a = textEdits(units, textUnits(ours)), b = textEdits(units, textUnits(theirs));
+		const a = textEdits(units, oursUnits), b = textEdits(units, theirsUnits);
 		if (!a || !b) conflict(base, ours, theirs, 'ambiguous-alignment-or-budget');
 		else {
 			const changes = [...a.map(e => ({...e, side: 0})), ...b.map(e => ({...e, side: 1}))].sort((x, y) => x.start - y.start || x.end - y.end || x.side - y.side);

package/dist/kit/ledger/transport.mjs

@@ -2,6 +2,7 @@
 // Paired source placement, shared by live editing and canonical-history proof.
 import {_rapierTransformSplices, _rapierValidAuthored, _rapierHistoryEffects} from './journal-records.mjs';
 import {projectInverseSource} from './inverse-source.mjs';
+import {authoredBasis, authoredPlacement, authoredPlacements} from './authored-origin.mjs';
 import {sha256} from './hash.mjs';
 import {canonicalJSON} from './data.mjs';
 
@@ -74,6 +75,18 @@ export function transposeRecord(base, splices, id, records) {
     if (next === null) throw new RangeError('canonical_transport_invalid');
     current = next;
   }
+  // A concurrent act that already removed these same authored units and wrote the
+  // same replacement is one physical edit. This act stays in history with no second
+  // deletion. Pure insertions are never collapsed: each one is its own unit. An
+  // inverse of that act means the replacement is not still in force.
+  const sameRows = (left, right) => left.length === right.length && left.every((row, index) =>
+    row.pos === right[index].pos && row.removed === right[index].removed && row.inserted === right[index].inserted);
+  const matched = crossed.filter(record => sameRows(record.splices, splices));
+  const targetsOf = record => record.transaction.sourceTransactionIds || (record.transaction.sourceTransactionId ? [record.transaction.sourceTransactionId] : []);
+  const withdrawn = matched.some(record => crossed.some(other => targetsOf(other).includes(record.transaction.id) ||
+    other.transaction.reverts === record.transaction.id || other.transaction.reapplies === record.transaction.id));
+  if (splices.some(row => row.removed.length) && matched.length && !withdrawn)
+    return {splices: [], sourceIndices: [], against: crossed, text: current};
   const moved = [], sourceIndices = [];
   for (const [sourceIndex, row] of splices.entries()) {
     const submitted = _rapierTransformSplices(source, [row]);
@@ -120,49 +133,7 @@ export function transposeSource(base, splices, client, log) {
   return transposeRecord(base, splices, client, records);
 }
 
-// The frontier names only causal maxima. Linear history needs one predecessor,
-// and concurrent predecessors remain separate until an act observes both.
-function authoredFrontier(records, visit = null) {
-  const dependencies = new Map(), frontier = new Set();
-  for (const record of records) {
-    const id = record.transaction.id, basis = record.authored?.basis;
-    if (visit) visit(record, basis ?? [...frontier].sort());
-    if (!basis) { dependencies.set(id, [...frontier]); frontier.clear(); }
-    else {
-      const pending = [...basis], seen = new Set();
-      while (pending.length) {
-        const prior = pending.pop();
-        if (seen.has(prior)) continue;
-        if (!dependencies.has(prior)) throw new RangeError('canonical_origin_invalid');
-        seen.add(prior); frontier.delete(prior); pending.push(...dependencies.get(prior));
-      }
-      dependencies.set(id, basis);
-    }
-    frontier.add(id);
-  }
-  return [...frontier].sort();
-}
-
-export function authoredBasis(records) { return authoredFrontier(records); }
-
-export function authoredPlacements(base, records) {
-  const origins = new Map(); let source = base;
-  authoredFrontier(records, (record, basis) => {
-    origins.set(record.transaction.id, record.authored ?? authoredPlacement(source, record.splices, basis));
-    source = _rapierTransformSplices(source, record.splices);
-    if (source === null) throw new RangeError('canonical_origin_invalid');
-  });
-  return origins;
-}
-
-// Immutable authored placement stays on its own act. Basis IDs refer only to this
-// canonical history; no source snapshot or duplicate history is stored.
-export function authoredPlacement(source, splices, basis) {
-  const origin = {basis: basis.slice().sort(), source: sha256(source), splices: splices.map(row => ({...row}))};
-  if (!_rapierValidAuthored(origin) || _rapierTransformSplices(source, splices) === null)
-    throw new RangeError('canonical_origin_invalid');
-  return origin;
-}
+export {authoredBasis, authoredPlacement, authoredPlacements};
 
 // Reconstruct an authored view from the same records, then prove its exact physical
 // placement. Equality of resulting text alone cannot prove a repeated-text anchor.
@@ -233,6 +204,19 @@ function authoredReplay(base, records, append = null) {
       if (source === null) throw new RangeError('canonical_origin_invalid');
     }
   }
+  const coverKey = origin => origin?.splices.some(row => row.removed.length)
+    ? canonicalJSON({basis: origin.basis, splices: origin.splices}) : null;
+  const coverCounts = new Map();
+  for (const [id, origin] of origins) {
+    if (effects.references.get(id)?.length) continue;
+    const key = coverKey(origin);
+    if (key) coverCounts.set(key, (coverCounts.get(key) || 0) + 1);
+  }
+  // Two inverses can name different acts and still withdraw one physical replacement.
+  const sharesCover = id => (effects.references.get(id) || []).some(ref => {
+    const key = coverKey(origins.get(ref));
+    return !!key && coverCounts.get(key) > 1;
+  });
   const ordered = (ids, selected = null) => {
     const order = [], known = new Set(ids), waiting = new Map(), dependents = new Map(), ready = [];
     const rank = id => selected ? Number(selected.has(id)) : Number(origins.get(id).splices.some(row => row.removed.length));
@@ -351,10 +335,11 @@ function authoredReplay(base, records, append = null) {
       if (aligned.text !== text) throw new RangeError('canonical_origin_invalid');
       const crossed = aligned.records.slice(basisOrder.length);
       let moved;
-      if (sharedInverses && effects.references.get(id)?.length) {
+      if (effects.references.get(id)?.length && (sharedInverses || sharesCover(id))) {
         // Each inverse retains its own targets. First prove the exact intention
         // in its causal source, then place that choice in the accepted effect
-        // graph. Another inverse may already suppress the same original bytes.
+        // graph. Another inverse may already suppress the same original bytes,
+        // including when the two inverses name different authors of one replacement.
         const authored = projectInverse(basis.text, basis.records, id);
         if (!same(origin.splices, authored.splices) ||
             _rapierTransformSplices(basis.text, origin.splices) !== authored.after)

package/dist/kit/pdf-vectors.mjs

@@ -132,7 +132,8 @@ export async function collectPdfVectors(main, {width, height, count, capture, si
         root = document.importNode(parsed.documentElement, true);
         root.style.setProperty('width', originalBox.width + 'px', 'important'); root.style.setProperty('height', originalBox.height + 'px', 'important');
         mount = document.createElement('div'); mount.style.cssText = `position:fixed;left:${originalBox.left}px;top:${originalBox.top}px;width:${originalBox.width}px;height:${originalBox.height}px;pointer-events:none`;
-        mount.append(root); document.body.append(mount); temporary.push(mount); await document.fonts.ready;
+        // A shadow root keeps the picture's own <style> on the picture, as an <img> does.
+        mount.attachShadow({mode: 'open'}).append(root); document.body.append(mount); temporary.push(mount); await document.fonts.ready;
         textRoots.push(root);
       }
       const box = root.getBoundingClientRect(), nodes = [root, ...root.querySelectorAll('*')], sequence = [];

package/dist/kit/print-capitals.mjs

@@ -82,4 +82,3 @@ export function createPrintCapitals(lineMetrics, linesHeight, followingProse) {
 
 const capitals = createPrintCapitals(lineMetrics, linesHeight, followingPrintProse);
 export const applyPrintCapitals = capitals.apply;
-export const clearPrintCapitals = capitals.clear;

package/dist/kit/rapier-ledger.mjs

@@ -10,6 +10,8 @@ export {_rapierTransformSplices, _rapierRecordSplices, _rapierValidLedgerRecord,
 import {replayHistory, sourceBefore, historyProjection, historyProjections, historyPlaces, selectiveUndo, groupHistoryActs, pictureHistorySplices} from './ledger/history.mjs';
 export {replayHistory, sourceBefore, historyProjection, historyProjections, historyPlaces, selectiveUndo, groupHistoryActs, pictureHistorySplices};
 
+import {sha256State} from './ledger/hash.mjs';
+export {sha256State};
 import {transposeSource} from './ledger/transport.mjs';
 export {transposeSource};
 

package/dist/kit/render-markdown.mjs

@@ -1716,6 +1716,15 @@ function* _rapierResolveSoftBreakTokensSteps(root) {
 	return root;
 }
 
+// Markup parsed in a document of its own, which runs no script and loads nothing (Copy's clipboard tree): one element per
+// markup, or no boxes where the joined parse did not keep them apart.
+function _rapierInertParse(markups) {
+	const doc = new DOMParser().parseFromString(markups.map((html, at) => '<div data-rapier-batch="' + at + '">' + html + '</div>').join(''), 'text/html');
+	const boxes = [...doc.body.childNodes];
+	const intact = boxes.length === markups.length && boxes.every((box, at) => box.getAttribute?.('data-rapier-batch') === String(at));
+	return {doc, boxes: intact ? boxes : null};
+}
+
 function _rapierUnwrapElement(element) {
 	while (element.firstChild) element.parentNode.insertBefore(element.firstChild, element);
 	element.remove();
@@ -1742,7 +1751,7 @@ function renderWithMathML(source, metadata = {}) {
 	return {html, equations};
 }
 
-  return {renderWithMathML, _rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierApplyImageGeometry, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
+  return {renderWithMathML, _rapierClipboardPayloadAsync, _rapierPlainTextFileAsync, _rapierCloneRootAsync, _rapierPortablePlainTextAsync, _rapierHeldPicturesAsWordsAsync, _rapierRenderSemanticRootAsync, _rapierProjectPortableRootAsync, _rapierPortableHtmlAsync, _rapierCalloutInfo, _rapierRemoveCalloutMarker, _rapierMathSource, _rapierFlattenPortableDetails, _rapierProjectPortableRoot, _rapierPortableHtml, _rapierNormalizeInlineText, _rapierPortableInlineText, _rapierPortableListText, _rapierPortableTableText, _rapierPortablePlainText, _rapierPlainTextFile, _rapierHeldPicturesAsWords, _rapierSourceTokenValue, _rapierResolveSoftBreakTokens, _rapierInertParse, _rapierUnwrapElement, _rapierBidiStrong, render: (source, metadata = {}) => { if (!md) initMarkdownIt(); return _rapierRenderSemanticRoot(source, metadata).innerHTML; }, initMarkdownIt, _rapierRenderSemanticRoot, _rapierInstallSemanticProbe, _rapierApplyImageGeometry, _rapierImageAltSize, _rapierImageAltSourceParts, _rapierImageAltText, _rapierImageSizeAttributes, _rapierRawHtmlFragment, _rapierApplyBlockDirection, _rapierFirstStrongDir, _rapierAssignHeadingSlugs, _rapierDisambiguateRenderedAnchors, _rapierDecodeHash, _rapierDecorateJumpLists, _rapierMarkFigureCaptions, _rapierMarkListContinuations, _rapierMarkTableCaptions, _rapierNormalizeCodeElement, _rapierLanguageClass, _relabelFootnoteHtml, _footnoteIdFromLabel, wrapDisplayMath, parser: () => md};
 }
 export {RAPIER_TABLE_CAPTION_PREFIX_RE as tableCaptionPrefix, RAPIER_PORTABLE_HIGHLIGHT_HEX as portableHighlightHex, _RAPIER_RTL_SCRIPT as rtlScripts, createMarkdownRenderer};
 

package/dist/kit/render-print.mjs

@@ -75,7 +75,7 @@ function _rapierPrintWillFont(markers) {
 	const bounds = [0, -400, 10, 0];
 	const outline = cat(u16(1), bounds.map(u16), u16(2), u16(0), [1, 1, 1], u16(0), u16(10), u16(-5), u16(bounds[1]), u16(bounds[3] - bounds[1]), u16((bounds[1] - bounds[3]) / 2), [0]);
 	const utf16 = text => Array.from(text, ch => u16(ch.charCodeAt(0)));
-	const names = [[1, 'RapierWill'], [2, 'Regular'], [4, 'RapierWill Regular'], [6, 'RapierWill-Regular']];
+	const names = [[1, 'RapierWillCarrier'], [2, 'Regular'], [4, 'RapierWillCarrier Regular'], [6, 'RapierWillCarrier-Regular']];
 	let offset = 0;
 	const tables = {
 		'OS/2': cat(u16(4), u16(advance), u16(400), u16(5), u16(0), u16(650), u16(600), u16(0), u16(75), u16(650), u16(600), u16(0), u16(350),
@@ -449,7 +449,17 @@ async function _rapierPrintTextPages(main, pageWidth, count, check, origin = mai
 			prev = run;
 		}
 	}
-	return pages.map(page => page.map(({block, carrier, ...run}) => run));
+	// Each run carries the tags of its block's structure (outermost first): a PDF reader finds the document's headings, lists and
+	// tables from them rather than from positions.
+	const ROLES = {TABLE: 'Table', TR: 'TR', TD: 'TD', TH: 'TH', UL: 'L', OL: 'L', LI: 'LI', BLOCKQUOTE: 'BlockQuote', P: 'P', PRE: 'Code', FIGCAPTION: 'Caption',
+		H1: 'H1', H2: 'H2', H3: 'H3', H4: 'H4', H5: 'H5', H6: 'H6'};
+	const tags = block => {
+		const chain = [];
+		for (let node = block; node && node !== main; node = node.parentElement)
+			if (ROLES[node.tagName] || node === block && node.matches('.rapier-will-carrier')) chain.unshift({node, role: ROLES[node.tagName] || 'P'});
+		return chain;
+	};
+	return pages.map(page => page.map(({block, ...run}) => ({...run, tags: tags(block)})));
 }
 
 function _rapierPrintLinkPages(main, width, height, count) {
@@ -542,6 +552,9 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 	const descriptor = add('<< /Type /FontDescriptor /FontName /RapierText /Flags 4 /FontBBox [' + font.bounds.join(' ') + '] /ItalicAngle 0 /Ascent 500 /Descent -500 /CapHeight 500 /StemV 80 /FontFile2 ' + fontFile + ' 0 R >>');
 	const descendant = add('<< /Type /Font /Subtype /CIDFontType2 /BaseFont /RapierText /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> /FontDescriptor ' + descriptor + ' 0 R /DW 500 /CIDToGIDMap /Identity >>');
 	const type = add('<< /Type /Font /Subtype /Type0 /BaseFont /RapierText /Encoding /Identity-H /DescendantFonts [' + descendant + ' 0 R] /ToUnicode ' + mapping + ' 0 R >>');
+	const carrierDescriptor = add('<< /Type /FontDescriptor /FontName /RapierWillCarrier /Flags 4 /FontBBox [' + font.bounds.join(' ') + '] /ItalicAngle 0 /Ascent 500 /Descent -500 /CapHeight 500 /StemV 80 /FontFile2 ' + fontFile + ' 0 R >>');
+	const carrierDescendant = add('<< /Type /Font /Subtype /CIDFontType2 /BaseFont /RapierWillCarrier /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> /FontDescriptor ' + carrierDescriptor + ' 0 R /DW 500 /CIDToGIDMap /Identity >>');
+	const carrierType = add('<< /Type /Font /Subtype /Type0 /BaseFont /RapierWillCarrier /Encoding /Identity-H /DescendantFonts [' + carrierDescendant + ' 0 R] /ToUnicode ' + mapping + ' 0 R >>');
 	const numberFont = pageNumbers ? add('<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>') : null;
 	const kids = pages.map(() => { objects.push(null); return objects.length - 1; }), decimal = value => Number(value.toFixed(4));
 	const nativeFonts = new Map();
@@ -571,12 +584,26 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 		nativeResources.push(entry.name + ' ' + type + ' 0 R');
 	}
 	const sharedImages = new Map();
+	// The structure tree (PDF 1.7, 14.7): one element per tagged DOM element, each run marked with its page's next MCID.
+	const structs = new Map(), documentElement = {role: 'Document', kids: []}, parentTree = [];
+	const structOf = tags => {
+		let parent = documentElement;
+		for (const {node, role} of tags) {
+			let element = structs.get(node);
+			if (!element) {element = {role, kids: [], parent}; structs.set(node, element); parent.kids.push(element);}
+			parent = element;
+		}
+		return parent === documentElement ? null : parent;
+	};
 	for (let index = 0; index < pages.length; index++) {
 		check();
+		const marked = [];
+		parentTree.push(marked);
 		const held = pages[index], flate = !!held?.rgb;
 		const picture = stream('/Type /XObject /Subtype /Image /Width ' + pixelWidth + ' /Height ' + pixelHeight + ' /ColorSpace /DeviceRGB /BitsPerComponent 8 /Filter /' + (flate ? 'FlateDecode' : 'DCTDecode'), flate ? held.rgb : held);
 		pages[index] = null;
-		let commands = 'q\n' + [decimal(pixelWidth * .75), 0, 0, decimal(pixelHeight * .75), decimal(margins.left), decimal(height - margins.top - pixelHeight * .75)].join(' ') + ' cm\n/Im0 Do\nQ\n';
+		// The page's picture is how its tagged text looks, not a figure of its own: an artifact.
+		let commands = '/Artifact BMC\nq\n' + [decimal(pixelWidth * .75), 0, 0, decimal(pixelHeight * .75), decimal(margins.left), decimal(height - margins.top - pixelHeight * .75)].join(' ') + ' cm\n/Im0 Do\nQ\nEMC\n';
 		const pictures = ['/Im0 ' + picture + ' 0 R'], states = [];
 		for (const drawing of vectorPages[index] || []) {
 			commands += `q\n.75 0 0 -.75 ${decimal(margins.left)} ${decimal(height - margins.top)} cm\n0 0 ${pixelWidth} ${pixelHeight} re W n\n1 0 0 1 ${decimal(drawing.x)} 0 cm\n`;
@@ -609,6 +636,8 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 			// Keep one logical Unicode text object, resetting its font before each scalar's direction
 			// can change. Readers that ignore ActualText otherwise discard earlier words in mixed RTL/LTR.
 			// Express width in the font size: some readers ignore horizontal text scaling when joining.
+			const element = structOf(run.tags || []);
+			if (element) {element.kids.push({page: index, mcid: marked.length}); commands += `/${element.role} << /MCID ${marked.length} >> BDC\n`; marked.push(element);}
 			commands += `q\n/Span << /ActualText <feff${hex(run.text)}> >> BDC\nBT\n100 Tz\n`;
 			for (const part of run.parts || [run]) {
 				if (part.font) {
@@ -623,11 +652,11 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 					const baseline = decimal(height - margins.top - (part.y + part.height * .8) * .75);
 					for (let letter = 0; letter < characters.length; letter++) {
 						const value = codes.get(characters[letter].codePointAt(0)).toString(16).padStart(4, '0');
-						commands += `/F1 ${decimal(size)} Tf\n3 Tr\n1 0 0 ${decimal(scaleY)} ${decimal(margins.left + part.x * .75 + slots[letter] * advance)} ${baseline} Tm\n<${value}> Tj\n`;
+						commands += `${run.carrier ? '/Fc' : '/F1'} ${decimal(size)} Tf\n3 Tr\n1 0 0 ${decimal(scaleY)} ${decimal(margins.left + part.x * .75 + slots[letter] * advance)} ${baseline} Tm\n<${value}> Tj\n`;
 					}
 				}
 			}
-			commands += 'ET\nEMC\nQ\n';
+			commands += 'ET\nEMC\nQ\n' + (element ? 'EMC\n' : '');
 		}
 		if (numberFont) commands += `BT\n/F2 9 Tf\n0 Tr\n1 0 0 1 ${decimal(width / 2 - String(index + 1).length * 2.5)} ${decimal(margins.bottom / 2)} Tm\n(${index + 1}) Tj\nET\n`;
 		const content = stream('/Filter /FlateDecode', await compressed(encode(commands)));
@@ -638,10 +667,17 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 				: '/Dest [' + kids[link.target.page] + ' 0 R /XYZ ' + decimal(margins.left + link.target.x * .75) + ' ' + decimal(height - margins.top - link.target.y * .75) + ' null]';
 			return add('<< /Type /Annot /Subtype /Link /Border [0 0 0] /Rect [' + rect.join(' ') + '] ' + target + ' >>');
 		});
-		put(kids[index], '<< /Type /Page /Parent 2 0 R /MediaBox [0 0 ' + decimal(width) + ' ' + decimal(height) + '] /Resources << /XObject << ' + pictures.join(' ') + ' >> /ExtGState << ' + states.join(' ') + ' >> /Font << /F1 ' + type + ' 0 R' + (numberFont ? ' /F2 ' + numberFont + ' 0 R' : '') + ' ' + nativeResources.join(' ') + ' >> >> /Contents ' + content + ' 0 R' + (annotations.length ? ' /Annots [' + annotations.map(id => id + ' 0 R').join(' ') + ']' : '') + ' >>');
+		put(kids[index], '<< /Type /Page /Parent 2 0 R /StructParents ' + index + ' /MediaBox [0 0 ' + decimal(width) + ' ' + decimal(height) + '] /Resources << /XObject << ' + pictures.join(' ') + ' >> /ExtGState << ' + states.join(' ') + ' >> /Font << /F1 ' + type + ' 0 R /Fc ' + carrierType + ' 0 R' + (numberFont ? ' /F2 ' + numberFont + ' 0 R' : '') + ' ' + nativeResources.join(' ') + ' >> >> /Contents ' + content + ' 0 R' + (annotations.length ? ' /Annots [' + annotations.map(id => id + ' 0 R').join(' ') + ']' : '') + ' >>');
 	}
 	put(2, '<< /Type /Pages /Count ' + kids.length + ' /Kids [' + kids.map(id => id + ' 0 R').join(' ') + '] >>');
-	put(1, '<< /Type /Catalog /Pages 2 0 R /Names << /EmbeddedFiles << /Names [<feff' + hex(filename) + '> ' + file + ' 0 R] >> >> /AF [' + file + ' 0 R] >>');
+	const tree = add(''), ids = new Map([[documentElement, add('')]]);
+	const reserve = element => { for (const kid of element.kids) if (kid.kids) { ids.set(kid, add('')); reserve(kid); } };
+	reserve(documentElement);
+	for (const [element, id] of ids) put(id, '<< /Type /StructElem /S /' + element.role + ' /P ' + (element.parent ? ids.get(element.parent) : tree) + ' 0 R /K [' +
+		element.kids.map(kid => kid.kids ? ids.get(kid) + ' 0 R' : '<< /Type /MCR /Pg ' + kids[kid.page] + ' 0 R /MCID ' + kid.mcid + ' >>').join(' ') + '] >>');
+	const parents = add('<< /Nums [' + parentTree.map((marked, index) => index + ' [' + marked.map(element => ids.get(element) + ' 0 R').join(' ') + ']').join(' ') + '] >>');
+	put(tree, '<< /Type /StructTreeRoot /K [' + ids.get(documentElement) + ' 0 R] /ParentTree ' + parents + ' 0 R /ParentTreeNextKey ' + parentTree.length + ' >>');
+	put(1, '<< /Type /Catalog /Pages 2 0 R /MarkInfo << /Marked true >> /StructTreeRoot ' + tree + ' 0 R /Names << /EmbeddedFiles << /Names [<feff' + hex(filename) + '> ' + file + ' 0 R] >> >> /AF [' + file + ' 0 R] >>');
 	const info = add('<< /Producer (Rapier) /Title <feff' + hex(title || filename.replace(/\.[^.]*$/, '')) + '> >>');
 	const header = encode('%PDF-1.7\n%\u00e2\u00e3\u00cf\u00d3\n'), offsets = new Array(objects.length);
 	let cursor = header.length;