@agentshouse/mdruntime 0.1.0-c2c52158b7381 → 0.1.0-c2e8a6f99866d

package/dist/connection.js

@@ -1,18 +1,18 @@
-import { roomTarget, target } from '@agentshouse/mdmodel';
+import { escapePointer, parseFrontmatter, roomTarget, target } from '@agentshouse/mdmodel';
 import { attachedModel, NO_ROOM_TYPES, roomTypesOf } from './attached-model.js';
 import { cached, modelTypes, NO_MODEL, sameModel, } from './model.js';
 import { observing, whole } from './observation.js';
 import { filterOf, identityOf, planOf, plain, queryKey, } from './query.js';
-import { createReadSide } from './read-side.js';
+import { createLiveQueries } from './live.js';
 import { seededResult } from './seed.js';
-import { documentKey, markdownPath, roomOfKey } from './rows.js';
+import { documentKey, roomOfKey } from './rows.js';
 import { createSearchIndex, searchPlanOf, } from './search.js';
 import { capped, MAXIMUM_WINDOW } from './windows.js';
 import { bootstrapRoom } from './bootstrap.js';
-import { changeSet, changing, entering, mergeChangeSets } from './change-set.js';
+import { changeSet, mergeChangeSets } from './change-set.js';
 import { createConversationStore, } from './conversation.js';
 import { leaving as leavingIn, partnerOf, queuedFile, } from './change.js';
-import { indexReferrers, referencesIndexed, validRoot, } from './collection.js';
+import { available, collectionOf, unreadable as unreadableIn, validRoot, } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
 import { binaryRecord } from './binary.js';
@@ -20,19 +20,21 @@ import { openedFiles } from './opened.js';
 import { ABSENT_TARGET, absentBinary, absentReference, binaryAnswer, binaryLinkAnswer, calledResult, failure, historyAnswer, LOCKED_UNREADABLE, lockedRoom, undeclared, UNCERTAIN, UNREADABLE, } from './outcome.js';
 import { createRecovery } from './recovery.js';
 import { doorReads } from './reads.js';
-import { refreshRoom } from './refresh.js';
+import { advancement } from './refresh.js';
 import { buildBatch, buildMove, joined, limiting, queuedDocuments, requeuing, } from './save.js';
-import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicating, sameMembership, standing, } from './replica.js';
+import { compositionOf, entryAt, landed, movedBy, overlayOf, replaying, returning, returnedPaths, sameMembership, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
 import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, moveTarget, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration } from './durability.js';
 import { readinessOf, SETTLED_ROOMS, } from './readiness.js';
 import { FencedMap } from './fence.js';
-import { keysIn, tallying } from './shared.js';
-import { finished, inChunks, ROW_WEIGHT, stepped, yielded } from './turn.js';
+import { fingerprint } from './stored.js';
+import { sameBinary } from './overlay.js';
+import { paced, ROW_WEIGHT, stepped, yielded } from './turn.js';
 import { identityTime, roomDraftRevision } from './identity.js';
 import { beneath, normalize } from './paths.js';
 import { openRuntimeStore, } from './store.js';
+import { changedCleanly, sameComposition, validatedCollection, } from './validation.js';
 import { unconfirmed } from './transfer.js';
 import { governs, holds, narrowed, planReach, } from './reach.js';
 function roomsAlone(plan) {
@@ -61,26 +63,19 @@ const OPENING_LANE = 'opening';
 const CONVERSATION_LANE = 'conversations';
 const ROOM_READS = 256;
 const ROOM_ATTEMPTS = 16;
+const SEARCH_BATCH = 256;
+const ERASE_BATCH = 512;
+const REDERIVE_BATCH = 256;
+const WALK_BYTES = 1 << 20;
+const QUERY_BYTES = 1 << 20;
+const STAGE_BYTES = 1 << 20;
+const CLEAN_CHANGES = 2_000;
 // A Room that locks offline stays readable this long after the connection drops, so a laptop waking or changing network keeps working while a disconnected device locks soon after.
 const LOCK_GRACE_MS = 120_000;
 function operationOf(input) {
     const operation = input?.operation_id;
     return typeof operation === 'string' ? operation : null;
 }
-const outside = new Map();
-function outsideOf(roots) {
-    const key = JSON.stringify(roots);
-    const held = outside.get(key);
-    if (held !== undefined)
-        return held;
-    const counted = (path) => (roots.some((root) => beneath(root, path)) ? 0 : 1);
-    const made = {
-        documents: (path) => (markdownPath(path) ? counted(path) : 0),
-        binaries: counted,
-    };
-    outside.set(key, made);
-    return made;
-}
 function abandonedOn(signal) {
     return new Promise((resolve) => {
         if (signal.aborted)
@@ -184,7 +179,7 @@ export function composeRuntime(options) {
     const queueSubscriptions = new Set();
     const roomDraftListeners = new Set();
     const presentationListeners = new Set();
-    const readSide = createReadSide();
+    const liveQueries = createLiveQueries((plan, cover) => answeredPlan(plan, cover));
     let withdrawConversations;
     let currencyQueued = null;
     let socketOpen = false;
@@ -198,7 +193,6 @@ export function composeRuntime(options) {
     let member = null;
     const memberListeners = new Set();
     const prepared = new Set();
-    const projecting = new Set();
     const unpreparedDemand = new Set();
     const unindexable = new Set();
     let preparing = false;
@@ -213,7 +207,19 @@ export function composeRuntime(options) {
     const transfers = new FencedMap(isFenced);
     const conversations = createConversationStore({
         agents: declaredAgents,
-        documents: ({ locator }) => rowsQuery(planOf({ rooms: [locator], select: { fields: 'all' } }, roomFacts())),
+        documents: (declaration, after) => rowsQuery(planOf({
+            rooms: [declaration.locator],
+            types: [declaration.type],
+            select: {
+                fields: [
+                    declaration.identity,
+                    declaration.name,
+                    ...(declaration.retired === undefined ? [] : [declaration.retired]),
+                ].map((field) => `/${escapePointer(field)}`),
+            },
+            limit: MAXIMUM_WINDOW,
+            ...(after === undefined ? {} : { after }),
+        }, roomFacts())),
         call: (name, input) => invokeAction(name, input),
         durably,
         stream: () => options.adapter.conversations,
@@ -224,8 +230,25 @@ export function composeRuntime(options) {
         expired: (operation) => pastHorizon(operation),
     });
     const searchIndex = createSearchIndex({
-        room: (room) => readSide.room(room),
-        document: (room, path) => readSide.document(room, path),
+        async *room(room) {
+            const local = await openLocal();
+            for (let after = null;;) {
+                const key = replicas.get(room)?.record.key;
+                if (key === undefined)
+                    return;
+                const page = await local.searched(key, room, after, SEARCH_BATCH, null);
+                yield page.documents;
+                if (page.next === null)
+                    return;
+                after = page.next;
+            }
+        },
+        async documents(room, paths) {
+            const key = replicas.get(room)?.record.key;
+            if (key === undefined || paths.length === 0)
+                return [];
+            return (await (await openLocal()).searched(key, room, null, paths.length, paths)).documents;
+        },
     });
     const roomsToIndex = new Set();
     const conversationsToIndex = new Set();
@@ -249,16 +272,36 @@ export function composeRuntime(options) {
         if (room.size === 0)
             roomDrafts.delete(locator);
     }
-    function roomDraftOf(record) {
+    async function visibleOf(locator, paths) {
+        const held = replicas.get(locator);
+        if (held === undefined)
+            return undefined;
+        const local = await openLocal();
+        const slice = await stepped(slicing(await local.entries(held.record.key, 'visible', paths), paths));
+        return { ...slice, collection: collectionOf(slice.documents, compositionOf(held.record)) };
+    }
+    function roomDraftOf(record, visible) {
         return structuredClone({
             room: record.locator,
             path: record.path,
             revision: record.revision,
             parts: record.parts,
-            changedUnderneath: underneath(record.parts, record.path, replicas.get(record.locator)?.visible),
+            changedUnderneath: underneath(record.parts, record.path, visible),
             returned: record.returned,
         });
     }
+    async function roomDraftsOf(records) {
+        const rooms = new Map();
+        for (const record of records) {
+            const paths = rooms.get(record.locator) ?? [];
+            paths.push(record.path);
+            rooms.set(record.locator, paths);
+        }
+        const layers = new Map();
+        for (const [locator, paths] of rooms)
+            layers.set(locator, await visibleOf(locator, paths));
+        return records.map((record) => roomDraftOf(record, layers.get(record.locator)));
+    }
     function snapshotRoomDrafts() {
         const records = [...roomDrafts.values()].flatMap((room) => [...room.values()]);
         records.sort((left, right) => {
@@ -268,18 +311,24 @@ export function composeRuntime(options) {
                 return left.path < right.path ? -1 : 1;
             return 0;
         });
-        return records.map(roomDraftOf);
+        return roomDraftsOf(records);
     }
+    let draftsShown = Promise.resolve();
     function publishRoomDrafts(waitingOnly) {
         if (closed)
             return;
-        const value = snapshotRoomDrafts();
-        for (const listener of roomDraftListeners) {
-            if (waitingOnly && listener.ready)
-                continue;
-            listener.ready = true;
-            listener.notify(value);
-        }
+        const snapshot = snapshotRoomDrafts();
+        draftsShown = draftsShown.then(async () => {
+            const value = await snapshot.catch(() => null);
+            if (value === null || closed)
+                return;
+            for (const listener of roomDraftListeners) {
+                if (waitingOnly && listener.ready)
+                    continue;
+                listener.ready = true;
+                listener.notify(value);
+            }
+        });
     }
     function presentationOf(app) {
         const value = presentations.get(app);
@@ -291,7 +340,7 @@ export function composeRuntime(options) {
             const stored = next(presentations.get(app));
             await local.present({ app, value: stored });
             presentations.set(app, stored);
-            publishChangeSet(changeSet('', null, null, { presentation: app }));
+            publishChangeSet(changeSet('', { presentation: app }));
         });
     }
     function emitPresentation(app) {
@@ -342,13 +391,7 @@ export function composeRuntime(options) {
         return { attentionRequired, reset };
     }
     function documentsIn(locator) {
-        const replica = replicas.get(locator);
-        return replica === undefined ? 0 : finished(counting(replica));
-    }
-    function* counting(replica) {
-        const weighed = outsideOf(replica.confirmed.record.typedSelection?.roots ?? []);
-        return ((yield* tallying(replica.visible.documents, weighed.documents)) +
-            (yield* tallying(replica.visible.binaries, weighed.binaries)));
+        return replicas.get(locator)?.count ?? 0;
     }
     function listed() {
         return structuredClone([...rooms.values()].map((room) => {
@@ -429,7 +472,7 @@ export function composeRuntime(options) {
         return { listed: roomsListed, rooms: held };
     }
     function emitRooms() {
-        readSide.recover();
+        liveQueries.recover();
         queueReadiness();
         const value = listed();
         for (const listener of roomListeners)
@@ -488,56 +531,29 @@ export function composeRuntime(options) {
         }
     }
     function applyChangeSet(set) {
-        const held = {
-            ...set,
-            documents: set.documents.filter(({ locator }) => prepared.has(locator) || projecting.has(locator)),
-        };
-        const applied = readSide.apply(held, () => searchIndex.changed(held));
-        if (applied instanceof Promise)
-            void applied.catch(unpublished);
+        liveQueries.touched(set);
+        searchIndex.changed(set);
     }
     function unpublished(error) {
         journal.record(`publication failed ${error instanceof Error ? error.name : 'unknown'}`);
     }
-    async function referenced(locator) {
-        for (;;) {
-            const record = replicas.get(locator)?.confirmed.record;
-            if (record === undefined || closed)
-                return;
-            const held = { text: record.documents, binaries: record.binaries };
-            const composition = compositionOf(record);
-            if (referencesIndexed(held, composition))
-                return;
-            await indexReferrers(held, composition);
-        }
-    }
     async function prepareReplica(locator) {
-        await referenced(locator);
-        const replica = replicas.get(locator);
-        if (replica === undefined || closed || prepared.has(locator))
-            return;
-        const visible = replica.visible;
-        const entered = [];
-        projecting.add(locator);
-        try {
-            await inChunks(await stepped(keysIn(visible.documents, visible.binaries)), (path) => ROW_WEIGHT + (visible.documents[path]?.length ?? 0), (chunk) => {
-                const current = replicas.get(locator);
-                if (current === undefined || closed)
-                    return;
-                const set = entering(locator, current, chunk);
-                entered.push(set);
-                return readSide.apply(set);
-            });
-            if (!replicas.has(locator) || closed)
+        for (;;) {
+            const held = replicas.get(locator);
+            if (held === undefined || closed || prepared.has(locator))
                 return;
+            const key = held.record.key;
+            const done = await exclusive(async () => (await openLocal()).rederive(key, REDERIVE_BATCH));
+            if (replicas.get(locator)?.record.key !== key)
+                continue;
+            if (!done)
+                continue;
             prepared.add(locator);
+            publishChangeSet(changeSet(locator, { documents: null }));
+            liveQueries.recover();
+            queueReadiness();
+            return;
         }
-        finally {
-            projecting.delete(locator);
-        }
-        conversations.changed(mergeChangeSets(entered));
-        readSide.recover();
-        queueReadiness();
     }
     function unprepared() {
         return [...unpreparedDemand, ...replicas.keys()].find((locator) => !prepared.has(locator) && !unindexable.has(locator));
@@ -593,6 +609,7 @@ export function composeRuntime(options) {
         const pending = [];
         const coverage = [];
         const overlay = [];
+        const read = [];
         for (const locator of locators) {
             const replica = replicas.get(locator);
             if (replica === undefined) {
@@ -606,15 +623,16 @@ export function composeRuntime(options) {
             }
             coverage.push({
                 room: locator,
-                generation: replica.confirmed.record.transfer,
+                generation: replica.record.transfer,
                 current: !(catching.has(locator) || owed.has(locator) || transfers.has(locator)),
             });
+            read.push({ locator, key: replica.record.key });
             for (const batch of replica.queue)
                 overlay.push(batch.id);
         }
         if (pending.length > 0)
             return { pending };
-        return { coverage: { rooms: coverage, indexes: [], overlay } };
+        return { coverage: { rooms: coverage, indexes: [], overlay }, rooms: read };
     }
     function awaitPreparation(cover) {
         if (!('pending' in cover))
@@ -726,7 +744,7 @@ export function composeRuntime(options) {
     function establish(name) {
         targets = { ...targets, [name]: { established: true } };
         queueReadiness();
-        void durably((local) => local.keepTargets(targets)).catch(() => {
+        void durably((local) => local.fact('targets', targets)).catch(() => {
             journal.record(`target record failed ${name}`);
         });
     }
@@ -763,18 +781,12 @@ export function composeRuntime(options) {
             readinessWatches.delete(watch);
         };
     }
-    function layerBytes(layer) {
+    function pageBytes(page) {
         let bytes = 0;
-        for (const [path, text] of Object.entries(layer.documents))
-            bytes += (path.length + text.length) * 2;
+        for (const { path, content } of page.entries)
+            bytes += (path.length + (content?.length ?? 0)) * 2;
         return bytes;
     }
-    function grownBy(next, previous) {
-        if (previous === undefined)
-            return layerBytes(next);
-        const documents = Object.fromEntries(Object.entries(next.documents).filter(([path, text]) => previous.documents[path] !== text));
-        return layerBytes({ ...next, documents });
-    }
     function exceeded(error) {
         return (typeof error === 'object' &&
             error !== null &&
@@ -883,6 +895,75 @@ export function composeRuntime(options) {
                 shown();
         }
     }
+    function sameCover(left, right) {
+        return JSON.stringify(left) === JSON.stringify(right);
+    }
+    async function coveredRows(plan, cover) {
+        for (;;) {
+            const before = cover();
+            if ('pending' in before)
+                return { pending: before };
+            const local = await openLocal();
+            const keys = before.rooms.map(({ key }) => key);
+            const changes = local.changes(keys);
+            const current = () => local.changes(keys) === changes;
+            const rows = await windowRows(local, plan, before.rooms, current);
+            const after = cover();
+            if (rows !== null && sameCover(before, after))
+                return { rows, cover: before, current };
+        }
+    }
+    async function windowRows(local, plan, rooms, unchanged) {
+        const first = await local.query(plan, rooms, QUERY_BYTES);
+        if (first.more === undefined || !('documents' in first)) {
+            const { more: _more, ...rows } = first;
+            return rows;
+        }
+        const documents = [...first.documents];
+        for (let more = first.more; more !== undefined;) {
+            if (!unchanged())
+                return null;
+            const page = await local.query({
+                ...plan,
+                after: { text: more, values: JSON.parse(more) },
+                limit: plan.limit === null ? null : plan.limit - documents.length,
+                total: false,
+            }, rooms, QUERY_BYTES);
+            if (!('documents' in page))
+                return null;
+            documents.push(...page.documents);
+            more = page.more;
+            if (more === undefined) {
+                return {
+                    documents,
+                    ...(page.next === undefined ? {} : { next: page.next }),
+                    ...(first.total === undefined ? {} : { total: first.total }),
+                };
+            }
+        }
+        return null;
+    }
+    function keyedOf(rows, coverage) {
+        if ('groups' in rows) {
+            return {
+                result: { ...rows, coverage },
+                keys: rows.groups.map((group) => JSON.stringify(group.key)),
+            };
+        }
+        return {
+            result: { ...rows, coverage },
+            keys: rows.documents.map((document) => documentKey(document.room, document.path)),
+        };
+    }
+    async function answeredPlan(plan, cover) {
+        const answered = await coveredRows(plan, cover);
+        if ('pending' in answered) {
+            const pending = answered.pending;
+            return { result: pending, keys: [], current: () => true };
+        }
+        const held = answered.cover;
+        return { ...keyedOf(answered.rows, held.coverage), current: answered.current };
+    }
     async function rowsQuery(plan) {
         const before = covered(plan);
         awaitPreparation(before);
@@ -891,11 +972,42 @@ export function composeRuntime(options) {
             return seededResult(seeded).result;
         if ('pending' in before)
             return before;
-        const { rows, at: cover } = await readSide.query(plan, () => covered(plan));
-        awaitPreparation(cover);
-        if ('pending' in cover)
+        const answered = await coveredRows(plan, () => {
+            const cover = covered(plan);
+            awaitPreparation(cover);
             return cover;
-        return { ...rows, coverage: cover.coverage };
+        });
+        if ('pending' in answered)
+            return answered.pending;
+        const held = answered.cover;
+        return { ...answered.rows, coverage: held.coverage };
+    }
+    async function everyRow(plan) {
+        const window = { ...plan, limit: MAXIMUM_WINDOW, after: null, total: false };
+        const first = await rowsQuery(window);
+        if ('pending' in first || first.next === undefined)
+            return first;
+        const documents = 'documents' in first ? [...first.documents] : [];
+        const groups = 'groups' in first ? [...first.groups] : [];
+        for (let next = first.next; next !== undefined;) {
+            const values = JSON.parse(next);
+            const page = await rowsQuery({
+                ...window,
+                after: { text: next, values: values.length === 0 ? null : values },
+            });
+            if ('pending' in page)
+                return page;
+            if ('documents' in page)
+                documents.push(...page.documents);
+            else
+                groups.push(...page.groups);
+            if (JSON.stringify(page.coverage) !== JSON.stringify(first.coverage))
+                return everyRow(plan);
+            next = page.next;
+        }
+        return 'documents' in first
+            ? { documents, coverage: first.coverage }
+            : { groups, coverage: first.coverage };
     }
     async function indexConversation(conversation) {
         searchIndex.indexMessages(conversation, [], false);
@@ -953,7 +1065,10 @@ export function composeRuntime(options) {
         for (const locator of set.queues)
             emitQueue(locator);
         if (set.drafts.length > 0 ||
-            set.documents.some((change) => roomDrafts.get(change.locator)?.has(change.path) === true)) {
+            set.documents.some((change) => {
+                const held = roomDrafts.get(change.locator);
+                return held !== undefined && (change.path === null || held.has(change.path));
+            })) {
             publishRoomDrafts(false);
         }
         for (const app of set.presentations)
@@ -966,9 +1081,21 @@ export function composeRuntime(options) {
             if (reason === 'revoked-authorization') {
                 await exclusive(async () => {
                     const revoked = { status: 'unavailable', reason: 'revoked' };
+                    const records = [...replicas].map(([locator, held]) => ({
+                        locator,
+                        held,
+                        record: { ...held.record, model: revoked, selectionModel: revoked },
+                    }));
                     try {
                         const local = await openLocal();
-                        await local.revokeModels([...replicas.values()].map((replica) => replica.confirmed.record));
+                        await local.commit({
+                            rooms: records.map(({ locator, record }) => ({
+                                locator,
+                                key: record.key,
+                                record: storedRecord(record),
+                                composition: compositionOf(record),
+                            })),
+                        });
                     }
                     catch {
                         journal.record('model revocation persistence failed');
@@ -983,22 +1110,17 @@ export function composeRuntime(options) {
                         models.set(key, revoked);
                         liveModels.delete(key);
                     }
-                    const revocations = [];
-                    for (const locator of [...rooms.keys()]) {
-                        const before = replicas.get(locator) ?? null;
-                        const after = before === null
-                            ? null
-                            : await stepped(replicating(await confirmedOf({ ...before.confirmed.record, model: revoked, selectionModel: revoked }, before.confirmed), before.queue, before));
-                        const set = await stepped(changing(locator, before, after, { room: true }));
-                        revocations.push([locator, before, after, set]);
-                    }
                     const changed = [];
-                    for (const [locator, before, after, set] of revocations) {
+                    for (const { locator, held, record } of records) {
+                        if (replicas.get(locator) !== held)
+                            continue;
+                        recomposed(locator, held.record, record);
+                        replicas.set(locator, { ...held, record });
+                    }
+                    for (const locator of [...rooms.keys()]) {
                         const room = rooms.get(locator);
-                        if (room === undefined || (replicas.get(locator) ?? null) !== before)
+                        if (room === undefined)
                             continue;
-                        if (after !== null)
-                            replicas.set(locator, after);
                         rooms.set(locator, {
                             ...room,
                             model: modelTypes(revoked),
@@ -1006,9 +1128,10 @@ export function composeRuntime(options) {
                                 ? null
                                 : { ...room.typedSelection, model: modelTypes(revoked) },
                         });
-                        changed.push(set);
+                        changed.push(changeSet(locator, { documents: null, room: true }));
                     }
                     publishChangeSet(mergeChangeSets(changed));
+                    prepare();
                 });
             }
         }
@@ -1039,7 +1162,7 @@ export function composeRuntime(options) {
                     model: modelTypes(modelOf(room.locator, 'typed-selection')),
                 },
             providerOwnedPaths: room.providerOwnedPaths,
-            roomVersion: replicas.get(room.locator)?.confirmed.record.roomVersion ?? null,
+            roomVersion: replicas.get(room.locator)?.record.roomVersion ?? null,
             synchronizationAvailable,
             refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
         });
@@ -1071,7 +1194,7 @@ export function composeRuntime(options) {
         else
             unlistedKept(unlisted);
         for (const room of listed) {
-            const held = replicas.get(room.locator)?.confirmed.record;
+            const held = replicas.get(room.locator)?.record;
             if (held !== undefined && held.replica.selection !== room.replica.selection) {
                 list(held, false);
                 continue;
@@ -1102,7 +1225,7 @@ export function composeRuntime(options) {
     }
     function unlistedKept(unlisted) {
         for (const locator of unlisted) {
-            const held = replicas.get(locator)?.confirmed.record;
+            const held = replicas.get(locator)?.record;
             if (held !== undefined)
                 list(held, false);
             else
@@ -1113,7 +1236,6 @@ export function composeRuntime(options) {
         const fresh = [...new Set(locators)].filter((locator) => !fences.has(locator));
         const removed = fresh.map((locator) => ({
             locator,
-            shown: prepared.has(locator) || projecting.has(locator) ? (replicas.get(locator) ?? null) : null,
             drafts: [...(roomDrafts.get(locator)?.keys() ?? [])],
         }));
         for (const locator of fresh) {
@@ -1150,36 +1272,48 @@ export function composeRuntime(options) {
         if (fresh.length === 0)
             return fresh;
         searchIndex.forget(fresh);
-        const withdrawn = readSide.apply(stepped(withdrawing(removed)), (set) => conversations.changed(set));
-        if (withdrawn instanceof Promise)
-            void withdrawn.catch(unpublished);
-        publishChangeSet(mergeChangeSets(removed.map(({ locator, drafts }) => changeSet(locator, null, null, { room: true, queue: true, drafts }))));
-        readSide.recover();
+        publishChangeSet(mergeChangeSets(removed.map(({ locator, drafts }) => changeSet(locator, { documents: null, room: true, queue: true, drafts }))));
+        liveQueries.recover();
         moveTo({ ...status, ...attention() });
         return fresh;
     }
-    function* withdrawing(removed) {
-        const sets = [];
-        for (const { locator, shown } of removed)
-            sets.push(yield* changing(locator, shown, null));
-        return mergeChangeSets(sets);
-    }
-    async function erased(local, locators) {
-        await local.erase(locators);
+    async function eraseFenced(locators) {
         for (const locator of locators) {
+            while (await durably((local) => local.erase(locator, ERASE_BATCH)))
+                await yielded();
             const held = fences.get(locator);
             if (held !== undefined)
                 held.erased = true;
         }
     }
+    let sweeping = false;
+    function sweep() {
+        if (sweeping || closed)
+            return;
+        sweeping = true;
+        void (async () => {
+            try {
+                while (!closed && (await durably((local) => local.erase(null, ERASE_BATCH)))) {
+                    await yielded();
+                }
+            }
+            catch {
+                journal.record('erasure failed');
+            }
+            finally {
+                sweeping = false;
+            }
+        })();
+    }
     async function loseRooms(locators) {
         const fresh = fence(locators);
         if (fresh.length === 0)
             return;
         await durably(async (local) => {
-            await erased(local, fresh);
+            await local.fence(fresh);
             await unpair(local);
         });
+        await eraseFenced(fresh);
     }
     function restored(key, persisted) {
         const prior = models.get(key);
@@ -1200,50 +1334,30 @@ export function composeRuntime(options) {
         return model;
     }
     async function hydrate(opened) {
-        const [records, queues, kept, presented, held, chatDrafts, lastCompleted, declared, named, known, staged, heldTargets,] = await Promise.all([
-            opened.all(),
+        const [held, queues, kept, heldConversations, chatDrafts] = await Promise.all([
+            opened.opened(),
             opened.queues(),
             opened.roomDrafts(),
-            opened.presentation(),
             opened.conversations(),
             opened.chatDrafts(),
-            opened.lastCompleted(),
-            opened.providerLimits(),
-            opened.capabilities(),
-            opened.member(),
-            opened.transfers(),
-            opened.targets(),
         ]);
+        const records = [...held.rooms.values()];
+        const counts = await opened.counts(records.map(({ key, typedSelection }) => ({ key, roots: typedSelection?.roots ?? [] })));
         const queuedBatches = new Map(queues.map((queue) => [queue.locator, queue.pending.map(({ batch }) => batch)]));
-        const previousReplicas = new Map(replicas);
-        const read = new Map();
-        for (const record of records) {
-            const model = restored(modelKey(record.locator, 'collection'), record.model);
-            const selectionModel = restored(modelKey(record.locator, 'typed-selection'), record.selectionModel);
-            const prior = previousReplicas.get(record.locator);
-            const confirmed = await confirmedOf({ ...record, model, selectionModel }, prior?.confirmed);
-            const replica = await stepped(replicating(confirmed, queuedBatches.get(record.locator) ?? [], prior));
-            await stepped(counting(replica));
-            read.set(record.locator, replica);
-        }
-        const sets = new Map();
-        for (const locator of new Set([...previousReplicas.keys(), ...read.keys()])) {
-            sets.set(locator, await stepped(changing(locator, previousReplicas.get(locator) ?? null, read.get(locator) ?? null)));
-        }
-        targets = heldTargets;
+        targets = held.targets;
         transfers.clear();
-        for (const record of staged)
-            transfers.set(record.locator, record);
-        limits = declared;
-        capabilities = named;
-        member = known;
+        for (const [locator, record] of held.transfers)
+            transfers.set(locator, record);
+        limits = held.providerLimits;
+        capabilities = held.capabilities;
+        member = held.member;
         roomDrafts.clear();
         for (const record of kept)
             rememberRoomDraft(record);
         presentations.clear();
-        for (const record of presented)
+        for (const record of held.presentation)
             presentations.set(record.app, record.value);
-        conversations.hydrate(held, chatDrafts);
+        conversations.hydrate(heldConversations, chatDrafts);
         pendings.clear();
         for (const queue of queues) {
             for (const { batch, state } of queue.pending) {
@@ -1251,17 +1365,27 @@ export function composeRuntime(options) {
             }
         }
         replicas.clear();
+        prepared.clear();
         queuesWithoutReplica.clear();
         for (const [locator, queue] of queuedBatches) {
-            if (!read.has(locator))
+            if (!held.rooms.has(locator))
                 queuesWithoutReplica.set(locator, queue);
         }
-        for (const record of records) {
-            if (fences.has(record.locator))
-                continue;
-            const replica = read.get(record.locator);
-            const { model, selectionModel } = replica.confirmed.record;
-            replicas.set(record.locator, replica);
+        records.forEach((stored, index) => {
+            if (fences.has(stored.locator))
+                return;
+            const model = restored(modelKey(stored.locator, 'collection'), stored.model);
+            const selectionModel = restored(modelKey(stored.locator, 'typed-selection'), stored.selectionModel);
+            const record = { ...stored, model, selectionModel };
+            replicas.set(record.locator, {
+                record,
+                queue: queuedBatches.get(record.locator) ?? [],
+                overlaid: held.overlaid.get(record.key) ?? new Set(),
+                count: counts[index] ?? 0,
+                confirmed: 0,
+            });
+            if (!held.unprepared.has(record.key))
+                prepared.add(record.locator);
             const existing = rooms.get(record.locator);
             if (existing === undefined)
                 list(record, false);
@@ -1280,11 +1404,15 @@ export function composeRuntime(options) {
                         },
                 });
             }
-        }
+        });
+        for (const key of held.orphans)
+            await opened.release(key);
+        if (held.erasing || held.orphans.length > 0)
+            queueMicrotask(sweep);
         return {
-            lastCompleted,
+            lastCompleted: held.lastCompleted,
             locators: new Set([...queuedBatches.keys(), ...replicas.keys()]),
-            read: mergeChangeSets([...sets].flatMap(([locator, set]) => (fences.has(locator) ? [] : [set]))),
+            read: mergeChangeSets([...replicas.keys()].map((locator) => changeSet(locator, { documents: null }))),
         };
     }
     async function readState(opened) {
@@ -1323,8 +1451,13 @@ export function composeRuntime(options) {
             emitStorageLoss();
         }
         const lastCompleted = await readState(opened);
-        if (interrupted.length > 0)
-            await erased(opened, interrupted);
+        if (interrupted.length > 0) {
+            queueMicrotask(() => {
+                void eraseFenced(interrupted).catch(() => {
+                    journal.record('erasure failed');
+                });
+            });
+        }
         moveTo({ ...status, lastCompleted, ...attention() });
         void exclusive(() => unpair(opened)).catch(() => {
             journal.record('unpair failed');
@@ -1355,15 +1488,31 @@ export function composeRuntime(options) {
             return state !== undefined && state.submission.state !== 'submitted' && !state.lost;
         };
     }
-    function landedWhole(locator, batch, confirmed, current) {
-        if (!landed(batch, confirmed, current))
+    const REWRITE_LINKS = ['field', 'body'];
+    const CHECKED_LINKS = ['field', 'section'];
+    async function sliceAt(record, view, queue, extra = [], moved = []) {
+        const local = await openLocal();
+        const needed = new Set([...touchedBy(queue), ...extra]);
+        const movedPaths = [...new Set([...movedBy(queue, record.locator), ...moved])];
+        if (movedPaths.length > 0) {
+            for (const { path } of await local.referrers(record.key, view, movedPaths, REWRITE_LINKS)) {
+                needed.add(path);
+            }
+        }
+        const paths = [...needed];
+        return stepped(slicing(await local.entries(record.key, view, paths), paths));
+    }
+    async function landedWhole(locator, batch, confirmedLayer, current) {
+        if (!landed(batch, confirmedLayer, current))
             return false;
         const partner = partnerOf(batch, locator);
         if (partner === null)
             return true;
         const other = replicas.get(partner);
         const half = other?.queue.find((one) => one.id === batch.id);
-        return other !== undefined && half !== undefined && landed(half, other.confirmed);
+        if (other === undefined || half === undefined)
+            return false;
+        return landed(half, await sliceAt(other.record, 'confirmed', [half]));
     }
     function carriedBack(locator, unlanded, written) {
         const back = new Map();
@@ -1401,7 +1550,7 @@ export function composeRuntime(options) {
                 roomDrafts: records.filter((record) => record.locator === room),
                 consumedRoomDrafts: elsewhere.filter((one) => one.locator === room).map(({ path }) => path),
             })),
-            changes: [...rooms].map((room) => changeSet(room, null, null, {
+            changes: [...rooms].map((room) => changeSet(room, {
                 drafts: [...records, ...elsewhere]
                     .filter((one) => one.locator === room)
                     .map(({ path }) => path),
@@ -1414,25 +1563,106 @@ export function composeRuntime(options) {
             },
         };
     }
-    async function settle(local, locator, before, confirmed, queue, settling = {}) {
+    function recomposed(locator, before, after) {
+        if (before !== undefined &&
+            before.key === after.key &&
+            fingerprint(compositionOf(before)) === fingerprint(compositionOf(after))) {
+            return;
+        }
+        if (before !== undefined && before.key === after.key)
+            prepared.delete(locator);
+    }
+    function committedRoom(locator, record, answer) {
+        if (answer.prepared[locator] === false)
+            prepared.delete(locator);
+        else if (answer.prepared[locator] === true)
+            prepared.add(locator);
+        if (!prepared.has(locator))
+            prepare([locator]);
+        return { count: answer.counts[locator] ?? replicas.get(locator)?.count ?? 0 };
+    }
+    function replayed(record, confirmedLayer, queue) {
+        return stepped(replaying(confirmedLayer, queue, record.locator, compositionOf(record)));
+    }
+    async function overlayDiff(record, before, visible, touched) {
+        const kept = before !== undefined && before.record.key === record.key
+            ? before.overlaid
+            : new Set();
+        return {
+            overlay: {
+                set: await stepped(overlayOf(visible, touched)),
+                cleared: [...kept].filter((path) => !touched.has(path)),
+            },
+            touched,
+        };
+    }
+    async function settle(local, locator, before, record, queue, settling = {}) {
+        return together(local, [await settlement(local, locator, before, record, queue, settling)]);
+    }
+    function unpairedIn(locator, batch) {
+        if (!queueIn(locator).some((held) => held.id === batch.id))
+            return false;
+        if (pendings.get(pendingKey(locator, batch.id))?.accepted !== undefined)
+            return false;
+        return !leavingIn(batch, locator) || withdrawable(locator)(batch);
+    }
+    async function together(local, settlements) {
+        const settled = new Set(settlements.map(({ locator }) => locator));
+        const all = [...settlements];
+        for (let wave = settlements; wave.length > 0;) {
+            const partnered = new Map();
+            for (const { locator, left } of wave) {
+                for (const batch of left) {
+                    const partner = partnerOf(batch, locator);
+                    if (partner === null || settled.has(partner) || !unpairedIn(partner, batch))
+                        continue;
+                    partnered.set(partner, [...(partnered.get(partner) ?? []), batch]);
+                }
+            }
+            const partners = [];
+            for (const [partner, batches] of partnered) {
+                settled.add(partner);
+                partners.push(await unpairing(local, partner, batches));
+            }
+            all.push(...partners);
+            wave = partners;
+        }
+        const answer = await local.commit({
+            rooms: all.flatMap(({ commit }) => commit.rooms),
+            writes: all.flatMap(({ commit }) => commit.writes),
+        });
+        return mergeChangeSets(all.map((one) => one.apply(answer)));
+    }
+    async function settlement(local, locator, before, record, queue, settling = {}) {
+        const view = settling.view ?? 'confirmed';
         const previousQueue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
-        const { withdrawn, kept } = await stepped(standing(confirmed, queue, withdrawable(locator), localSaves));
+        const overrides = settling.changes;
+        const read = await sliceAt(record, view, queue, [
+            ...(before !== undefined && before.record.key === record.key ? before.overlaid : []),
+            ...(overrides?.set.map(({ path }) => path) ?? []),
+            ...(overrides?.removed ?? []),
+        ]);
+        const confirmedLayer = overrides === undefined
+            ? read
+            : await stepped(slicingWith(read, overrides.set, overrides.removed));
+        const composition = compositionOf(record);
+        const { withdrawn, kept } = await stepped(standing(confirmedLayer, queue, withdrawable(locator), localSaves, locator, composition));
         const founded = kept.filter((batch) => !queue.includes(batch));
         const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
-        const unqueued = withdrawn.map((batch) => ({
-            batch,
-            landed: landedWhole(locator, batch, confirmed),
-        }));
+        const unqueued = [];
+        for (const batch of withdrawn) {
+            unqueued.push({ batch, landed: await landedWhole(locator, batch, confirmedLayer) });
+        }
         const returning = [
-            ...[...unqueued].reverse().map(({ batch, landed }) => ({
+            ...[...unqueued].reverse().map(({ batch, landed: held }) => ({
                 batch,
-                returned: localSaves || landed ? null : returnedBy('withdrawn'),
+                returned: localSaves || held ? null : returnedBy('withdrawn'),
             })),
-            ...(settling.leaving === undefined ? [] : [settling.leaving]),
+            ...(settling.leaving ?? []),
         ];
         const written = new Map();
-        for (const { batch, returned } of returning) {
-            if (returned === null || batch.between?.destination.room === locator)
+        for (const { batch, returned: reason } of returning) {
+            if (reason === null || batch.between?.destination.room === locator)
                 continue;
             for (const saved of pendings.get(pendingKey(locator, batch.id))?.drafts ?? []) {
                 const existing = written.get(saved.path) ?? roomDrafts.get(locator)?.get(saved.path);
@@ -1441,73 +1671,85 @@ export function composeRuntime(options) {
                     path: saved.path,
                     revision: roomDraftRevision(),
                     parts: returnedInto(existing?.parts, saved.parts),
-                    returned,
+                    returned: reason,
                 });
             }
         }
         const carried = carriedBack(locator, [
-            ...[...unqueued].reverse().flatMap(({ batch, landed }) => (landed ? [] : [batch])),
-            ...(settling.leaving === undefined || settling.leaving.returned === null
-                ? []
-                : [settling.leaving.batch]),
+            ...[...unqueued].reverse().flatMap(({ batch, landed: held }) => (held ? [] : [batch])),
+            ...(settling.leaving ?? []).flatMap(({ batch, returned }) => returned === null ? [] : [batch]),
         ], written);
-        await local.keepAuthored({
-            locator,
-            queue: kept,
-            founded,
-            roomDrafts: [...written.values()],
-            consumedRoomDrafts: carried.taken,
-        }, ...carried.writes);
+        const replayedLayer = await replayed(record, confirmedLayer, kept);
+        const { overlay, touched } = await overlayDiff(record, before, replayedLayer.visible, replayedLayer.touched);
+        const commit = {
+            rooms: [
+                {
+                    locator,
+                    key: record.key,
+                    record: storedRecord(record),
+                    roots: record.typedSelection?.roots ?? [],
+                    ...settling.commit,
+                    ...(overrides === undefined
+                        ? {}
+                        : { confirmed: { set: overrides.set, removed: overrides.removed } }),
+                    overlay,
+                },
+            ],
+            writes: [
+                {
+                    locator,
+                    queue: kept,
+                    founded,
+                    roomDrafts: [...written.values()],
+                    consumedRoomDrafts: carried.taken,
+                },
+                ...carried.writes,
+            ],
+        };
         const staying = new Set(kept.map((batch) => batch.id));
-        for (const batch of previousQueue) {
-            if (!staying.has(batch.id))
-                pendings.delete(pendingKey(locator, batch.id));
-        }
-        for (const record of written.values())
-            rememberRoomDraft(record);
-        carried.remember();
-        const drafts = [...written.keys(), ...carried.taken];
-        try {
-            await local.write({
-                next: confirmed.record,
-                previous: before?.confirmed.record ?? null,
-                ...(settling.stored === undefined ? {} : { stored: settling.stored }),
-            });
-        }
-        catch (error) {
-            const held = before === undefined ? null : await stepped(replicating(before.confirmed, kept, before));
-            const set = await stepped(changing(locator, before ?? null, held, { queue: queueChanged, drafts }));
-            if (held !== null)
-                replicas.set(locator, held);
-            else if (kept.length > 0)
-                queuesWithoutReplica.set(locator, kept);
-            else
+        return {
+            locator,
+            left: previousQueue.filter((batch) => !staying.has(batch.id)),
+            commit,
+            apply: (answer) => {
+                for (const batch of previousQueue) {
+                    if (!staying.has(batch.id))
+                        pendings.delete(pendingKey(locator, batch.id));
+                }
+                for (const draft of written.values())
+                    rememberRoomDraft(draft);
+                carried.remember();
+                const drafts = [...written.keys(), ...carried.taken];
                 queuesWithoutReplica.delete(locator);
-            publishChangeSet(mergeChangeSets([set, ...carried.changes]));
-            moveTo({ ...status, ...attention() });
-            throw error;
-        }
-        const changed = { room: settling.room, queue: queueChanged, drafts };
-        const next = await stepped(replicating(confirmed, kept, before));
-        await stepped(counting(next));
-        const set = await stepped(changing(locator, before ?? null, next, changed));
-        return () => {
-            queuesWithoutReplica.delete(locator);
-            for (const { batch, landed } of unqueued) {
-                const outcome = localSaves ? 'dropped' : landed ? 'landed' : 'withdrawn';
-                journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
-            }
-            replicas.set(locator, next);
-            return mergeChangeSets([
-                heldChange(locator, before ?? null, next, set, changed),
-                ...carried.changes,
-            ]);
+                for (const { batch, landed: held } of unqueued) {
+                    const outcome = localSaves ? 'dropped' : held ? 'landed' : 'withdrawn';
+                    journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
+                }
+                const changed = answer.changed[locator];
+                const confirmedChanged = settling.commit?.published !== undefined ||
+                    settling.commit?.refreshed === true ||
+                    overrides !== undefined;
+                recomposed(locator, before?.record, record);
+                const { count } = committedRoom(locator, record, answer);
+                replicas.set(locator, {
+                    record,
+                    queue: kept,
+                    overlaid: touched,
+                    count,
+                    confirmed: (before?.confirmed ?? 0) + (confirmedChanged ? 1 : 0),
+                });
+                return mergeChangeSets([
+                    changeSet(locator, {
+                        documents: changed === undefined ? [] : changed,
+                        room: settling.room,
+                        queue: queueChanged,
+                        drafts,
+                    }),
+                    ...carried.changes,
+                ]);
+            },
         };
     }
-    function heldChange(locator, before, next, set, changed) {
-        const held = replicas.get(locator) ?? null;
-        return held === next ? set : changeSet(locator, before, held, changed);
-    }
     function adoptModels(locator, record) {
         for (const [attached, model] of [
             ['collection', record.model],
@@ -1539,44 +1781,54 @@ export function composeRuntime(options) {
             selection: taken(answers?.selection, held.selection, 'typed-selection'),
         };
     }
-    function publish(local, room, confirmed, landing, live) {
-        const { base, stored } = landing;
+    function publish(local, room, record, landing, live) {
         return exclusive(async () => {
-            if (stored !== undefined) {
-                await indexReferrers({ text: confirmed.record.documents, binaries: confirmed.record.binaries }, compositionOf(confirmed.record));
-            }
             if (!live()) {
                 caughtUpTo(room.locator);
                 return true;
             }
             const prior = replicas.get(room.locator);
-            if (base !== undefined &&
-                (prior?.confirmed.record.roomVersion !== base.record.roomVersion ||
-                    prior.confirmed.record.revisions !== base.record.revisions)) {
+            if (landing.kind === 'refreshed' &&
+                (prior === undefined || prior.record.key !== record.key || prior.confirmed !== landing.base)) {
+                await local.unrefresh(record.key);
                 return false;
             }
-            adoptModels(room.locator, confirmed.record);
+            adoptModels(room.locator, record);
             const queue = prior?.queue ?? queuesWithoutReplica.get(room.locator) ?? [];
-            const roomVersion = confirmed.record.roomVersion;
+            const roomVersion = record.roomVersion;
             const accepted = queue.filter((batch) => {
-                const accepted = pendings.get(pendingKey(room.locator, batch.id))?.accepted;
-                return (accepted !== undefined && options.adapter.reached(room.locator, roomVersion, accepted));
+                const at = pendings.get(pendingKey(room.locator, batch.id))?.accepted;
+                return at !== undefined && options.adapter.reached(room.locator, roomVersion, at);
             });
-            let settled;
+            let set;
             try {
-                settled = await settle(local, room.locator, prior, confirmed, queue.filter((batch) => !accepted.includes(batch)), { room: true, ...(stored === undefined ? {} : { stored }) });
+                set = await settle(local, room.locator, prior, record, queue.filter((batch) => !accepted.includes(batch)), landing.kind === 'refreshed'
+                    ? {
+                        room: true,
+                        view: 'refreshed',
+                        commit: { refreshed: true, composition: compositionOf(record) },
+                    }
+                    : {
+                        room: true,
+                        view: landing.refreshed ? 'refreshed' : 'confirmed',
+                        commit: {
+                            published: { from: prior?.record.key ?? null },
+                            composition: compositionOf(record),
+                            ...(landing.refreshed ? { refreshed: true } : {}),
+                        },
+                    });
             }
             catch (error) {
                 if (!exceeded(error))
                     throw error;
-                await exceededOn(room.locator, grownBy(confirmed.record, prior?.confirmed.record));
+                await exceededOn(room.locator, null);
                 caughtUpTo(room.locator);
                 return true;
             }
-            const set = settled();
-            if (stored !== undefined) {
+            if (landing.kind === 'bootstrapped') {
                 transfers.delete(room.locator);
                 catching.delete(room.locator);
+                sweep();
             }
             for (const batch of accepted)
                 pendings.delete(pendingKey(room.locator, batch.id));
@@ -1587,8 +1839,6 @@ export function composeRuntime(options) {
             sourceRefusals.delete(room.locator);
             declarationRefusals.delete(room.locator);
             list(room, true);
-            if (prior === undefined)
-                prepared.add(room.locator);
             publishChangeSet(set);
             await unpair(local);
             moveTo({ ...status, ...attention() });
@@ -1601,7 +1851,6 @@ export function composeRuntime(options) {
     }
     async function savedRoom(locator) {
         const local = await openLocal();
-        await referenced(locator);
         const replica = replicas.get(locator);
         const room = rooms.get(locator);
         if (replica === undefined || room === undefined) {
@@ -1632,10 +1881,12 @@ export function composeRuntime(options) {
         const target = await savedRoom(locator);
         const saved = [];
         const files = [];
+        const filed = read.filter(({ parts }) => parts.file !== undefined).map(({ path }) => path);
+        const visible = filed.length === 0 ? undefined : await visibleOf(locator, filed);
         for (const { path, parts } of read) {
             const file = parts.file === undefined
                 ? undefined
-                : await heldFile(parts.file.blob, binaryBase(target.replica.visible, path));
+                : await heldFile(parts.file.blob, binaryBase(visible, path));
             if (parts.file !== undefined && file !== undefined) {
                 files.push({ key: file.localId, blob: parts.file.blob });
             }
@@ -1655,8 +1906,173 @@ export function composeRuntime(options) {
             return [[path, { ...record, path: to, revision: roomDraftRevision() }]];
         }));
     }
-    function sideOf(locator, replica, room) {
-        const record = replica.confirmed.record;
+    async function savingIn(replica, changes, extra, leaving = []) {
+        const record = replica.record;
+        const local = await openLocal();
+        const paths = [
+            ...extra,
+            ...changes.flatMap((change) => change.kind === 'move' ? [change.path, change.to] : [change.path]),
+        ];
+        const moved = [
+            ...leaving,
+            ...changes.flatMap((change) => (change.kind === 'move' ? [change.path] : [])),
+        ];
+        const removed = changes.flatMap((change) => (change.kind === 'remove' ? [change.path] : []));
+        const referring = removed.length === 0
+            ? []
+            : (await local.referrers(record.key, 'confirmed', removed, CHECKED_LINKS)).map(({ path }) => path);
+        const confirmedLayer = await sliceAt(record, 'confirmed', replica.queue, [...paths, ...referring], moved);
+        const { visible } = await replayed(record, confirmedLayer, replica.queue);
+        const composition = compositionOf(record);
+        return {
+            record,
+            confirmed: confirmedLayer,
+            visible,
+            *visibleOver(queue) {
+                return (yield* replaying(confirmedLayer, queue, record.locator, composition)).visible;
+            },
+        };
+    }
+    async function unmodeledIn(record) {
+        const composition = compositionFor(record);
+        if (available(composition))
+            return false;
+        const local = await openLocal();
+        const roots = record.typedSelection?.roots ?? [];
+        if (composition.model.status === 'unavailable' &&
+            (await local.typedWithin(record.key, 'visible', roots, false))) {
+            return true;
+        }
+        return (composition.selection !== null &&
+            composition.selection.model.status === 'unavailable' &&
+            (await local.typedWithin(record.key, 'visible', roots, true)));
+    }
+    function textDiffers(left, right) {
+        return ((left?.content ?? undefined) !== (right?.content ?? undefined) ||
+            !sameBinary(left?.binary ?? undefined, right?.binary ?? undefined));
+    }
+    function textOf(entry) {
+        if (entry === null)
+            return undefined;
+        return entry.binary !== null ? null : entry.content;
+    }
+    function walkOf(local, key, view) {
+        return async (after) => {
+            const page = await local.walk(key, view, after, WALK_BYTES);
+            return {
+                entries: page.entries.map(({ path, content, binary }) => ({
+                    path,
+                    content: binary !== null ? null : content,
+                })),
+                next: page.next,
+            };
+        };
+    }
+    function lookupOf(local, key, view) {
+        return async (paths) => {
+            if (paths.length === 0)
+                return new Map();
+            return new Map((await local.typed(key, view, paths)).map(({ path, type, binary }) => [
+                path,
+                { type: type ?? undefined, binary },
+            ]));
+        };
+    }
+    function declaredOf(entry) {
+        if (entry.binary !== null)
+            return { type: undefined, binary: true };
+        const read = parseFrontmatter(entry.content ?? '');
+        return { type: read.ok ? (read.frontmatter.type ?? 'any') : undefined, binary: false };
+    }
+    function overriddenWalk(walk, overrides) {
+        const sorted = [...overrides.keys()].sort();
+        const beyond = (path) => {
+            if (path === null)
+                return 0;
+            let low = 0;
+            let high = sorted.length;
+            while (low < high) {
+                const middle = (low + high) >>> 1;
+                if (sorted[middle] <= path)
+                    low = middle + 1;
+                else
+                    high = middle;
+            }
+            return low;
+        };
+        return async (after) => {
+            const page = await walk(after);
+            const end = page.next;
+            const added = sorted
+                .slice(beyond(after), end === null ? sorted.length : beyond(end))
+                .flatMap((path) => {
+                const entry = overrides.get(path);
+                return entry === null || entry === undefined
+                    ? []
+                    : [{ path, content: entry.binary !== null ? null : entry.content }];
+            });
+            const entries = [...page.entries.filter(({ path }) => !overrides.has(path)), ...added].sort((left, right) => (left.path < right.path ? -1 : left.path > right.path ? 1 : 0));
+            return { entries, next: end };
+        };
+    }
+    function overriddenLookup(lookup, overrides) {
+        return async (paths) => {
+            const known = new Map(await lookup(paths.filter((path) => !overrides.has(path))));
+            for (const path of paths) {
+                const entry = overrides.get(path);
+                if (entry === undefined)
+                    continue;
+                if (entry === null)
+                    known.delete(path);
+                else
+                    known.set(path, declaredOf(entry));
+            }
+            return known;
+        };
+    }
+    function validatorOf(record, confirmedLayer) {
+        return async (resulting, touched) => {
+            const composition = compositionFor(record);
+            const local = await openLocal();
+            const changed = [];
+            const overrides = new Map();
+            const pace = paced();
+            for (const path of new Set([...confirmedLayer.held, ...touched])) {
+                await pace(ROW_WEIGHT);
+                const was = entryAt(confirmedLayer, path);
+                const now = entryAt(resulting, path);
+                if (!textDiffers(was, now))
+                    continue;
+                overrides.set(path, now);
+                if (textOf(was) !== textOf(now))
+                    changed.push({ path, was: textOf(was), now: textOf(now) });
+            }
+            const lookup = overriddenLookup(lookupOf(local, record.key, 'confirmed'), overrides);
+            const clean = available(composition) &&
+                changed.length <= CLEAN_CHANGES &&
+                (await changedCleanly(changed, compositionOf(record), composition, {
+                    lookup,
+                    texts: textsOf(local, record.key, 'confirmed'),
+                    referrers: referrersOf(local, record.key, 'confirmed'),
+                }));
+            if (clean)
+                return { verdict: 'accept' };
+            return validatedCollection(overriddenWalk(walkOf(local, record.key, 'confirmed'), overrides), lookup, composition);
+        };
+    }
+    function textsOf(local, key, view) {
+        return async (paths) => new Map((await local.entries(key, view, paths)).map(({ path, content, binary }) => [
+            path,
+            binary !== null ? null : content,
+        ]));
+    }
+    function referrersOf(local, key, view) {
+        return async (targets) => [
+            ...new Set((await local.referrers(key, view, targets, CHECKED_LINKS)).map(({ path }) => path)),
+        ];
+    }
+    async function sideOf(locator, replica, room, saving) {
+        const record = replica.record;
         return {
             room: locator,
             handle: room.handle,
@@ -1664,37 +2080,71 @@ export function composeRuntime(options) {
             composition: compositionFor(record),
             operations: room.operations,
             providerOwnedPaths: room.providerOwnedPaths,
-            visible: replica.visible,
+            visible: saving.visible,
             queued: queuedDocuments(replica.queue),
-            clean: {
-                text: record.documents,
-                binaries: record.binaries,
-                composition: compositionOf(record),
-            },
+            unmodeled: await unmodeledIn(record),
+            validate: validatorOf(record, saving.confirmed),
         };
     }
     function movedInto(locator, saved) {
         const into = saved.find(({ parts }) => parts.move?.room !== undefined && parts.move.room !== locator);
         return into?.parts.move?.room ?? null;
     }
+    async function saveCommit(local, files, rooms) {
+        const touched = new Map();
+        const commits = [];
+        for (const { locator, saving, before, queue } of rooms) {
+            const replayedLayer = await replayed(saving.record, saving.confirmed, queue);
+            const diff = await overlayDiff(saving.record, before, replayedLayer.visible, replayedLayer.touched);
+            touched.set(locator, diff.touched);
+            commits.push({
+                locator,
+                key: saving.record.key,
+                roots: saving.record.typedSelection?.roots ?? [],
+                overlay: diff.overlay,
+            });
+        }
+        try {
+            const answer = await local.commit({
+                rooms: commits,
+                writes: rooms.map(({ write }) => write),
+                files,
+                whole: true,
+            });
+            return { answer, touched };
+        }
+        catch {
+            return null;
+        }
+    }
+    function savedReplica(locator, before, queue, touched, answer) {
+        replicas.set(locator, {
+            ...before,
+            queue,
+            overlaid: touched,
+            count: answer.counts[locator] ?? before.count,
+        });
+    }
     async function committedMove(locator, destination, { local, replica, room }, saved, consumed, writtenBy, files) {
         const mixed = saved.find(({ parts }) => Object.keys(parts).length !== 1 || parts.move?.room !== destination);
         if (mixed !== undefined) {
             return { outcome: 'refused', code: 'mixed-room-move', retryable: false, file: mixed.path };
         }
-        const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, replica.visible)));
+        const moves = saved.map(({ path, parts }) => ({ path, to: moveTarget(parts.move) }));
+        const sourceSaving = await savingIn(replica, moves.map(({ path }) => ({ kind: 'remove', path })), saved.map(({ path }) => path), moves.map(({ path }) => path));
+        const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, sourceSaving.visible)));
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
-        await referenced(destination);
         const target = replicas.get(destination);
         const listedRoom = rooms.get(destination);
         if (target === undefined || listedRoom === undefined) {
             throw runtimeError('room-not-held', `No Local Replica for ${destination}`);
         }
+        const arriving = await savingIn(target, [], moves.map(({ to }) => to));
         const built = await buildMove({
-            source: sideOf(locator, replica, room),
-            destination: sideOf(destination, target, listedRoom),
-            moves: saved.map(({ path, parts }) => ({ path, to: moveTarget(parts.move) })),
+            source: await sideOf(locator, replica, room, sourceSaving),
+            destination: await sideOf(destination, target, listedRoom, arriving),
+            moves,
             providerLimits: limits,
             local: localSaves,
             ...(writtenBy === undefined ? {} : { writtenBy }),
@@ -1721,35 +2171,38 @@ export function composeRuntime(options) {
         const left = [...consumed, ...carrying.map(({ from }) => from)];
         const leavingQueue = [...replica.queue, built.leaving];
         const arrivingQueue = [...target.queue, built.arriving];
-        let fencedRoom;
-        try {
-            fencedRoom = await local.saveAuthored(files, {
+        const committedBoth = await saveCommit(local, files, [
+            {
                 locator,
+                saving: sourceSaving,
+                before: replica,
                 queue: leavingQueue,
-                saved: new Map([[id, saved]]),
-                consumedRoomDrafts: left,
-            }, {
+                write: {
+                    locator,
+                    queue: leavingQueue,
+                    saved: new Map([[id, saved]]),
+                    consumedRoomDrafts: left,
+                },
+            },
+            {
                 locator: destination,
+                saving: arriving,
+                before: target,
                 queue: arrivingQueue,
-                saved: new Map([[id, marked]]),
-                roomDrafts: carried,
-            });
-        }
-        catch {
+                write: {
+                    locator: destination,
+                    queue: arrivingQueue,
+                    saved: new Map([[id, marked]]),
+                    roomDrafts: carried,
+                },
+            },
+        ]);
+        if (committedBoth === null)
             return { outcome: 'refused', code: 'durable-write', retryable: true };
+        const { answer, touched } = committedBoth;
+        if (answer.fenced !== null) {
+            throw runtimeError('room-not-held', `No Local Replica for ${answer.fenced}`);
         }
-        if (fencedRoom !== null) {
-            throw runtimeError('room-not-held', `No Local Replica for ${fencedRoom}`);
-        }
-        const nextSource = await stepped(replicating(replica.confirmed, leavingQueue, replica));
-        const nextDestination = await stepped(replicating(target.confirmed, arrivingQueue, target));
-        const sets = [
-            await stepped(changing(locator, replica, nextSource, { queue: true, drafts: left })),
-            await stepped(changing(destination, target, nextDestination, {
-                queue: true,
-                drafts: carried.map(({ path }) => path),
-            })),
-        ];
         if (fences.has(locator) || fences.has(destination)) {
             throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
         }
@@ -1767,9 +2220,20 @@ export function composeRuntime(options) {
             forgetRoomDraft(locator, path);
         for (const record of carried)
             rememberRoomDraft(record);
-        replicas.set(locator, nextSource);
-        replicas.set(destination, nextDestination);
-        publishChangeSet(mergeChangeSets(sets));
+        savedReplica(locator, replica, leavingQueue, touched.get(locator), answer);
+        savedReplica(destination, target, arrivingQueue, touched.get(destination), answer);
+        publishChangeSet(mergeChangeSets([
+            changeSet(locator, {
+                documents: answer.changed[locator] ?? [],
+                queue: true,
+                drafts: left,
+            }),
+            changeSet(destination, {
+                documents: answer.changed[destination] ?? [],
+                queue: true,
+                drafts: carried.map(({ path }) => path),
+            }),
+        ]));
         queuedSave(locator);
         return { outcome: 'saved', identifier: id };
     }
@@ -1785,15 +2249,16 @@ export function composeRuntime(options) {
             return committedMove(locator, into, target, saved, consumed, writtenBy, files);
         }
         const { local, replica, room } = target;
-        const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, replica.visible)));
+        const parts = saved.map(({ path, parts: held }) => changesOf(path, held));
+        const changes = parts.flatMap(({ changes: made }) => made);
+        const saving = await savingIn(replica, changes, [
+            ...saved.map(({ path }) => path),
+            ...parts.flatMap(({ bases }) => bases.map(({ path }) => path)),
+        ]);
+        const changed = saved.flatMap(({ path, parts: held }) => changedParts(path, underneath(held, path, saving.visible)));
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
-        const parts = saved.map(({ path, parts }) => changesOf(path, parts));
-        const changes = parts.flatMap(({ changes }) => changes);
-        const visibleOver = function* (queue) {
-            return (yield* replicating(replica.confirmed, queue, replica)).visible;
-        };
-        const requeue = await stepped(requeuing(replica.queue, changes, replica.visible, withdrawable(locator), visibleOver));
+        const requeue = await stepped(requeuing(replica.queue, changes, saving.visible, withdrawable(locator), saving.visibleOver));
         if (requeue.kind === 'refused')
             return { outcome: 'refused', ...requeue.refusal };
         const foreign = [...requeue.withdrawn.keys()].some((origin) => {
@@ -1811,22 +2276,19 @@ export function composeRuntime(options) {
         const withdrawing = requeue.withdrawn.size > 0;
         const input = {
             local: localSaves,
-            baseRoomVersion: replica.confirmed.record.roomVersion,
-            composition: compositionFor(replica.confirmed.record),
+            baseRoomVersion: replica.record.roomVersion,
+            composition: compositionFor(replica.record),
             operations: room.operations,
             providerOwnedPaths: room.providerOwnedPaths,
             providerLimits: limits,
             handle: room.handle,
-            visible: replica.visible,
+            visible: saving.visible,
             changes,
             bases: parts.flatMap(({ bases }) => bases),
             queued: queuedDocuments(replica.queue),
             writtenBy,
-            clean: {
-                text: replica.confirmed.record.documents,
-                binaries: replica.confirmed.record.binaries,
-                composition: compositionOf(replica.confirmed.record),
-            },
+            unmodeled: await unmodeledIn(replica.record),
+            validate: validatorOf(replica.record, saving.confirmed),
         };
         const checked = withdrawing
             ? await buildBatch({ ...input, queued: new Set([...input.queued, ...requeue.queued]) })
@@ -1851,8 +2313,7 @@ export function composeRuntime(options) {
                 ? null
                 : await buildBatch({
                     ...input,
-                    visible: (await stepped(replicating(replica.confirmed, requeue.queue, replica)))
-                        .visible,
+                    visible: await stepped(saving.visibleOver(requeue.queue)),
                     changes: requeue.changes,
                     queued: queuedDocuments(requeue.queue),
                 });
@@ -1885,34 +2346,34 @@ export function composeRuntime(options) {
         for (const replaced of withdrawn.values()) {
             if (replaced === null || !batches.includes(replaced))
                 continue;
-            const limited = await stepped(limiting(batches, replaced, limits, visibleOver));
+            const limited = await stepped(limiting(batches, replaced, limits, saving.visibleOver));
             if (limited !== null)
                 return { outcome: 'refused', ...limited };
         }
         const carried = carriedDrafts(locator, saved, consumed);
         const left = [...consumed, ...carried.keys()];
         const arrived = [...carried.values()];
-        let fencedRoom;
-        try {
-            fencedRoom = await local.saveAuthored(files, {
+        const done = await saveCommit(local, files, [
+            {
                 locator,
+                saving,
+                before: replica,
                 queue: batches,
-                saved: drafted,
-                consumedRoomDrafts: left,
-                roomDrafts: arrived,
-            });
-        }
-        catch {
+                write: {
+                    locator,
+                    queue: batches,
+                    saved: drafted,
+                    consumedRoomDrafts: left,
+                    roomDrafts: arrived,
+                },
+            },
+        ]);
+        if (done === null)
             return { outcome: 'refused', code: 'durable-write', retryable: true };
+        const { answer, touched } = done;
+        if (answer.fenced !== null) {
+            throw runtimeError('room-not-held', `No Local Replica for ${answer.fenced}`);
         }
-        if (fencedRoom !== null) {
-            throw runtimeError('room-not-held', `No Local Replica for ${fencedRoom}`);
-        }
-        const next = await stepped(replicating(replica.confirmed, batches, replica));
-        const set = await stepped(changing(locator, replica, next, {
-            queue: true,
-            drafts: [...left, ...arrived.map(({ path }) => path)],
-        }));
         if (fences.has(locator))
             throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
         for (const origin of withdrawn.keys())
@@ -1928,8 +2389,12 @@ export function composeRuntime(options) {
             forgetRoomDraft(locator, path);
         for (const record of arrived)
             rememberRoomDraft(record);
-        replicas.set(locator, next);
-        publishChangeSet(set);
+        savedReplica(locator, replica, batches, touched.get(locator), answer);
+        publishChangeSet(changeSet(locator, {
+            documents: answer.changed[locator] ?? [],
+            queue: true,
+            drafts: [...left, ...arrived.map(({ path }) => path)],
+        }));
         queuedSave(locator);
         const identifier = join?.batch.id ??
             built?.batch.id ??
@@ -1949,9 +2414,8 @@ export function composeRuntime(options) {
             if (fences.has(held))
                 continue;
             pendings.set(pendingKey(held, batch.id), { ...state, submission, lost });
-            const replica = replicas.get(held);
-            if (replica !== undefined)
-                publishChangeSet(changeSet(held, replica, replica, { queue: true }));
+            if (replicas.has(held))
+                publishChangeSet(changeSet(held, { queue: true }));
         }
         moveTo({ ...status, ...attention() });
     }
@@ -1995,7 +2459,7 @@ export function composeRuntime(options) {
             if (fencedSince(locator, since))
                 return failure({ kind: 'room-not-readable', locator });
             if (result.kind === 'scoped-refusal') {
-                const room = replicas.get(result.locator)?.confirmed.record;
+                const room = replicas.get(result.locator)?.record;
                 if (room !== undefined)
                     await scoped(result, room, await openLocal());
             }
@@ -2026,8 +2490,9 @@ export function composeRuntime(options) {
             return UNREADABLE;
         if (locked(at.room))
             return LOCKED_UNREADABLE;
-        const visible = replicas.get(at.room)?.visible;
-        if (visible?.documents[at.path] !== undefined || visible?.binaries[at.path] !== undefined) {
+        const held = replicas.get(at.room);
+        if (held !== undefined &&
+            (await (await openLocal()).entries(held.record.key, 'visible', [at.path])).length > 0) {
             return { kind: 'document', ...at };
         }
         const history = await readHistory(at.room, at.path);
@@ -2085,7 +2550,7 @@ export function composeRuntime(options) {
             if (locator !== null && fencedSince(locator, since))
                 return failure({ kind: 'room-not-readable', locator });
             if (settled.kind === 'scoped-refusal') {
-                const room = replicas.get(settled.locator)?.confirmed.record;
+                const room = replicas.get(settled.locator)?.record;
                 if (room !== undefined)
                     await scoped(settled, room, await openLocal());
             }
@@ -2106,36 +2571,43 @@ export function composeRuntime(options) {
             return held;
         return transferBinary(request, (authorization) => keptFiles.fetch(name, () => options.adapter.binary(authorization, request)), binaryAnswer);
     }
-    function binaryPath(locator, path, revision) {
+    async function binaryPath(locator, path, revision) {
         if (revision !== undefined)
             return { kind: 'path', locator, path, revision };
-        const visible = replicas.get(locator)?.visible;
-        const held = visible?.binaries[path];
-        if (visible === undefined || held === undefined)
+        const replica = replicas.get(locator);
+        if (replica === undefined)
             return null;
-        if (held.state === 'pending')
-            return { kind: 'pending', localId: held.localId };
-        const record = binaryRecord(path, held, visible.revisions[path]);
+        const local = await openLocal();
+        const [held] = await local.entries(replica.record.key, 'visible', [path]);
+        if (held?.binary === undefined || held.binary === null)
+            return null;
+        if (held.binary.state === 'pending')
+            return { kind: 'pending', localId: held.binary.localId };
+        const record = binaryRecord(path, held.binary, held.revision ?? undefined);
         if (record.state !== 'accepted')
             return null;
-        const replica = replicas.get(locator);
-        const queued = (replica?.queue ?? []).flatMap((batch) => batch.changes);
+        const queued = replica.queue.flatMap((batch) => batch.changes);
+        const sources = queued.flatMap((change) => (change.kind === 'move' ? [change.path] : []));
+        const confirmedLayer = await stepped(slicing(await local.entries(replica.record.key, 'confirmed', [path, ...sources]), [
+            path,
+            ...sources,
+        ]));
         const holds = (at) => {
-            const kept = replica?.confirmed.record.binaries[at];
+            const kept = confirmedLayer.binaries[at];
             return (kept?.state === 'accepted' &&
                 kept.fileRef === record.fileRef &&
-                replica?.confirmed.record.revisions[at] === record.revision);
+                confirmedLayer.revisions[at] === record.revision);
         };
-        let confirmed = path;
-        for (let index = queued.length - 1; index >= 0 && !holds(confirmed); index -= 1) {
+        let confirmedAt = path;
+        for (let index = queued.length - 1; index >= 0 && !holds(confirmedAt); index -= 1) {
             const change = queued[index];
-            if (change.kind === 'move' && change.to === confirmed)
-                confirmed = change.path;
+            if (change.kind === 'move' && change.to === confirmedAt)
+                confirmedAt = change.path;
         }
         return {
             kind: 'path',
             locator,
-            path: confirmed,
+            path: confirmedAt,
             revision: record.revision,
             fileRef: record.fileRef,
         };
@@ -2145,7 +2617,7 @@ export function composeRuntime(options) {
         const drafted = roomDrafts.get(locator)?.get(path)?.parts.file;
         const asked = drafted !== undefined && drafted.localId === revision
             ? { kind: 'pending', localId: revision }
-            : binaryPath(locator, path, revision);
+            : await binaryPath(locator, path, revision);
         if (asked === null)
             return absentBinary(path);
         if (asked.kind === 'pending') {
@@ -2163,7 +2635,7 @@ export function composeRuntime(options) {
     }
     async function linkBinaryPath(locator, path, revision) {
         await ready;
-        const asked = binaryPath(locator, path, revision);
+        const asked = await binaryPath(locator, path, revision);
         if (asked === null || asked.kind === 'pending')
             return absentBinary(path);
         return transferBinary(asked, (held) => options.adapter.link(held, asked), binaryLinkAnswer);
@@ -2224,7 +2696,7 @@ export function composeRuntime(options) {
         try {
             const result = await options.adapter.action(authorization, { name, input });
             if (result.kind === 'scoped-refusal') {
-                const room = replicas.get(result.locator)?.confirmed.record;
+                const room = replicas.get(result.locator)?.record;
                 if (room !== undefined)
                     await scoped(result, room, await openLocal());
             }
@@ -2299,85 +2771,277 @@ export function composeRuntime(options) {
     }
     function reachedBy(locator, roomVersion) {
         const held = replicas.get(locator);
-        return (held !== undefined &&
-            options.adapter.reached(locator, held.confirmed.record.roomVersion, roomVersion));
+        return (held !== undefined && options.adapter.reached(locator, held.record.roomVersion, roomVersion));
     }
-    function writtenAfter(locator, roomVersion, path) {
-        const written = replicas.get(locator)?.confirmed.record.written[path];
+    async function writtenAfter(locator, roomVersion, path) {
+        const held = replicas.get(locator);
+        if (held === undefined)
+            return false;
+        const [entry] = await (await openLocal()).entries(held.record.key, 'confirmed', [path]);
+        const written = entry?.written ?? undefined;
         return (written !== undefined &&
             options.adapter.reached(locator, written, roomVersion) &&
             !options.adapter.reached(locator, roomVersion, written));
     }
-    async function pullRefresh(authorized, confirmed, live) {
-        if (!live())
+    function overriddenTexts(texts, overrides) {
+        return async (paths) => {
+            const known = new Map(await texts(paths.filter((path) => !overrides.has(path))));
+            for (const path of paths) {
+                const entry = overrides.get(path);
+                if (entry === undefined)
+                    continue;
+                if (entry === null)
+                    known.delete(path);
+                else
+                    known.set(path, entry.binary !== null ? null : entry.content);
+            }
+            return known;
+        };
+    }
+    async function unreadableRoom(texts, walk, paths) {
+        if (paths !== null) {
+            const text = {};
+            for (const [path, content] of await texts(paths))
+                if (content !== null)
+                    text[path] = content;
+            return stepped(unreadableIn(text, Object.keys(text)));
+        }
+        for (let after = null;;) {
+            const page = await walk(after);
+            const text = {};
+            for (const { path, content } of page.entries)
+                if (content !== null)
+                    text[path] = content;
+            const refused = await stepped(unreadableIn(text, Object.keys(text)));
+            if (refused !== null)
+                return refused;
+            if (page.next === null)
+                return null;
+            after = page.next;
+        }
+    }
+    async function validatedRoom(local, record, view, previous, overrides = null) {
+        const composition = compositionOf(record);
+        const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+        const lookup = overrides === null
+            ? lookupOf(local, record.key, view)
+            : overriddenLookup(lookupOf(local, record.key, view), overrides);
+        const texts = overrides === null
+            ? textsOf(local, record.key, view)
+            : overriddenTexts(textsOf(local, record.key, view), overrides);
+        const walk = overrides === null
+            ? walkOf(local, record.key, view)
+            : overriddenWalk(walkOf(local, record.key, view), overrides);
+        let changes = null;
+        let reshaped = false;
+        if (previous !== null && previous.changed.length <= CLEAN_CHANGES) {
+            const [was, now] = await Promise.all([
+                local.entries(record.key, 'confirmed', previous.changed),
+                overrides === null
+                    ? local.entries(record.key, view, previous.changed)
+                    : Promise.resolve([]),
+            ]);
+            const before = new Map(was.map((entry) => [entry.path, entry]));
+            const after = overrides === null
+                ? new Map(now.map((entry) => [entry.path, entry]))
+                : overrides;
+            changes = previous.changed.flatMap((path) => {
+                const one = before.get(path) ?? null;
+                const other = after.get(path) ?? null;
+                reshaped ||= textDiffers(one, other);
+                const held = textOf(one);
+                const next = textOf(other);
+                return held === next ? [] : [{ path, was: held, now: next }];
+            });
+        }
+        const named = changes === null ? null : changes.map(({ path }) => path);
+        const textChanged = changes === null || changes.length > 0 || reshaped;
+        const modelsChanged = previous === null || !sameComposition(compositionOf(previous.record), composition);
+        if (modeled && (textChanged || modelsChanged)) {
+            const clean = previous !== null &&
+                changes !== null &&
+                (await changedCleanly(changes, compositionOf(previous.record), composition, {
+                    lookup,
+                    texts,
+                    referrers: referrersOf(local, record.key, 'confirmed'),
+                }));
+            if (clean)
+                return null;
+            const verdict = await validatedCollection(walk, lookup, composition);
+            if (verdict.verdict === 'accept')
+                return null;
+            if (verdict.rule !== 'model-unavailable')
+                return { kind: 'refused', refusal: verdict };
+            return unreadableRoom(texts, walk, named);
+        }
+        if (textChanged)
+            return unreadableRoom(texts, walk, named);
+        return null;
+    }
+    function refreshingOf(local, key, liveness) {
+        return {
+            prior: async (paths) => new Map((await local.entries(key, 'refreshed', paths)).map((entry) => [entry.path, entry])),
+            async stage(page) {
+                const batches = batched(page.entries);
+                for (const [index, entries] of batches.entries()) {
+                    const last = index === batches.length - 1;
+                    const staged = await exclusive(async () => {
+                        if (!liveness())
+                            return false;
+                        await local.refresh(key, last
+                            ? { ...page, entries }
+                            : { entries, removals: [], folders: [], folderRemovals: [] });
+                        return true;
+                    });
+                    if (!staged)
+                        return false;
+                }
+                return true;
+            },
+        };
+    }
+    function batched(entries) {
+        const batches = [[]];
+        let spent = 0;
+        for (const entry of entries) {
+            const size = (entry.content?.length ?? 0) + ROW_WEIGHT;
+            if (spent + size > STAGE_BYTES && batches.at(-1).length > 0) {
+                batches.push([]);
+                spent = 0;
+            }
+            batches.at(-1).push(entry);
+            spent += size;
+        }
+        return batches;
+    }
+    async function pullRefresh(authorized, held, liveness) {
+        if (!liveness())
             return unconfirmed;
         const turn = generation;
+        const { record } = held;
+        const base = held.confirmed;
+        const local = await openLocal();
         try {
-            const result = await refreshRoom(reads, authorized, confirmed, (models, held) => (live() ? remodel(confirmed.record.locator, models, held) : held), live);
-            const detail = result.kind === 'advanced' ? result.confirmed.record.roomVersion : result.kind;
-            journal.record(`transfer refresh ${confirmed.record.locator} ${detail}`);
-            return result;
+            await exclusive(() => local.unrefresh(record.key));
+            const result = await advancement(reads, authorized, record, (models, kept) => (liveness() ? remodel(record.locator, models, kept) : kept), liveness, refreshingOf(local, record.key, liveness));
+            if (result.kind !== 'advanced') {
+                journal.record(`transfer refresh ${record.locator} ${result.kind}`);
+                return result;
+            }
+            const refused = await validatedRoom(local, result.record, 'refreshed', {
+                record,
+                changed: [...result.changed],
+            });
+            if (refused !== null) {
+                journal.record(`transfer refresh ${record.locator} refused`);
+                return refused;
+            }
+            journal.record(`transfer refresh ${record.locator} ${result.record.roomVersion}`);
+            return { kind: 'advanced', record: result.record, base };
         }
         catch (error) {
-            journal.record(`transfer refresh ${confirmed.record.locator} transport-uncertainty`);
+            journal.record(`transfer refresh ${record.locator} transport-uncertainty`);
             throw error;
         }
         finally {
-            reads.finished(confirmed.record.locator, turn);
-        }
+            reads.finished(record.locator, turn);
+        }
+    }
+    const heldContents = new Map();
+    function heldContentOf(local, key) {
+        const known = heldContents.get(key);
+        if (known !== undefined)
+            return known;
+        if (heldContents.size > ROOM_READS)
+            heldContents.clear();
+        const made = {
+            files: (after, limit) => local.files(key, 'confirmed', after, limit),
+            async contents(paths) {
+                return new Map((await local.entries(key, 'confirmed', paths)).flatMap(({ path, content, revision }) => content === null || revision === null ? [] : [[path, { content, revision }]]));
+            },
+        };
+        heldContents.set(key, made);
+        return made;
     }
-    function staging(local, live) {
+    function staging(local, liveness) {
         return {
             held: (locator) => transfers.get(locator) ?? null,
-            staged: (record) => local.staged(record),
-            stage: (record, page) => exclusive(async () => {
-                if (!live())
-                    return false;
-                const bytes = layerBytes(page);
-                if (!(await admitted(local, record.locator, bytes)))
-                    return false;
-                try {
-                    await local.stage(record, page);
-                }
-                catch (error) {
-                    if (!exceeded(error))
-                        throw error;
-                    await exceededOn(record.locator, bytes);
-                    return false;
+            async stage(record, page, composition) {
+                const bytes = pageBytes(page);
+                const batches = batched(page.entries);
+                let key = record.key;
+                for (const [index, entries] of batches.entries()) {
+                    const last = index === batches.length - 1;
+                    const staged = await exclusive(async () => {
+                        if (!liveness())
+                            return null;
+                        if (index === 0 && !(await admitted(local, record.locator, bytes)))
+                            return null;
+                        try {
+                            return await local.stage(record, composition, { entries, folders: last ? page.folders : [] }, key, last);
+                        }
+                        catch (error) {
+                            if (!exceeded(error))
+                                throw error;
+                            await exceededOn(record.locator, bytes);
+                            return null;
+                        }
+                    });
+                    if (staged === null)
+                        return null;
+                    key = staged;
                 }
-                transfers.set(record.locator, record);
-                readSide.recover();
-                return true;
-            }),
+                transfers.set(record.locator, { ...record, key });
+                liveQueries.recover();
+                return key;
+            },
+            async refreshing(key) {
+                await exclusive(() => local.unrefresh(key));
+                return refreshingOf(local, key, liveness);
+            },
             abandon: (locator) => exclusive(async () => {
-                if (!live())
+                if (!liveness())
                     return;
                 await local.abandon(locator);
                 transfers.delete(locator);
-                readSide.recover();
+                liveQueries.recover();
+                sweep();
             }),
+            setAside: (locator) => exclusive(async () => {
+                if (!liveness())
+                    return;
+                await local.abandon(locator, true);
+                transfers.delete(locator);
+                liveQueries.recover();
+            }),
+            release: (key) => exclusive(async () => {
+                await local.release(key);
+                sweep();
+            }),
+            content: (key) => heldContentOf(local, key),
+            validate: (record, view) => validatedRoom(local, record, view, null),
         };
     }
-    function reusable(room) {
-        const record = replicas.get(room.locator)?.confirmed.record;
+    function reusable(room, local) {
+        const record = replicas.get(room.locator)?.record;
         if (record === undefined || record.replica.selection !== room.replica.selection)
             return null;
-        return { documents: record.documents, revisions: record.revisions };
+        return heldContentOf(local, record.key);
     }
-    async function pullBootstrap(authorized, room, local, live) {
-        if (!live())
+    async function pullBootstrap(authorized, room, local, liveness) {
+        if (!liveness())
             return unconfirmed;
         const turn = generation;
         if (replicas.has(room.locator)) {
             catching.add(room.locator);
-            readSide.recover();
+            liveQueries.recover();
         }
         try {
             const result = await bootstrapRoom(reads, authorized, room, {
                 collection: modelOf(room.locator),
                 selection: modelOf(room.locator, 'typed-selection'),
-            }, (models, held) => (live() ? remodel(room.locator, models, held) : held), live, staging(local, live), reusable(room));
-            const detail = result.kind === 'staged' ? result.confirmed.record.roomVersion : result.kind;
+            }, (models, held) => (liveness() ? remodel(room.locator, models, held) : held), liveness, staging(local, liveness), reusable(room, local));
+            const detail = result.kind === 'staged' ? result.record.roomVersion : result.kind;
             journal.record(`transfer bootstrap ${room.locator} ${detail}`);
             if (result.kind !== 'staged')
                 caughtUpTo(room.locator);
@@ -2394,10 +3058,10 @@ export function composeRuntime(options) {
     }
     function caughtUpTo(locator) {
         if (catching.delete(locator))
-            readSide.recover();
+            liveQueries.recover();
     }
     function behind(room) {
-        const held = replicas.get(room.locator)?.confirmed.record.roomVersion;
+        const held = replicas.get(room.locator)?.record.roomVersion;
         return (held !== undefined &&
             [announced.get(room.locator), room.roomVersion].some((later) => later !== undefined && !options.adapter.reached(room.locator, held, later)));
     }
@@ -2410,12 +3074,11 @@ export function composeRuntime(options) {
         return advanceOnce(room, local, authorized, live);
     }
     async function advanceOnce(room, local, authorized, live) {
-        await referenced(room.locator);
         if (!live() || paused.has(room.locator))
             return unconfirmed;
         const held = replicas.get(room.locator);
         if (held !== undefined) {
-            const refreshed = await pullRefresh(authorized, held.confirmed, live);
+            const refreshed = await pullRefresh(authorized, held, live);
             if (!live())
                 return unconfirmed;
             if (refreshed.kind === 'still-current') {
@@ -2430,10 +3093,11 @@ export function composeRuntime(options) {
                 return null;
             }
             if (refreshed.kind === 'advanced') {
-                if (!(await publish(local, room, refreshed.confirmed, { base: held.confirmed }, live))) {
-                    const now = replicas.get(room.locator)?.confirmed.record.roomVersion;
+                const landing = { kind: 'refreshed', base: refreshed.base };
+                if (!(await publish(local, room, refreshed.record, landing, live))) {
+                    const now = replicas.get(room.locator)?.record.roomVersion;
                     const reached = now !== undefined &&
-                        options.adapter.reached(room.locator, now, refreshed.confirmed.record.roomVersion);
+                        options.adapter.reached(room.locator, now, refreshed.record.roomVersion);
                     return reached ? null : advance(room, local, authorized, live);
                 }
                 await retainModel(local, room, 'collection', modelOf(room.locator));
@@ -2443,7 +3107,7 @@ export function composeRuntime(options) {
                 return refreshed;
             if (opened !== null) {
                 owed.add(room.locator);
-                readSide.recover();
+                liveQueries.recover();
                 return unconfirmed;
             }
             if (reloadsDue.get(room.locator) === generation)
@@ -2454,7 +3118,7 @@ export function composeRuntime(options) {
             return unconfirmed;
         if (bootstrapped.kind !== 'staged')
             return bootstrapped;
-        await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored }, live);
+        await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
         return null;
     }
     async function withhold(withheld, room, local, progress) {
@@ -2527,46 +3191,90 @@ export function composeRuntime(options) {
             (accepted.author === undefined ? '' : ` author ${accepted.author}`) +
             (accepted.time === undefined ? '' : ` time ${accepted.time}`));
     }
-    async function adoptAccepted(room, local, submitted, accepted) {
-        await referenced(room.locator);
+    function settling(acceptance) {
+        return acceptance !== null && 'apply' in acceptance;
+    }
+    function refusalOf(acceptance) {
+        return settling(acceptance) ? (acceptance.refused ?? null) : acceptance;
+    }
+    async function acceptance(room, local, submitted, accepted) {
         if (!continuing())
             return unconfirmed;
         const current = replicas.get(room.locator);
         if (current === undefined || !current.queue.some((batch) => batch.id === submitted.id)) {
             return null;
         }
-        const held = current.confirmed.record.roomVersion;
+        const held = current.record.roomVersion;
         logAccepted(room.locator, submitted, accepted);
-        const applied = options.adapter.reached(room.locator, held, accepted.roomVersion)
-            ? { kind: 'staged', confirmed: current.confirmed }
-            : await applyReturned(current.confirmed, submitted, accepted, options.adapter.follows(room.locator, held, accepted.roomVersion)
-                ? accepted.roomVersion
-                : held, accepted.roomVersion);
-        if (applied.kind !== 'staged') {
-            const key = pendingKey(room.locator, submitted.id);
-            const state = pendings.get(key);
-            await local.accept(room.locator, submitted.id, accepted.roomVersion);
-            if (state !== undefined && !fences.has(room.locator))
-                pendings.set(key, { ...state, accepted: accepted.roomVersion });
-            emitQueue(room.locator);
-            return applied;
-        }
-        const settled = await settle(local, room.locator, current, applied.confirmed, current.queue.filter((batch) => batch.id !== submitted.id), { room: true });
-        pendings.delete(pendingKey(room.locator, submitted.id));
-        unreadable.delete(room.locator);
-        sourceRefusals.delete(room.locator);
-        declarationRefusals.delete(room.locator);
-        const set = settled();
-        list(room, true);
-        publishChangeSet(set);
-        moveTo({ ...status, ...attention() });
-        return null;
+        let record = current.record;
+        let changes;
+        if (!options.adapter.reached(room.locator, held, accepted.roomVersion)) {
+            const paths = [...returnedPaths(submitted, accepted)];
+            const confirmedLayer = await stepped(slicing(await local.entries(record.key, 'confirmed', paths), paths));
+            const back = await stepped(returning(confirmedLayer, submitted, accepted, accepted.roomVersion));
+            record = {
+                ...record,
+                roomVersion: options.adapter.follows(room.locator, held, accepted.roomVersion)
+                    ? accepted.roomVersion
+                    : held,
+            };
+            const overrides = new Map([
+                ...back.set.map((entry) => [entry.path, entry]),
+                ...back.removed.map((path) => [path, null]),
+            ]);
+            const refused = await validatedRoom(local, record, 'confirmed', { record: current.record, changed: [...overrides.keys()] }, overrides);
+            if (refused !== null) {
+                const key = pendingKey(room.locator, submitted.id);
+                return {
+                    locator: room.locator,
+                    left: [],
+                    commit: {
+                        rooms: [],
+                        writes: [
+                            {
+                                locator: room.locator,
+                                accepted: [{ id: submitted.id, roomVersion: accepted.roomVersion }],
+                            },
+                        ],
+                    },
+                    refused,
+                    apply() {
+                        const state = pendings.get(key);
+                        if (state !== undefined && !fences.has(room.locator))
+                            pendings.set(key, { ...state, accepted: accepted.roomVersion });
+                        return changeSet(room.locator, { queue: true });
+                    },
+                };
+            }
+            changes = back;
+        }
+        const settled = await settlement(local, room.locator, current, record, current.queue.filter((batch) => batch.id !== submitted.id), { room: true, ...(changes === undefined ? {} : { changes }) });
+        return {
+            ...settled,
+            apply(answer) {
+                const set = settled.apply(answer);
+                pendings.delete(pendingKey(room.locator, submitted.id));
+                unreadable.delete(room.locator);
+                sourceRefusals.delete(room.locator);
+                declarationRefusals.delete(room.locator);
+                list(room, true);
+                return set;
+            },
+        };
+    }
+    async function adoptedTogether(local, acceptances) {
+        const settlements = acceptances.filter(settling);
+        if (settlements.length > 0) {
+            publishChangeSet(await together(local, settlements));
+            moveTo({ ...status, ...attention() });
+        }
+        await unpair(local);
     }
     async function adopted(room, local, submitted, accepted) {
         const failed = await exclusive(async () => {
-            const adopting = await adoptAccepted(room, local, submitted, accepted);
-            await unpair(local);
-            return adopting;
+            const adopting = await acceptance(room, local, submitted, accepted);
+            await adoptedTogether(local, [adopting]);
+            return refusalOf(adopting);
         });
         if (failed === null)
             return true;
@@ -2577,19 +3285,20 @@ export function composeRuntime(options) {
     async function adoptedMove(room, partner, local, submitted, accepted) {
         const other = discovered.get(partner);
         const failed = await exclusive(async () => {
-            const left = await adoptAccepted(room, local, submitted, accepted);
+            const left = await acceptance(room, local, submitted, accepted);
             const arriving = replicas.get(partner)?.queue.find((batch) => batch.id === submitted.id);
             const arrived = other === undefined || arriving === undefined || accepted.destination === undefined
                 ? null
-                : await adoptAccepted(other, local, arriving, {
+                : await acceptance(other, local, arriving, {
                     kind: 'accepted',
                     ...accepted.destination,
                 });
-            if (other !== undefined && arrived?.kind === 'refused' && continuing()) {
-                refusedSource(other, arrived);
+            await adoptedTogether(local, [left, arrived]);
+            const refusedArrival = refusalOf(arrived);
+            if (other !== undefined && refusedArrival?.kind === 'refused' && continuing()) {
+                refusedSource(other, refusedArrival);
             }
-            await unpair(local);
-            return left;
+            return refusalOf(left);
         });
         submitLater(partner);
         if (failed === null)
@@ -2615,79 +3324,102 @@ export function composeRuntime(options) {
                     continue;
                 if (queueIn(partner).some((held) => held.id === batch.id))
                     continue;
-                if (pendings.get(pendingKey(locator, batch.id))?.accepted !== undefined)
-                    continue;
-                if (leavingIn(batch, locator) && !withdrawable(locator)(batch))
-                    continue;
-                return { locator, batch };
+                if (unpairedIn(locator, batch))
+                    return { locator, batch };
             }
         }
         return null;
     }
-    async function unpair(local) {
-        const handled = new Set();
-        for (let held = unpaired(handled); held !== null && continuing(); held = unpaired(handled)) {
-            const { locator, batch } = held;
-            handled.add(pendingKey(locator, batch.id));
-            journal.record(`outcome ${locator} ${batch.id} ${localSaves ? 'dropped' : 'unpaired'}`);
-            const leaving = {
-                batch,
-                returned: !localSaves && leavingIn(batch, locator) ? returnedBy('withdrawn') : null,
+    async function unpairing(local, locator, batches) {
+        const ids = new Set(batches.map(({ id }) => id));
+        const leaving = batches.map((batch) => ({
+            batch,
+            returned: !localSaves && leavingIn(batch, locator) ? returnedBy('withdrawn') : null,
+        }));
+        const outcome = localSaves ? 'dropped' : 'unpaired';
+        const current = replicas.get(locator);
+        if (current !== undefined) {
+            const settled = await settlement(local, locator, current, current.record, current.queue.filter((one) => !ids.has(one.id)), { leaving });
+            return {
+                ...settled,
+                apply(answer) {
+                    for (const batch of batches)
+                        journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
+                    const set = settled.apply(answer);
+                    submitLater(locator);
+                    return set;
+                },
             };
-            const current = replicas.get(locator);
-            if (current !== undefined) {
-                const settled = await settle(local, locator, current, current.confirmed, current.queue.filter((one) => one.id !== batch.id), { leaving });
-                publishChangeSet(settled());
+        }
+        const queue = queueIn(locator).filter((one) => !ids.has(one.id));
+        const written = new Map();
+        for (const { batch, returned } of leaving) {
+            if (returned === null)
                 continue;
-            }
-            const queue = queueIn(locator).filter((one) => one.id !== batch.id);
-            const written = new Map((leaving.returned === null
-                ? []
-                : (pendings.get(pendingKey(locator, batch.id))?.drafts ?? [])).map((saved) => [
-                saved.path,
-                {
+            for (const saved of pendings.get(pendingKey(locator, batch.id))?.drafts ?? []) {
+                written.set(saved.path, {
                     locator,
                     path: saved.path,
                     revision: roomDraftRevision(),
-                    parts: returnedInto(roomDrafts.get(locator)?.get(saved.path)?.parts, saved.parts),
-                    returned: leaving.returned,
-                },
-            ]));
-            const carried = carriedBack(locator, leaving.returned === null ? [] : [batch], written);
-            await local.keepAuthored({
-                locator,
-                queue,
-                roomDrafts: [...written.values()],
-                consumedRoomDrafts: carried.taken,
-            }, ...carried.writes);
-            pendings.delete(pendingKey(locator, batch.id));
-            if (queue.length > 0)
-                queuesWithoutReplica.set(locator, queue);
-            else
-                queuesWithoutReplica.delete(locator);
-            for (const record of written.values())
-                rememberRoomDraft(record);
-            carried.remember();
-            publishChangeSet(mergeChangeSets([
-                changeSet(locator, null, null, {
-                    queue: true,
-                    drafts: [...written.keys(), ...carried.taken],
-                }),
-                ...carried.changes,
-            ]));
+                    parts: returnedInto((written.get(saved.path) ?? roomDrafts.get(locator)?.get(saved.path))?.parts, saved.parts),
+                    returned,
+                });
+            }
+        }
+        const carried = carriedBack(locator, leaving.flatMap(({ batch, returned }) => (returned === null ? [] : [batch])), written);
+        return {
+            locator,
+            left: batches,
+            commit: {
+                rooms: [],
+                writes: [
+                    {
+                        locator,
+                        queue,
+                        roomDrafts: [...written.values()],
+                        consumedRoomDrafts: carried.taken,
+                    },
+                    ...carried.writes,
+                ],
+            },
+            apply() {
+                for (const batch of batches) {
+                    journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
+                    pendings.delete(pendingKey(locator, batch.id));
+                }
+                if (queue.length > 0)
+                    queuesWithoutReplica.set(locator, queue);
+                else
+                    queuesWithoutReplica.delete(locator);
+                for (const record of written.values())
+                    rememberRoomDraft(record);
+                carried.remember();
+                submitLater(locator);
+                return mergeChangeSets([
+                    changeSet(locator, {
+                        queue: true,
+                        drafts: [...written.keys(), ...carried.taken],
+                    }),
+                    ...carried.changes,
+                ]);
+            },
+        };
+    }
+    async function unpair(local) {
+        const handled = new Set();
+        for (let held = unpaired(handled); held !== null && continuing(); held = unpaired(handled)) {
+            const { locator, batch } = held;
+            handled.add(pendingKey(locator, batch.id));
+            publishChangeSet(await together(local, [await unpairing(local, locator, [batch])]));
         }
         if (handled.size === 0)
             return;
         moveTo({ ...status, ...attention() });
-        for (const key of handled)
-            submitLater(key.slice(0, key.indexOf('\u0000')));
     }
     async function discardHeld(head, room, local, signal) {
         const partner = partnerOf(head, room.locator);
         const other = partner === null ? undefined : discovered.get(partner);
-        await discardPending(room, local, signal);
-        if (other !== undefined && !signal.aborted)
-            await discardPending(other, local, signal);
+        await discardPending(other === undefined ? [room] : [room, other], local, signal);
     }
     async function submitRoom(room, local, authorized, progress, signal) {
         while (continuing() && authorization !== undefined && !signal.aborted) {
@@ -2858,14 +3590,12 @@ export function composeRuntime(options) {
                     if (current === undefined || !current.queue.some((batch) => batch.id === head.id)) {
                         return;
                     }
-                    const settled = await settle(local, room.locator, current, current.confirmed, current.queue.filter((batch) => batch.id !== head.id), {
-                        leaving: (result.kind === 'expired' && landedWhole(room.locator, head, current.confirmed)) ||
-                            (result.kind === 'conflicted' &&
-                                landedWhole(room.locator, head, current.confirmed, result.affected))
-                            ? { ...left, returned: null }
-                            : left,
-                    });
-                    publishChangeSet(settled());
+                    const confirmedLayer = await sliceAt(current.record, 'confirmed', [head]);
+                    const held = (result.kind === 'expired' &&
+                        (await landedWhole(room.locator, head, confirmedLayer))) ||
+                        (result.kind === 'conflicted' &&
+                            (await landedWhole(room.locator, head, confirmedLayer, result.affected)));
+                    publishChangeSet(await settle(local, room.locator, current, current.record, current.queue.filter((batch) => batch.id !== head.id), { leaving: [held ? { ...left, returned: null } : left] }));
                     await unpair(local);
                     moveTo({ ...status, ...attention() });
                 });
@@ -2893,44 +3623,67 @@ export function composeRuntime(options) {
     function pastHorizon(identity) {
         return (outcomeRetention !== null && identityTime(identity) + outcomeRetention * 1000 <= Date.now());
     }
-    async function discardPending(room, local, signal) {
-        const { locator } = room;
+    async function discardPending(rooms, local, signal) {
         const discarded = await exclusive(async () => {
-            if (fences.has(locator))
-                return false;
-            const before = replicas.get(locator);
-            const queue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
-            fences.set(locator, { at: discoveries, erased: false });
-            lastFenced.set(locator, ++fencings);
-            try {
-                await local.discard(locator);
-            }
-            finally {
-                fences.delete(locator);
+            const held = rooms
+                .filter(({ locator }) => !fences.has(locator))
+                .map((room) => ({
+                room,
+                before: replicas.get(room.locator),
+                queue: queueIn(room.locator),
+            }));
+            if (held.length === 0)
+                return [];
+            const answer = await local.commit({
+                rooms: held.flatMap(({ room, before }) => before === undefined
+                    ? []
+                    : [
+                        {
+                            locator: room.locator,
+                            key: before.record.key,
+                            roots: before.record.typedSelection?.roots ?? [],
+                            overlay: { set: [], cleared: [...before.overlaid] },
+                        },
+                    ]),
+                discards: held.map(({ room }) => room.locator),
+            });
+            for (const { room, before, queue } of held) {
+                const { locator } = room;
+                lastFenced.set(locator, ++fencings);
+                for (const batch of queue)
+                    pendings.delete(pendingKey(locator, batch.id));
+                queuesWithoutReplica.delete(locator);
+                if (before !== undefined) {
+                    replicas.set(locator, {
+                        ...before,
+                        queue: [],
+                        overlaid: new Set(),
+                        count: answer.counts[locator] ?? before.count,
+                    });
+                }
+                journal.record(`room discarded ${locator}`);
             }
-            for (const batch of queue)
-                pendings.delete(pendingKey(locator, batch.id));
-            queuesWithoutReplica.delete(locator);
-            const after = before === undefined ? null : await stepped(replicating(before.confirmed, [], before));
-            if (after !== null)
-                replicas.set(locator, after);
-            journal.record(`room discarded ${locator}`);
-            publishChangeSet(changeSet(locator, before ?? null, after, { queue: true }));
+            publishChangeSet(mergeChangeSets(held.map(({ room }) => changeSet(room.locator, {
+                documents: answer.changed[room.locator] ?? [],
+                queue: true,
+            }))));
             moveTo({ ...status, ...attention() });
-            return true;
+            return held.map(({ room }) => room);
         });
-        if (!discarded)
-            return;
-        const progress = { complete: true, reachable: true };
-        await roomTask(locator, async (live) => {
-            await Promise.race([
-                reload(room, local, progress, () => live() && !signal.aborted),
-                abandonedOn(signal),
-            ]);
-        });
-        if (signal.aborted)
-            return;
-        await rest(progress);
+        for (const room of discarded) {
+            if (signal.aborted)
+                return;
+            const progress = { complete: true, reachable: true };
+            await roomTask(room.locator, async (live) => {
+                await Promise.race([
+                    reload(room, local, progress, () => live() && !signal.aborted),
+                    abandonedOn(signal),
+                ]);
+            });
+            if (signal.aborted)
+                return;
+            await rest(progress);
+        }
     }
     function awaitingAnswer(locator) {
         let release = () => { };
@@ -2947,7 +3700,7 @@ export function composeRuntime(options) {
     async function retainModel(local, room, attached, next) {
         const key = modelKey(room.locator, attached);
         const previous = modelOf(room.locator, attached);
-        const heldBefore = replicas.get(room.locator)?.confirmed.record;
+        const heldBefore = replicas.get(room.locator)?.record;
         if (JSON.stringify(previous) === JSON.stringify(next) &&
             (heldBefore === undefined ||
                 (JSON.stringify(heldBefore.operations) === JSON.stringify(room.operations) &&
@@ -2966,33 +3719,48 @@ export function composeRuntime(options) {
             let changed = null;
             if (held !== undefined) {
                 const declared = {
-                    ...held.confirmed.record,
+                    ...held.record,
                     operations: room.operations,
                     replica: room.replica,
                     typedSelection: room.typedSelection ?? null,
                     ...(attached === 'collection' ? { model: next } : { selectionModel: next }),
                 };
-                const reclassified = sameMembership(declared, held.confirmed.record)
-                    ? { kind: 'staged', confirmed: await confirmedOf(declared, held.confirmed) }
-                    : await readReclassified(declared, held.confirmed);
-                const record = reclassified.kind === 'staged'
+                let read = 'staged';
+                if (!sameMembership(declared, held.record)) {
+                    const verdict = await validatedCollection(walkOf(local, held.record.key, 'confirmed'), lookupOf(local, held.record.key, 'confirmed'), compositionOf(declared));
+                    read =
+                        verdict.verdict !== 'refuse'
+                            ? 'staged'
+                            : verdict.rule === 'model-unavailable'
+                                ? 'deferred'
+                                : { kind: 'refused', refusal: verdict };
+                }
+                const record = read === 'staged'
                     ? declared
-                    : {
-                        ...declared,
-                        typedSelection: held.confirmed.record.typedSelection,
-                    };
-                const read = reclassified.kind === 'deferred'
-                    ? { kind: 'staged', confirmed: await confirmedOf(record, held.confirmed) }
-                    : reclassified;
-                await local.write({ next: record, previous: held.confirmed.record });
-                const replica = read.kind === 'staged'
-                    ? await stepped(replicating(read.confirmed, held.queue, held))
-                    : { ...held, confirmed: { ...held.confirmed, record } };
-                await stepped(counting(replica));
-                const set = await stepped(changing(room.locator, held, replica, { room: true }));
-                replicas.set(room.locator, replica);
-                changed = heldChange(room.locator, held, replica, set, { room: true });
-                if (read.kind === 'staged') {
+                    : { ...declared, typedSelection: held.record.typedSelection };
+                const confirmedLayer = await sliceAt(record, 'confirmed', held.queue, held.overlaid);
+                const replayedLayer = await replayed(record, confirmedLayer, held.queue);
+                const diff = await overlayDiff(record, held, replayedLayer.visible, replayedLayer.touched);
+                const answer = await local.commit({
+                    rooms: [
+                        {
+                            locator: room.locator,
+                            key: record.key,
+                            record: storedRecord(record),
+                            roots: record.typedSelection?.roots ?? [],
+                            composition: compositionOf(record),
+                            overlay: diff.overlay,
+                        },
+                    ],
+                });
+                recomposed(room.locator, held.record, record);
+                const { count } = committedRoom(room.locator, record, answer);
+                replicas.set(room.locator, { ...held, record, overlaid: diff.touched, count });
+                changed = changeSet(room.locator, {
+                    documents: answer.changed[room.locator] ?? [],
+                    room: true,
+                });
+                if (read === 'staged' || read === 'deferred') {
                     if (declarationRefusals.delete(room.locator)) {
                         sourceRefusals.delete(room.locator);
                         unreadable.delete(room.locator);
@@ -3045,17 +3813,10 @@ export function composeRuntime(options) {
     }
     function heldRooms(listed) {
         return listed.flatMap((room) => {
-            const record = replicas.get(room.locator)?.confirmed.record;
+            const record = replicas.get(room.locator)?.record;
             if (record === undefined || record.replica.selection !== room.replica.selection)
                 return [];
-            return [
-                {
-                    locator: room.locator,
-                    roomVersion: record.roomVersion,
-                    documents: record.documents,
-                    revisions: record.revisions,
-                },
-            ];
+            return [{ locator: room.locator, roomVersion: record.roomVersion }];
         });
     }
     async function synchronize(listed, local, progress, attempt, live) {
@@ -3083,7 +3844,7 @@ export function composeRuntime(options) {
             progress.complete = false;
             return false;
         }
-        const prior = replicas.get(room.locator)?.confirmed.record;
+        const prior = replicas.get(room.locator)?.record;
         if (prior !== undefined && prior.replica.selection !== room.replica.selection) {
             list(prior, false);
             emitRooms();
@@ -3137,7 +3898,7 @@ export function composeRuntime(options) {
                 await withhold(bootstrapped, room, local, progress);
                 return;
             }
-            await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored }, live);
+            await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
             await caughtUp(room, local, progress, live);
         }
         finally {
@@ -3224,11 +3985,12 @@ export function composeRuntime(options) {
         if (JSON.stringify(result.providerLimits) !== JSON.stringify(limits) ||
             JSON.stringify(result.capabilities) !== JSON.stringify(previousCapabilities)) {
             limits = result.providerLimits;
-            await local.declare(limits, capabilities);
+            await local.fact('providerLimits', limits);
+            await local.fact('capabilities', capabilities);
         }
         const signedIn = result.member ?? null;
         if (JSON.stringify(signedIn) !== JSON.stringify(member)) {
-            await local.keepMember(signedIn);
+            await local.fact('member', signedIn);
             member = signedIn;
             emitMember();
         }
@@ -3432,7 +4194,7 @@ export function composeRuntime(options) {
         owed.clear();
         for (const locator of reloading)
             catching.add(locator);
-        readSide.recover();
+        liveQueries.recover();
         return reloading;
     }
     async function reloadNow(replaced, progress) {
@@ -3599,7 +4361,7 @@ export function composeRuntime(options) {
         if (synced && !recorded) {
             const completedAt = new Date().toISOString();
             try {
-                await (await openLocal()).complete(completedAt);
+                await (await openLocal()).fact('lastCompleted', completedAt);
                 if (!live())
                     return;
                 recorded = true;
@@ -3639,8 +4401,8 @@ export function composeRuntime(options) {
             if (room === undefined || room.replica.admission !== 'admitted')
                 return;
             if (held !== undefined &&
-                (held.confirmed.record.replica.selection !== room.replica.selection ||
-                    options.adapter.reached(locator, held.confirmed.record.roomVersion, roomVersion))) {
+                (held.record.replica.selection !== room.replica.selection ||
+                    options.adapter.reached(locator, held.record.roomVersion, roomVersion))) {
                 return;
             }
             const during = underway?.generation === generation ? underway.progress : null;
@@ -3702,7 +4464,14 @@ export function composeRuntime(options) {
                 void rediscover(event.scope);
             else
                 void applyRoom(event.locator, event.roomVersion);
-        }, receipts);
+        }, receipts, heldRevisions);
+    }
+    async function heldRevisions(locator, paths) {
+        const held = replicas.get(locator);
+        if (held === undefined || paths.length === 0)
+            return new Map();
+        const entries = await (await openLocal()).entries(held.record.key, 'confirmed', paths);
+        return new Map(entries.flatMap(({ path, revision }) => revision === null ? [] : [[path, revision]]));
     }
     function writesHeld() {
         return serviceMode === 'write-halted' || haltedRefusal;
@@ -3794,7 +4563,7 @@ export function composeRuntime(options) {
         statusListeners.clear();
         serviceModeListeners.clear();
         memberListeners.clear();
-        readSide.close();
+        liveQueries.close();
         queueSubscriptions.clear();
         roomDraftListeners.clear();
         presentationListeners.clear();
@@ -3840,7 +4609,7 @@ export function composeRuntime(options) {
         const watchers = seedWatchers.get(plan.key) ?? new Set();
         seedWatchers.set(plan.key, watchers);
         watchers.add(shown);
-        const stop = readSide.watch(plan, identityOf(plan), () => {
+        const stop = liveQueries.watch(plan, identityOf(plan), () => {
             const cover = covered(plan);
             awaitPreparation(cover);
             return seedBehind(plan, cover);
@@ -3911,10 +4680,9 @@ export function composeRuntime(options) {
             if ('pending' in answered)
                 continue;
             const searchedConversations = named.filter((one) => searchIndex.conversations().has(one));
-            await readSide.settled();
             const seen = searchIndex.changes();
             await searchIndex.caughtUp();
-            const selected = roomsAlone(answering) ? null : await rowsQuery(answering);
+            const selected = roomsAlone(answering) ? null : await everyRow(answering);
             if (selected !== null && 'pending' in selected)
                 continue;
             if (searchIndex.changes() !== seen ||
@@ -3927,7 +4695,7 @@ export function composeRuntime(options) {
                     : new Set(reachedRooms(answering)), plan.collection
                 ? new Map(answered.coverage.rooms.map(({ room }) => [
                     room,
-                    replicas.get(room)?.confirmed.record.typedSelection?.roots ?? [],
+                    replicas.get(room)?.record.typedSelection?.roots ?? [],
                 ]))
                 : null);
             const coverage = {
@@ -3947,13 +4715,17 @@ export function composeRuntime(options) {
             roomDraftListeners.add(listener);
             void exclusive(async () => {
                 await openLocal();
-                if (closed || !roomDraftListeners.has(listener))
-                    return;
-                listener.ready = true;
             }).then(() => {
-                if (closed || !listener.ready || !roomDraftListeners.has(listener))
+                if (closed || !roomDraftListeners.has(listener))
                     return;
-                listener.notify(snapshotRoomDrafts());
+                const snapshot = snapshotRoomDrafts();
+                draftsShown = draftsShown.then(async () => {
+                    const value = await snapshot.catch(() => null);
+                    if (value === null || closed || !roomDraftListeners.has(listener))
+                        return;
+                    listener.ready = true;
+                    listener.notify(value);
+                });
             }, () => { });
             return () => {
                 roomDraftListeners.delete(listener);
@@ -4068,9 +4840,9 @@ export function composeRuntime(options) {
                     return listed;
                 });
             },
-            read(room, path) {
+            async read(room, path) {
                 const record = roomDrafts.get(room)?.get(path);
-                return record === undefined ? null : roomDraftOf(record);
+                return record === undefined ? null : ((await roomDraftsOf([record]))[0] ?? null);
             },
             write(room, path, revision, input) {
                 return exclusive(async () => {
@@ -4080,11 +4852,11 @@ export function composeRuntime(options) {
                     const local = await openLocal();
                     const current = roomDrafts.get(room)?.get(path);
                     if ((current?.revision ?? null) !== revision) {
-                        return staleWrite(current === undefined ? null : roomDraftOf(current));
+                        return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
                     }
                     const file = parts.file === undefined
                         ? undefined
-                        : await heldFile(parts.file.blob, binaryBase(replicas.get(room)?.visible, path));
+                        : await heldFile(parts.file.blob, binaryBase(await visibleOf(room, [path]), path));
                     const record = {
                         locator: room,
                         path,
@@ -4096,8 +4868,8 @@ export function composeRuntime(options) {
                         ? []
                         : [{ key: file.localId, blob: parts.file.blob }]);
                     rememberRoomDraft(record);
-                    publishChangeSet(changeSet(room, null, null, { drafts: [path] }));
-                    return { outcome: 'written', roomDraft: roomDraftOf(record) };
+                    publishChangeSet(changeSet(room, { drafts: [path] }));
+                    return { outcome: 'written', roomDraft: (await roomDraftsOf([record]))[0] ?? null };
                 });
             },
             discard(room, path, revision) {
@@ -4105,11 +4877,11 @@ export function composeRuntime(options) {
                     const local = await openLocal();
                     const current = roomDrafts.get(room)?.get(path);
                     if (current === undefined || current.revision !== revision) {
-                        return staleWrite(current === undefined ? null : roomDraftOf(current));
+                        return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
                     }
                     await local.discardRoomDraft(room, path);
                     forgetRoomDraft(room, path);
-                    publishChangeSet(changeSet(room, null, null, { drafts: [path] }));
+                    publishChangeSet(changeSet(room, { drafts: [path] }));
                     moveTo({ ...status, ...attention() });
                     return { outcome: 'written', roomDraft: null };
                 });
@@ -4157,7 +4929,7 @@ export function composeRuntime(options) {
             const room = calledRooms(name, input).find((one) => locked(one));
             return room === undefined ? recoveredAction(name, input) : lockedRoom(room);
         },
-        reached(locator, roomVersion, path) {
+        async reached(locator, roomVersion, path) {
             return path === undefined
                 ? reachedBy(locator, roomVersion)
                 : writtenAfter(locator, roomVersion, path);