@agentshouse/mdruntime 0.1.0-c95464765b116 → 0.1.0-c95f0f04f2113

package/dist/save.js

@@ -1,10 +1,13 @@
 import { definitionOf } from './model.js';
-import { apply, ATTACHMENT, links, parse, pointerSegments, references, relative, relativize, retarget, serialize, target, } from '@agentshouse/mdmodel';
-import { immutable, queuedFile, departure, } from './change.js';
-import { available, changedCleanly, collectionOf, documentsOf, governing, referring, validateCollection, } from './collection.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 { overlay } from './overlay.js';
-import { covered, normalize } from './paths.js';
+import { overlaying } from './overlay.js';
+import { ancestors, covered, normalize } from './paths.js';
+import { sorting } from './shared.js';
+import { paced, ROW_WEIGHT, stepped } from './turn.js';
+import { validatedCollection } from './validation.js';
 function refuse(code, file, location) {
     return {
         kind: 'refused',
@@ -20,7 +23,7 @@ function repointed(document, definition, from, to, moves, settled) {
     const parsed = parse(document.content, from);
     if (!parsed.ok)
         return [];
-    let next = parsed.document;
+    const changes = [];
     const names = new Set();
     for (const { pointer, value } of definition === undefined
         ? []
@@ -32,38 +35,39 @@ function repointed(document, definition, from, to, moves, settled) {
         const destination = moves.get(named) ?? named;
         if (target(to, value) === destination)
             continue;
-        const applied = apply(next, {
+        changes.push({
             kind: 'reference',
             pointer,
             value: retarget(value, relative(to, destination)),
             prior: value,
         });
-        if (applied.outcome !== 'applied')
-            continue;
-        next = applied.document;
         names.add(name);
     }
+    if (changes.length === 0)
+        return [];
+    const applied = apply(parsed.document, changes);
+    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, path, changes) {
-    let next = document;
+function edited(document, changes) {
+    const parts = new Map();
     for (const change of changes) {
-        if (change.path !== path)
-            continue;
-        if (change.kind !== 'section' && change.kind !== 'preamble')
-            continue;
-        const applied = apply(next, change.kind === 'preamble'
-            ? { kind: 'preamble', value: change.value, prior: next.preamble }
-            : {
+        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: next.sections[change.name],
+                prior: document.sections[change.name] ?? '',
             });
-        if (applied.outcome === 'applied')
-            next = applied.document;
     }
-    return next;
+    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 = [];
@@ -78,7 +82,7 @@ function bodies(path, before, after) {
     return changes;
 }
 function relinks(path, moved, before, moves) {
-    let after = before;
+    const changes = [];
     for (const link of links(before, path)) {
         const destination = moves.get(link.target) ?? link.target;
         if (destination === link.target && moved === path)
@@ -86,20 +90,23 @@ function relinks(path, moved, before, moves) {
         const to = relative(moved, destination);
         if (to === relative(path, link.target))
             continue;
-        const applied = apply(after, { kind: 'link', href: link.href, to });
-        if (applied.outcome === 'refuse') {
-            return {
-                kind: 'refused',
-                refusal: {
-                    code: applied.refusal.rule,
-                    retryable: false,
-                    file: path,
-                    ...(applied.refusal.location === undefined ? {} : { location: applied.refusal.location }),
-                },
-            };
-        }
-        after = applied.document;
+        changes.push({ kind: 'link', href: link.href, to });
+    }
+    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 after = applied.document;
     if (after === before)
         return { kind: 'changes', changes: [] };
     if (before.type === undefined) {
@@ -107,19 +114,14 @@ function relinks(path, moved, before, moves) {
     }
     return { kind: 'changes', changes: bodies(path, before, after) };
 }
-function subsumed(merged, path) {
-    for (let index = merged.length - 1; index >= 0; index -= 1) {
-        const item = merged[index];
-        if (item.path !== path)
-            continue;
-        if (item.kind === 'section' || item.kind === 'preamble')
-            merged.splice(index, 1);
-    }
+function partKey(change) {
+    return change.kind === 'section' ? `section ${change.name}` : change.kind;
 }
-function rewrites(changes, visible) {
+function* rewrites(changes, visible) {
     const moves = new Map();
     const settled = new Set();
-    for (const change of changes) {
+    const parts = new Map();
+    for (const [index, change] of changes.entries()) {
         if (change.kind === 'move')
             moves.set(change.path, change.to);
         if (change.kind === 'remove' ||
@@ -130,54 +132,143 @@ function rewrites(changes, visible) {
         }
         if (change.kind === 'field')
             settled.add(`${change.path} ${change.name}`);
+        if (isPart(change)) {
+            const held = parts.get(change.path);
+            if (held === undefined)
+                parts.set(change.path, [index]);
+            else
+                held.push(index);
+        }
     }
     if (moves.size === 0)
         return { kind: 'changes', changes };
     const merged = [...changes];
     const added = [];
-    for (const [path, document] of documentsOf(visible.collection)) {
+    for (const [path, document] of yield* documentsOf(visible.collection)) {
         if (settled.has(path))
             continue;
         const moved = moves.get(path) ?? path;
         const definition = definitionOf(governing(visible.collection.composition, path), document.type);
-        added.push(...repointed(document, definition, path, moved, moves, settled));
-        const relinked = relinks(path, moved, edited(document, path, merged), moves);
+        const repointing = repointed(document, definition, path, moved, moves, settled);
+        added.push(...repointing);
+        const own = parts.get(path) ?? [];
+        const relinked = relinks(path, moved, edited(document, own.map((index) => merged[index])), moves);
         if (relinked.kind === 'refused')
             return relinked;
+        const keyed = new Map();
+        for (const index of own) {
+            const key = partKey(merged[index]);
+            if (!keyed.has(key))
+                keyed.set(key, index);
+        }
         for (const change of relinked.changes) {
             if (change.kind === 'replace') {
-                subsumed(merged, path);
+                for (const index of own) {
+                    const kind = merged[index]?.kind;
+                    if (kind === 'section' || kind === 'preamble')
+                        merged[index] = null;
+                }
                 added.push(change);
                 continue;
             }
-            const index = merged.findIndex((item) => item.kind === change.kind &&
-                item.path === path &&
-                (change.kind !== 'section' || (item.kind === 'section' && item.name === change.name)));
-            if (index === -1)
+            const index = keyed.get(partKey(change));
+            if (index === undefined)
                 added.push(change);
             else
                 merged[index] = change;
         }
+        const text = visible.collection.text[path].length;
+        const rewritten = repointing.length > 0 || relinked.changes.length > 0;
+        yield ROW_WEIGHT + text + (rewritten ? text : 0);
     }
-    return { kind: 'changes', changes: [...added, ...merged] };
+    return {
+        kind: 'changes',
+        changes: [...added, ...merged.filter((change) => change !== null)],
+    };
 }
-function anticipated(changes, preconditions, rewritten, visible) {
-    const derived = rewritten.filter((change) => !changes.includes(change));
+function* anticipated(changes, preconditions, rewritten, visible) {
+    const given = new Set(changes);
+    const derived = rewritten.filter((change) => !given.has(change));
     return {
         changes: rewritten,
-        preconditions: [...preconditionsOf(derived, visible, []), ...preconditions],
+        preconditions: [...(yield* preconditionsOf(derived, visible, [])), ...preconditions],
     };
 }
-export function providerRewritten(batch, visible) {
-    const rewritten = rewrites(batch.changes, visible);
+export function* providerRewritten(batch, visible) {
+    const rewritten = yield* rewrites(batch.changes, visible);
     if (rewritten.kind === 'refused')
         return batch;
     return {
         ...batch,
-        ...anticipated(batch.changes, batch.preconditions, rewritten.changes, visible),
+        ...(yield* anticipated(batch.changes, batch.preconditions, rewritten.changes, visible)),
     };
 }
-function incoming(collection, removed, candidates) {
+function crossed(document, definition, path, to) {
+    const changes = [];
+    for (const link of links(document, path)) {
+        const written = to(link.target, link.href);
+        if (written !== undefined)
+            changes.push({ kind: 'link', href: link.href, to: written });
+    }
+    for (const { pointer, value } of definition === undefined
+        ? []
+        : references(document, definition)) {
+        const named = target(path, value);
+        const written = named === null ? undefined : to(named, value);
+        if (written !== undefined) {
+            changes.push({ kind: 'reference', pointer, value: retarget(value, written), prior: value });
+        }
+    }
+    return changes;
+}
+function rewritten(path, document, changes) {
+    if (changes.length === 0)
+        return [];
+    const applied = apply(document, changes);
+    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),
+    ];
+}
+function roomPathOf(handle, path) {
+    return `/rooms/${handle}/${path}`;
+}
+export function* leavingRewritten(batch, visible) {
+    const between = batch.between;
+    if (between === undefined)
+        return batch;
+    const moved = new Map(between.moves.map(({ path, to }) => [path, roomPathOf(between.destination.handle, to)]));
+    const derived = [];
+    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))));
+        yield ROW_WEIGHT + visible.collection.text[path].length;
+    }
+    if (derived.length === 0)
+        return batch;
+    return {
+        ...batch,
+        changes: [...derived, ...batch.changes],
+        preconditions: [...(yield* preconditionsOf(derived, visible, [])), ...batch.preconditions],
+    };
+}
+export function rewriting(batch, locator) {
+    return leaving(batch, locator) || batch.changes.some((change) => change.kind === 'move');
+}
+export function* effectiveIn(batch, locator, visible) {
+    return leaving(batch, locator)
+        ? yield* leavingRewritten(batch, visible)
+        : yield* providerRewritten(batch, visible);
+}
+function* incoming(collection, removed, candidates) {
     const found = new Map();
     const note = (target, file) => {
         if (!removed.has(target))
@@ -186,13 +277,20 @@ function incoming(collection, removed, candidates) {
         referrers.add(file);
         found.set(target, referrers);
     };
-    const read = candidates === null
-        ? documentsOf(collection)
-        : [...new Set(candidates)].sort().flatMap((path) => {
+    const read = function* (paths) {
+        const seen = new Set();
+        for (const path of paths) {
+            if (seen.has(path))
+                continue;
+            seen.add(path);
             const document = collection.document(path);
-            return document === undefined ? [] : [[path, document]];
-        });
-    for (const [path, document] of read) {
+            if (document !== undefined)
+                yield [path, document];
+        }
+    };
+    for (const [path, document] of candidates === null
+        ? yield* documentsOf(collection)
+        : read(candidates)) {
         const definition = definitionOf(governing(collection.composition, path), document.type);
         for (const { value, to } of definition === undefined ? [] : references(document, definition)) {
             if (to.includes(ATTACHMENT))
@@ -201,8 +299,9 @@ function incoming(collection, removed, candidates) {
             if (named !== null)
                 note(named, path);
         }
+        yield ROW_WEIGHT + collection.text[path].length;
     }
-    const [first] = [...found.keys()].sort();
+    const [first] = yield* sorting(found.keys());
     if (first === undefined)
         return null;
     const every = new Set();
@@ -215,14 +314,16 @@ function incoming(collection, removed, candidates) {
             code: 'referenced-missing-file',
             retryable: false,
             file: first,
-            referrers: [...every].sort(),
+            referrers: yield* sorting(every),
         },
     };
 }
 function affected(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
-function guard(changes, input) {
+const WRITE = ['write'];
+const MOVE_OUT = ['write', 'erase'];
+function guard(changes, input, removing) {
     const overridden = new Map();
     const existing = {
         has: (path) => overridden.get(path) ??
@@ -230,6 +331,7 @@ function guard(changes, input) {
         add: (path) => void overridden.set(path, true),
         delete: (path) => void overridden.set(path, false),
     };
+    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);
@@ -238,13 +340,14 @@ function guard(changes, input) {
             if (covered(input.providerOwnedPaths, normalized)) {
                 return refuse('provider-owned-path', normalized);
             }
-            const operation = change.kind === 'remove' ? 'delete' : 'write';
-            if (!input.local && !covered(input.operations[operation], normalized))
-                return refuse(`${operation}-grant`, normalized);
+            for (const operation of change.kind === 'remove' ? removing : WRITE)
+                if (!input.local && !covered(input.operations[operation], normalized))
+                    return refuse(`${operation}-grant`, normalized);
         }
-        if (change.kind === 'create') {
-            if (existing.has(change.path))
-                return refuse('path-collision', change.path);
+        if (change.kind === 'create' || change.kind === 'arrival') {
+            const taken = existing.has(change.path) ? change.path : occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             existing.add(change.path);
             continue;
         }
@@ -254,6 +357,9 @@ function guard(changes, input) {
                     input.bases.some((base) => base.kind === 'absent' && base.path === change.path))) {
                 return refuse('path-collision', change.path);
             }
+            const taken = occupied(change.path);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (!input.local &&
                 existing.has(change.path) &&
                 input.visible.revisions[departure(changes, index)] === undefined) {
@@ -265,8 +371,9 @@ function guard(changes, input) {
         if (change.kind === 'move') {
             if (!existing.has(change.path))
                 return refuse('path-absent', change.path);
-            if (existing.has(change.to))
-                return refuse('path-collision', change.to);
+            const taken = existing.has(change.to) ? change.to : occupied(change.to);
+            if (taken !== null)
+                return refuse('path-collision', taken);
             if (unrevised(input, change.path)) {
                 return refuse('unknown-revision', change.path);
             }
@@ -284,7 +391,7 @@ function guard(changes, input) {
             continue;
         }
         if (change.kind === 'replace') {
-            if (!input.local && input.visible.revisions[change.path] === undefined) {
+            if (unrevised(input, change.path)) {
                 return refuse('unknown-revision', change.path);
             }
             continue;
@@ -298,6 +405,22 @@ function guard(changes, input) {
 function unrevised(input, path) {
     return (!input.local && input.queued?.has(path) !== true && input.visible.revisions[path] === undefined);
 }
+export function queuedDocuments(queue) {
+    const paths = new Set();
+    for (const batch of queue) {
+        for (const change of batch.changes) {
+            if (change.kind === 'binary' || (change.kind === 'arrival' && !('content' in change)))
+                continue;
+            if (change.kind === 'remove')
+                paths.delete(change.path);
+            else if (change.kind !== 'move')
+                paths.add(change.path);
+            else if (paths.delete(change.path))
+                paths.add(change.to);
+        }
+    }
+    return paths;
+}
 function identity(precondition) {
     const part = precondition.kind === 'field' || precondition.kind === 'section' ? precondition.name : '';
     return `${precondition.kind} ${precondition.path} ${part}`;
@@ -315,7 +438,7 @@ function sameTarget(precondition, change) {
     return ((precondition.kind !== 'field' && precondition.kind !== 'section') ||
         ((change.kind === 'field' || change.kind === 'section') && precondition.name === change.name));
 }
-function preconditionsOf(changes, visible, bases) {
+function* preconditionsOf(changes, visible, bases) {
     const preconditions = [];
     const seen = new Set();
     const add = (precondition) => {
@@ -326,6 +449,7 @@ function preconditionsOf(changes, visible, bases) {
         preconditions.push(precondition);
     };
     for (const change of changes) {
+        yield ROW_WEIGHT;
         if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
             const based = bases.find((base) => sameTarget(base, change));
             if (based !== undefined) {
@@ -373,10 +497,13 @@ function preconditionsOf(changes, visible, bases) {
 function depth(path) {
     return path.split('/').length;
 }
-function exceeded(limits, changes, effective, resulting) {
+function* exceeding(limits, changes, effective, resulting) {
     const written = effective.map((change) => (change.kind === 'move' ? change.to : change.path));
     const created = changes
-        .filter((change) => change.kind === 'create' || change.kind === 'move' || change.kind === 'binary')
+        .filter((change) => change.kind === 'create' ||
+        change.kind === 'move' ||
+        change.kind === 'binary' ||
+        change.kind === 'arrival')
         .map((change) => (change.kind === 'move' ? change.to : change.path));
     for (const limit of limits) {
         const value = limit.value;
@@ -390,9 +517,13 @@ function exceeded(limits, changes, effective, resulting) {
             return refuse('provider-limit', undefined, limit.name);
         }
         if (limit.name === 'document-size') {
-            const large = written.find((path) => new TextEncoder().encode(resulting.documents[path] ?? '').byteLength > value);
-            if (large !== undefined)
-                return refuse('provider-limit', large, limit.name);
+            for (const path of written) {
+                const text = resulting.documents[path] ?? '';
+                if (new TextEncoder().encode(text).byteLength > value) {
+                    return refuse('provider-limit', path, limit.name);
+                }
+                yield ROW_WEIGHT + text.length;
+            }
         }
         if (limit.name === 'path-length') {
             const long = created.find((path) => path.length > value);
@@ -422,7 +553,7 @@ function relativeField(path, name, value, handle, definition) {
         !opened.ok ||
         !JSON.stringify(value ?? null).includes(`/rooms/${handle}/`))
         return value;
-    const held = apply(opened.document, { kind: 'field', name, value, prior: undefined });
+    const held = apply(opened.document, [{ kind: 'field', name, value, prior: undefined }]);
     if (held.outcome !== 'applied')
         return value;
     const result = relativize(held.document, path, handle, definition);
@@ -458,17 +589,6 @@ function relativeChanges(input) {
         return { ...change, fields, sections };
     });
 }
-function unmodeledType(collection, composition) {
-    if (available(composition))
-        return false;
-    for (const [path, document] of documentsOf(collection)) {
-        if (document.type !== undefined &&
-            document.type !== 'any' &&
-            governing(composition, path).status === 'unavailable')
-            return true;
-    }
-    return false;
-}
 function unqueueable(file) {
     return { kind: 'refused', refusal: { code: 'unknown-revision', retryable: false, file } };
 }
@@ -478,29 +598,44 @@ function isPart(change) {
 function touched(change) {
     return change.kind === 'move' ? [change.path, change.to] : [change.path];
 }
-function partApplied(content, path, change) {
+function partsApplied(content, path, changes) {
     const parsed = parse(content, path);
     if (!parsed.ok)
         return null;
     const document = parsed.document;
-    const applied = apply(document, change.kind === 'field'
-        ? {
-            kind: 'field',
-            name: change.name,
-            value: change.value,
-            prior: document.fields[change.name],
-        }
-        : change.kind === 'section'
-            ? {
+    const parts = 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],
-            }
-            : { kind: 'preamble', value: change.value, prior: document.preamble });
+                prior: document.sections[change.name] ?? '',
+            });
+        else
+            parts.set('preamble', { kind: 'preamble', value: change.value, prior: document.preamble });
+    }
+    const applied = apply(document, [...parts.values()]);
     return applied.outcome === 'applied' ? serialize(applied.document) : null;
 }
-function folded(changes, change, appending) {
+function settledParts(changes, deferred) {
+    for (const [held, parts] of deferred) {
+        const content = partsApplied(held.content, held.path, parts);
+        if (content === null)
+            return held.path;
+        changes[changes.indexOf(held)] = { ...held, content };
+    }
+    deferred.clear();
+    return null;
+}
+function folded(changes, change, appending, deferred) {
     const held = changes.find((item) => item.path === change.path && (item.kind === 'create' || item.kind === 'replace'));
     const whole = held === undefined ? -1 : changes.indexOf(held);
     const occupied = changes.some((item) => !isPart(item) && item !== held && touched(item).includes(change.path));
@@ -521,10 +656,11 @@ function folded(changes, change, appending) {
             return 'appended';
         }
         if ('content' in held) {
-            const content = partApplied(held.content, held.path, change);
-            if (content === null)
-                return 'refused';
-            changes[whole] = { ...held, content };
+            const parts = deferred.get(held);
+            if (parts === undefined)
+                deferred.set(held, [change]);
+            else
+                parts.push(change);
             return 'folded';
         }
         if (change.kind === 'preamble')
@@ -555,17 +691,21 @@ function folded(changes, change, appending) {
     changes.push(change);
     return 'appended';
 }
-function relinked(batch, move, before, after, appending) {
-    const derived = rewrites([move], after);
+function* relinked(batch, move, before, after, appending) {
+    const derived = yield* rewrites([move], after);
     if (derived.kind === 'refused')
         return derived;
     const changes = [...batch.changes];
     const appended = [];
     let changed = false;
+    const deferred = new Map();
     for (const change of derived.changes) {
         if (change === move)
             continue;
-        const outcome = folded(changes, change, appending);
+        const unsettled = isPart(change) ? null : settledParts(changes, deferred);
+        if (unsettled !== null)
+            return unqueueable(unsettled);
+        const outcome = folded(changes, change, appending, deferred);
         if (outcome === 'refused')
             return unqueueable(change.path);
         if (outcome === 'appended')
@@ -573,9 +713,13 @@ function relinked(batch, move, before, after, appending) {
         if (outcome !== 'skipped')
             changed = true;
     }
+    const unsettled = settledParts(changes, deferred);
+    if (unsettled !== null)
+        return unqueueable(unsettled);
     if (!changed)
         return { kind: 'relinked', batch };
     const held = new Set(batch.preconditions.map(identity));
+    const added = yield* preconditionsOf(appended, before, []);
     return {
         kind: 'relinked',
         batch: immutable({
@@ -584,7 +728,7 @@ function relinked(batch, move, before, after, appending) {
             changes,
             preconditions: [
                 ...batch.preconditions,
-                ...preconditionsOf(appended, before, []).filter((precondition) => !held.has(identity(precondition))),
+                ...added.filter((precondition) => !held.has(identity(precondition))),
             ],
         }),
     };
@@ -630,7 +774,7 @@ function withdrawnFile(batch, change, at) {
     ];
     return immutable({ ...batch, id: changeBatchIdentity(), changes, preconditions });
 }
-export function requeued(queue, changes, visible, changeable, state) {
+export function* requeuing(queue, changes, visible, changeable, state) {
     const next = [...queue];
     const origins = new Map();
     const withdrawn = new Map();
@@ -653,19 +797,19 @@ export function requeued(queue, changes, visible, changeable, state) {
             return unqueueable(change.path);
         const following = next.slice(index);
         const rebuilt = [];
-        let before = change.kind === 'move' ? state(next.slice(0, index)) : visible;
+        let before = change.kind === 'move' ? yield* state(next.slice(0, index)) : visible;
         for (const [offset, batch] of following.entries()) {
             let current = batch;
             if (change.kind === 'move') {
-                const after = state(next.slice(0, index + offset + 1));
+                const after = yield* state(next.slice(0, index + offset + 1));
                 const appending = offset === 0 && created(batch, queuedFile(batch, change.path, held.localId));
-                const relinking = relinked(batch, change, before, after, appending);
+                const relinking = yield* relinked(batch, change, before, after, appending);
                 if (relinking.kind === 'refused')
                     return relinking;
                 current = relinking.batch;
                 before = after;
             }
-            if (current !== batch && !open(batch))
+            if (current !== batch && (!open(batch) || batch.between !== undefined))
                 return unqueueable(change.path);
             rebuilt.push(offset === 0
                 ? withdrawnFile(current, change, queuedFile(current, change.path, held.localId))
@@ -706,10 +850,17 @@ export function joined(queue, owner, extra) {
     if (clash !== undefined)
         return unqueueable(clash);
     const changes = [...owner.changes];
+    const deferred = new Map();
     for (const change of extra.changes) {
-        if (folded(changes, change, true) === 'refused')
+        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 = [
@@ -728,62 +879,66 @@ export function joined(queue, owner, extra) {
     });
     return { kind: 'joined', batch, queue: queue.map((item) => (item === owner ? batch : item)) };
 }
-export function limitedIn(queue, batch, limits, state) {
+export function* limiting(queue, batch, limits, state) {
     const at = queue.indexOf(batch);
-    const limited = exceeded(limits, batch.changes, providerRewritten(batch, state(queue.slice(0, at))).changes, state(queue.slice(0, at + 1)));
+    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?.kind === 'refused' ? limited.refusal : null;
 }
-export function buildBatch(input) {
-    const changes = relativeChanges(input);
-    const structural = changes.find((change) => change.kind === 'move' || change.kind === 'remove');
-    if (structural !== undefined && unmodeledType(input.visible.collection, input.composition))
-        return refuse('model-unavailable', structural.path);
-    if (changes.length === 0)
-        return refuse('no-change');
-    const rewritten = rewrites(changes, input.visible);
-    if (rewritten.kind === 'refused')
-        return rewritten;
-    const refusal = guard(changes, input);
-    if (refusal !== null)
-        return refusal;
-    const preconditions = preconditionsOf(changes, input.visible, input.bases);
-    const predicted = anticipated(changes, preconditions, rewritten.changes, input.visible);
-    const resulting = overlay(input.visible, [
-        { id: '', baseRoomVersion: input.baseRoomVersion, ...predicted },
-    ]);
-    const clean = input.clean !== undefined &&
-        input.clean.text === input.visible.documents &&
-        input.clean.binaries === input.visible.binaries &&
-        available(input.composition)
-        ? input.clean
-        : null;
-    const removed = new Set(changes.filter((change) => change.kind === 'remove').map((change) => change.path));
+function typedText(content) {
+    if (content === undefined)
+        return false;
+    const parsed = parse(content);
+    return parsed.ok && parsed.document.type !== undefined && parsed.document.type !== 'any';
+}
+function touchedLibrary(resulting, touched, composition) {
+    const entries = touched
+        .flatMap((path) => {
+        const content = resulting.documents[path];
+        const binary = resulting.binaries[path] !== undefined;
+        return content === undefined && !binary ? [] : [{ path, content: content ?? null }];
+    })
+        .sort((left, right) => (left.path < right.path ? -1 : left.path > right.path ? 1 : 0));
+    const contents = new Map(entries.map(({ path, content }) => [path, content]));
+    const binaries = new Set(Object.keys(resulting.binaries).filter((path) => resulting.binaries[path] !== undefined));
+    return validatedCollection(() => Promise.resolve({ entries, next: null }), async (paths) => {
+        const known = new Map();
+        const pace = paced();
+        for (const path of paths) {
+            const content = contents.get(path);
+            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 });
+                await pace(content.length + ROW_WEIGHT);
+            }
+        }
+        return known;
+    }, composition);
+}
+async function judging(visible, resulting, composition, validate, removed, touched) {
     if (removed.size > 0) {
-        const referrers = clean === null ? null : referring(clean, input.composition, removed);
-        const referenced = incoming(collectionOf(resulting.documents, input.composition), removed, referrers === null ? null : [...referrers, ...predicted.changes.flatMap(affected)]);
+        const referenced = await stepped(incoming(collectionOf(resulting.documents, composition), removed, null));
         if (referenced !== null)
             return referenced;
     }
-    const typed = (content) => {
-        if (content === undefined)
-            return false;
-        const parsed = parse(content);
-        return parsed.ok && parsed.document.type !== undefined && parsed.document.type !== 'any';
-    };
-    const touched = [...new Set(predicted.changes.flatMap(affected))];
-    const typedPaths = touched.filter((path) => typed(input.visible.documents[path]) || typed(resulting.documents[path]));
-    const needsModel = typedPaths.length > 0;
-    const withoutModel = typedPaths.find((path) => governing(input.composition, path).status === 'unavailable');
+    const typedPaths = [];
+    const pace = paced();
+    for (const path of touched) {
+        const before = visible.documents[path];
+        const after = resulting.documents[path];
+        if (typedText(before) || typedText(after))
+            typedPaths.push(path);
+        await pace((before?.length ?? 0) + (after?.length ?? 0) + ROW_WEIGHT);
+    }
+    const withoutModel = typedPaths.find((path) => governing(composition, path).status === 'unavailable');
     if (withoutModel !== undefined)
         return refuse('model-unavailable', withoutModel);
-    const verdict = clean !== null &&
-        changedCleanly({ text: resulting.documents, binaries: resulting.binaries }, clean, input.composition)
-        ? { verdict: 'accept' }
-        : validateCollection(needsModel
-            ? resulting.documents
-            : Object.fromEntries(touched.flatMap((path) => resulting.documents[path] === undefined
-                ? []
-                : [[path, resulting.documents[path]]])), Object.keys(resulting.binaries), input.composition);
+    const verdict = typedPaths.length > 0
+        ? await validate(resulting, touched)
+        : await touchedLibrary(resulting, touched, composition);
     if (verdict.verdict === 'refuse') {
         return {
             kind: 'refused',
@@ -796,12 +951,92 @@ export function buildBatch(input) {
             },
         };
     }
-    const limited = exceeded(input.providerLimits, changes, predicted.changes, resulting);
+    return {
+        kind: 'judged',
+        validated: typedPaths
+            .map((path) => governing(composition, path))
+            .find((model) => model.status !== 'unavailable'),
+    };
+}
+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))
+        .join('/');
+    return `field ${pointer} ${key}`;
+}
+function roomReferencesIn(path, content, composition) {
+    if (content === undefined)
+        return [];
+    const parsed = parse(content, path);
+    if (!parsed.ok)
+        return [];
+    return roomReferences(parsed.document, definitionOf(governing(composition, path), parsed.document.type));
+}
+function* admittedRooms(changes, visible, resulting, composition) {
+    const from = new Map();
+    for (const [index, change] of changes.entries()) {
+        if (change.kind === 'move')
+            from.set(change.to, departure(changes, index));
+    }
+    for (const path of [...new Set(changes.flatMap(affected))].sort()) {
+        const now = resulting.documents[path];
+        if (now === undefined)
+            continue;
+        const held = new Set(roomReferencesIn(path, visible.documents[from.get(path) ?? path], composition).map(placed));
+        for (const reference of roomReferencesIn(path, now, composition)) {
+            if (reference.kind === 'link' || reference.crossRoom === true)
+                continue;
+            if (held.has(placed(reference)))
+                continue;
+            return refuse('unresolved-reference', path, reference.kind === 'field' ? reference.pointer : reference.section);
+        }
+        yield ROW_WEIGHT + now.length;
+    }
+    return null;
+}
+function validationOf(validated) {
+    return validated === undefined
+        ? {}
+        : {
+            validation: {
+                identity: validated.snapshot.identity,
+                version: validated.snapshot.version,
+                source: validated.status,
+            },
+        };
+}
+async function batching(input) {
+    const changes = relativeChanges(input);
+    const structural = changes.find((change) => change.kind === 'move' || change.kind === 'remove');
+    if (structural !== undefined && input.unmodeled) {
+        return refuse('model-unavailable', structural.path);
+    }
+    if (changes.length === 0)
+        return refuse('no-change');
+    const rewritten = await stepped(rewrites(changes, input.visible));
+    if (rewritten.kind === 'refused')
+        return rewritten;
+    const refusal = guard(changes, input, WRITE);
+    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 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;
+    const crossing = await stepped(admittedRooms(changes, input.visible, resulting, input.composition));
+    if (crossing !== null)
+        return crossing;
+    const limited = await stepped(exceeding(input.providerLimits, changes, predicted.changes, resulting));
     if (limited !== null)
         return limited;
-    const validated = typedPaths
-        .map((path) => governing(input.composition, path))
-        .find((model) => model.status !== 'unavailable');
     return {
         kind: 'batch',
         batch: immutable({
@@ -810,15 +1045,127 @@ export function buildBatch(input) {
             changes,
             preconditions,
             ...(input.writtenBy === undefined ? {} : { writtenBy: input.writtenBy }),
-            ...(validated === undefined
-                ? {}
-                : {
-                    validation: {
-                        identity: validated.snapshot.identity,
-                        version: validated.snapshot.version,
-                        source: validated.status,
-                    },
-                }),
+            ...validationOf(judged.validated),
         }),
     };
 }
+export const MOVE_DOCUMENTS = 'move-documents';
+function heldAt(visible, path) {
+    return visible.documents[path] !== undefined || visible.binaries[path] !== undefined;
+}
+function arrivingText(path, to, source, moved) {
+    const content = source.visible.documents[path];
+    const document = source.visible.collection.document(path);
+    if (document === undefined)
+        return content;
+    const definition = definitionOf(governing(source.composition, path), document.type);
+    const changes = crossed(document, definition, path, (named, href) => {
+        const at = moved.get(named);
+        if (at !== undefined)
+            return target(to, href) === at ? undefined : relative(to, at);
+        return heldAt(source.visible, named) ? roomPathOf(source.handle, named) : undefined;
+    });
+    if (changes.length === 0)
+        return content;
+    const applied = apply(document, changes);
+    return applied.outcome === 'applied' ? serialize(applied.document) : content;
+}
+function arrivalOf({ path, to }, source, moved) {
+    const { documents, revisions, fileIds, created, changes, binaries } = source.visible;
+    const kept = {
+        ...(fileIds[path] === undefined ? {} : { fileId: fileIds[path] }),
+        ...(created[path] === undefined ? {} : { created: created[path] }),
+        ...(changes[path] === undefined ? {} : { change: changes[path] }),
+    };
+    const heads = {
+        ...(revisions[path] === undefined ? {} : { revision: revisions[path] }),
+        ...kept,
+    };
+    const binary = binaries[path];
+    if (binary?.state === 'accepted') {
+        const { byteLength, mediaType, sha256 } = binary;
+        return {
+            kind: 'arrival',
+            path: to,
+            binary: { byteLength, mediaType, sha256 },
+            ...heads,
+        };
+    }
+    const content = arrivingText(path, to, source, moved);
+    return {
+        kind: 'arrival',
+        path: to,
+        content,
+        ...(content === documents[path] ? heads : kept),
+    };
+}
+async function moving(input) {
+    const { source, destination, moves } = input;
+    if (moves.length === 0)
+        return refuse('no-change');
+    const removals = moves.map(({ path }) => ({ kind: 'remove', path }));
+    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');
+    if (uploading !== undefined)
+        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: [] }, WRITE);
+    if (arrives !== null)
+        return arrives;
+    const bound = input.providerLimits.find((limit) => limit.name === MOVE_DOCUMENTS)?.value;
+    if (typeof bound === 'number' && moves.length > bound) {
+        return refuse('provider-limit', undefined, MOVE_DOCUMENTS);
+    }
+    if (source.unmodeled)
+        return refuse('model-unavailable', moves[0].path);
+    const id = changeBatchIdentity();
+    const between = {
+        source: { room: source.room, baseRoomVersion: source.baseRoomVersion },
+        destination: {
+            room: destination.room,
+            baseRoomVersion: destination.baseRoomVersion,
+            handle: destination.handle,
+        },
+        moves,
+    };
+    const written = input.writtenBy === undefined ? {} : { writtenBy: input.writtenBy };
+    const leavingBatch = {
+        id,
+        baseRoomVersion: source.baseRoomVersion,
+        changes: removals,
+        preconditions: moves.map(({ path }) => existence(source.visible, path)),
+        ...written,
+        between,
+    };
+    const effective = await stepped(leavingRewritten(leavingBatch, source.visible));
+    const left = await stepped(overlaying(source.visible, [effective]));
+    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;
+    const arrivingBatch = {
+        id,
+        baseRoomVersion: destination.baseRoomVersion,
+        changes: arrivals,
+        preconditions: moves.map(({ to }) => ({ kind: 'absent', path: to })),
+        ...written,
+        between,
+    };
+    const arrived = await stepped(overlaying(destination.visible, [arrivingBatch]));
+    const destinationJudged = await judging(destination.visible, arrived, destination.composition, destination.validate, new Set(), moves.map(({ to }) => to));
+    if (destinationJudged.kind === 'refused')
+        return destinationJudged;
+    const limited = (await stepped(exceeding(input.providerLimits, removals, effective.changes, left))) ??
+        (await stepped(exceeding(input.providerLimits, arrivals, arrivals, arrived)));
+    if (limited !== null)
+        return limited;
+    return { kind: 'moved', leaving: immutable(leavingBatch), arriving: immutable(arrivingBatch) };
+}
+export function buildMove(input) {
+    return moving(input);
+}
+export function buildBatch(input) {
+    return batching(input);
+}