@agentshouse/mdruntime 0.1.0-cd26b960b7262 → 0.1.0-cd30853a1b15e

package/dist/save.js

@@ -1,14 +1,14 @@
-import { definitionOf } from './model.js';
-import { apply, ARRAY_INDEX, ATTACHMENT, links, parse, pointerSegments, references, relative, relativize, retarget, roomReferences, serialize, target, } from '@agentshouse/mdmodel';
-import { immutable, leaving, queuedFile, departure, } from './change.js';
-import { collectionOf, documentsOf, governing, } from './collection.js';
-import { changeBatchIdentity } from './identity.js';
-import { overlaying } from './overlay.js';
-import { ancestors, authoredAt, covered, normalize } from './paths.js';
+import { apply, ARRAY_INDEX, ATTACHMENT, create, links, parse, pointerSegments, references, relative, relativize, retarget, roomReferences, serialize, target, } from '@agentshouse/mdmodel';
+import { immutable, isPart, leaving, queuedFile, departure, } from './change.js';
+import { collectionOf, definitionsAt, documentsOf, governing, textType, typedText, } from './collection.js';
+import { changeBatchIdentity, roomDraftRevision } from './identity.js';
+import { composed, overlaying } from './overlay.js';
+import { ancestors } from './paths.js';
 import { entriesIn, sorting } from './shared.js';
+import { applyParts, changedParts, changesOf, moveTarget, partsBetween, withdrawnDrafts, } from './room-draft.js';
 import { paced, ROW_WEIGHT, stepped } from './turn.js';
 import { validatedCollection } from './validation.js';
-function refuse(code, file, location) {
+function refuse(code, file, location, line) {
     return {
         kind: 'refused',
         refusal: {
@@ -16,9 +16,13 @@ function refuse(code, file, location) {
             retryable: false,
             ...(file === undefined ? {} : { file }),
             ...(location === undefined ? {} : { location }),
+            ...(line === undefined ? {} : { line }),
         },
     };
 }
+function refusedBy(refusal, file) {
+    return refuse(refusal.rule, file, refusal.location, refusal.line);
+}
 function repointed(document, definition, from, to, moves, settled) {
     const changes = [];
     const names = new Set();
@@ -42,43 +46,13 @@ function repointed(document, definition, from, to, moves, settled) {
     }
     if (changes.length === 0)
         return [];
-    const applied = apply(document, changes);
+    const applied = apply(document, changes, definition);
     if (applied.outcome !== 'applied')
         return [];
     const next = applied.document;
     return [...names].map((name) => ({ kind: 'field', path: from, name, value: next.fields[name] }));
 }
-function edited(document, changes) {
-    const parts = new Map();
-    for (const change of changes) {
-        if (change.kind === 'preamble')
-            parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
-        if (change.kind === 'section')
-            parts.set(`section ${change.name}`, {
-                kind: 'section',
-                name: change.name,
-                value: change.value,
-                prior: document.sections[change.name] ?? '',
-            });
-    }
-    if (parts.size === 0)
-        return document;
-    const applied = apply(document, [...parts.values()]);
-    return applied.outcome === 'applied' ? applied.document : document;
-}
-function bodies(path, before, after) {
-    const changes = [];
-    if (after.preamble !== before.preamble) {
-        changes.push({ kind: 'preamble', path, value: after.preamble });
-    }
-    for (const [name, value] of Object.entries(after.sections)) {
-        if (before.sections[name] === value)
-            continue;
-        changes.push({ kind: 'section', path, name, value });
-    }
-    return changes;
-}
-function relinks(path, moved, before, moves) {
+function relinks(path, moved, before, moves, definition) {
     const changes = [];
     for (const link of links(before, path)) {
         const destination = moves.get(link.target) ?? link.target;
@@ -91,28 +65,21 @@ function relinks(path, moved, before, moves) {
     }
     if (changes.length === 0)
         return { kind: 'changes', changes: [] };
-    const applied = apply(before, changes);
-    if (applied.outcome === 'refuse') {
-        return {
-            kind: 'refused',
-            refusal: {
-                code: applied.refusal.rule,
-                retryable: false,
-                file: path,
-                ...(applied.refusal.location === undefined ? {} : { location: applied.refusal.location }),
-            },
-        };
-    }
+    const applied = apply(before, changes, definition);
+    if (applied.outcome === 'refuse')
+        return refusedBy(applied.refusal, path);
     const after = applied.document;
     if (after === before)
         return { kind: 'changes', changes: [] };
     if (before.type === undefined) {
         return { kind: 'changes', changes: [{ kind: 'replace', path, content: serialize(after) }] };
     }
-    return { kind: 'changes', changes: bodies(path, before, after) };
+    return { kind: 'changes', changes: partsBetween(path, before, after) };
 }
 function partKey(change) {
-    return change.kind === 'section' ? `section ${change.name}` : change.kind;
+    return change.kind === 'section' || change.kind === 'field'
+        ? `${change.kind} ${change.name}`
+        : change.kind;
 }
 const NAMES_A_SKIP_TESTS = 64;
 const ENCODED = /[%&\\]/u;
@@ -155,13 +122,14 @@ function* rewrites(changes, visible) {
         if (settled.has(path))
             continue;
         const moved = moves.get(path) ?? path;
-        const definition = definitionOf(governing(visible.collection.composition, path), document.type);
+        const definition = definitionsAt(visible.collection.composition, path)(document.type);
         const repointing = repointed(document, definition, path, moved, moves, settled);
         added.push(...repointing);
         const own = parts.get(path) ?? [];
+        const edited = applyParts(document, own.map((index) => merged[index]), definition);
         const relinked = moved === path && own.length === 0 && cannotLink(document.content, names)
             ? { kind: 'changes', changes: [] }
-            : relinks(path, moved, edited(document, own.map((index) => merged[index])), moves);
+            : relinks(path, moved, edited.outcome === 'applied' ? edited.document : document, moves, definition);
         if (relinked.kind === 'refused')
             return relinked;
         const keyed = new Map();
@@ -174,7 +142,7 @@ function* rewrites(changes, visible) {
             if (change.kind === 'replace') {
                 for (const index of own) {
                     const kind = merged[index]?.kind;
-                    if (kind === 'section' || kind === 'preamble')
+                    if (kind === 'field' || kind === 'section' || kind === 'preamble')
                         merged[index] = null;
                 }
                 added.push(change);
@@ -230,25 +198,21 @@ function crossed(document, definition, path, to) {
     }
     return changes;
 }
-function rewritten(path, document, changes) {
+function rewritten(path, document, changes, definition) {
     if (changes.length === 0)
         return [];
-    const applied = apply(document, changes);
+    const applied = apply(document, changes, definition);
     if (applied.outcome !== 'applied')
         return [];
     const after = applied.document;
     if (document.type === undefined)
         return [{ kind: 'replace', path, content: serialize(after) }];
-    const names = new Set(changes.flatMap((change) => change.kind === 'reference' ? [pointerSegments(change.pointer)[0] ?? ''] : []));
-    return [
-        ...[...names].map((name) => ({ kind: 'field', path, name, value: after.fields[name] })),
-        ...bodies(path, document, after),
-    ];
+    return partsBetween(path, document, after);
 }
 function roomPathOf(handle, path) {
     return `/rooms/${handle}/${path}`;
 }
-export function* leavingRewritten(batch, visible) {
+function* leavingRewritten(batch, visible) {
     const between = batch.between;
     if (between === undefined)
         return batch;
@@ -257,8 +221,8 @@ export function* leavingRewritten(batch, visible) {
     for (const [path, document] of yield* documentsOf(visible.collection)) {
         if (moved.has(path))
             continue;
-        const definition = definitionOf(governing(visible.collection.composition, path), document.type);
-        derived.push(...rewritten(path, document, crossed(document, definition, path, (named) => moved.get(named))));
+        const definition = definitionsAt(visible.collection.composition, path)(document.type);
+        derived.push(...rewritten(path, document, crossed(document, definition, path, (named) => moved.get(named)), definition));
         yield ROW_WEIGHT + visible.collection.text[path].length;
     }
     if (derived.length === 0)
@@ -300,7 +264,7 @@ function* incoming(collection, removed, candidates) {
     for (const [path, document] of candidates === null
         ? yield* documentsOf(collection)
         : read(candidates)) {
-        const definition = definitionOf(governing(collection.composition, path), document.type);
+        const definition = definitionsAt(collection.composition, path)(document.type);
         for (const { value, to } of definition === undefined ? [] : references(document, definition)) {
             if (to.includes(ATTACHMENT))
                 continue;
@@ -343,18 +307,9 @@ function guard(changes, input, removing) {
     const occupied = (path) => input.folders.has(path) ? path : (ancestors(path).find((one) => existing.has(one)) ?? null);
     for (const [index, change] of changes.entries()) {
         for (const path of affected(change)) {
-            const normalized = normalize(path);
-            if (normalized === null || normalized === '')
-                return refuse('room-root', path);
-            if (covered(input.providerOwnedPaths, normalized) ||
-                (input.authoredPaths !== undefined && !authoredAt(input.authoredPaths, normalized))) {
-                return refuse('provider-owned-path', normalized);
-            }
-            if (!input.pathRule(normalized))
-                return refuse('invalid-path', normalized);
-            for (const operation of change.kind === 'remove' ? removing : WRITE)
-                if (!input.local && !covered(input.operations[operation], normalized))
-                    return refuse(`${operation}-grant`, normalized);
+            const refused = input.rule(path, change.kind === 'remove' ? removing : WRITE);
+            if (refused !== null)
+                return refuse(refused.code, refused.path);
         }
         if (change.kind === 'create' || change.kind === 'arrival') {
             const taken = existing.has(change.path) ? change.path : occupied(change.path);
@@ -415,9 +370,9 @@ function guard(changes, input, removing) {
     return null;
 }
 function unrevised(input, path) {
-    return (!input.local && input.queued?.has(path) !== true && input.visible.revisions[path] === undefined);
+    return !input.local && !input.queued.has(path) && input.visible.revisions[path] === undefined;
 }
-export function queuedDocuments(queue) {
+function queuedDocuments(queue) {
     const paths = new Set();
     for (const batch of queue) {
         for (const change of batch.changes) {
@@ -462,7 +417,7 @@ function* preconditionsOf(changes, visible, bases) {
     };
     for (const change of changes) {
         yield ROW_WEIGHT;
-        if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
+        if (isPart(change)) {
             const based = bases.find((base) => sameTarget(base, change));
             if (based !== undefined) {
                 add(based);
@@ -553,93 +508,101 @@ function* exceeding(limits, changes, effective, resulting) {
 function shellRelative(text, path, handle, definition) {
     if (!text.includes(`/rooms/${handle}/`))
         return null;
-    const parsed = parse(text, path);
+    const parsed = parse(text, path, definition);
     if (!parsed.ok)
         return null;
     const result = relativize(parsed.document, path, handle, definition(parsed.document.type));
     return result.outcome === 'applied' && result.document.content !== text ? result.document : null;
 }
 function relativeField(path, name, value, handle, definition) {
-    const opened = parse('---\n---\n');
-    if (definition === undefined ||
-        !opened.ok ||
-        !JSON.stringify(value ?? null).includes(`/rooms/${handle}/`))
+    if (definition === undefined || !JSON.stringify(value ?? null).includes(`/rooms/${handle}/`))
         return value;
-    const held = apply(opened.document, [{ kind: 'field', name, value, prior: undefined }]);
+    const held = apply(create(definition.name, definition), [{ kind: 'field', name, value, prior: undefined }], definition);
     if (held.outcome !== 'applied')
         return value;
     const result = relativize(held.document, path, handle, definition);
     return result.outcome === 'applied' ? result.document.fields[name] : value;
 }
 function relativeChanges(input) {
+    const changes = [];
+    for (const change of input.changes) {
+        const next = relativeChange(change, input);
+        if ('refusal' in next)
+            return next;
+        changes.push(next.change);
+    }
+    return { kind: 'changes', changes };
+}
+function relativeChange(change, input) {
     const { handle, composition, visible } = input;
-    const typed = (path) => (type) => definitionOf(governing(composition, path), type);
     const body = (path, text) => shellRelative(text, path, handle, () => undefined)?.content ?? text;
-    return input.changes.map((change) => {
-        const definition = typed(change.path);
-        if (change.kind === 'field') {
-            const type = visible.collection.document(change.path)?.type;
-            const value = relativeField(change.path, change.name, change.value, handle, definition(type));
-            return value === change.value ? change : { ...change, value };
-        }
-        if (change.kind === 'section' || change.kind === 'preamble') {
-            const value = body(change.path, change.value);
-            return value === change.value ? change : { ...change, value };
-        }
-        if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
-            const content = shellRelative(change.content, change.path, handle, definition)?.content ?? change.content;
-            return content === change.content ? change : { ...change, content };
-        }
-        if (change.kind !== 'create')
-            return change;
-        const type = typeof change.fields.type === 'string' ? change.fields.type : undefined;
-        const fields = Object.fromEntries(Object.entries(change.fields).map(([name, value]) => [
-            name,
-            relativeField(change.path, name, value, handle, definition(type)),
-        ]));
-        const sections = Object.fromEntries(Object.entries(change.sections).map(([name, value]) => [name, body(change.path, value)]));
-        return { ...change, fields, sections };
-    });
+    const definition = definitionsAt(composition, change.path);
+    if (change.kind === 'field') {
+        const type = visible.collection.document(change.path)?.type;
+        const value = relativeField(change.path, change.name, change.value, handle, definition(type));
+        return { change: value === change.value ? change : { ...change, value } };
+    }
+    if (change.kind === 'section' || change.kind === 'preamble') {
+        const value = body(change.path, change.value);
+        return { change: value === change.value ? change : { ...change, value } };
+    }
+    if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
+        const content = shellRelative(change.content, change.path, handle, definition)?.content ?? change.content;
+        return { change: content === change.content ? change : { ...change, content } };
+    }
+    if (change.kind !== 'create')
+        return { change };
+    const type = typeof change.fields.type === 'string' ? change.fields.type : undefined;
+    const fields = Object.fromEntries(Object.entries(change.fields).map(([name, value]) => [
+        name,
+        relativeField(change.path, name, value, handle, definition(type)),
+    ]));
+    const sections = Object.fromEntries(Object.entries(change.sections).map(([name, value]) => [name, body(change.path, value)]));
+    const written = composed(change.path, fields, sections, composition);
+    if (written.outcome === 'refuse')
+        return refusedBy(written.refusal, change.path);
+    if (written.outcome === 'stale')
+        throw new Error(`the creation of ${change.path} is stale`);
+    if (Object.keys(sections).length === 0)
+        return { change: { ...change, fields, sections } };
+    return {
+        change: { kind: 'create', path: change.path, content: serialize(written.document) },
+    };
 }
 function unqueueable(file) {
-    return { kind: 'refused', refusal: { code: 'unknown-revision', retryable: false, file } };
-}
-function isPart(change) {
-    return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
+    return refuse('unknown-revision', file);
 }
 function touched(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
-function partsApplied(content, path, changes) {
-    const parsed = parse(content, path);
-    if (!parsed.ok)
-        return null;
-    const document = parsed.document;
-    const parts = new Map();
+function partsApplied(content, path, changes, composition) {
+    const applied = partsResult(content, path, changes, composition);
+    return applied?.outcome === 'applied' ? serialize(applied.document) : null;
+}
+function unapplied(changes, visible, composition) {
+    const parted = new Map();
     for (const change of changes) {
-        if (change.kind === 'field')
-            parts.set(`field ${change.name}`, {
-                kind: 'field',
-                name: change.name,
-                value: change.value,
-                prior: document.fields[change.name],
-            });
-        else if (change.kind === 'section')
-            parts.set(`section ${change.name}`, {
-                kind: 'section',
-                name: change.name,
-                value: change.value,
-                prior: document.sections[change.name] ?? '',
-            });
-        else
-            parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
+        if (isPart(change))
+            parted.set(change.path, [...(parted.get(change.path) ?? []), change]);
+    }
+    for (const [path, parts] of parted) {
+        const content = visible.documents[path];
+        if (content === undefined)
+            continue;
+        const applied = partsResult(content, path, parts, composition);
+        if (applied?.outcome === 'refuse')
+            return refusedBy(applied.refusal, path);
     }
-    const applied = apply(document, [...parts.values()]);
-    return applied.outcome === 'applied' ? serialize(applied.document) : null;
+    return null;
+}
+function partsResult(content, path, changes, composition) {
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(content, path, definitions);
+    return parsed.ok ? applyParts(parsed.document, changes, definitions(parsed.document.type)) : null;
 }
-function settledParts(changes, deferred) {
+function settledParts(changes, deferred, composition) {
     for (const [held, parts] of deferred) {
-        const content = partsApplied(held.content, held.path, parts);
+        const content = partsApplied(held.content, held.path, parts, composition);
         if (content === null)
             return held.path;
         changes[changes.indexOf(held)] = { ...held, content };
@@ -714,7 +677,9 @@ function* relinked(batch, move, before, after, appending) {
     for (const change of derived.changes) {
         if (change === move)
             continue;
-        const unsettled = isPart(change) ? null : settledParts(changes, deferred);
+        const unsettled = isPart(change)
+            ? null
+            : settledParts(changes, deferred, after.collection.composition);
         if (unsettled !== null)
             return unqueueable(unsettled);
         const outcome = folded(changes, change, appending, deferred);
@@ -725,7 +690,7 @@ function* relinked(batch, move, before, after, appending) {
         if (outcome !== 'skipped')
             changed = true;
     }
-    const unsettled = settledParts(changes, deferred);
+    const unsettled = settledParts(changes, deferred, after.collection.composition);
     if (unsettled !== null)
         return unqueueable(unsettled);
     if (!changed)
@@ -786,11 +751,10 @@ function withdrawnFile(batch, change, at) {
     ];
     return immutable({ ...batch, id: changeBatchIdentity(), changes, preconditions });
 }
-export function* requeuing(queue, changes, visible, changeable, state) {
+function* requeuing(queue, changes, visible, changeable, state) {
     const next = [...queue];
     const origins = new Map();
     const withdrawn = new Map();
-    const owners = new Set();
     const queued = new Set();
     const kept = [];
     const originOf = (batch) => origins.get(batch) ?? batch.id;
@@ -836,7 +800,6 @@ export function* requeuing(queue, changes, visible, changeable, state) {
             if (replaced !== null)
                 origins.set(replaced, origin);
         }
-        owners.add(originOf(owner));
         next.splice(index, following.length, ...rebuilt.filter((batch) => batch !== null));
         queued.add(change.path);
     }
@@ -846,62 +809,16 @@ export function* requeuing(queue, changes, visible, changeable, state) {
         changes: kept,
         queued,
         withdrawn,
-        owners,
     };
 }
-function covering(precondition) {
-    return precondition.kind === 'field' ||
-        precondition.kind === 'section' ||
-        precondition.kind === 'preamble'
-        ? identity(precondition)
-        : `path ${precondition.path}`;
-}
-export function joined(queue, owner, extra) {
-    const later = new Set(queue.slice(queue.indexOf(owner) + 1).flatMap((batch) => batch.changes.flatMap(touched)));
-    const clash = extra.changes.flatMap(touched).find((path) => later.has(path));
-    if (clash !== undefined)
-        return unqueueable(clash);
-    const changes = [...owner.changes];
-    const deferred = new Map();
-    for (const change of extra.changes) {
-        const unsettled = isPart(change) ? null : settledParts(changes, deferred);
-        if (unsettled !== null)
-            return unqueueable(unsettled);
-        if (folded(changes, change, true, deferred) === 'refused')
-            return unqueueable(change.path);
-    }
-    const unsettled = settledParts(changes, deferred);
-    if (unsettled !== null)
-        return unqueueable(unsettled);
-    const held = new Set(owner.preconditions.map(covering));
-    const written = new Set(owner.changes.flatMap((change) => change.kind === 'create' || change.kind === 'replace' ? [change.path] : []));
-    const preconditions = [
-        ...owner.preconditions,
-        ...extra.preconditions.filter((precondition) => {
-            const key = covering(precondition);
-            return (!held.has(key) && (key === `path ${precondition.path}` || !written.has(precondition.path)));
-        }),
-    ];
-    const batch = immutable({
-        ...owner,
-        ...(extra.validation === undefined ? {} : { validation: extra.validation }),
-        id: changeBatchIdentity(),
-        changes,
-        preconditions,
-    });
-    return { kind: 'joined', batch, queue: queue.map((item) => (item === owner ? batch : item)) };
-}
-export function* limiting(queue, batch, limits, state) {
+function* limiting(queue, batch, limits, state) {
     const at = queue.indexOf(batch);
     const rewritten = yield* providerRewritten(batch, yield* state(queue.slice(0, at)));
     const limited = yield* exceeding(limits, batch.changes, rewritten.changes, yield* state(queue.slice(0, at + 1)));
     return limited?.refusal ?? null;
 }
-function typedText(content) {
-    if (content === undefined)
-        return false;
-    const parsed = parse(content);
-    return parsed.ok && parsed.document.type !== undefined && parsed.document.type !== 'any';
+function typedContent(content) {
+    return content !== undefined && typedText(parse(content));
 }
 function touchedLibrary(resulting, touched, composition) {
     const entries = touched
@@ -921,9 +838,9 @@ function touchedLibrary(resulting, touched, composition) {
             if (binaries.has(path))
                 known.set(path, { type: undefined, binary: true });
             else if (content !== undefined && content !== null) {
-                const read = parse(content, path);
-                if (read.ok)
-                    known.set(path, { type: read.document.type ?? 'any', binary: false });
+                const type = textType(parse(content, path, definitionsAt(composition, path)));
+                if (type !== undefined)
+                    known.set(path, { type, binary: false });
                 await pace(content.length + ROW_WEIGHT);
             }
         }
@@ -941,7 +858,7 @@ async function judging(visible, resulting, composition, validate, removed, touch
     for (const path of touched) {
         const before = visible.documents[path];
         const after = resulting.documents[path];
-        if (typedText(before) || typedText(after))
+        if (typedContent(before) || typedContent(after))
             typedPaths.push(path);
         await pace((before?.length ?? 0) + (after?.length ?? 0) + ROW_WEIGHT);
     }
@@ -959,6 +876,7 @@ async function judging(visible, resulting, composition, validate, removed, touch
                 retryable: false,
                 file: verdict.file,
                 ...(verdict.location === undefined ? {} : { location: verdict.location }),
+                ...(verdict.line === undefined ? {} : { line: verdict.line }),
                 ...(verdict.referrers === undefined ? {} : { referrers: verdict.referrers }),
             },
         };
@@ -974,8 +892,6 @@ function placed(reference) {
     const key = roomPathOf(reference.handle, reference.path);
     if (reference.kind === 'link')
         return `link ${key}`;
-    if (reference.kind === 'item')
-        return `section ${reference.section} ${key}`;
     const pointer = reference.pointer
         .split('/')
         .map((segment) => (ARRAY_INDEX.test(segment) ? '-' : segment))
@@ -985,10 +901,11 @@ function placed(reference) {
 function roomReferencesIn(path, content, composition) {
     if (content === undefined)
         return [];
-    const parsed = parse(content, path);
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(content, path, definitions);
     if (!parsed.ok)
         return [];
-    return roomReferences(parsed.document, definitionOf(governing(composition, path), parsed.document.type));
+    return roomReferences(parsed.document, definitions(parsed.document.type));
 }
 function* admittedRooms(changes, visible, resulting, composition) {
     const from = new Map();
@@ -1006,7 +923,7 @@ function* admittedRooms(changes, visible, resulting, composition) {
                 continue;
             if (held.has(placed(reference)))
                 continue;
-            return refuse('unresolved-reference', path, reference.kind === 'field' ? reference.pointer : reference.section);
+            return refuse('unresolved-reference', path, reference.pointer);
         }
         yield ROW_WEIGHT + now.length;
     }
@@ -1024,7 +941,10 @@ function validationOf(validated) {
         };
 }
 async function batching(input) {
-    const changes = relativeChanges(input);
+    const relative = relativeChanges(input);
+    if (relative.kind === 'refused')
+        return relative;
+    const { changes } = relative;
     const structural = changes.find((change) => change.kind === 'move' || change.kind === 'remove');
     if (structural !== undefined && input.unmodeled) {
         return refuse('model-unavailable', structural.path);
@@ -1034,12 +954,12 @@ async function batching(input) {
     const rewritten = await stepped(rewrites(changes, input.visible));
     if (rewritten.kind === 'refused')
         return rewritten;
-    const refusal = guard(changes, input, WRITE);
+    const refusal = guard(changes, input, WRITE) ?? unapplied(changes, input.visible, input.composition);
     if (refusal !== null)
         return refusal;
     const preconditions = await stepped(preconditionsOf(changes, input.visible, input.bases));
     const predicted = await stepped(anticipated(changes, preconditions, rewritten.changes, input.visible));
-    const resulting = await stepped(overlaying(input.visible, [{ id: '', baseRoomVersion: input.baseRoomVersion, ...predicted }]));
+    const resulting = await stepped(overlaying(input.visible, [{ id: '', baseRoomVersion: input.baseRoomVersion, ...predicted }], input.composition));
     const judged = await judging(input.visible, resulting, input.composition, input.validate, new Set(changes.filter((change) => change.kind === 'remove').map((change) => change.path)), [...new Set(predicted.changes.flatMap(affected))]);
     if (judged.kind === 'refused')
         return judged;
@@ -1061,7 +981,7 @@ async function batching(input) {
         }),
     };
 }
-export const MOVE_DOCUMENTS = 'move-documents';
+const MOVE_DOCUMENTS = 'move-documents';
 function heldAt(visible, path) {
     return visible.documents[path] !== undefined || visible.binaries[path] !== undefined;
 }
@@ -1070,7 +990,7 @@ function arrivingText(path, to, source, moved) {
     const document = source.visible.collection.document(path);
     if (document === undefined)
         return content;
-    const definition = definitionOf(governing(source.composition, path), document.type);
+    const definition = definitionsAt(source.composition, path)(document.type);
     const changes = crossed(document, definition, path, (named, href) => {
         const at = moved.get(named);
         if (at !== undefined)
@@ -1079,7 +999,7 @@ function arrivingText(path, to, source, moved) {
     });
     if (changes.length === 0)
         return content;
-    const applied = apply(document, changes);
+    const applied = apply(document, changes, definition);
     return applied.outcome === 'applied' ? serialize(applied.document) : content;
 }
 function arrivalOf({ path, to }, source, moved) {
@@ -1112,9 +1032,9 @@ function arrivalOf({ path, to }, source, moved) {
     };
 }
 async function moving(input) {
-    const { source, destination, moves, pathRule } = input;
+    const { source, destination, moves } = input;
     const removals = moves.map(({ path }) => ({ kind: 'remove', path }));
-    const leaves = guard(removals, { ...source, local: input.local, bases: [], pathRule }, MOVE_OUT);
+    const leaves = guard(removals, { ...source, local: input.local, bases: [] }, MOVE_OUT);
     if (leaves !== null)
         return leaves;
     const uploading = moves.find(({ path }) => source.visible.binaries[path]?.state === 'pending');
@@ -1122,7 +1042,7 @@ async function moving(input) {
         return refuse('unknown-revision', uploading.path);
     const moved = new Map(moves.map(({ path, to }) => [path, to]));
     const arrivals = moves.map((move) => arrivalOf(move, source, moved));
-    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [], pathRule }, WRITE);
+    const arrives = guard(arrivals, { ...destination, local: input.local, bases: [] }, WRITE);
     if (arrives !== null)
         return arrives;
     const bound = input.providerLimits.find((limit) => limit.name === MOVE_DOCUMENTS)?.value;
@@ -1151,7 +1071,7 @@ async function moving(input) {
         between,
     };
     const effective = await stepped(leavingRewritten(leavingBatch, source.visible));
-    const left = await stepped(overlaying(source.visible, [effective]));
+    const left = await stepped(overlaying(source.visible, [effective], source.composition));
     const sourceJudged = await judging(source.visible, left, source.composition, source.validate, new Set(moves.map(({ path }) => path)), [...new Set(effective.changes.map((change) => change.path))]);
     if (sourceJudged.kind === 'refused')
         return sourceJudged;
@@ -1163,7 +1083,7 @@ async function moving(input) {
         ...written,
         between,
     };
-    const arrived = await stepped(overlaying(destination.visible, [arrivingBatch]));
+    const arrived = await stepped(overlaying(destination.visible, [arrivingBatch], destination.composition));
     const destinationJudged = await judging(destination.visible, arrived, destination.composition, destination.validate, new Set(), moves.map(({ to }) => to));
     if (destinationJudged.kind === 'refused')
         return destinationJudged;
@@ -1173,9 +1093,180 @@ async function moving(input) {
         return limited;
     return { kind: 'moved', leaving: immutable(leavingBatch), arriving: immutable(arrivingBatch) };
 }
-export function buildMove(input) {
-    return moving(input);
+function unreadable(saved, visible, composition) {
+    const path = saved.find(({ path: at, parts }) => (parts.fields !== undefined ||
+        parts.sections !== undefined ||
+        parts.preamble !== undefined) &&
+        typedContent(visible.documents[at]) &&
+        governing(composition, at).status === 'unavailable')?.path;
+    return path === undefined ? null : refuse('model-unavailable', path);
+}
+function changedUnderneath(saved, visible) {
+    const parts = saved.flatMap(({ path, parts: held }) => changedParts(path, held, visible));
+    return parts.length === 0
+        ? null
+        : { kind: 'refused', refusal: { code: 'changed-underneath', retryable: false, parts } };
+}
+function sideOf(room, visible) {
+    const { record } = room;
+    return {
+        room: record.locator,
+        handle: record.declaration.handle,
+        baseRoomVersion: record.roomVersion,
+        composition: room.composition,
+        rule: room.rule,
+        visible,
+        folders: room.folders,
+        queued: queuedDocuments(room.queue),
+        unmodeled: !room.modelled,
+        validate: room.validate,
+    };
+}
+function carriedDrafts(ask, from, into) {
+    return new Map(ask.saved.flatMap(({ path, parts }) => {
+        const record = from.drafts.get(path);
+        if (parts.move === undefined || record === undefined || ask.consumed.has(path))
+            return [];
+        const to = moveTarget(parts.move);
+        if (into.drafts.has(to))
+            return [];
+        const locator = into.record.locator;
+        return [[path, { ...record, locator, path: to, revision: roomDraftRevision() }]];
+    }));
+}
+async function plannedMove(ask, source, into) {
+    const destination = into.record.locator;
+    const mixed = ask.saved.find(({ parts }) => Object.keys(parts).length !== 1 || parts.move?.room !== destination);
+    if (mixed !== undefined)
+        return refuse('mixed-room-move', mixed.path);
+    const leavingVisible = await stepped(source.replay(source.queue));
+    const changed = changedUnderneath(ask.saved, leavingVisible);
+    if (changed !== null)
+        return changed;
+    const moves = ask.saved.map(({ path, parts }) => ({ path, to: moveTarget(parts.move) }));
+    const built = await moving({
+        source: sideOf(source, leavingVisible),
+        destination: sideOf(into, await stepped(into.replay(into.queue))),
+        moves,
+        providerLimits: ask.providerLimits,
+        local: ask.local,
+        ...(ask.writtenBy === undefined ? {} : { writtenBy: ask.writtenBy }),
+    });
+    if (built.kind === 'refused')
+        return built;
+    const { id } = built.leaving;
+    const carried = carriedDrafts(ask, source, into);
+    return {
+        kind: 'planned',
+        identifier: id,
+        rooms: [
+            {
+                locator: source.record.locator,
+                queue: [...source.queue, built.leaving],
+                saved: new Map([[id, ask.saved]]),
+                consumed: [...ask.consumed, ...carried.keys()],
+                carried: [],
+            },
+            {
+                locator: destination,
+                queue: [...into.queue, built.arriving],
+                saved: new Map([
+                    [id, [...carried.values()].map(({ path }) => ({ path, parts: {} }))],
+                ]),
+                consumed: [],
+                carried: [...carried.values()],
+            },
+        ],
+    };
+}
+async function plannedWithin(ask, room) {
+    const { record } = room;
+    const visible = await stepped(room.replay(room.queue));
+    const changed = unreadable(ask.saved, visible, room.composition) ?? changedUnderneath(ask.saved, visible);
+    if (changed !== null)
+        return changed;
+    const parts = ask.saved.map(({ path, parts: held }) => changesOf(path, held));
+    const changes = parts.flatMap(({ changes: made }) => made);
+    const requeue = await stepped(requeuing(room.queue, changes, visible, (batch) => room.changeable.has(batch.id), room.replay));
+    if (requeue.kind === 'refused')
+        return requeue;
+    const foreign = [...requeue.withdrawn.keys()].some((origin) => {
+        const writer = room.queue.find((batch) => batch.id === origin)?.writtenBy;
+        return writer?.app !== ask.writtenBy?.app || writer?.release !== ask.writtenBy?.release;
+    });
+    if (foreign)
+        return unqueueable([...requeue.queued].at(-1));
+    const input = {
+        local: ask.local,
+        baseRoomVersion: record.roomVersion,
+        composition: room.composition,
+        rule: room.rule,
+        providerLimits: ask.providerLimits,
+        handle: record.declaration.handle,
+        visible,
+        folders: room.folders,
+        changes,
+        bases: parts.flatMap(({ bases }) => bases),
+        queued: queuedDocuments(room.queue),
+        writtenBy: ask.writtenBy,
+        unmodeled: !room.modelled,
+        validate: room.validate,
+    };
+    const rewritten = requeue.withdrawn.size > 0;
+    if (rewritten) {
+        const whole = await batching({
+            ...input,
+            providerLimits: [],
+            queued: new Set([...input.queued, ...requeue.queued]),
+        });
+        if (whole.kind === 'refused')
+            return whole;
+    }
+    const own = !rewritten
+        ? await batching(input)
+        : requeue.changes.length === 0
+            ? null
+            : await batching({
+                ...input,
+                visible: await stepped(room.replay(requeue.queue)),
+                changes: requeue.changes,
+                queued: queuedDocuments(requeue.queue),
+            });
+    if (own?.kind === 'refused')
+        return own;
+    const queue = own === null ? requeue.queue : [...requeue.queue, own.batch];
+    const saved = new Map();
+    for (const [origin, rebuilt] of requeue.withdrawn) {
+        if (rebuilt === null)
+            continue;
+        const limited = await stepped(limiting(queue, rebuilt, ask.providerLimits, room.replay));
+        if (limited !== null)
+            return { kind: 'refused', refusal: limited };
+        saved.set(rebuilt.id, withdrawnDrafts(room.saved.get(origin) ?? [], changes));
+    }
+    if (own !== null) {
+        saved.set(own.batch.id, ask.saved.filter(({ path }) => !requeue.queued.has(path)));
+    }
+    const carried = carriedDrafts(ask, room, room);
+    return {
+        kind: 'planned',
+        identifier: own?.batch.id ??
+            [...requeue.withdrawn].map(([origin, rebuilt]) => rebuilt?.id ?? origin).at(-1),
+        rooms: [
+            {
+                locator: record.locator,
+                queue,
+                saved,
+                consumed: [...ask.consumed, ...carried.keys()],
+                carried: [...carried.values()],
+            },
+        ],
+    };
+}
+export function destination(locator, saved) {
+    const into = saved.find(({ parts }) => parts.move?.room !== undefined && parts.move.room !== locator);
+    return into?.parts.move?.room ?? null;
 }
-export function buildBatch(input) {
-    return batching(input);
+export function planSave(ask, room, into) {
+    return into === undefined ? plannedWithin(ask, room) : plannedMove(ask, room, into);
 }