rapier-markdown-kit 1.2.32 → 1.2.40

package/dist/kit/ledger/history.mjs

@@ -5,6 +5,7 @@ import {sourceView, HistorySource} from './source.mjs';
 import {textRootParts, rootAfter} from './hash.mjs';
 import {authoredHistory, authoredPlacements} from './transport.mjs';
 import {plainData, canonicalJSON} from './data.mjs';
+import {evaluateWill} from '../../agent/will.mjs';
 
 const historyFailure = reason => ({ok: false, reason});
 const historyInteger = value => Number.isSafeInteger(value) && value >= 0 && !Object.is(value, -0);
@@ -323,6 +324,8 @@ export function selectiveUndo(input, actIds, options = {}) {
 		(options.splitSplice !== undefined && typeof options.splitSplice !== 'function')) return historyFailure('act_invalid');
 	const requested = new Set(actIds), available = prepared.byId;
 	if ([...requested].some(id => !available.has(id))) return historyFailure('act_unavailable');
+	if (options.actor?.kind === 'agent' && [...requested].some(id => available.get(id).record.transaction.actor.kind !== 'agent'))
+		return historyFailure('act_forbidden');
 	const selected = new Set([...requested].filter(id => prepared.effects.active.has(id)));
 	const records = prepared.records;
 	let inverseId = 'planned-inverse'; while (available.has(inverseId)) inverseId += ':';
@@ -359,6 +362,9 @@ export function selectiveUndo(input, actIds, options = {}) {
 			sourceIndices: transported.sourceIndices.get(record.transaction.id)})) : prepared.rows;
 		const result = projectInverseSource(transported ? {...prepared, rows, records: transported.records} : prepared, selected, projectedEffects, options);
 		if (!result.ok) return result;
+		if (options.actor?.kind === 'agent' && prepared.metadata.docKind === 'markdown' &&
+			evaluateWill(prepared.source, result.splices).outcome !== 'applied')
+			return historyFailure('will_refused');
 		return {...result, actIds: [...requested], sourceTransactionIds: [...selected], metadata, afterMetadata,
 			effectChanged, unchanged: result.after === prepared.source && !metadata && !effectChanged};
 	} catch (_) { return historyFailure('history_invalid'); }

package/dist/kit/ledger/inverse-source.mjs

@@ -10,7 +10,7 @@ const historyBoundary = (source, at) => Number.isSafeInteger(at) && at >= 0 && !
 	!(at > 0 && at < source.length && (source.charCodeAt(at - 1) & 0xFC00) === 0xD800 &&
 	(source.charCodeAt(at) & 0xFC00) === 0xDC00);
 
-function minimalHistorySplice(before, after, pos = 0) {
+export function minimalHistorySplice(before, after, pos = 0) {
 	let first = 0, a = before.length, b = after.length;
 	while (first < a && first < b && before[first] === after[first]) first++;
 	if (!historyBoundary(before, first) || !historyBoundary(after, first)) first--;
@@ -262,7 +262,11 @@ export function projectInverseSource(prepared, selected, projectedEffects, optio
 					const start = boundary(row.pos), end = boundary(row.pos + row.removed.length);
 					let at = start.last, count = Math.max(0, end.first - at);
 					if (!row.removed.length) {
-						const marker = pieces.slice(start.first, start.last).findIndex(item => item.mark?.inserted.length);
+						const run = pieces.slice(start.first, start.last), next = pieces[start.last];
+						let before = start.first - 1; while (before >= 0 && !pieces[before].text) before--;
+						const leftAct = before >= 0 ? byId.get(pieces[before].owner)?.actId : undefined;
+						const sameAct = leftAct !== undefined && run.some(item => item.mark?.actId === leftAct);
+						const marker = run.findIndex(item => item.mark?.inserted.length && (next && owns(next, item.mark) || !sameAct));
 						at = marker < 0 ? start.last : start.first + marker; count = 0;
 					}
 					const removed = pieces.slice(at, at + count);

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

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 import {fields, scalar, plainPrototype} from './data.mjs';
 import {transformText} from './source.mjs';
+import {dataImage} from '../../spec/md-assets.mjs';
 
 const _RAPIER_TRANSACTION_ACTOR_LIMIT = 160;
 const _RAPIER_TRANSACTION_OPERATION_LIMIT = 96;
@@ -175,10 +176,10 @@ function _rapierPictureFinish(record, original, earlier, lookup) {
 	if (!reference || !/^\]\[[a-z0-9-]+\]$/i.test(reference.inserted) || reference.removed === reference.inserted) return false;
 	const definition = rows.find(row => row !== reference), oldLabel = reference.removed.slice(2, -1), newLabel = reference.inserted.slice(2, -1);
 	const body = (text, label) => {
-		const prefix = '[' + label + ']: data:image/svg+xml;base64,';
+		const prefix = '[' + label + ']: ';
 		if (typeof text !== 'string' || !text.startsWith(prefix)) return null;
 		const value = text.slice(prefix.length), end = value.indexOf(' '), bytes = end < 0 ? value : value.slice(0, end), title = end < 0 ? '' : value.slice(end);
-		return /^[A-Za-z0-9+/]+={0,2}$/.test(bytes) && !/[\r\n]/.test(title) ? title : null;
+		return dataImage(bytes)?.codec === 'image/svg+xml' && !/[\r\n]/.test(title) ? title : null;
 	};
 	const title = body(definition.removed, oldLabel);
 	if (title === null || body(definition.inserted, newLabel) !== title) return false;
@@ -292,6 +293,7 @@ function _rapierWalkHistoryEffects(records, lookup, visit = null, observe = null
 				}
 			}
 			if (refs.some(id => typeof id !== 'string' || !nodes.has(id) || pictures.has(id))) return {ok: false};
+			if (tx.actor?.kind === 'agent' && refs.some(id => byId.get(id).transaction.actor?.kind !== 'agent')) return {ok: false};
 			nodes.set(tx.id, {active: true, blockers: 0, references: refs, dependents: []}); references.set(tx.id, refs.slice());
 			byId.set(tx.id, record); earlier.push(record);
 			for (const ref of refs) {

package/dist/kit/ledger/merge.mjs

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 import {readLedger, exportLedger, rootAfter} from './format.mjs';
 import {_rapierTransformSplices, _rapierTransformMetadata, _rapierMetadataDelta, _rapierHistoryEffects, _rapierMetadataState} from './journal-records.mjs';
-import {mergeText} from './text-merge.mjs';
+import {mergeText, willMergeConflict} from './text-merge.mjs';
 import {transposeAuthored, authoredPlacements} from './transport.mjs';
-import {parseWill, stripOneTerminator} from '../../agent/will.mjs';
 import {sha256} from './hash.mjs';
 import {canonicalJSON, fault} from './data.mjs';
 export function transportInterval(start, end, splices) {
@@ -58,17 +57,6 @@ function checkpointList(read) {
   }
   return list;
 }
-function kept(text) {
-  const will = parseWill(text);
-  if (will.fault) return {fault: will.fault, text};
-  return will.regions.filter(region => region.law !== 'edit').map(({law, intent, start, end}) =>
-    law === 'keep' ? {law, intent, text: text.slice(start, end)} : {law, intent});
-}
-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)));
-}
 function expandRetainedStart(shorter, longer) {
   if (shorter.ledger.documentAuthority !== longer.ledger.documentAuthority ||
       shorter.ledger.start.revision <= longer.ledger.start.revision) return null;
@@ -191,10 +179,8 @@ export function merge(first, second) {
     const local = localIds.get(record.transaction.id);
     if (local) mappedIds.set(record.transaction.id, local.transaction.id);
   }
-  const incomingKept = canonicalJSON(kept(theirs.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;
+  const keepDiffers = willMergeConflict(common.text, ours.text, theirs.text);
+  let conflicted = keepDiffers, incomingSource = common.text;
   if (!conflicted) for (const record of incoming) {
     const beforeSource = incomingSource;
     incomingSource = _rapierTransformSplices(incomingSource, record.splices);

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

@@ -1,4 +1,28 @@
 // SPDX-License-Identifier: MIT
+import {parseWill, stripOneTerminator} from '../../agent/will.mjs';
+
+export function willMergeConflict(base, ours, theirs) {
+	const snapshot = text => {
+		const will = parseWill(text);
+		return {fault: will.fault, regions: will.regions.filter(region => region.law !== 'edit').map(region => ({
+			law: region.law, intent: region.intent, text: text.slice(region.start, region.end),
+		}))};
+	};
+	const a = snapshot(ours), b = snapshot(theirs);
+	if (a.fault || b.fault) return ours !== theirs;
+	const kept = value => JSON.stringify(value.regions.map(({law, intent, text}) => ({law, intent, ...(law === 'keep' ? {text} : {})})));
+	if (kept(a) !== kept(b)) return true;
+	if (base === null) return false;
+	const prior = snapshot(base);
+	if (prior.fault) return base !== ours || base !== theirs;
+	const appended = value => {
+		const before = prior.regions.filter(region => region.law === 'append'), after = value.regions.filter(region => region.law === 'append');
+		return before.length === after.length && before.every((region, index) =>
+			stripOneTerminator(after[index].text).startsWith(stripOneTerminator(region.text)));
+	};
+	return !appended(a) || !appended(b);
+}
+
 function textFault(code, message) { return Object.assign(new Error(message), {code}); }
 export function canonicalNote(text) {
 	if (typeof text !== 'string') throw textFault('note_text', 'A note must be text');
@@ -272,13 +296,168 @@ function textDeclarations(units) {
 	return [...definitions, ...continuations, ...(text.match(/<!--[\s\S]*?(?:-->|$)/g) || [])].join('\0');
 }
 
+function* textGroups(units, a, b) {
+	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);
+	for (let i = 0; i < changes.length;) {
+		const group = [changes[i++]], start = group[0].start; let end = group[0].end;
+		while (i < changes.length && (changes[i].start < end || group.some(e => {
+			const next = changes[i];
+			const afterBlock = (edit, insert) => insert.start === insert.end && insert.start === edit.end && edit.start < edit.end && units.slice(edit.start, edit.end).every(unit => textEnvelopeAt(unit));
+			if (afterBlock(e, next) || afterBlock(next, e)) return false;
+			if (e.start === e.end && next.start <= e.start && e.start <= next.end) return true;
+			if (next.start === next.end && e.start <= next.start && next.start <= e.end) return true;
+			return next.start >= e.end && units.slice(e.start, e.end).every(textSpace) &&
+				units.slice(e.end, next.start).every(textSpace) && units.slice(next.start, next.end).every(textSpace);
+		}))) {
+			group.push(changes[i]); end = Math.max(end, changes[i++].end);
+		}
+		const before = units.slice(start, end).join('');
+		const version = side => {
+			let value = '', at = start;
+			for (const e of group.filter(e => e.side === side)) { value += units.slice(at, e.start).join('') + e.text; at = e.end; }
+			return value + units.slice(at, end).join('');
+		};
+		yield {start, end, before, av: version(0), bv: version(1)};
+	}
+}
+
+function textMoves(groups) {
+	const blank = value => !value.trim();
+	const side = (g, which) => which === 0 ? g.av : g.bv;
+	for (const g of groups) {
+		if (g.resolved !== undefined || blank(g.before)) continue;
+		for (const gone of [0, 1]) {
+			const removed = side(g, gone), other = side(g, 1 - gone);
+			if (!blank(removed) || other === g.before) continue;
+			if (other.split(g.before).length === 2) { g.resolved = other.replace(g.before, ''); break; }
+			const homes = groups.filter(h => h !== g && h.resolved === undefined && blank(h.before) && blank(side(h, 1 - gone)) && side(h, gone).trim() === g.before.trim());
+			if (homes.length === 1) {
+				const trailing = side(homes[0], gone).match(/\s*$/)[0], edited = other.replace(/\s*$/, '');
+				g.resolved = ''; homes[0].resolved = side(homes[0], gone).match(/^\s*/)[0] + edited + trailing; break;
+			}
+		}
+	}
+	return groups;
+}
+
+const textLines = text => text.match(/[^\r\n]*(?:\r\n|\r|\n)|[^\r\n]+$/g) || [];
+const textWords = text => text.match(/\s+|\S+/g) || [];
+const TEXT_ITEM = /^( {0,3})(?:[-+*]|\d{1,9}[.)])[ \t]+\S/;
+const TEXT_TAGS = /^(tags|aliases):[ \t]*\[([^\[\]\r\n]*)\][ \t]*(\r\n|\r|\n|$)/;
+function textCounts(text) {
+	const counts = new Map();
+	for (const word of text.match(/[\p{L}\p{N}_]+/gu) || []) counts.set(word, (counts.get(word) || 0) + 1);
+	return counts;
+}
+function textConserved(before, av, bv, merged) {
+	const [b, a, t, m] = [before, av, bv, merged].map(textCounts);
+	for (const word of new Set([...b.keys(), ...a.keys(), ...t.keys(), ...m.keys()])) {
+		const base = b.get(word) || 0, da = (a.get(word) || 0) - base, dt = (t.get(word) || 0) - base, got = (m.get(word) || 0) - base;
+		const both = [da + dt, da, dt];
+		if (da * dt > 0 ? got < Math.min(...both) || got > Math.max(...both) : got !== da + dt) return false;
+	}
+	return true;
+}
+function textRefine(before, av, bv, options, level = 'line') {
+	const merged = textRefineLevel(before, av, bv, options, level);
+	return merged !== null && textConserved(before, av, bv, merged) ? merged : null;
+}
+function textRefineLevel(before, av, bv, options, level) {
+	const split = level === 'line' ? textLines : textWords;
+	const units = split(before), oursUnits = split(av), theirsUnits = split(bv);
+	const reordered = textPermuted(units, oursUnits, theirsUnits);
+	if (reordered !== null) return reordered;
+	const a = textEdits(units, oursUnits), b = textEdits(units, theirsUnits);
+	if (!a || !b) return null;
+	let out = '', pos = 0;
+	for (const g of textGroups(units, a, b)) {
+		out += units.slice(pos, g.start).join('');
+		if (g.av === g.bv) out += g.av;
+		else if (g.av === g.before) out += g.bv;
+		else if (g.bv === g.before) out += g.av;
+		else {
+			const fine = level === 'line' ? textRefineGroup(g, options) : null;
+			if (fine === null) return null;
+			out += fine;
+		}
+		pos = g.end;
+	}
+	return out + units.slice(pos).join('');
+}
+function textPermuted(units, ours, theirs) {
+	const solid = list => list.filter(unit => !textSpace(unit));
+	const baseSolid = solid(units), known = new Map(baseSolid.map((unit, k) => [unit, k]));
+	if (known.size !== baseSolid.length) return null;
+	const reorders = side => { const x = solid(side); return x.length === baseSolid.length && x.every(unit => known.has(unit)) && new Set(x).size === x.length && side.join('') !== units.join(''); };
+	const [first, second] = [reorders(ours), reorders(theirs)];
+	if (first === second) return null;
+	const [moved, changed] = first ? [ours, theirs] : [theirs, ours];
+	const edits = textEdits(units, changed);
+	if (!edits) return null;
+	const replace = new Map(), after = new Map();
+	for (const e of edits) {
+		const inner = []; for (let i = e.start; i < e.end; i++) if (!textSpace(units[i])) inner.push(i);
+		if (!inner.length) {
+			if (!e.text.trim()) continue;
+			let k = -1; for (let i = e.start - 1; i >= 0; i--) if (!textSpace(units[i])) { k = known.get(units[i]); break; }
+			const gap = e.start > 0 && textSpace(units[e.start - 1]);
+			after.set(k, [...(after.get(k) || []), {text: e.text, gap}]);
+		} else if (inner.length === 1) {
+			if (!e.text.trim()) replace.set(known.get(units[inner[0]]), units.slice(e.start, e.end).some(textSpace) ? ' ' : '');
+			else if (units.slice(e.start, e.end).some(textSpace)) return null;
+			else replace.set(known.get(units[inner[0]]), e.text);
+		} else return null;
+	}
+	const out = [], place = (k, from) => {
+		const rows = after.get(k) || [];
+		return rows.filter(row => row.gap === from).map(row => row.text);
+	};
+	out.push(...place(-1, false));
+	for (let i = 0; i < moved.length; i++) {
+		const unit = moved[i];
+		if (textSpace(unit)) { out.push(unit); continue; }
+		const k = known.get(unit);
+		if (replace.get(k) === '' || replace.get(k) === ' ') {
+			if (replace.get(k) === ' ') { if (i + 1 < moved.length && textSpace(moved[i + 1])) i++; else if (out.length && textSpace(out[out.length - 1])) out.pop(); }
+		} else out.push(replace.has(k) ? replace.get(k) : unit);
+		out.push(...place(k, false));
+		if (after.get(k)?.some(row => row.gap)) { if (i + 1 < moved.length && textSpace(moved[i + 1])) out.push(moved[++i]); out.push(...place(k, true)); }
+	}
+	return out.join('');
+}
+
+function textRefineGroup({before, av, bv}, options) {
+	const [first, second] = textDeviceOptions(options), ids = first < second ? [0, 1] : [1, 0];
+	const added = (side, base) => side.startsWith(base) ? side.slice(base.length) : null;
+	const oursAdded = added(av, before), theirsAdded = added(bv, before);
+	if (oursAdded !== null && theirsAdded !== null && textLines(oursAdded + theirsAdded).every(line => TEXT_ITEM.test(line))) {
+		const tail = value => value && !/[\r\n]$/.test(value) ? value + (before.includes('\r\n') ? '\r\n' : '\n') : value;
+		const parts = [tail(oursAdded), tail(theirsAdded)];
+		const last = tail(before) === before ? '' : (before.includes('\r\n') ? '\r\n' : '\n');
+		return before + last + parts[ids[0]] + parts[ids[1]];
+	}
+	const lines = textLines(before);
+	if (lines.length === 1) {
+		const tags = TEXT_TAGS.exec(before), x = TEXT_TAGS.exec(av), y = TEXT_TAGS.exec(bv);
+		if (tags && x && y && x[1] === tags[1] && y[1] === tags[1]) {
+			const list = row => row[2].split(',').map(item => item.trim()).filter(Boolean);
+			const base = list(tags), ours = list(x), theirs = list(y);
+			const kept = base.filter(item => ours.includes(item) && theirs.includes(item));
+			const added = [ours, theirs].map(list => list.filter(item => !base.includes(item)));
+			const joined = [...new Set([...kept, ...added[ids[0]], ...added[ids[1]]])];
+			return tags[1] + ': [' + joined.join(', ') + ']' + tags[3];
+		}
+	}
+	return textRefineLevel(before, av, bv, options, 'word');
+}
 export function mergeText(base, ours, theirs, options = {}) {
 	canonicalNote(ours); canonicalNote(theirs); if (base !== null) canonicalNote(base);
 	const unchanged = value => ({text: value, clean: !value.includes(TEXT_CONFLICT), conflicts: value.includes(TEXT_CONFLICT) ? [{kind: 'existing-conflict', advisory: true}] : []});
 	if (ours === theirs) return unchanged(ours);
-	if (base === ours) return unchanged(theirs);
-	if (base === theirs) return unchanged(ours);
-	const conflicts = []; let text = '';
+	const willConflict = willMergeConflict(base, ours, theirs);
+	if (!willConflict && base === ours) return unchanged(theirs);
+	if (!willConflict && base === theirs) return unchanged(ours);
+	const conflicts = []; let text = '', a, b;
 	const conflict = (before, a, b, kind) => {
 		const ab = inspectTextConflicts(a), bb = inspectTextConflicts(b);
 		const au = textUnits(a), bu = textUnits(b); let first = 0, last = 0;
@@ -314,40 +493,24 @@ export function mergeText(base, ours, theirs, options = {}) {
 	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 (willConflict) conflict(base, ours, theirs, 'will');
 	else if (textDeclarations(oursUnits) !== declared || textDeclarations(theirsUnits) !== declared) conflict(base, ours, theirs, 'document-bindings');
 	else {
-		const a = textEdits(units, oursUnits), b = textEdits(units, theirsUnits);
-		if (!a || !b) conflict(base, ours, theirs, 'ambiguous-alignment-or-budget');
+		const reordered = textPermuted(units, oursUnits, theirsUnits);
+		if (reordered !== null && textConserved(base, ours, theirs, reordered)) text += reordered;
+		else if (!(a = textEdits(units, oursUnits)) || !(b = textEdits(units, theirsUnits))) 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);
 			let pos = 0;
-			for (let i = 0; i < changes.length;) {
-				const group = [changes[i++]], start = group[0].start; let end = group[0].end;
-				while (i < changes.length && (changes[i].start < end || group.some(e => {
-					const next = changes[i];
-					const afterBlock = (edit, insert) => insert.start === insert.end && insert.start === edit.end && edit.start < edit.end && units.slice(edit.start, edit.end).every(unit => textEnvelopeAt(unit));
-					if (afterBlock(e, next) || afterBlock(next, e)) return false;
-					if (e.start === e.end && next.start <= e.start && e.start <= next.end) return true;
-					if (next.start === next.end && e.start <= next.start && next.start <= e.end) return true;
-					return next.start >= e.end && units.slice(e.start, e.end).every(textSpace) &&
-						units.slice(e.end, next.start).every(textSpace) && units.slice(next.start, next.end).every(textSpace);
-				}))) {
-					group.push(changes[i]); end = Math.max(end, changes[i++].end);
-				}
+			for (const {start, end, before, av, bv, resolved} of textMoves([...textGroups(units, a, b)])) {
 				text += units.slice(pos, start).join('');
-				const before = units.slice(start, end).join('');
-				const version = side => {
-					let value = '', at = start;
-					for (const e of group.filter(e => e.side === side)) { value += units.slice(at, e.start).join('') + e.text; at = e.end; }
-					return value + units.slice(at, end).join('');
-				};
-				const av = version(0), bv = version(1);
-				if (av === bv) text += av;
+				if (resolved !== undefined) text += resolved;
+				else if (av === bv) text += av;
 				else if (av === before) text += bv;
 				else if (bv === before) text += av;
 				else {
 					const tick = end === start + 1 ? textTick(before, av, bv) : null;
-					if (tick !== null) text += tick; else conflict(before, av, bv, 'text');
+					const fine = tick === null ? textRefine(before, av, bv, options) : null;
+					if (tick !== null) text += tick; else if (fine !== null) text += fine; else conflict(before, av, bv, 'text');
 				}
 				pos = end;
 			}

package/dist/kit/rapier-ledger.mjs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
-import {exportLedger, replaceLedgerText, readLedger, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
-export {exportLedger, replaceLedgerText, readLedger, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId};
+import {exportLedger, prepareLedgerAsync, replaceLedgerText, readLedger, readLedgerAsync, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId} from './ledger/format.mjs';
+export {exportLedger, prepareLedgerAsync, replaceLedgerText, readLedger, readLedgerAsync, ledgerWithStart, textRoot, rootAfter, historyEnvelope, agentActorId};
 import {authorship, readAuthorship, ledgerFromAuthorship} from './ledger/authorship.mjs';
 export {authorship, readAuthorship, ledgerFromAuthorship};
 import {merge, transportInterval, transportTouchedInterval} from './ledger/merge.mjs';

package/dist/kit/render-markdown.mjs

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 import {htmlPlaceholder, mountHtmlBlocks, materializeObjects, objectPosterLabel, htmlImageRecord, htmlLayoutEdit, htmlModeEdit, mergeHtmlObjectBlocks} from '../spec/html-blocks.mjs';
 import {finish, finishAsync, cloneTree, cleanTree, serializeTree, htmlParts, admitHtml, htmlBoundary, pause, check} from './render-work.mjs';
+import {installWikiParser, wikiAddress} from './wiki.mjs';
 const RAPIER_TABLE_CAPTION_PREFIX_RE = /^(?:Table:|:) /;
 const RAPIER_PORTABLE_HIGHLIGHT_HEX = Object.freeze({
 	green: '#35c57a', red: '#f05a62', blue: '#4f91f7', yellow: '#e6b91e', purple: '#9b6dea',
@@ -9,6 +10,51 @@ const _RAPIER_RTL_SCRIPT = /[\p{Script=Hebrew}\p{Script=Arabic}\p{Script=Syriac}
 function createMarkdownRenderer(runtime) {
   const {Node, _rapierPrefixPortableAnchors, RAPIER_HIGHLIGHT_COLOR_BY_MARKER, RAPIER_MARKDOWN_SPEC, RAPIER_RENDERED_HEADING_SELECTOR, _rapierApplyMarkdownSpec, _rapierChromeOwnsId, _rapierCodeHtml, _rapierDeriveDarkColor, _rapierDormantHeadings, _rapierEmbedAssetSource, _rapierHeadingSlugBase, _rapierNextHeadingSlug, _rapierHighlightAdmitted, _rapierInstallMarkdownMath, _rapierMarkdownPreview, _rapierPlainLayout, _rapierProviders, _rapierRemoteContent, _rapierRemoteImagePlaceholder, _rapierRemoteSubresourceOrigin, _rapierRenderedAnchorOriginalIds, _rapierSourceCharEscaped, _rapierSplitOpeningFrontmatter, _rapierUiDiagram, _rapierUiMath, document, escapeRapierHtmlText, globalThis, sanitizeRapierHtml, window} = runtime;
   let md = runtime.md;
+  let wikiTimer = null, wikiAttempt = 0;
+  const wikiBusy = new WeakSet();
+  function scheduleWikiEmbeds() {
+    if (!globalThis.RapierPlatform || !document || wikiTimer !== null) return;
+    wikiTimer = setTimeout(async () => {
+      wikiTimer = null;
+      const original = globalThis.RapierOriginalFolderCore?.currentOriginal();
+      if (!original) { if (++wikiAttempt < 8) scheduleWikiEmbeds(); return; }
+      wikiAttempt = 0;
+      for (const node of [...document.querySelectorAll('#editor-blocks .rapier-source-token--wiki-embed')].slice(0, 32)) {
+        if (wikiBusy.has(node) || node.hasAttribute('data-rapier-wiki-ready')) continue;
+        wikiBusy.add(node);
+        try {
+          const link = node.querySelector('a'), href = link?.getAttribute('href');
+          if (!href) continue;
+          const before = node.innerHTML;
+          const embedded = await original.embed(href);
+          if (!node.isConnected || node.innerHTML !== before || globalThis.RapierOriginalFolderCore?.currentOriginal() !== original) continue;
+          const holder = _rapierRenderSemanticRoot(embedded.text, {docKind: 'markdown'}, {wikiEmbedding: true});
+          let followed = 0;
+          for (const anchor of holder.querySelectorAll('a[href]')) {
+            const address = anchor.getAttribute('href');
+            if (/^(?:[a-z][a-z0-9+.-]*:|\/)/i.test(address)) continue;
+            try {
+              if (++followed > 64) throw new Error('link limit');
+              anchor.setAttribute('href', await original.addressFrom(embedded.displayPath, address));
+            } catch (_) { anchor.replaceWith(...anchor.childNodes); }
+          }
+          if (!node.isConnected || node.innerHTML !== before || globalThis.RapierOriginalFolderCore?.currentOriginal() !== original) continue;
+          for (const image of holder.querySelectorAll('img,[data-rapier-remote-src]'))
+            image.replaceWith(document.createTextNode(image.getAttribute('alt') || image.textContent || ''));
+          for (const block of [...holder.querySelectorAll('p,h1,h2,h3,h4,h5,h6,div,pre,blockquote,ul,ol,li,table,tr,td,th')].reverse())
+            block.replaceWith(...block.childNodes, document.createElement('br'));
+          node.replaceChildren(...holder.childNodes);
+          node.setAttribute('data-rapier-visible', encodeURIComponent(node.textContent));
+          node.setAttribute('data-rapier-wiki-ready', '');
+          node.contentEditable = 'false';
+        } catch (_) {  }
+        finally { wikiBusy.delete(node); }
+      }
+    }, 125);
+  }
+  window?.addEventListener?.('rapier:original-file-ready', scheduleWikiEmbeds);
+  const wikiMode = options => options.wikiEmbedding ? 'links' : options.wikiLinks !== undefined ? options.wikiLinks
+    : globalThis.RapierOriginalFolderCore?.currentOriginal?.() ? 'label' : false;
 function initMarkdownIt() {
 	if (typeof window.markdownit !== 'function') throw new Error('markdownit');
 	if (typeof _rapierMarkdownPreview === 'function') globalThis.rapierRenderPreview = _rapierMarkdownPreview;
@@ -82,6 +128,21 @@ function initMarkdownIt() {
 	const sourceToken = (source, visible, className) =>
 		'<span class="rapier-source-token ' + className + '" data-rapier-source="' +
 		encodeURIComponent(source) + '" data-rapier-visible="' + encodeURIComponent(visible) + '">' + md.utils.escapeHtml(visible) + '</span>';
+	installWikiParser(md, (token, env) => {
+		const {target, label, embed} = token.meta, href = wikiAddress(target), esc = md.utils.escapeHtml;
+		if (env.rapierWikiLinks === 'label') return esc(label);
+		if (embed && /\.(?:png|jpe?g|gif|webp|jxl)(?:#.*)?$/i.test(target)) {
+			if (!env.rapierWikiEmbedding && globalThis.RapierPlatform?.files.relativeCandidate?.(href) && globalThis.RapierEmbeddedImages?.imageHtml)
+				return globalThis.RapierEmbeddedImages.imageHtml(null, label, '', null, '', label, token.content, href, env.rapierImagePresentation !== false);
+			return '<span data-rapier-remote-src="' + esc(href) + '" data-rapier-remote-alt="' + esc(label) +
+				'" data-rapier-image-source="' + esc(encodeURIComponent(token.content)) + '">' + esc(label) + '</span>';
+		}
+		const note = embed && !env.rapierWikiEmbedding;
+		if (note) scheduleWikiEmbeds();
+		return '<span class="rapier-source-token rapier-source-token--wiki' + (note ? '-embed' : '') +
+			'" data-rapier-source="' + esc(encodeURIComponent(token.content)) + '" data-rapier-visible="' + esc(encodeURIComponent(label)) +
+			'"><a href="' + esc(href) + '">' + esc(label) + '</a></span>';
+	});
 	md.renderer.rules.emoji = (tokens, idx) => {
 		const token = tokens[idx];
 		const source = token.markup ? ':' + token.markup + ':' : token.content;
@@ -114,7 +175,9 @@ function initMarkdownIt() {
 
 	md.renderer.rules.image = (tokens, idx, opts, env, self) => {
 		const token = tokens[idx];
-		const src = token.attrGet('src') || '';
+		const written = token.attrGet('src') || '';
+		const hosted = globalThis.RapierEmbedPictureBase?.(written) ?? null;
+		const src = hosted || written;
 		const title = token.attrGet('title') || '';
 		const rawAlt = String(token.content ?? token.attrGet('alt') ?? '');
 		const size = _rapierImageAltSize(rawAlt);
@@ -140,7 +203,7 @@ function initMarkdownIt() {
 				+ (token.meta?.mdImage?.source ? ' data-rapier-image-source="' + escape(encodeURIComponent(token.meta.mdImage.source)) + '"' : '')
 				+ '>' + escape(alt || src) + '</span>';
 		}
-		if (!env.rapierPage && !_rapierRemoteContent.allowed && _rapierRemoteSubresourceOrigin(src)) {
+		if (!hosted && !env.rapierPage && !_rapierRemoteContent.allowed && _rapierRemoteSubresourceOrigin(src)) {
 			const html = _rapierRemoteImagePlaceholder(src, alt, title, size, layout, rawAlt);
 			return html.replace('<span ', '<span data-rapier-markdown-image="" ' +
 				(token.meta?.mdImage?.source ? 'data-rapier-image-source="' + md.utils.escapeHtml(encodeURIComponent(token.meta.mdImage.source)) + '" ' : ''));
@@ -402,8 +465,20 @@ function _rapierRenderSemanticRoot(canonical, metadata, options = {}) {
 
 	const markdown = _rapierSplitOpeningFrontmatter(canonical).body;
 	const env = {rapierImagePresentation: options.imagePresentation === true, ...(options.page ? {rapierPage: true} : {}), ...(options.providers === false ? {rapierProviders: false} : {})};
+	if (options.wikiEmbedding) env.rapierWikiEmbedding = true;
+	const wikiLinks = wikiMode(options);
+	if (wikiLinks) env.rapierWikiLinks = wikiLinks;
 	if (options.mathEquations) env.rapierMathEquations = options.mathEquations;
-	let rendered = md
+	const nesting = md && options.maxNesting > 0 ? options.maxNesting : 0;
+	let rendered;
+	if (nesting || md && options.closeDetails) {
+		const saved = md.options.maxNesting;
+		if (nesting) md.options.maxNesting = nesting;
+		try {
+			const tokens = md.parse(markdown, env);
+			rendered = md.renderer.render(options.closeDetails ? _rapierCloseOpenDetails(tokens) : tokens, md.options, env);
+		} finally { md.options.maxNesting = saved; }
+	} else rendered = md
 		? md.render(markdown, env)
 		: '<pre><code>' + escapeRapierHtmlText(markdown) + '</code></pre>';
 	if (md && env.footnotes && Array.isArray(env.footnotes.list) && env.footnotes.list.length) {
@@ -435,8 +510,16 @@ async function _rapierRenderSemanticRootAsync(canonical, metadata, options = {})
 	}
 	const markdown = _rapierSplitOpeningFrontmatter(canonical).body;
 	const fallbackEnv = options.page ? {rapierPage: true} : {};
-	let parsed = options.parsed || (runtime.parseAsync ? await runtime.parseAsync(markdown, options) : {tokens: md.parse(markdown, fallbackEnv), env: fallbackEnv});
-	let {tokens, env} = parsed, labels = env.footnotes?.list?.map((item, index) => String(item?.label || ('inline-' + (index + 1))));
+	const wikiLinks = markdown.includes('[[') && wikiMode(options);
+	if (wikiLinks) fallbackEnv.rapierWikiLinks = wikiLinks;
+	const nesting = options.maxNesting > 0 ? options.maxNesting : 0, saved = md.options.maxNesting;
+	if (nesting) md.options.maxNesting = nesting;
+	let parsed;
+	try { parsed = !wikiLinks && options.parsed || (runtime.parseAsync && !wikiLinks && !nesting ? await runtime.parseAsync(markdown, options) : {tokens: md.parse(markdown, fallbackEnv), env: fallbackEnv}); }
+	finally { md.options.maxNesting = saved; }
+	let {tokens, env} = parsed;
+	if (options.closeDetails) tokens = _rapierCloseOpenDetails(tokens);
+	let labels = env.footnotes?.list?.map((item, index) => String(item?.label || ('inline-' + (index + 1))));
 	env = {...env, rapierImagePresentation: options.imagePresentation === true};
 	await pause(work, .3);
 	const inert = document.createElement('template').content.ownerDocument;
@@ -727,6 +810,38 @@ function _rapierImageSizeAttributes(size, marker, geometry, automatic = true) {
     return attributes + (style ? ' style="' + style + '"' : '');
 }
 
+function _rapierCloseOpenDetails(tokens) {
+	const opens = /^<details[\t\n\f\r />]/i, closes = /^<\/details[\t\n\f\r ]*>$/i;
+	const tags = token => {
+		const found = [];
+		if (token.type === 'html_inline') found.push(token.content);
+		else if (token.type === 'html_block') _rapierRawHtmlFragment(token.content, tag => { found.push(tag); return tag; }, md);
+		else if (token.type === 'inline') for (const child of token.children || []) if (child.type === 'html_inline') found.push(child.content);
+		return found;
+	};
+	const after = new Map(), add = (index, count) => after.set(index, (after.get(index) || 0) + count);
+	const waiting = [];
+	for (let index = 0; index < tokens.length; index++) {
+		const token = tokens[index];
+		let depth = 0;
+		for (const tag of tags(token)) {
+			if (opens.test(tag)) { if (token.type === 'html_block') waiting.push(index); else depth++; }
+			else if (closes.test(tag)) { if (depth) depth--; else waiting.pop(); }
+		}
+		if (depth) add(index + 1 < tokens.length && tokens[index + 1].nesting === -1 ? index + 1 : index, depth);
+	}
+	for (const index of waiting) add(index, 1);
+	if (!after.size) return tokens;
+	const out = [];
+	tokens.forEach((token, index) => {
+		out.push(token);
+		const count = after.get(index);
+		if (count) out.push({type: 'html_block', tag: '', attrs: null, map: null, nesting: 0, level: token.level || 0, children: null,
+			content: '</details>'.repeat(count) + '\n', markup: '', info: '', meta: null, block: true, hidden: false});
+	});
+	return out;
+}
+
 function _rapierRawHtmlFragment(source, rewrite, parser) {
 	const state = new parser.inline.State(source, parser, {}, []);
 	const htmlRule = parser.inline.ruler.__rules__.find(rule => rule.name === 'html_inline').fn;
@@ -792,7 +907,9 @@ function* _rapierAssignHeadingSlugsSteps(root, selector = RAPIER_RENDERED_HEADIN
 		if (!headingSet.has(element) && element.id) used[element.id] = 0;
 	}
 	for (const heading of headings) { yield;
-		heading.id = _rapierNextHeadingSlug(_rapierHeadingSlugBase(heading.textContent), used);
+		const base = _rapierHeadingSlugBase(heading.textContent);
+		const owned = typeof _rapierChromeOwnsId === 'function' && _rapierChromeOwnsId(base);
+		heading.id = _rapierNextHeadingSlug(owned ? 'heading-' + base : base, used);
 	}
 }
 
@@ -1622,11 +1739,17 @@ async function _rapierPlainTextFileAsync(context) {
 async function _rapierCloneRootAsync(root, work) { return finishAsync(cloneTree(root), work); }
 
 function _rapierSourceTokenValue(node) {
-	if (!node?.hasAttribute('data-rapier-source') || !node.hasAttribute('data-rapier-visible') ||
-			Array.from(node.childNodes).some(child => child.nodeType !== Node.TEXT_NODE)) return null;
+	if (!node?.hasAttribute('data-rapier-source') || !node.hasAttribute('data-rapier-visible')) return null;
 	try {
+		const source = decodeURIComponent(node.getAttribute('data-rapier-source'));
+		if (node.classList.contains('rapier-source-token--wiki') || node.classList.contains('rapier-source-token--wiki-embed')) {
+			const token = md.parseInline(source, {rapierWikiLinks: 'links'})[0]?.children;
+			if (token?.length !== 1 || token[0].type !== 'rapier_wiki') return null;
+			if (!node.hasAttribute('data-rapier-wiki-ready') && (node.children.length !== 1 || node.firstElementChild.tagName !== 'A' ||
+				node.firstElementChild.getAttribute('href') !== wikiAddress(token[0].meta.target))) return null;
+		} else if (Array.from(node.childNodes).some(child => child.nodeType !== Node.TEXT_NODE)) return null;
 		return node.textContent === decodeURIComponent(node.getAttribute('data-rapier-visible'))
-			? decodeURIComponent(node.getAttribute('data-rapier-source')) : null;
+			? source : null;
 	} catch (_) { return null; }
 }
 
@@ -1634,7 +1757,7 @@ function _rapierResolveSoftBreakTokens(root) { return finish(_rapierResolveSoftB
 
 function* _rapierResolveSoftBreakTokensSteps(root) {
 	for (const token of root.querySelectorAll('.rapier-source-token--softbreak')) { yield;
-		if (_rapierSourceTokenValue(token) === '\n') token.replaceWith(document.createTextNode(' '));
+		if (_rapierSourceTokenValue(token) === '\n') token.replaceWith(document.createTextNode(token.closest('pre') ? '\n' : ' '));
 		else token.replaceWith(...token.childNodes);
 	}
 	return root;

package/dist/kit/render-print.mjs

@@ -3,7 +3,7 @@ import {collectPdfVectors} from './pdf-vectors.mjs';
 import {collectPdfGlyphs} from './pdf-glyphs.mjs';
 import {pdfFontSources, waitForFonts} from './export-fonts.mjs';
 import {apply as applyTypography} from '../layout/typography.mjs';
-import {documentLanguage, pageSizeOf} from '../spec/document-settings.mjs';
+import {documentLanguage, pageSizeOf, paperForLanguage} from '../spec/document-settings.mjs';
 import {applyPrintCapitals} from './print-capitals.mjs';
 import {stripOneTerminator as _rapierWillStripOneTerminator} from '../agent/will.mjs';
 import {quotedWillSpan} from '../spec/md-marks.mjs';
@@ -220,7 +220,7 @@ async function _rapierWritePrintPdf({root, css, fontCss = '', canonical, bom = f
 		if (current?.() === false) refuse('document_changed');
 	};
 	if (!root?.ownerDocument || typeof capture !== 'function') refuse('pdf_render_unavailable');
-	const paper = settings?.papersize || (templatePage ? pageSizeOf(settings) : {width: 11906, height: 16838});
+	const paper = settings?.papersize || (templatePage ? pageSizeOf(settings) : paperForLanguage(root.ownerDocument.defaultView?.navigator?.language));
 	const width = paper.width / 20, height = paper.height / 20;
 	const margins = Object.fromEntries(['top', 'right', 'bottom', 'left'].map(side =>
 		[side, settings?.geometry ? settings.geometry[side] / 20 : (side === 'top' ? 12 : 14) * 72 / 25.4]));
@@ -841,7 +841,7 @@ async function writeRasterPdf({pages, textPages, linkPages = [], vectorPages = [
 					const characters = fallbackCharacters(part, run.carrier); if (!characters.length) continue;
 					const {slots, count} = _rapierPrintSlots(part.text, part.rtl);
 					const advance = part.width * .75 / count;
-					const baseline = decimal(height - margins.top - (part.y + part.height * .8) * .75);
+					const baseline = decimal(height - margins.top - (part.baseline ?? part.y + part.height * .8) * .75);
 					for (let letter = 0; letter < characters.length; letter++) {
 						const size = Math.max(.1, advance * 2 * [...characters[letter].replace(/\n/g, '')].length), scaleY = Math.max(.1, part.height * .75) / size;
 						const value = (codes.get(characters[letter]) || codes.get(characters[letter].codePointAt(0))).toString(16).padStart(4, '0');