@agentshouse/mdruntime 0.1.0-cefbc8bb8a1c0 → 0.1.0-cf1e7fdb9c600

package/dist/connection.js

@@ -1,8 +1,8 @@
-import { escapePointer, parseFrontmatter, roomTarget, target } from '@agentshouse/mdmodel';
+import { bodied, identityOf, parseFrontmatter, plain, queryKey, roomTarget, target, } from '@agentshouse/mdmodel';
 import { attachedModel, builtInModel, 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 { planWithin, } from './query.js';
 import { createLiveQueries } from './live.js';
 import { seededResult } from './seed.js';
 import { documentKey, roomOfKey } from './rows.js';
@@ -12,7 +12,7 @@ import { bootstrapRoom } from './bootstrap.js';
 import { changeSet, mergeChangeSets } from './change-set.js';
 import { createConversationStore, } from './conversation.js';
 import { leaving as leavingIn, partnerOf, queuedFile, } from './change.js';
-import { available, collectionOf, composedOf, unreadable as unreadableIn, validRoot, } from './collection.js';
+import { available, collectionOf, composedOf, validRoot, } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
 import { binaryRecord } from './binary.js';
@@ -20,10 +20,9 @@ import { attachedFile } from './file.js';
 import { openedFiles } from './opened.js';
 import { ABSENT_TARGET, absentBinary, attachAnswer, binaryAnswer, binaryLinkAnswer, calledResult, failure, historyAnswer, LOCKED_UNREADABLE, lockedRoom, OFFLINE, undeclared, UNCERTAIN, UNREADABLE, } from './outcome.js';
 import { createRecovery } from './recovery.js';
-import { doorReads } from './reads.js';
 import { advancement } from './refresh.js';
 import { buildBatch, buildMove, joined, limiting, queuedDocuments, requeuing, } from './save.js';
-import { compositionOf, entryAt, landed, movedBy, overlayOf, replaying, returning, returnedPaths, sameMembership, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
+import { compositionOf, entryAt, landed, movedBy, overlayOf, replaying, returning, returnedPaths, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
 import { binaryBase, changedParts, changesOf, gatheredParts, held, heldFile, joinedDraft, moveTarget, readParts, readSavedParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration, refusedForSpace, } from './durability.js';
@@ -34,7 +33,7 @@ import { paced, ROW_WEIGHT, stepped, yielded } from './turn.js';
 import { identityTime, roomDraftRevision } from './identity.js';
 import { ancestors, beneath, normalize } from './paths.js';
 import { openRuntimeStore, } from './store.js';
-import { changedCleanly, sameComposition, validatedCollection, } from './validation.js';
+import { validatedNeighbourhood } from './validation.js';
 import { unconfirmed } from './transfer.js';
 import { governs, holds, narrowed, planReach, } from './reach.js';
 function within(root, path) {
@@ -59,37 +58,34 @@ const DERIVE_BYTES = 1 << 23;
 const DERIVE_FLOOR = 1 << 18;
 // An index build aims at this much database work, so a Save, a query or the next part's progress waits behind at most one short build.
 const DERIVE_AIM_MS = 250;
-// A build past its floor of text stops after a second and a half of work, its full-text writes included, so a Room whose text costs ten times the usual still reports progress within the 2 s bound.
+// A build past its floor of text stops after a second and a half of work, its full-text writes included, so a Room whose text costs ten times the usual holds a Save, a query or the next part's progress behind no longer build.
 const DERIVE_LONGEST_MS = 1_500;
-const WALK_BYTES = 1 << 20;
 const QUERY_BYTES = 1 << 20;
 const STAGE_BYTES = 1 << 20;
 const STAGE_FLOOR = 1 << 16;
 // A batch aims at this much database work, so a Save or a query waits behind at most one short write.
 const STAGE_AIM_MS = 50;
 const STREAMS_HELD = 4;
-const NOTHING_HELD = { parts: 0, bytes: 0 };
+const NOTHING_HELD = { bytes: 0 };
 const QUEUED_TEXT = 1 << 23;
-// Bytes still arriving are reported at most this often, well inside the 2 s progress bound, so readiness is not rebuilt for every chunk the network hands over.
+// Bytes still arriving are reported at most this often, so readiness is not rebuilt for every chunk the network hands over while a slow link still moves the figure.
 const ARRIVAL_REPORT_MS = 250;
-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;
 }
-function abandonedOn(signal) {
-    return new Promise((resolve) => {
-        if (signal.aborted)
-            resolve(null);
-        else
-            signal.addEventListener('abort', () => resolve(null), { once: true });
+function readUntil(read, signal) {
+    if (signal.aborted)
+        return Promise.resolve({ kind: 'transport-uncertainty' });
+    return new Promise((resolve, reject) => {
+        const stop = () => resolve({ kind: 'transport-uncertainty' });
+        signal.addEventListener('abort', stop, { once: true });
+        read.then(resolve, reject).finally(() => signal.removeEventListener('abort', stop));
     });
 }
-function roomLane(locator) {
-    return `room ${locator}`;
-}
+const TEXT_READS = 4;
 function pendingKey(locator, id) {
     return `${locator}\u0000${id}`;
 }
@@ -109,6 +105,7 @@ export function composeRuntime(options) {
     const usableWhenHeld = options.usableWhenHeld ?? [];
     const queuesWithoutReplica = new FencedMap(isFenced);
     const pendings = new Map();
+    const landedAhead = new Map();
     const seeds = new Map();
     const seedWatchers = new Map();
     const roomDrafts = new FencedMap(isFenced);
@@ -120,15 +117,24 @@ export function composeRuntime(options) {
     const counted = new Map();
     const unreadable = new Set();
     const builtIn = builtInModel(roomTypes);
+    const typedPaths = options.adapter.typedPaths ?? [];
     const models = new FencedMap(isFenced);
     const liveModels = new FencedMap(isFenced);
     const invalidModels = new Set();
     const discovered = new Map();
-    const reads = doorReads(options.adapter, (locator) => discovered.get(locator), () => generation);
+    let inFlight = new AbortController();
+    const refreshed = options.adapter.refresh?.bind(options.adapter);
+    const reads = {
+        bootstrap: (authorized, request) => readUntil(options.adapter.bootstrap(authorized, request), inFlight.signal),
+        ...(refreshed === undefined
+            ? {}
+            : {
+                refresh: (authorized, request) => readUntil(refreshed(authorized, request), inFlight.signal),
+            }),
+        reached: (locator, roomVersion, target) => options.adapter.reached(locator, roomVersion, target),
+    };
     let roomsListed = false;
     const scopedRefusals = new Map();
-    const sourceRefusals = new Map();
-    const declarationRefusals = new Set();
     function modelOf(locator) {
         return models.get(locator) ?? NO_MODEL;
     }
@@ -138,7 +144,7 @@ export function composeRuntime(options) {
             : modelOf(locator);
     }
     function composed(record) {
-        return compositionOf(record, builtIn);
+        return compositionOf(record, builtIn, typedPaths);
     }
     function compositionFor(record) {
         return composed({ ...record, model: savedModel(record.locator) });
@@ -151,10 +157,10 @@ export function composeRuntime(options) {
     let closed = false;
     let stopping = false;
     let withdrawStream;
-    const announced = new Map();
     let underway = null;
     let streamed = null;
     let handed = false;
+    let naming = 0;
     const recovery = (options.recovery ?? createRecovery()).scope(ROOM_ATTEMPTS);
     const repairing = new Set();
     const calling = new Set();
@@ -165,12 +171,13 @@ export function composeRuntime(options) {
     let recorded = false;
     const stale = new Set();
     let generation = 0;
-    let discovering = null;
-    let opened = null;
-    const owed = new Set();
-    const reloadsDue = new Map();
+    const reloadsDue = new Set();
+    const highest = new Map();
+    const beyondHorizon = new Set();
     const lanes = new Map();
-    let roomReads = { generation, free: ROOM_READS, waiting: [] };
+    const roomLanes = new Map();
+    let roomWork = 0;
+    const roomReads = { free: ROOM_READS, waiting: [] };
     const working = new Set();
     let mutations = Promise.resolve();
     let gathering = null;
@@ -186,6 +193,8 @@ export function composeRuntime(options) {
     let withdrawConversations;
     let currencyQueued = null;
     let socketOpen = false;
+    let announced = false;
+    let missedChange = false;
     const confirmed = new Set();
     let lockGrace = null;
     const lockListeners = new Set();
@@ -195,6 +204,8 @@ export function composeRuntime(options) {
     const serviceModeListeners = new Set();
     let member = null;
     const memberListeners = new Set();
+    let authorityChanges = 0;
+    const authorityChangeListeners = new Set();
     const unpreparedDemand = new Set();
     const unpreparable = new Set();
     let preparing = false;
@@ -224,11 +235,9 @@ export function composeRuntime(options) {
     const streaming = new Set();
     const underived = new Map();
     const unindexed = new Map();
-    const unchecked = new Map();
+    const startedOver = new Map();
     let arrivalReported = 0;
-    let onScreen = options.shell.onScreen;
-    const shownWaiters = [];
-    let streams = { generation, free: STREAMS_HELD };
+    let streamsFree = STREAMS_HELD;
     let queuedText = 0;
     const installWaiters = [];
     const stageBudget = {
@@ -245,26 +254,12 @@ export function composeRuntime(options) {
     };
     const installTurns = { busy: false, ahead: 0, finishing: [], starting: [] };
     const conversations = createConversationStore({
-        agents: declaredAgents,
-        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),
+        history: (request) => readConversationHistory(request),
         durably,
         stream: () => options.adapter.conversations,
         publish: publishChangeSet,
         online: () => connectionOf() !== 'unreachable' && refusal === null,
-        listed: () => roomsListed,
         full: () => full,
         closed: () => closed,
         unanswered: resendLater,
@@ -272,6 +267,8 @@ export function composeRuntime(options) {
     });
     const journal = createLog();
     const keptFiles = openedFiles(database, isFenced);
+    const holding = new Map();
+    const unholdable = new Map();
     let readyFromStore = () => { };
     const ready = new Promise((resolve) => {
         readyFromStore = resolve;
@@ -361,9 +358,9 @@ export function composeRuntime(options) {
         return value === undefined ? null : structuredClone(value);
     }
     async function writtenRoomDraft(room, path, revision, input, next) {
-        const parts = readParts(input);
+        const parts = readParts(input, path);
         if (path === '' || normalize(path) !== path)
-            throw runtimeError('room-draft-malformed');
+            throw runtimeError('room-draft-malformed', `room-draft-malformed at ${path}: a path inside the Room, such as notes/a.md`);
         const local = await openLocal();
         const current = roomDrafts.get(room)?.get(path);
         if ((current?.revision ?? null) !== revision) {
@@ -412,7 +409,7 @@ export function composeRuntime(options) {
         const changed = new Map();
         for (const room of [...replicas.keys(), ...queuesWithoutReplica.keys()]) {
             for (const { batch, state } of entriesOf(room)) {
-                if (state === 'accepted' || state === 'local')
+                if (state === 'local')
                     continue;
                 for (const { path } of batch.changes)
                     changed.set(`${room}\u0000${path}`, { room, path });
@@ -433,16 +430,9 @@ export function composeRuntime(options) {
                 returned: structuredClone(record.returned),
             });
         }
-        for (const [room, refusal] of sourceRefusals)
-            attentionRequired.push({ room, refusal: structuredClone(refusal) });
         attentionRequired.sort((left, right) => {
             if (left.room !== right.room)
                 return left.room < right.room ? -1 : 1;
-            if ('refusal' in left || 'refusal' in right) {
-                if ('refusal' in left && 'refusal' in right)
-                    return 0;
-                return 'refusal' in left ? -1 : 1;
-            }
             if (left.path !== right.path)
                 return left.path < right.path ? -1 : 1;
             return 0;
@@ -597,9 +587,6 @@ export function composeRuntime(options) {
         if (localSaves)
             return Object.freeze({ batch, state: 'local' });
         const state = pendings.get(pendingKey(locator, batch.id));
-        if (state?.accepted !== undefined) {
-            return Object.freeze({ batch, state: 'accepted', roomVersion: state.accepted });
-        }
         return Object.freeze({ batch, ...(state?.submission ?? { state: 'waiting' }) });
     }
     function entriesOf(locator) {
@@ -673,11 +660,7 @@ export function composeRuntime(options) {
         })();
     }
     function roomsOfReach(reach) {
-        return new Set([
-            ...reach.rooms,
-            ...reach.documents.map(roomOfKey),
-            ...reach.areas.flatMap((area) => (area.types.length === 0 ? [] : [area.room])),
-        ]);
+        return new Set([...reach.rooms, ...reach.documents.map(roomOfKey)]);
     }
     function reachedRooms(plan) {
         const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
@@ -716,7 +699,7 @@ export function composeRuntime(options) {
             coverage.push({
                 room: locator,
                 generation: replica.record.transfer,
-                current: !(catching.has(locator) || owed.has(locator) || transfers.has(locator)),
+                current: !(catching.has(locator) || transfers.has(locator)),
             });
             read.push({ locator, key: replica.record.key });
             for (const batch of replica.queue)
@@ -743,8 +726,6 @@ export function composeRuntime(options) {
         return { listed: named.every((room) => replicas.has(room)), rooms: named };
     }
     function roomState(locator) {
-        if (sourceRefusals.has(locator))
-            return 'refused';
         const listedRoom = discovered.get(locator);
         if (roomsListed &&
             (listedRoom === undefined ||
@@ -759,7 +740,7 @@ export function composeRuntime(options) {
     }
     function conversationCoverage(reach) {
         const declared = reach === null || reach.conversations;
-        if (!declared || options.adapter.conversations === undefined || declaredAgents() === undefined)
+        if (!declared || options.adapter.conversations === undefined)
             return 'undeclared';
         if (!conversations.known() || !conversations.current())
             return 'acquiring';
@@ -774,79 +755,50 @@ export function composeRuntime(options) {
             ? 'connected'
             : 'connecting';
     }
-    function refusedIn(locators) {
-        return locators.flatMap((room) => {
-            const held = sourceRefusals.get(room);
-            if (held === undefined)
-                return [];
-            const { file, location } = held.fields;
-            return [
-                {
-                    room,
-                    name: discovered.get(room)?.name ?? room,
-                    file: typeof file === 'string' ? file : '',
-                    rule: held.code,
-                    location: typeof location === 'string' ? location : null,
-                },
-            ];
-        });
+    function bytesOf(room, underway) {
+        const transfer = transfers.get(room);
+        if (transfer !== undefined) {
+            const owed = (unindexed.get(room) ?? []).reduce((sum, part) => sum + part.bytes, 0);
+            return {
+                done: transfer.done.bytes - Math.ceil(owed),
+                total: Math.max(arrivals.get(room) ?? 0, transfer.done.bytes),
+            };
+        }
+        const held = underway ? NOTHING_HELD : (replicas.get(room)?.record.inventory ?? NOTHING_HELD);
+        return { done: held.bytes, total: arrivals.get(room) ?? held.bytes };
     }
     function installationOf(coverage) {
         const rooms = { done: 0, total: 0 };
-        const parts = { done: 0, total: 0 };
         const bytes = { done: 0, total: 0 };
         let installing = 0;
         let downloading = false;
-        let checking = 0;
         for (const { room, state } of coverage) {
             if (state === 'unadmitted')
                 continue;
             rooms.total += 1;
             if (state === 'complete')
                 rooms.done += 1;
-            const transfer = transfers.get(room);
             const underway = state === 'acquiring' || (installs.has(room) && state !== 'complete');
             if (underway)
                 installing += 1;
             if (underway && (streaming.has(room) || !arrivals.has(room)))
                 downloading = true;
-            if (transfer !== undefined) {
-                const check = unchecked.get(room);
-                const unchecking = check === undefined ? 0 : check.bytes * (1 - Math.min(1, check.done / check.text));
-                const owed = (unindexed.get(room) ?? []).reduce((sum, part) => sum + part.bytes, 0);
-                const arrived = arrivals.get(room);
-                parts.done += transfer.done.parts;
-                parts.total += Math.max(arrived?.parts ?? 0, transfer.done.parts);
-                bytes.done += transfer.done.bytes - Math.ceil(owed + unchecking);
-                checking += Math.ceil(owed + unchecking) - Math.ceil(owed);
-                bytes.total += Math.max(arrived?.bytes ?? 0, transfer.done.bytes);
-                continue;
-            }
-            const held = underway ? NOTHING_HELD : (replicas.get(room)?.record.inventory ?? NOTHING_HELD);
-            const arrived = arrivals.get(room) ?? held;
-            parts.done += held.parts;
-            parts.total += arrived.parts;
-            bytes.done += held.bytes;
-            bytes.total += arrived.bytes;
+            const now = bytesOf(room, underway);
+            const earlier = underway ? startedOver.get(room) : undefined;
+            bytes.done += Math.max(now.done, earlier?.done ?? 0);
+            bytes.total += Math.max(now.total, earlier?.total ?? 0);
         }
         const step = installing === 0
             ? null
             : downloading
                 ? 'downloading'
-                : bytes.done + checking < bytes.total
+                : bytes.done < bytes.total
                     ? 'writing'
                     : 'replaying';
-        return {
-            step,
-            paused: installing > 0 && !onScreen ? 'hidden' : null,
-            rooms,
-            parts,
-            bytes,
-        };
+        return { step, rooms, bytes };
     }
     function readinessFor(port, reach) {
         const required = requiredRooms(reach);
-        const search = port.search === 'required';
         const coverage = required.rooms.map((room) => ({ room, state: roomState(room) }));
         const preparing = coverage
             .filter((room) => room.state === 'preparing' && !unpreparable.has(room.room))
@@ -859,14 +811,12 @@ export function composeRuntime(options) {
                 listed: required.listed,
                 rooms: coverage,
                 conversations: conversationCoverage(reach),
-                search: search ? 'required' : 'unused',
             },
             persistence,
             connection: connectionOf(),
             house: refusal !== null ? 'refused' : writesHeld() ? 'write-halted' : 'open',
-            space: full ? 'full' : port.space,
+            space: full ? 'full' : null,
             installation: installationOf(coverage),
-            refused: refusedIn(required.rooms),
             lost: storageLoss !== null,
             established: targets[port.target]?.established === true ||
                 (usableWhenHeld.includes(port.target) && required.rooms.some((room) => reopened.has(room))),
@@ -954,8 +904,12 @@ export function composeRuntime(options) {
         unpreparable.clear();
         journal.record('space freed');
         queueReadiness();
-        if (!closed && authorization !== undefined)
-            void sync('unstreamed');
+        if (closed || authorization === undefined)
+            return;
+        if (options.adapter.roomStream === undefined)
+            void sync('unstreamed', null);
+        else
+            void resynchronize();
     }
     function seedRoomHeld(room, version) {
         return indexed(room) && reachedBy(room, version);
@@ -995,7 +949,24 @@ export function composeRuntime(options) {
     function sameCover(left, right) {
         return JSON.stringify(left) === JSON.stringify(right);
     }
+    async function unheldRows(local, plan, rows, rooms) {
+        if (plan.shape.kind !== 'documents' || !bodied(plan.shape))
+            return [];
+        if (!('documents' in rows) || !textOnline())
+            return [];
+        const named = new Map();
+        for (const { room, path, textHeld } of rows.documents) {
+            if (textHeld === false)
+                named.set(room, [...(named.get(room) ?? []), path]);
+        }
+        const unheld = [];
+        for (const { locator, key } of rooms) {
+            unheld.push(...(await unheldIn(local, locator, key, named.get(locator) ?? [])));
+        }
+        return unheld.filter((one) => unholdable.get(textKey(one)) !== one.revision);
+    }
     async function coveredRows(plan, cover) {
+        const asked = new Set();
         for (;;) {
             const before = cover();
             if ('pending' in before)
@@ -1006,8 +977,14 @@ export function composeRuntime(options) {
             const current = () => local.changes(keys) === changes;
             const rows = await windowRows(local, plan, before.rooms, current);
             const after = cover();
-            if (rows !== null && sameCover(before, after))
+            if (rows === null || !sameCover(before, after))
+                continue;
+            const unheld = (await unheldRows(local, plan, rows, before.rooms)).filter((one) => !asked.has(textKey(one)));
+            if (unheld.length === 0)
                 return { rows, cover: before, current };
+            for (const one of unheld)
+                asked.add(textKey(one));
+            await holdTexts(unheld);
         }
     }
     async function windowRows(local, plan, rooms, unchanged) {
@@ -1103,6 +1080,8 @@ export function composeRuntime(options) {
     }
     async function refuse(reason, provider = null) {
         discoveryPaused = true;
+        inFlight.abort();
+        inFlight = new AbortController();
         try {
             if (reason === 'revoked-authorization') {
                 await exclusive(async () => {
@@ -1187,10 +1166,10 @@ export function composeRuntime(options) {
             providerOwnedPaths: room.providerOwnedPaths,
             roomVersion: replicas.get(room.locator)?.record.roomVersion ?? null,
             synchronizationAvailable,
-            refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
+            refusal: scopedRefusals.get(room.locator) ?? null,
         });
     }
-    async function applyDiscovery(found, started, covered) {
+    async function applyDiscovery(found, started, left) {
         const lockedBefore = lockedRooms();
         for (const room of found) {
             const fence = fences.get(room.locator);
@@ -1204,18 +1183,11 @@ export function composeRuntime(options) {
         const listedLocators = new Set(listed.map((room) => room.locator));
         for (const locator of listedLocators)
             scopedRefusals.delete(locator);
-        if (covered === undefined)
+        if (left === undefined)
             discovered.clear();
-        else
-            for (const locator of covered)
-                discovered.delete(locator);
         for (const room of listed)
             discovered.set(room.locator, room);
-        const unlisted = unlistedHeld(new Set(found.map((room) => room.locator))).filter((locator) => covered === undefined || covered.includes(locator));
-        if (options.adapter.exhaustiveDiscovery === true)
-            await loseRooms(unlisted);
-        else
-            unlistedKept(unlisted);
+        await loseRooms(left ?? unlistedHeld(new Set(found.map((room) => room.locator))));
         for (const room of listed) {
             const held = replicas.get(room.locator)?.record;
             if (held !== undefined && held.replica.selection !== room.replica.selection) {
@@ -1246,15 +1218,6 @@ export function composeRuntime(options) {
             ]),
         ].filter((locator) => !listed.has(locator));
     }
-    function unlistedKept(unlisted) {
-        for (const locator of unlisted) {
-            const held = replicas.get(locator)?.record;
-            if (held !== undefined)
-                list(held, false);
-            else
-                rooms.delete(locator);
-        }
-    }
     function fence(locators) {
         const fresh = [...new Set(locators)].filter((locator) => !fences.has(locator));
         const removed = fresh.map((locator) => ({
@@ -1265,24 +1228,26 @@ export function composeRuntime(options) {
             fences.set(locator, { at: discoveries, erased: false });
             lastFenced.set(locator, ++fencings);
             confirmed.delete(locator);
-            for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [])
+            for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? []) {
                 pendings.delete(pendingKey(locator, batch.id));
+                landedAhead.delete(pendingKey(locator, batch.id));
+            }
             replicas.delete(locator);
+            highest.delete(locator);
+            beyondHorizon.delete(locator);
             queuesWithoutReplica.delete(locator);
             rooms.delete(locator);
             roomDrafts.delete(locator);
             attachedFiles.delete(locator);
             untransferred(locator);
+            startedOver.delete(locator);
             catching.delete(locator);
             discovered.delete(locator);
-            announced.delete(locator);
             unreadable.delete(locator);
             stale.delete(locator);
             repairable.delete(locator);
             unpreparable.delete(locator);
             scopedRefusals.delete(locator);
-            sourceRefusals.delete(locator);
-            declarationRefusals.delete(locator);
             models.delete(locator);
             liveModels.delete(locator);
             invalidModels.delete(locator);
@@ -1373,6 +1338,7 @@ export function composeRuntime(options) {
         transfers.clear();
         arrivals.clear();
         streaming.clear();
+        startedOver.clear();
         limits = held.providerLimits;
         capabilities = held.capabilities;
         member = held.member;
@@ -1382,8 +1348,9 @@ export function composeRuntime(options) {
         presentations.clear();
         for (const record of held.presentation)
             presentations.set(record.app, record.value);
-        conversations.hydrate(heldConversations, chatDrafts, held.conversationList);
+        conversations.hydrate(heldConversations, chatDrafts, held.conversationList, held.conversationCursor);
         pendings.clear();
+        landedAhead.clear();
         for (const queue of queues) {
             for (const { batch, state } of queue.pending) {
                 pendings.set(pendingKey(queue.locator, batch.id), state);
@@ -1534,6 +1501,16 @@ export function composeRuntime(options) {
     }
     const REWRITE_LINKS = ['field', 'body'];
     const CHECKED_LINKS = ['field', 'section'];
+    const BODY_LINKS = ['body'];
+    async function textsNeeded(local, record, named) {
+        const paths = [...new Set(named.map((one) => (typeof one === 'string' ? one : one.path)))];
+        const unheld = await unheldIn(local, record.locator, record.key, paths);
+        if (unheld.length === 0)
+            return null;
+        await holdTexts(unheld);
+        const [first] = await unheldIn(local, record.locator, record.key, unheld.map(({ path }) => path));
+        return first?.path ?? null;
+    }
     async function sliceAt(record, view, queue, extra = [], moved = []) {
         const local = await openLocal();
         const needed = new Set([...touchedBy(queue), ...extra]);
@@ -1634,8 +1611,6 @@ export function composeRuntime(options) {
     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) {
@@ -1678,10 +1653,16 @@ export function composeRuntime(options) {
             ? read
             : await stepped(slicingWith(read, overrides.set, overrides.removed));
         const composition = composed(record);
-        const { withdrawn, kept } = await stepped(standing(confirmedLayer, queue, withdrawable(locator), localSaves, locator, composition));
-        const founded = kept.filter((batch) => !queue.includes(batch));
+        const shown = queue.filter((batch) => {
+            const held = landedAhead.get(pendingKey(locator, batch.id));
+            return (held !== undefined &&
+                Object.entries(held).some(([path, revision]) => confirmedLayer.revisions[path] !== revision));
+        });
+        const unshown = queue.filter((batch) => !shown.includes(batch));
+        const { withdrawn, kept } = await stepped(standing(confirmedLayer, unshown, withdrawable(locator), localSaves, locator, composition));
+        const founded = kept.filter((batch) => !unshown.includes(batch));
         const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
-        const unqueued = [];
+        const unqueued = shown.map((batch) => ({ batch, landed: true }));
         for (const batch of withdrawn) {
             unqueued.push({ batch, landed: await landedWhole(locator, batch, confirmedLayer) });
         }
@@ -1746,8 +1727,10 @@ export function composeRuntime(options) {
             commit,
             apply: (answer) => {
                 for (const batch of previousQueue) {
-                    if (!staying.has(batch.id))
-                        pendings.delete(pendingKey(locator, batch.id));
+                    if (staying.has(batch.id))
+                        continue;
+                    pendings.delete(pendingKey(locator, batch.id));
+                    landedAhead.delete(pendingKey(locator, batch.id));
                 }
                 for (const draft of written.values())
                     rememberRoomDraft(draft);
@@ -1804,28 +1787,34 @@ export function composeRuntime(options) {
         models.set(locator, state);
         return { collection: state };
     }
-    function publish(local, room, record, landing, live) {
+    function publish(local, room, reached, landing, live) {
         const landed = exclusive(async () => {
             if (!live()) {
                 caughtUpTo(room.locator);
                 return true;
             }
             const prior = replicas.get(room.locator);
-            if (landing.kind === 'refreshed' &&
-                (prior === undefined || prior.record.key !== record.key || prior.confirmed !== landing.base)) {
-                await local.unrefresh(record.key);
+            if (!stands(room.locator, landing.from)) {
+                if (landing.kind === 'refreshed') {
+                    await local.unrefresh(reached.key);
+                    return false;
+                }
+                caughtUpTo(room.locator);
+                await abandoned(local, room.locator);
                 return false;
             }
+            const record = landing.kind === 'refreshed' && prior !== undefined
+                ? {
+                    ...prior.record,
+                    roomVersion: reached.roomVersion,
+                    ...(landing.remodelled ? { model: reached.model } : {}),
+                }
+                : reached;
             adoptModels(room.locator, record);
             const queue = prior?.queue ?? queuesWithoutReplica.get(room.locator) ?? [];
-            const roomVersion = record.roomVersion;
-            const accepted = queue.filter((batch) => {
-                const at = pendings.get(pendingKey(room.locator, batch.id))?.accepted;
-                return at !== undefined && options.adapter.reached(room.locator, roomVersion, at);
-            });
             let set;
             try {
-                set = await settle(local, room.locator, prior, record, queue.filter((batch) => !accepted.includes(batch)), landing.kind === 'refreshed'
+                set = await settle(local, room.locator, prior, record, queue, landing.kind === 'refreshed'
                     ? {
                         room: true,
                         view: 'refreshed',
@@ -1847,25 +1836,26 @@ export function composeRuntime(options) {
                 return true;
             }
             if (landing.kind === 'bootstrapped') {
+                highest.delete(room.locator);
+                beyondHorizon.delete(room.locator);
                 untransferred(room.locator);
+                startedOver.delete(room.locator);
                 catching.delete(room.locator);
                 if (prior !== undefined && prior.record.key !== record.key)
                     sweep();
+                name(room.locator);
             }
-            for (const batch of accepted)
-                pendings.delete(pendingKey(room.locator, batch.id));
             stale.delete(room.locator);
             unpreparable.delete(room.locator);
             if (unreadable.delete(room.locator))
                 scopedRefusals.delete(room.locator);
-            sourceRefusals.delete(room.locator);
-            declarationRefusals.delete(room.locator);
             list(room, true);
             publishChangeSet(set);
+            if (landing.kind === 'bootstrapped')
+                void heldAgain(room.locator);
             await unpair(local);
             moveTo({ ...status, ...attention() });
-            options.adapter.roomStream?.published(room.locator, roomVersion);
-            if (accepted.length > 0 && (replicas.get(room.locator)?.queue.length ?? 0) > 0) {
+            if (landing.kind === 'bootstrapped' && (replicas.get(room.locator)?.queue.length ?? 0) > 0) {
                 submitLater(room.locator);
             }
             return true;
@@ -1877,7 +1867,7 @@ export function composeRuntime(options) {
         const replica = replicas.get(locator);
         const room = rooms.get(locator);
         if (replica === undefined || room === undefined) {
-            throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
+            throw runtimeError('unknown-room', `Unknown Room ${locator}`);
         }
         return { local, replica, room };
     }
@@ -1939,6 +1929,19 @@ export function composeRuntime(options) {
         const referring = removed.length === 0
             ? []
             : (await local.referrers(record.key, 'confirmed', removed, CHECKED_LINKS)).map(({ path }) => path);
+        const unheld = await textsNeeded(local, record, [
+            ...paths,
+            ...referring,
+            ...(moved.length === 0
+                ? []
+                : await local.referrers(record.key, 'confirmed', moved, REWRITE_LINKS)),
+            ...(removed.length === 0
+                ? []
+                : await local.referrers(record.key, 'confirmed', removed, BODY_LINKS)),
+        ]);
+        if (unheld !== null) {
+            return { refusal: { code: 'transport-uncertainty', retryable: true, file: unheld } };
+        }
         const confirmedLayer = await sliceAt(record, 'confirmed', replica.queue, [...paths, ...paths.flatMap(ancestors), ...referring], moved);
         const { visible } = await replayed(record, confirmedLayer, replica.queue);
         const composition = composed(record);
@@ -1969,18 +1972,6 @@ export function composeRuntime(options) {
             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)
@@ -1997,37 +1988,6 @@ export function composeRuntime(options) {
         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))));
@@ -2045,9 +2005,8 @@ export function composeRuntime(options) {
     }
     function validatorOf(record, confirmedLayer) {
         return async (resulting, touched) => {
-            const composition = compositionFor(record);
             const local = await openLocal();
-            const changed = [];
+            const changes = [];
             const overrides = new Map();
             const pace = paced();
             for (const path of new Set([...confirmedLayer.held, ...touched])) {
@@ -2058,19 +2017,13 @@ export function composeRuntime(options) {
                     continue;
                 overrides.set(path, now);
                 if (textOf(was) !== textOf(now))
-                    changed.push({ path, was: textOf(was), now: textOf(now) });
+                    changes.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, composed(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);
+            return validatedNeighbourhood(changes, compositionFor(record), {
+                lookup: overriddenLookup(lookupOf(local, record.key, 'confirmed'), overrides),
+                texts: textsOf(local, record.key, 'confirmed'),
+                referrers: referrersOf(local, record.key, 'confirmed'),
+            });
         };
     }
     function textsOf(local, key, view) {
@@ -2147,15 +2100,19 @@ export function composeRuntime(options) {
         }
         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));
+        if ('refusal' in sourceSaving)
+            return { outcome: 'refused', ...sourceSaving.refusal };
         const changed = saved.flatMap(({ path, parts }) => changedParts(path, parts, sourceSaving.visible));
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
         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}`);
+            throw runtimeError('unknown-room', `Unknown Room ${destination}`);
         }
         const arriving = await savingIn(target, [], moves.map(({ to }) => to));
+        if ('refusal' in arriving)
+            return { outcome: 'refused', ...arriving.refusal };
         const built = await buildMove({
             source: await sideOf(locator, replica, room, sourceSaving),
             destination: await sideOf(destination, target, listedRoom, arriving),
@@ -2216,10 +2173,10 @@ export function composeRuntime(options) {
             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}`);
+            throw runtimeError('unknown-room', `Unknown Room ${answer.fenced}`);
         }
         if (fences.has(locator) || fences.has(destination)) {
-            throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
+            throw runtimeError('unknown-room', `Unknown Room ${locator}`);
         }
         pendings.set(pendingKey(locator, id), {
             drafts: saved,
@@ -2272,6 +2229,8 @@ export function composeRuntime(options) {
             ...saved.map(({ path }) => path),
             ...parts.flatMap(({ bases }) => bases.map(({ path }) => path)),
         ]);
+        if ('refusal' in saving)
+            return { outcome: 'refused', ...saving.refusal };
         const changed = saved.flatMap(({ path, parts: held }) => changedParts(path, held, saving.visible));
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
@@ -2390,10 +2349,10 @@ export function composeRuntime(options) {
             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}`);
+            throw runtimeError('unknown-room', `Unknown Room ${answer.fenced}`);
         }
         if (fences.has(locator))
-            throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
+            throw runtimeError('unknown-room', `Unknown Room ${locator}`);
         for (const origin of withdrawn.keys())
             pendings.delete(pendingKey(locator, origin));
         for (const [id, drafts] of drafted) {
@@ -2442,7 +2401,7 @@ export function composeRuntime(options) {
             throw new Error('connection refused');
         await local.keepUpload(locator, identifier, upload);
         if (fences.has(locator))
-            throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
+            throw runtimeError('unknown-room', `Unknown Room ${locator}`);
         const key = pendingKey(locator, identifier);
         pendings.set(key, { ...pendings.get(key), upload });
         if (!continuing())
@@ -2579,6 +2538,83 @@ export function composeRuntime(options) {
             return UNCERTAIN;
         }
     }
+    async function heldAgain(locator) {
+        const replica = replicas.get(locator);
+        if (replica === undefined || !textOnline())
+            return;
+        try {
+            const wanted = await (await openLocal()).wanted(locator, replica.record.key);
+            await holdTexts(wanted.map(({ path, revision }) => ({ locator, path, revision })));
+        }
+        catch {
+            journal.record(`hold text ${locator} unwritten`);
+        }
+    }
+    function textOnline() {
+        return !closed && refusal === null && connectionOf() === 'connected';
+    }
+    function textKey({ locator, path }) {
+        return documentKey(locator, path);
+    }
+    async function readText({ locator, path, revision }) {
+        const replica = replicas.get(locator);
+        if (replica === undefined || !textOnline())
+            return;
+        try {
+            await ensureAuthorization();
+        }
+        catch {
+            return;
+        }
+        if (closed || authorization === undefined || refusal !== null)
+            return;
+        const since = fencings;
+        journal.record(`hold text ${locator} ${path}`);
+        const read = await reads
+            .bootstrap(authorization, { locator, selection: replica.record.replica.selection, path })
+            .catch(() => null);
+        journal.record(`outcome text ${read?.kind ?? 'transport-uncertainty'}`);
+        if (read === null || read.kind !== 'bootstrap' || fencedSince(locator, since))
+            return;
+        const content = read.documents[path];
+        const now = replicas.get(locator);
+        if (content === undefined || read.revisions[path] !== revision || now === undefined) {
+            unholdable.set(textKey({ locator, path, revision }), revision);
+            return;
+        }
+        const held = await (await openLocal()).hold(locator, now.record.key, compositionFor(now.record), [{ path, revision, content }]);
+        if (held.length === 0)
+            unholdable.set(textKey({ locator, path, revision }), revision);
+        else
+            publishChangeSet(changeSet(locator, { documents: held }));
+    }
+    function holdText(unheld) {
+        const key = textKey(unheld);
+        const running = holding.get(key);
+        if (running !== undefined)
+            return running;
+        const started = readText(unheld).finally(() => holding.delete(key));
+        holding.set(key, started);
+        return started;
+    }
+    async function holdTexts(wanted) {
+        const queue = wanted.filter((one) => unholdable.get(textKey(one)) !== one.revision);
+        await Promise.all(Array.from({ length: Math.min(TEXT_READS, queue.length) }, async () => {
+            for (let next = queue.shift(); next !== undefined; next = queue.shift()) {
+                await holdText(next);
+            }
+        }));
+    }
+    async function unheldIn(local, locator, key, paths) {
+        if (paths.length === 0)
+            return [];
+        return (await local.entries(key, 'confirmed', paths)).flatMap((entry) => entry.content === null &&
+            entry.binary === null &&
+            entry.outline !== null &&
+            entry.revision !== null
+            ? [{ locator, path: entry.path, revision: entry.revision }]
+            : []);
+    }
     function fetchBinary(request, name) {
         return transferBinary(request, (authorization) => keptFiles.fetch(name, () => options.adapter.binary(authorization, request)), binaryAnswer);
     }
@@ -2714,14 +2750,16 @@ export function composeRuntime(options) {
     }
     async function cleanUp() {
         const freed = await database.ask({ kind: 'opened.clean' });
-        return freed + ((await options.shell.cleanUp?.()) ?? 0);
-    }
-    function declaredAgents() {
-        for (const capability of capabilities) {
-            if (capability.conversationAgents !== undefined)
-                return capability.conversationAgents;
+        const local = await openLocal();
+        let texts = 0;
+        for (const [locator, replica] of replicas) {
+            const released = await local.unhold(locator, replica.record.key, compositionFor(replica.record));
+            texts += released.bytes;
+            if (released.paths.length > 0) {
+                publishChangeSet(changeSet(locator, { documents: released.paths }));
+            }
         }
-        return undefined;
+        return freed + texts + ((await options.shell.cleanUp?.()) ?? 0);
     }
     function declaredAction(name) {
         for (const capability of capabilities) {
@@ -2774,6 +2812,24 @@ export function composeRuntime(options) {
             return UNCERTAIN;
         }
     }
+    async function readConversationHistory(request) {
+        await ready;
+        const stream = options.adapter.conversations;
+        if (closed || refusal !== null || stream?.history === undefined)
+            return UNCERTAIN;
+        journal.record('transfer conversation history');
+        try {
+            const result = await stream.history(request);
+            if (result.kind === 'revoked-authorization')
+                await refuse('revoked-authorization');
+            journal.record(`outcome conversation history ${result.kind}`);
+            return calledResult(result);
+        }
+        catch {
+            journal.record('outcome conversation history transport-uncertainty');
+            return UNCERTAIN;
+        }
+    }
     function unsettled(result) {
         return result.kind !== 'action' && result.retryable;
     }
@@ -2835,6 +2891,33 @@ export function composeRuntime(options) {
         const held = replicas.get(locator);
         return (held !== undefined && options.adapter.reached(locator, held.record.roomVersion, roomVersion));
     }
+    function shownAt(locator) {
+        const held = replicas.get(locator)?.record.roomVersion;
+        const raised = highest.get(locator);
+        if (held === undefined || raised === undefined)
+            return held ?? raised;
+        return options.adapter.reached(locator, held, raised) ? held : raised;
+    }
+    function showing(locator, roomVersion) {
+        const at = shownAt(locator);
+        if (at === undefined || !options.adapter.reached(locator, at, roomVersion)) {
+            highest.set(locator, roomVersion);
+        }
+    }
+    function older(locator, roomVersion) {
+        if (beyondHorizon.has(locator))
+            return false;
+        const at = shownAt(locator);
+        return (at !== undefined &&
+            options.adapter.reached(locator, at, roomVersion) &&
+            !options.adapter.reached(locator, roomVersion, at));
+    }
+    function replaced(locators) {
+        for (const locator of locators) {
+            highest.delete(locator);
+            beyondHorizon.add(locator);
+        }
+    }
     async function writtenAfter(locator, roomVersion, path) {
         const held = replicas.get(locator);
         if (held === undefined)
@@ -2845,122 +2928,27 @@ export function composeRuntime(options) {
             options.adapter.reached(locator, written, roomVersion) &&
             !options.adapter.reached(locator, roomVersion, written));
     }
-    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, checked = null) {
-        const composition = composed(record);
-        const modeled = record.model.status !== 'unavailable' || record.typedSelection !== null;
-        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 walking = overrides === null
-            ? walkOf(local, record.key, view)
-            : overriddenWalk(walkOf(local, record.key, view), overrides);
-        const walk = checked === null
-            ? walking
-            : async (after) => {
-                const page = await walking(after);
-                checked(page.entries.reduce((sum, entry) => sum + (entry.content?.length ?? 0), 0));
-                return page;
-            };
-        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(composed(previous.record), composition);
-        if (modeled && (textChanged || modelsChanged)) {
-            const clean = previous !== null &&
-                changes !== null &&
-                (await changedCleanly(changes, composed(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;
+    async function writtenLater(local, locator, key, paths, roomVersion) {
+        if (paths.length === 0 || !older(locator, roomVersion))
+            return new Set();
+        const entries = await local.entries(key, 'confirmed', paths);
+        return new Set(entries.flatMap(({ path, written }) => written !== null &&
+            options.adapter.reached(locator, written, roomVersion) &&
+            !options.adapter.reached(locator, roomVersion, written)
+            ? [path]
+            : []));
     }
-    function refreshingOf(local, key, composition, liveness, replaying = null) {
-        const write = replaying === null ? exclusive : finishingWrite;
+    function refreshingOf(local, locator, key, composition, liveness, replaying = false) {
+        const write = replaying ? finishingWrite : exclusive;
         return {
-            async turn() {
-                if (replaying === null)
-                    return;
-                installing(replaying);
-                await screened();
+            turn() {
+                if (replaying)
+                    installing(locator);
             },
             prior: async (paths) => new Map((await local.entries(key, 'refreshed', paths)).map((entry) => [entry.path, entry])),
+            later: (paths, roomVersion) => writtenLater(local, locator, key, paths, roomVersion),
             async stage(page) {
                 for (let written = 0;;) {
-                    if (replaying !== null)
-                        await screened();
                     const end = batchEnd(page.entries, written);
                     const last = end === page.entries.length;
                     const entries = page.entries.slice(written, end);
@@ -3060,25 +3048,13 @@ export function composeRuntime(options) {
             return;
         void yielded().then(nextInstallTurn);
     }
-    function screened() {
-        if (onScreen || closed)
-            return Promise.resolve();
-        queueReadiness();
-        return new Promise((resolve) => shownWaiters.push(resolve));
-    }
     async function heldStream() {
-        for (;;) {
-            if (streams.generation !== generation)
-                streams = { generation, free: STREAMS_HELD };
-            const held = streams;
-            if (held.free > 0) {
-                held.free -= 1;
-                return once(() => {
-                    held.free += 1;
-                });
-            }
+        while (streamsFree === 0)
             await new Promise((admit) => installWaiters.push(admit));
-        }
+        streamsFree -= 1;
+        return once(() => {
+            streamsFree += 1;
+        });
     }
     async function unqueued() {
         while (queuedText >= QUEUED_TEXT) {
@@ -3106,14 +3082,19 @@ export function composeRuntime(options) {
         streaming.delete(locator);
         underived.delete(locator);
         unindexed.delete(locator);
-        unchecked.delete(locator);
+    }
+    function setBack(locator) {
+        const now = bytesOf(locator, true);
+        const earlier = startedOver.get(locator);
+        startedOver.set(locator, {
+            done: Math.max(now.done, earlier?.done ?? 0),
+            total: Math.max(now.total, earlier?.total ?? 0),
+        });
     }
     function owedIndexes(locator, bytes, text) {
         if (bytes <= 0 || text <= 0)
             return;
-        unindexed.set(locator, [...(unindexed.get(locator) ?? []), { bytes: bytes / 2, text }]);
-        const check = unchecked.get(locator) ?? { bytes: 0, text: 0, done: 0 };
-        unchecked.set(locator, { ...check, bytes: check.bytes + bytes / 2, text: check.text + text });
+        unindexed.set(locator, [...(unindexed.get(locator) ?? []), { bytes, text }]);
     }
     function built(locator, { done, text }) {
         const owed = unindexed.get(locator) ?? [];
@@ -3139,52 +3120,34 @@ export function composeRuntime(options) {
         if (installs.delete(locator))
             queueReadiness();
     }
-    function screen(value) {
-        if (value === onScreen)
-            return;
-        onScreen = value;
-        journal.record(`installation ${value ? 'shown' : 'hidden'}`);
-        queueReadiness();
-        if (!value)
-            return;
-        for (const resolve of shownWaiters.splice(0))
-            resolve();
-    }
-    async function pullRefresh(authorized, held, liveness, hold) {
+    async function pullRefresh(authorized, held, liveness, hold, refresh) {
         if (!liveness())
             return unconfirmed;
-        const turn = generation;
         const { record } = held;
-        const base = held.confirmed;
+        const from = standingOf(record.locator);
         const local = await openLocal();
         try {
             await exclusive(() => local.unrefresh(record.key));
-            const result = await advancement({
-                ...reads,
-                async refresh(authorization, request) {
-                    hold.release();
-                    try {
-                        return await reads.refresh(authorization, request);
-                    }
-                    finally {
-                        hold.take();
-                    }
-                },
-            }, authorized, record, (models, kept) => (liveness() ? remodel(record.locator, models, kept) : kept), liveness, refreshingOf(local, record.key, composed(record), liveness));
+            const result = await advancement(async (authorization, request) => {
+                hold.release();
+                try {
+                    return await refresh(authorization, request);
+                }
+                finally {
+                    hold.take();
+                }
+            }, authorized, record, (models, kept) => (liveness() ? remodel(record.locator, models, kept) : kept), liveness, refreshingOf(local, record.locator, record.key, composed(record), 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 };
+            return {
+                kind: 'advanced',
+                record: result.record,
+                from,
+                remodelled: result.record.model !== record.model,
+            };
         }
         catch (error) {
             if (refusedForSpace(error))
@@ -3192,9 +3155,6 @@ export function composeRuntime(options) {
             journal.record(`transfer refresh ${record.locator} transport-uncertainty`);
             throw error;
         }
-        finally {
-            reads.finished(record.locator, turn);
-        }
     }
     const heldContents = new Map();
     function heldContentOf(local, key) {
@@ -3212,11 +3172,17 @@ export function composeRuntime(options) {
         heldContents.set(key, made);
         return made;
     }
+    async function abandoned(local, locator) {
+        await local.abandon(locator);
+        setBack(locator);
+        untransferred(locator);
+        liveQueries.recover();
+        sweep();
+    }
     function staging(local, liveness) {
         const derived = async (locator, key, composition) => {
             underived.delete(locator);
             for (;;) {
-                await screened();
                 if (!liveness())
                     return false;
                 const done = await finishingWrite(async () => liveness()
@@ -3233,13 +3199,7 @@ export function composeRuntime(options) {
             held: (locator) => transfers.get(locator) ?? null,
             async turn(locator, step) {
                 installing(locator);
-                for (;;) {
-                    await screened();
-                    const release = step === 'downloading' ? await heldStream() : () => { };
-                    if (onScreen || closed)
-                        return release;
-                    release();
-                }
+                return step === 'downloading' ? heldStream() : () => { };
             },
             unqueued,
             queued(text) {
@@ -3254,7 +3214,7 @@ export function composeRuntime(options) {
                     at(bytes) {
                         if (ended)
                             return;
-                        arrivals.set(locator, { parts: arrivals.get(locator)?.parts ?? 0, bytes });
+                        arrivals.set(locator, bytes);
                         streaming.add(locator);
                         const now = performance.now();
                         if (now - arrivalReported < ARRIVAL_REPORT_MS)
@@ -3262,14 +3222,6 @@ export function composeRuntime(options) {
                         arrivalReported = now;
                         queueReadiness();
                     },
-                    part() {
-                        const arrived = arrivals.get(locator);
-                        arrivals.set(locator, {
-                            parts: (arrived?.parts ?? 0) + 1,
-                            bytes: arrived?.bytes ?? 0,
-                        });
-                        queueReadiness();
-                    },
                     end() {
                         if (ended)
                             return;
@@ -3279,14 +3231,10 @@ export function composeRuntime(options) {
                     },
                 };
             },
-            announced(locator) {
-                const later = announced.get(locator);
-                return later === undefined ? [] : [later];
-            },
+            streamed: options.adapter.roomStream !== undefined,
             async stage(record, page, composition) {
                 const { locator } = record;
                 installing(locator);
-                await screened();
                 if (!liveness())
                     return null;
                 const key = await installWrite(async () => {
@@ -3315,19 +3263,16 @@ export function composeRuntime(options) {
             derive: derived,
             async refreshing(locator, key, composition) {
                 await exclusive(() => local.unrefresh(key));
-                return refreshingOf(local, key, composition, liveness, locator);
+                return refreshingOf(local, locator, key, composition, liveness, true);
             },
             abandon: (locator) => exclusive(async () => {
-                if (!liveness())
-                    return;
-                await local.abandon(locator);
-                untransferred(locator);
-                liveQueries.recover();
-                sweep();
+                if (liveness())
+                    await abandoned(local, locator);
             }),
             setAside: async (locator) => {
                 if (!liveness())
                     return;
+                setBack(locator);
                 untransferred(locator);
                 liveQueries.recover();
             },
@@ -3336,19 +3281,6 @@ export function composeRuntime(options) {
                 sweep();
             }),
             content: (key) => heldContentOf(local, key),
-            async validate(record, view) {
-                const { locator } = record;
-                const refused = await validatedRoom(local, record, view, null, null, (text) => {
-                    const check = unchecked.get(locator);
-                    if (check === undefined)
-                        return;
-                    unchecked.set(locator, { ...check, done: check.done + text });
-                    queueReadiness();
-                });
-                unchecked.delete(locator);
-                queueReadiness();
-                return refused;
-            },
         };
     }
     function reusable(room, local) {
@@ -3360,15 +3292,21 @@ export function composeRuntime(options) {
     async function pullBootstrap(authorized, room, local, liveness) {
         if (!liveness())
             return unconfirmed;
-        const turn = generation;
         if (replicas.has(room.locator)) {
             catching.add(room.locator);
             liveQueries.recover();
         }
         try {
-            const result = await bootstrapRoom(reads, authorized, room, { collection: modelOf(room.locator) }, builtIn, (models, held) => (liveness() ? remodel(room.locator, models, held) : held), liveness, staging(local, liveness), reusable(room, local));
+            const result = await bootstrapRoom(reads, authorized, room, { collection: modelOf(room.locator) }, builtIn, typedPaths, (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' && older(room.locator, result.record.roomVersion)) {
+                caughtUpTo(room.locator);
+                installed(room.locator);
+                await abandoned(local, room.locator);
+                journal.record(`transfer bootstrap ${room.locator} older than shown`);
+                return { kind: 'transport-uncertainty' };
+            }
             if (result.kind !== 'staged') {
                 caughtUpTo(room.locator);
                 installed(room.locator);
@@ -3383,9 +3321,6 @@ export function composeRuntime(options) {
             journal.record(`transfer bootstrap ${room.locator} transport-uncertainty`);
             throw error;
         }
-        finally {
-            reads.finished(room.locator, turn);
-        }
     }
     function caughtUpTo(locator) {
         if (catching.delete(locator))
@@ -3393,51 +3328,55 @@ export function composeRuntime(options) {
     }
     function behind(room) {
         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)));
+        return held !== undefined && !options.adapter.reached(room.locator, held, room.roomVersion);
     }
-    async function advance(room, local, authorized, live) {
-        const carried = reads.carried(room.locator);
-        const withheld = await advanceOnce(room, local, authorized, live);
-        if (withheld !== null || reads.carried(room.locator) === carried || !behind(room)) {
-            return withheld;
-        }
-        return advanceOnce(room, local, authorized, live);
+    function standingOf(locator) {
+        const held = replicas.get(locator);
+        return { key: held?.record.key ?? null, confirmed: held?.confirmed ?? 0 };
     }
-    async function advanceOnce(room, local, authorized, running) {
+    function stands(locator, from) {
+        const now = standingOf(locator);
+        return now.key === from.key && now.confirmed === from.confirmed;
+    }
+    async function advance(room, local, authorized, running) {
         const live = () => running() && !full;
         if (!live())
             return unconfirmed;
         const held = replicas.get(room.locator);
-        if (held !== undefined) {
-            const refreshed = await ahead((hold) => refreshedRoom(room, local, authorized, held, live, hold));
+        if (held !== undefined && options.adapter.roomStream !== undefined) {
+            stale.delete(room.locator);
+            name(room.locator);
+            return null;
+        }
+        const refresh = reads.refresh;
+        if (held !== undefined && refresh !== undefined) {
+            const refreshed = await ahead((hold) => refreshedRoom(room, local, authorized, held, live, hold, refresh));
             if (refreshed === 'behind')
                 return advance(room, local, authorized, live);
             if (refreshed !== 'beyond-horizon')
                 return refreshed;
-            if (opened !== null) {
-                owed.add(room.locator);
-                liveQueries.recover();
-                return unconfirmed;
-            }
-            if (reloadsDue.get(room.locator) === generation)
+            if (reloadsDue.has(room.locator))
                 return unconfirmed;
+            replaced([room.locator]);
         }
+        const from = standingOf(room.locator);
         const bootstrapped = await pullBootstrap(authorized, room, local, live);
-        if (bootstrapped.kind === 'staged') {
-            await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
+        if (bootstrapped.kind !== 'staged')
+            return live() ? bootstrapped : unconfirmed;
+        const landing = { kind: 'bootstrapped', refreshed: bootstrapped.refreshed, from };
+        if (await publish(local, room, bootstrapped.record, landing, live)) {
             return live() ? null : unconfirmed;
         }
-        return live() ? bootstrapped : unconfirmed;
+        return reachedBy(room.locator, bootstrapped.record.roomVersion)
+            ? null
+            : advance(room, local, authorized, live);
     }
-    async function refreshedRoom(room, local, authorized, held, live, hold) {
-        const refreshed = await pullRefresh(authorized, held, live, hold);
+    async function refreshedRoom(room, local, authorized, held, live, hold, refresh) {
+        const refreshed = await pullRefresh(authorized, held, live, hold, refresh);
         if (!live())
             return unconfirmed;
         if (refreshed.kind === 'still-current') {
             stale.delete(room.locator);
-            if (sourceRefusals.has(room.locator))
-                return null;
             if (unreadable.delete(room.locator)) {
                 scopedRefusals.delete(room.locator);
                 list(room, true);
@@ -3446,7 +3385,11 @@ export function composeRuntime(options) {
             return null;
         }
         if (refreshed.kind === 'advanced') {
-            const landing = { kind: 'refreshed', base: refreshed.base };
+            const landing = {
+                kind: 'refreshed',
+                from: refreshed.from,
+                remodelled: refreshed.remodelled,
+            };
             if (!(await publish(local, room, refreshed.record, landing, live))) {
                 const now = replicas.get(room.locator)?.record.roomVersion;
                 const reached = now !== undefined &&
@@ -3459,12 +3402,9 @@ export function composeRuntime(options) {
         return refreshed.kind === 'beyond-horizon' ? 'beyond-horizon' : refreshed;
     }
     async function withhold(withheld, room, local, progress) {
-        if (withheld.kind === 'unconfirmed')
+        if (withheld.kind === 'unconfirmed' || isFenced(room.locator))
             return;
-        if (withheld.kind === 'refused')
-            stale.delete(room.locator);
-        else
-            stale.add(room.locator);
+        stale.add(room.locator);
         if (withheld.kind === 'transport-uncertainty' || withheld.kind === 'retryable-refusal') {
             const reset = withheld.kind === 'retryable-refusal' ? withheld.reset : undefined;
             repairable.set(room.locator, reset);
@@ -3486,30 +3426,10 @@ export function composeRuntime(options) {
             list(room, false);
             emitRooms();
         }
-        else if (withheld.kind === 'refused') {
-            refusedSource(room, withheld);
-        }
         else if (withheld.kind === 'revoked-authorization') {
             await refuse('revoked-authorization');
         }
     }
-    function refusedSource(room, { refusal }) {
-        sourceRefusals.set(room.locator, {
-            code: refusal.rule,
-            retryable: false,
-            fields: {
-                file: refusal.file,
-                ...(refusal.location === undefined ? {} : { location: refusal.location }),
-                ...(refusal.referrers === undefined ? {} : { referrers: refusal.referrers }),
-            },
-        });
-        declarationRefusals.delete(room.locator);
-        unreadable.add(room.locator);
-        list(room, false);
-        emitRooms();
-        moveTo({ ...status, ...attention() });
-        journal.record(`source refused ${room.locator} ${refusal.rule} ${refusal.file}`);
-    }
     function leaving(batch, result) {
         if (result.kind === 'expired')
             return { batch, returned: returnedBy('expired') };
@@ -3531,8 +3451,8 @@ export function composeRuntime(options) {
     function settling(acceptance) {
         return acceptance !== null && 'apply' in acceptance;
     }
-    function refusalOf(acceptance) {
-        return settling(acceptance) ? (acceptance.refused ?? null) : acceptance;
+    function failureOf(acceptance) {
+        return settling(acceptance) ? null : acceptance;
     }
     async function acceptance(room, local, submitted, accepted) {
         if (!continuing())
@@ -3545,7 +3465,8 @@ export function composeRuntime(options) {
         logAccepted(room.locator, submitted, accepted);
         let record = current.record;
         let changes;
-        if (!options.adapter.reached(room.locator, held, accepted.roomVersion)) {
+        if (!options.adapter.reached(room.locator, held, accepted.roomVersion) &&
+            !older(room.locator, 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));
@@ -3555,34 +3476,6 @@ export function composeRuntime(options) {
                     ? 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 }) });
@@ -3590,10 +3483,9 @@ export function composeRuntime(options) {
             ...settled,
             apply(answer) {
                 const set = settled.apply(answer);
+                showing(room.locator, accepted.roomVersion);
                 pendings.delete(pendingKey(room.locator, submitted.id));
                 unreadable.delete(room.locator);
-                sourceRefusals.delete(room.locator);
-                declarationRefusals.delete(room.locator);
                 list(room, true);
                 return set;
             },
@@ -3611,13 +3503,9 @@ export function composeRuntime(options) {
         const failed = await exclusive(async () => {
             const adopting = await acceptance(room, local, submitted, accepted);
             await adoptedTogether(local, [adopting]);
-            return refusalOf(adopting);
+            return failureOf(adopting);
         });
-        if (failed === null)
-            return true;
-        if (failed.kind === 'refused' && continuing())
-            refusedSource(room, failed);
-        return false;
+        return failed === null;
     }
     async function adoptedMove(room, partner, local, submitted, accepted) {
         const other = discovered.get(partner);
@@ -3631,18 +3519,10 @@ export function composeRuntime(options) {
                     ...accepted.destination,
                 });
             await adoptedTogether(local, [left, arrived]);
-            const refusedArrival = refusalOf(arrived);
-            if (other !== undefined && refusedArrival?.kind === 'refused' && continuing()) {
-                refusedSource(other, refusedArrival);
-            }
-            return refusalOf(left);
+            return failureOf(left);
         });
         submitLater(partner);
-        if (failed === null)
-            return true;
-        if (failed.kind === 'refused' && continuing())
-            refusedSource(room, failed);
-        return false;
+        return failed === null;
     }
     function queueIn(locator) {
         return replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [];
@@ -3761,12 +3641,10 @@ export function composeRuntime(options) {
     async function submitRoom(room, local, authorized, progress, signal) {
         while (continuing() && authorization !== undefined && !signal.aborted) {
             const replica = replicas.get(room.locator);
-            const head = replica?.queue[0];
+            const head = replica?.queue.find((batch) => !landedAhead.has(pendingKey(room.locator, batch.id)));
             if (replica === undefined || head === undefined)
                 return 'done';
             const state = pendings.get(pendingKey(room.locator, head.id));
-            if (state?.accepted !== undefined)
-                return 'done';
             const partner = partnerOf(head, room.locator);
             if (partner !== null && !leavingIn(head, room.locator)) {
                 submitLater(partner);
@@ -3880,12 +3758,12 @@ export function composeRuntime(options) {
                 }
                 if (result.kind === 'expired') {
                     await exclusive(() => mark(local, room.locator, head, { state: 'waiting' }, partner !== null && lost));
-                    const there = other === undefined ? null : await advance(other, local, authorized, continuing);
+                    const there = other === undefined ? null : await advanced(other, local, authorized);
                     if (other !== undefined && there !== null) {
                         await withhold(there, other, local, progress);
                         return 'done';
                     }
-                    const withheld = await advance(room, local, authorized, continuing);
+                    const withheld = await advanced(room, local, authorized);
                     if (withheld !== null) {
                         await withhold(withheld, room, local, progress);
                         return 'done';
@@ -3907,8 +3785,8 @@ export function composeRuntime(options) {
             if (result.kind === 'conflicted' || result.kind === 'rejected' || result.kind === 'expired') {
                 const left = leaving(head, result);
                 const refreshed = async () => ({
-                    there: other === undefined ? null : await advance(other, local, authorized, continuing),
-                    here: await advance(room, local, authorized, continuing),
+                    there: other === undefined ? null : await advanced(other, local, authorized),
+                    here: await advanced(room, local, authorized),
                 });
                 const judged = result.kind === 'conflicted' && other !== undefined ? await refreshed() : null;
                 if (judged !== null && (judged.there !== null || judged.here !== null)) {
@@ -3932,6 +3810,13 @@ export function composeRuntime(options) {
                         (await landedWhole(room.locator, head, confirmedLayer))) ||
                         (result.kind === 'conflicted' &&
                             (await landedWhole(room.locator, head, confirmedLayer, result.affected)));
+                    if (held &&
+                        result.kind === 'conflicted' &&
+                        partner === null &&
+                        !landed(head, confirmedLayer)) {
+                        landedAhead.set(pendingKey(room.locator, head.id), Object.fromEntries([...touchedBy([head])].map((path) => [path, confirmedLayer.revisions[path]])));
+                        return;
+                    }
                     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() });
@@ -3988,8 +3873,10 @@ export function composeRuntime(options) {
             for (const { room, before, queue } of held) {
                 const { locator } = room;
                 lastFenced.set(locator, ++fencings);
-                for (const batch of queue)
+                for (const batch of queue) {
                     pendings.delete(pendingKey(locator, batch.id));
+                    landedAhead.delete(pendingKey(locator, batch.id));
+                }
                 queuesWithoutReplica.delete(locator);
                 if (before !== undefined) {
                     replicas.set(locator, {
@@ -4012,25 +3899,22 @@ export function composeRuntime(options) {
             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),
-                ]);
-            });
+            await roomTask(room.locator, (live) => reload(room, local, progress, live));
             if (signal.aborted)
                 return;
             await rest(progress);
         }
     }
     function awaitingAnswer(locator) {
+        answering.get(locator)?.release();
         let release = () => { };
-        const awaited = new Promise((resolve) => {
+        const answered = new Promise((resolve) => {
             release = resolve;
         });
-        answering.set(locator, { generation, answered: awaited });
+        const awaited = { answered, release };
+        answering.set(locator, awaited);
         return () => {
-            if (answering.get(locator)?.answered === awaited)
+            if (answering.get(locator) === awaited)
                 answering.delete(locator);
             release();
         };
@@ -4042,6 +3926,30 @@ export function composeRuntime(options) {
                 JSON.stringify(held.replica) === JSON.stringify(room.replica) &&
                 JSON.stringify(held.typedSelection) === JSON.stringify(room.typedSelection ?? null)));
     }
+    async function keepNaming(local, room) {
+        const held = replicas.get(room.locator)?.record;
+        if (held === undefined || (held.name === room.name && held.handle === room.handle))
+            return;
+        await exclusive(async () => {
+            if (!continuing())
+                return;
+            const replica = replicas.get(room.locator);
+            if (replica === undefined)
+                return;
+            const record = { ...replica.record, name: room.name, handle: room.handle };
+            await local.commit({
+                rooms: [
+                    {
+                        locator: room.locator,
+                        key: record.key,
+                        record: storedRecord(record),
+                        composed: composedOf(composed(record)),
+                    },
+                ],
+            });
+            replicas.set(room.locator, { ...replica, record });
+        });
+    }
     async function retainModel(local, room, next) {
         const key = room.locator;
         const previous = modelOf(room.locator);
@@ -4057,26 +3965,15 @@ export function composeRuntime(options) {
             const held = replicas.get(room.locator);
             let changed = null;
             if (held !== undefined) {
-                const declared = {
+                const record = {
                     ...held.record,
+                    name: room.name,
+                    handle: room.handle,
                     operations: room.operations,
                     replica: room.replica,
                     typedSelection: room.typedSelection ?? null,
                     model: next,
                 };
-                let read = 'staged';
-                if (!sameMembership(declared, held.record)) {
-                    const verdict = await validatedCollection(walkOf(local, held.record.key, 'confirmed'), lookupOf(local, held.record.key, 'confirmed'), composed(declared));
-                    read =
-                        verdict.verdict !== 'refuse'
-                            ? 'staged'
-                            : verdict.rule === 'model-unavailable'
-                                ? 'deferred'
-                                : { kind: 'refused', refusal: verdict };
-                }
-                const record = read === 'staged'
-                    ? declared
-                    : { ...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);
@@ -4098,16 +3995,6 @@ export function composeRuntime(options) {
                     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);
-                    }
-                }
-                else {
-                    refusedSource(room, read);
-                    declarationRefusals.add(room.locator);
-                }
             }
             heldModel(room, next);
             if (changed === null)
@@ -4152,6 +4039,17 @@ export function composeRuntime(options) {
         emitRooms();
         journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
     }
+    function name(locator) {
+        const stream = options.adapter.roomStream;
+        const record = replicas.get(locator)?.record;
+        const room = discovered.get(locator);
+        if (stream === undefined || record === undefined || room === undefined)
+            return;
+        if (!socketOpen || !handed || record.replica.selection !== room.replica.selection)
+            return;
+        naming += 1;
+        stream.hold([{ locator, roomVersion: record.roomVersion }]);
+    }
     function heldRooms(listed) {
         return listed.flatMap((room) => {
             const record = replicas.get(room.locator)?.record;
@@ -4169,14 +4067,19 @@ export function composeRuntime(options) {
             return outcome?.status === 'fulfilled' && outcome.value;
         });
         if (attempt === 'opened') {
+            naming += 1;
             options.adapter.roomStream?.hold(heldRooms(ready));
             handed = true;
         }
-        discovering?.release();
-        const loaded = await Promise.allSettled(ready
-            .filter((room) => attempt === 'unstreamed' || !replicas.has(room.locator))
-            .map((room) => roomTask(room.locator, (held) => loadRoom(room, local, progress, held))));
-        const failed = [...prepared, ...loaded].find((room) => room.status === 'rejected');
+        for (const room of ready) {
+            if (attempt !== 'unstreamed' && replicas.has(room.locator)) {
+                if (attempt === 'authorized')
+                    name(room.locator);
+                continue;
+            }
+            void roomTask(room.locator, (live) => loadRoom(room, local, progress, live)).then(() => rest(progress));
+        }
+        const failed = prepared.find((room) => room.status === 'rejected');
         if (failed !== undefined)
             throw failed.reason;
     }
@@ -4195,12 +4098,16 @@ export function composeRuntime(options) {
         }
         if (prior !== undefined)
             await retainModel(local, room, modelOf(room.locator));
+        if (prior !== undefined)
+            await keepNaming(local, room);
         if (discoveryPaused || authorization === undefined)
             return false;
         return room.replica.admission === 'admitted';
     }
     async function caughtUp(room, local, progress, live) {
-        if (authorization === undefined || !live() || !behind(room))
+        if (options.adapter.roomStream !== undefined || authorization === undefined)
+            return;
+        if (!live() || !behind(room))
             return;
         const withheld = await advance(room, local, authorization, live);
         if (withheld !== null)
@@ -4213,6 +4120,8 @@ export function composeRuntime(options) {
     async function loadRoom(room, local, progress, live) {
         if (!live() || authorization === undefined)
             return;
+        if (replicas.has(room.locator) && !(await prepareRoom(room, local, progress)))
+            return;
         if (replicas.has(room.locator) && revoked(room.locator)) {
             await reload(room, local, progress, live);
             return;
@@ -4230,20 +4139,53 @@ export function composeRuntime(options) {
                 reloadsDue.delete(room.locator);
             if (!live() || authorization === undefined)
                 return;
+            const from = standingOf(room.locator);
             const bootstrapped = await pullBootstrap(authorization, room, local, live);
             if (bootstrapped.kind !== 'staged') {
                 if (live())
                     await withhold(bootstrapped, room, local, progress);
                 return;
             }
-            await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
+            await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed, from }, live);
             await caughtUp(room, local, progress, live);
         }
         finally {
             caughtUpTo(room.locator);
         }
     }
-    async function discoverRooms(local, progress, attempt, live, scope) {
+    async function asked(authorized) {
+        try {
+            return (await options.adapter.discover?.(authorized)) ?? { kind: 'transport-uncertainty' };
+        }
+        catch {
+            return { kind: 'transport-uncertainty' };
+        }
+    }
+    function malformed(listed) {
+        for (const room of listed) {
+            if (room.operations === undefined ||
+                !['write', 'delete'].every((operation) => Array.isArray(room.operations[operation]) &&
+                    room.operations[operation].every((scope) => typeof scope === 'string')) ||
+                room.replica === undefined ||
+                typeof room.replica.selection !== 'string' ||
+                room.replica.selection.length === 0 ||
+                !['admitted', 'unavailable'].includes(room.replica.admission) ||
+                !['locked', 'open'].includes(room.replica.offline)) {
+                return `invalid model or replica declaration ${room.locator}`;
+            }
+            if (!declaredSelection(room))
+                return `invalid typed selection declaration ${room.locator}`;
+        }
+        return null;
+    }
+    async function signIn(local, signedIn) {
+        if (JSON.stringify(signedIn) === JSON.stringify(member))
+            return;
+        await local.fact('member', signedIn);
+        member = signedIn;
+        emitMember();
+    }
+    async function discoverRooms(local, progress, attempt, live, found) {
         if (closed || authorization === undefined) {
             notifyReady();
             return;
@@ -4251,13 +4193,7 @@ export function composeRuntime(options) {
         moveTo(transferring(status));
         discoveries += 1;
         const started = discoveries;
-        let result;
-        try {
-            result = await options.adapter.discover(authorization, scope);
-        }
-        catch {
-            result = { kind: 'transport-uncertainty' };
-        }
+        const result = found ?? (await asked(authorization));
         if (result.kind === 'discovery')
             roomsNamed = true;
         if (!live()) {
@@ -4267,7 +4203,7 @@ export function composeRuntime(options) {
         }
         journal.record(`connection discover ${result.kind}`);
         if (result.kind === 'transport-uncertainty') {
-            await settleModels([...rooms.values()].map((room) => discovered.get(room.locator) ?? room), 'cached', local);
+            await cachedModels(local);
             progress.reachable = false;
             progress.complete = false;
             notifyReady();
@@ -4288,26 +4224,12 @@ export function composeRuntime(options) {
             notifyReady();
             return;
         }
-        for (const room of result.rooms) {
-            if (room.operations === undefined ||
-                !['write', 'delete'].every((operation) => Array.isArray(room.operations[operation]) &&
-                    room.operations[operation].every((scope) => typeof scope === 'string')) ||
-                room.replica === undefined ||
-                typeof room.replica.selection !== 'string' ||
-                room.replica.selection.length === 0 ||
-                !['admitted', 'unavailable'].includes(room.replica.admission) ||
-                !['locked', 'open'].includes(room.replica.offline)) {
-                journal.record(`invalid model or replica declaration ${room.locator}`);
-                await refuse('missing-required-guarantee');
-                notifyReady();
-                return;
-            }
-            if (!declaredSelection(room)) {
-                journal.record(`invalid typed selection declaration ${room.locator}`);
-                await refuse('missing-required-guarantee');
-                notifyReady();
-                return;
-            }
+        const invalid = malformed(result.rooms);
+        if (invalid !== null) {
+            journal.record(invalid);
+            await refuse('missing-required-guarantee');
+            notifyReady();
+            return;
         }
         if (refusal !== null) {
             refusal = null;
@@ -4322,15 +4244,9 @@ export function composeRuntime(options) {
             limits = result.providerLimits;
             await local.fact('providerLimits', limits);
             await local.fact('capabilities', capabilities);
-            conversations.declared();
-        }
-        const signedIn = result.member ?? null;
-        if (JSON.stringify(signedIn) !== JSON.stringify(member)) {
-            await local.fact('member', signedIn);
-            member = signedIn;
-            emitMember();
         }
-        await synchronize(await applyDiscovery(result.rooms, started, result.covered), local, progress, attempt, live);
+        await signIn(local, result.member ?? null);
+        await synchronize(await applyDiscovery(result.rooms, started), local, progress, attempt, live);
     }
     async function ensureAuthorization() {
         if (authorization !== undefined)
@@ -4345,23 +4261,45 @@ export function composeRuntime(options) {
         }
     }
     async function admittedRead(work) {
-        if (roomReads.generation !== generation) {
-            roomReads = { generation, free: ROOM_READS, waiting: [] };
+        while (roomReads.free === 0) {
+            await new Promise((admit) => roomReads.waiting.push(admit));
         }
-        const reads = roomReads;
-        while (reads.free === 0)
-            await new Promise((admit) => reads.waiting.push(admit));
-        reads.free -= 1;
+        roomReads.free -= 1;
         try {
             await work();
         }
         finally {
-            reads.free += 1;
-            reads.waiting.shift()?.();
+            roomReads.free += 1;
+            roomReads.waiting.shift()?.();
         }
     }
+    function inRoom(locator, work) {
+        roomWork += 1;
+        const ran = (roomLanes.get(locator) ?? Promise.resolve()).then(async () => {
+            try {
+                return await work(continuing);
+            }
+            finally {
+                roomWork -= 1;
+            }
+        });
+        const chain = ran.then(() => undefined, () => undefined);
+        roomLanes.set(locator, chain);
+        working.add(chain);
+        void chain.finally(() => {
+            working.delete(chain);
+            if (roomLanes.get(locator) === chain)
+                roomLanes.delete(locator);
+        });
+        return ran;
+    }
     function roomTask(locator, work) {
-        return task(roomLane(locator), (live) => admittedRead(() => work(live)));
+        if (stopping)
+            return Promise.resolve();
+        return inRoom(locator, (live) => admittedRead(() => work(live))).catch(() => undefined);
+    }
+    function advanced(room, local, authorized) {
+        return inRoom(room.locator, (live) => advance(room, local, authorized, live));
     }
     function task(lane, work) {
         if (stopping)
@@ -4377,23 +4315,19 @@ export function composeRuntime(options) {
         void run.finally(() => working.delete(run));
         return run;
     }
-    function sync(attempt) {
+    function sync(attempt, found) {
         return task(OPENING_LANE, async (live) => {
             if (!live()) {
                 readyFromStore();
                 return;
             }
             const progress = { complete: true, reachable: true };
-            const gate = discover();
-            if (attempt === 'opened')
-                opened = generation;
-            underway = attempt === 'opened' ? { generation, progress } : null;
+            underway = attempt === 'opened' ? progress : null;
             if (attempt === 'opened')
                 streamed = progress;
             complete = false;
             recorded = false;
             moveTo(transferring(status));
-            handed = false;
             try {
                 const local = await openLocal();
                 if (!live())
@@ -4401,7 +4335,7 @@ export function composeRuntime(options) {
                 await ensureAuthorization();
                 if (!live())
                     return;
-                await discoverRooms(local, progress, attempt, live);
+                await discoverRooms(local, progress, attempt, live, found);
             }
             catch {
                 progress.complete = false;
@@ -4409,7 +4343,6 @@ export function composeRuntime(options) {
                     progress.reachable = false;
             }
             finally {
-                gate.release();
                 notifyReady();
             }
             if (!live())
@@ -4421,35 +4354,59 @@ export function composeRuntime(options) {
             if (handed || closed || progress.reachable)
                 return;
             underway = null;
-            opened = null;
-            journal.record('connection reopen');
             await rest(progress, live);
-            options.adapter.roomStream?.reopen();
         });
     }
-    function rediscover(scope) {
+    function resynchronize() {
         return task(OPENING_LANE, async (live) => {
-            if (!live() || !socketOpen)
+            if (!live() || !announced)
                 return;
             const progress = { complete: true, reachable: true };
-            const gate = discover();
             moveTo(transferring(status));
             try {
                 const local = await openLocal();
                 if (!live())
                     return;
-                await ensureAuthorization();
+                await synchronize([...discovered.values()], local, progress, 'unstreamed', live);
+            }
+            catch {
+                progress.complete = false;
+            }
+            if (live())
+                await finishOpening(progress, live);
+        });
+    }
+    function countAuthorityChange() {
+        authorityChanges += 1;
+        for (const listener of authorityChangeListeners)
+            listener(authorityChanges);
+    }
+    function changeAuthority(change) {
+        return task(OPENING_LANE, async (live) => {
+            if (!live() || !announced)
+                return;
+            countAuthorityChange();
+            const progress = { complete: true, reachable: true };
+            moveTo(transferring(status));
+            try {
+                const local = await openLocal();
                 if (!live())
                     return;
-                await discoverRooms(local, progress, 'authorized', live, scope);
+                const invalid = malformed(change.rooms);
+                if (invalid !== null) {
+                    journal.record(invalid);
+                    await refuse('missing-required-guarantee');
+                    return;
+                }
+                if (change.member !== undefined)
+                    await signIn(local, change.member);
+                discoveries += 1;
+                const listed = await applyDiscovery(change.rooms, discoveries, change.left);
+                await synchronize(listed, local, progress, 'authorized', live);
             }
             catch {
                 progress.complete = false;
             }
-            finally {
-                gate.release();
-                notifyReady();
-            }
             if (!live())
                 return;
             if (!progress.complete)
@@ -4457,15 +4414,17 @@ export function composeRuntime(options) {
             await rest(progress, live);
         });
     }
-    function closedSocket(revoked, lost) {
-        notifyDiscovered();
-        const opened = socketOpen;
+    function closedSocket(revoked, lost, authorityChanged) {
+        notifyReady();
+        const opened = announced;
         socketOpen = false;
+        announced = false;
+        missedChange ||= authorityChanged;
+        handed = false;
+        naming = 0;
         connectionLost();
-        if (lost) {
-            reads.lost();
+        if (lost)
             conversations.lost();
-        }
         if (revoked) {
             void refuse('revoked-authorization');
             return;
@@ -4476,18 +4435,32 @@ export function composeRuntime(options) {
         moveTo({
             ...status,
             state: status.state === 'synced' ? 'syncing' : status.state,
-            providerUnreachable: status.providerUnreachable || !opened,
+            providerUnreachable: status.providerUnreachable || (!opened && lost),
         });
+        void closing(opened);
     }
-    function applyOpening(expired) {
-        const progress = underway?.generation === generation ? underway.progress : null;
+    function closing(opened) {
+        return task(OPENING_LANE, async (live) => {
+            if (!live())
+                return;
+            const local = await openLocal();
+            if (!opened && !socketOpen)
+                await cachedModels(local);
+            await rest(null, live);
+        });
+    }
+    function cachedModels(local) {
+        return settleModels([...rooms.values()].map((room) => discovered.get(room.locator) ?? room), 'cached', local);
+    }
+    function caughtUpRooms(expired) {
+        const progress = underway;
+        underway = null;
+        naming = Math.max(0, naming - 1);
         const cycle = progress ?? { complete: true, reachable: true };
-        if (opened === generation)
-            opened = null;
+        replaced(expired);
         const reloading = progress === null ? [] : owedReloads(expired);
         const replacing = reloadNow((room) => expired.includes(room.locator) || reloading.includes(room.locator), cycle);
         return task(OPENING_LANE, async (live) => {
-            underway = null;
             if (!live())
                 return;
             if (progress === null) {
@@ -4495,20 +4468,14 @@ export function composeRuntime(options) {
                 await rest(cycle, live);
                 return;
             }
-            await roomsCarried([...expired, ...reloading]);
-            if (!live())
-                return;
             try {
                 const local = await openLocal();
-                const reloaded = await replacing;
+                await replacing;
                 if (progress.reachable) {
                     await settleModels([...discovered.values()].filter((room) => replicas.has(room.locator) &&
                         !expired.includes(room.locator) &&
                         !reloading.includes(room.locator)), 'current', local);
                 }
-                const failed = reloaded.find((outcome) => outcome.status === 'rejected');
-                if (failed !== undefined)
-                    throw failed.reason;
             }
             catch {
                 progress.complete = false;
@@ -4520,11 +4487,8 @@ export function composeRuntime(options) {
     }
     function owedReloads(expired) {
         const reloading = [...discovered.values()]
-            .filter((room) => replicas.has(room.locator) &&
-            !expired.includes(room.locator) &&
-            (owed.has(room.locator) || revoked(room.locator)))
+            .filter((room) => replicas.has(room.locator) && !expired.includes(room.locator) && revoked(room.locator))
             .map((room) => room.locator);
-        owed.clear();
         for (const locator of reloading)
             catching.add(locator);
         liveQueries.recover();
@@ -4533,16 +4497,17 @@ export function composeRuntime(options) {
     async function reloadNow(replaced, progress) {
         const reloaded = [...discovered.values()].filter((room) => replicas.has(room.locator) && replaced(room));
         for (const room of reloaded)
-            reloadsDue.set(room.locator, generation);
+            reloadsDue.add(room.locator);
         try {
             const local = await openLocal();
-            return await Promise.allSettled(reloaded.map((room) => roomTask(room.locator, (live) => reload(room, local, progress, live))));
+            for (const room of reloaded) {
+                void roomTask(room.locator, (live) => reload(room, local, progress, live)).then(() => rest(progress));
+            }
         }
         catch {
             for (const room of reloaded)
                 reloadsDue.delete(room.locator);
             progress.reachable = false;
-            return [];
         }
     }
     async function settleModels(held, status, local) {
@@ -4553,7 +4518,7 @@ export function composeRuntime(options) {
         const settled = await exclusive(async () => {
             if (!continuing())
                 return [];
-            const unchanged = held.filter((room) => owed(room) && !declarationRefusals.has(room.locator) && declaredAsHeld(room));
+            const unchanged = held.filter((room) => owed(room) && declaredAsHeld(room));
             for (const room of unchanged) {
                 const next = { ...modelOf(room.locator), status };
                 const replica = replicas.get(room.locator);
@@ -4613,14 +4578,10 @@ export function composeRuntime(options) {
         try {
             const local = await openLocal();
             await roomTask(locator, async (live) => {
-                const current = () => live() && !signal.aborted;
-                if (!current() || authorization === undefined)
+                if (!live() || authorization === undefined)
                     return;
-                const withheld = await Promise.race([
-                    advance(room, local, authorization, current),
-                    abandonedOn(signal),
-                ]);
-                if (withheld !== null && current())
+                const withheld = await advance(room, local, authorization, live);
+                if (withheld !== null && live())
                     await withhold(withheld, room, local, progress);
             });
         }
@@ -4675,7 +4636,6 @@ export function composeRuntime(options) {
                 progress.complete = false;
                 return;
             }
-            reads.applied();
             submitAll();
             for (const locator of stale)
                 if (repairable.has(locator))
@@ -4706,7 +4666,7 @@ export function composeRuntime(options) {
         if (!live())
             return;
         let lastCompleted = status.lastCompleted;
-        let synced = complete && stale.size === 0 && !pending();
+        let synced = complete && roomWork === 0 && naming === 0 && stale.size === 0 && !pending();
         if (synced && !recorded) {
             const completedAt = new Date().toISOString();
             try {
@@ -4721,75 +4681,78 @@ export function composeRuntime(options) {
             }
         }
         moveTo({
-            state: pending() ? 'pending' : synced && complete ? 'synced' : 'syncing',
+            state: pending()
+                ? 'pending'
+                : synced && complete && roomWork === 0 && naming === 0
+                    ? 'synced'
+                    : 'syncing',
             lastCompleted,
-            providerUnreachable: !progress.reachable,
+            providerUnreachable: progress === null ? status.providerUnreachable : !progress.reachable,
             ...attention(),
         });
     }
-    function discover() {
-        let release = () => { };
-        const done = new Promise((resolve) => {
-            release = resolve;
-        });
-        discovering = { generation, done, release };
-        return discovering;
-    }
-    function applyRoom(locator, roomVersion) {
-        announced.set(locator, roomVersion);
-        return task(roomLane(locator), async (live) => {
-            if (discovering?.generation === generation)
-                await discovering.done;
-            const saving = answering.get(locator);
-            if (saving?.generation === generation)
-                await saving.answered;
-            if (!live() || authorization === undefined)
-                return;
-            const room = discovered.get(locator);
-            const held = replicas.get(locator);
-            if (room === undefined || room.replica.admission !== 'admitted')
-                return;
-            if (held !== undefined &&
-                (held.record.replica.selection !== room.replica.selection ||
-                    options.adapter.reached(locator, held.record.roomVersion, roomVersion))) {
-                return;
-            }
-            const during = underway?.generation === generation ? underway.progress : null;
-            const progress = during ?? { complete: true, reachable: true };
-            if (during === null)
-                moveTo(transferring(status));
+    function applyRoom(change) {
+        const { locator } = change;
+        if (stopping)
+            return Promise.resolve();
+        return inRoom(locator, async (live) => {
+            await answering.get(locator)?.answered;
+            const progress = underway ?? { complete: true, reachable: true };
             try {
                 const local = await openLocal();
-                await admittedRead(async () => {
-                    if (!live() || authorization === undefined)
-                        return;
-                    const withheld = await advance(room, local, authorization, live);
-                    if (withheld !== null)
-                        await withhold(withheld, room, local, progress);
-                });
+                for (;;) {
+                    if (!live())
+                        return null;
+                    const room = discovered.get(locator);
+                    const held = replicas.get(locator);
+                    if (room === undefined ||
+                        held === undefined ||
+                        room.replica.admission !== 'admitted' ||
+                        held.record.replica.selection !== room.replica.selection) {
+                        return null;
+                    }
+                    const at = held.record.roomVersion;
+                    if (options.adapter.reached(locator, at, change.roomVersion))
+                        return progress;
+                    if (!options.adapter.reached(locator, at, change.from)) {
+                        name(locator);
+                        return progress;
+                    }
+                    if (underway === null)
+                        moveTo(transferring(status));
+                    const writing = () => live() && !full;
+                    let outlined = false;
+                    const refreshed = await ahead((hold) => pullRefresh(authorization ?? {}, held, writing, hold, async () => {
+                        const page = await change.read();
+                        const paths = Object.keys(page.outlines ?? {});
+                        outlined = paths.length > 0;
+                        await local.remember(locator, held.record.key, paths);
+                        return page;
+                    }));
+                    if (refreshed.kind !== 'advanced')
+                        return progress;
+                    const landing = {
+                        kind: 'refreshed',
+                        from: refreshed.from,
+                        remodelled: refreshed.remodelled,
+                    };
+                    if (await publish(local, room, refreshed.record, landing, writing)) {
+                        stale.delete(locator);
+                        await retainModel(local, room, modelOf(locator));
+                        if (outlined)
+                            void heldAgain(locator);
+                        return progress;
+                    }
+                }
             }
             catch {
+                if (!stale.has(locator))
+                    name(locator);
                 stale.add(locator);
+                return progress;
             }
-            finally {
-                if (during === null)
-                    await rest(progress, live);
-            }
-        });
+        }).then((progress) => rest(progress), () => undefined);
     }
-    function roomsCarried(replacing) {
-        const replaced = new Set(replacing.map(roomLane));
-        return Promise.all([...lanes]
-            .filter(([lane, held]) => lane !== OPENING_LANE && !replaced.has(lane) && held.generation === generation)
-            .map(([, held]) => held.chain));
-    }
-    const receipts = {
-        heads: async () => (await openLocal()).receivedHeads(),
-        parts: async (key, count) => (await openLocal()).receivedParts(key, count),
-        keep: async (key, head, part) => (await openLocal()).keepReceived(key, head, part),
-        drop: async (keys) => (await openLocal()).dropReceived(keys),
-        ahead,
-    };
     function observeStream() {
         const stream = options.adapter.roomStream;
         if (stream === undefined || withdrawStream !== undefined)
@@ -4799,31 +4762,35 @@ export function composeRuntime(options) {
                 return;
             if (event.kind === 'opened') {
                 socketOpen = true;
+                announced = false;
+                handed = false;
+                naming = 0;
                 connectionLive();
                 generation += 1;
-                for (const admit of installWaiters.splice(0))
-                    admit();
-                reads.opened();
                 conversations.reopened();
                 recovery.resume();
-                void sync('opened');
+            }
+            else if (event.kind === 'discovered') {
+                if (!socketOpen)
+                    return;
+                announced = true;
+                if (missedChange) {
+                    missedChange = false;
+                    countAuthorityChange();
+                }
+                void sync('opened', event.discovery);
+                for (const locator of replicas.keys())
+                    void heldAgain(locator);
             }
             else if (event.kind === 'closed')
-                closedSocket(event.revoked, event.lost);
-            else if (event.kind === 'opening')
-                void applyOpening(event.expired);
+                closedSocket(event.revoked, event.lost, event.authorityChanged);
+            else if (event.kind === 'caught-up')
+                void caughtUpRooms(event.expired);
             else if (event.kind === 'authority-changed')
-                void rediscover(event.scope);
+                void changeAuthority(event);
             else
-                void applyRoom(event.locator, event.roomVersion);
-        }, receipts, heldRevisions);
-    }
-    async function heldRevisions(locator, paths) {
-        const held = replicas.get(locator);
-        if (held === undefined || paths.length === 0)
-            return new Map();
-        const entries = await ahead(async () => (await openLocal()).entries(held.record.key, 'confirmed', paths));
-        return new Map(entries.flatMap(({ path, revision }) => revision === null ? [] : [[path, revision]]));
+                void applyRoom(event);
+        });
     }
     function writesHeld() {
         return serviceMode === 'write-halted' || haltedRefusal;
@@ -4896,8 +4863,6 @@ export function composeRuntime(options) {
         notifyDiscovered();
         if (probing !== null)
             clearInterval(probing);
-        for (const resolve of shownWaiters.splice(0))
-            resolve();
         connectionLive();
         lockListeners.clear();
         readinessWatches.clear();
@@ -4915,6 +4880,7 @@ export function composeRuntime(options) {
         statusListeners.clear();
         serviceModeListeners.clear();
         memberListeners.clear();
+        authorityChangeListeners.clear();
         liveQueries.close();
         queueSubscriptions.clear();
         roomDraftListeners.clear();
@@ -4922,6 +4888,7 @@ export function composeRuntime(options) {
     }
     async function stop() {
         stopping = true;
+        inFlight.abort();
         await recovery.retire();
         await Promise.all(working);
         await mutations;
@@ -4940,15 +4907,15 @@ export function composeRuntime(options) {
         readyFromStore();
     });
     if (options.adapter.roomStream === undefined)
-        void sync('unstreamed');
+        void sync('unstreamed', null);
     function planned(input, reach) {
-        const plan = planOf(input, roomFacts(reach), planReach(reach));
+        const plan = planWithin(input, roomFacts(reach), planReach(reach));
         const named = plan.paths !== null &&
             plan.rooms !== null &&
             plan.paths.length * plan.rooms.length <= MAXIMUM_WINDOW;
         return plan.limit === null && named ? plan : { ...plan, limit: capped(plan.limit) };
     }
-    function watchPlan(plan, deliver) {
+    function watchPlan(plan, deliver, fail) {
         let seeded = false;
         let pending = true;
         const shown = () => {
@@ -4974,7 +4941,7 @@ export function composeRuntime(options) {
             }
             seeded = false;
             deliver(message);
-        });
+        }, fail);
         return () => {
             watchers.delete(shown);
             if (watchers.size === 0)
@@ -4982,61 +4949,59 @@ export function composeRuntime(options) {
             stop();
         };
     }
-    async function searched(input, reach, locked) {
+    async function searched(input, reach) {
         const asked = searchPlanOf(input);
-        const filter = {
-            ...filterOf(asked.documents ?? {}, roomFacts(reach), planReach(reach)),
-            locked,
-        };
-        const unlocking = (filter.rooms ?? [])
-            .filter((room) => locked.includes(room))
-            .map((room) => ({ room, awaits: 'unlock' }));
-        for (;;) {
-            const cover = covered(filter);
-            awaitPreparation(cover);
-            const pending = [...unlocking, ...('pending' in cover ? cover.pending : [])];
-            const complete = pending.length === 0 && !('pending' in cover);
-            const awaited = new Set('pending' in cover ? cover.pending.map(({ room }) => room) : []);
-            const answering = complete
-                ? filter
-                : { ...filter, rooms: reachedRooms(filter).filter((room) => !awaited.has(room)) };
-            const answered = covered(answering);
-            if ('pending' in answered)
-                continue;
-            const listed = conversations.searchable();
-            const named = reach !== null && !reach.conversations
-                ? []
-                : (asked.conversations ?? listed).filter((one) => listed.includes(one) && conversations.acquired(one));
-            const hits = await (await openLocal()).search({
-                text: asked.text,
-                limit: capped(asked.limit),
-                after: asked.after,
-                total: asked.total,
-                documents: {
-                    plan: answering,
-                    rooms: answered.rooms,
-                    beneath: asked.collection
-                        ? answered.rooms.map(({ locator, key }) => ({
-                            key,
-                            roots: replicas.get(locator)?.record.typedSelection?.roots ?? [],
-                        }))
-                        : [],
-                },
-                conversations: named,
-            });
-            if (JSON.stringify(covered(answering)) !== JSON.stringify(answered))
-                continue;
-            const coverage = {
-                rooms: answered.coverage.rooms,
-                conversations: named,
-                overlay: answered.coverage.overlay,
+        await ready;
+        const search = options.adapter.search;
+        if (search === undefined) {
+            return {
+                kind: 'undeclared',
+                code: 'action-undeclared',
+                fields: { name: 'search' },
+                retryable: false,
+            };
+        }
+        if (closed || refusal !== null || connectionOf() !== 'connected')
+            return OFFLINE;
+        const reached = reach === null ? null : new Set(reach.rooms);
+        const named = asked.rooms === null
+            ? reached === null
+                ? null
+                : [...reached]
+            : asked.rooms.filter((room) => reached === null || reached.has(room));
+        const rooms = named === null ? null : named.filter((room) => replicas.has(room)).sort();
+        if (rooms !== null && rooms.length === 0)
+            return { kind: 'found', documents: [] };
+        try {
+            await ensureAuthorization();
+        }
+        catch {
+            return UNCERTAIN;
+        }
+        if (closed || authorization === undefined || refusal !== null)
+            return UNCERTAIN;
+        journal.record('transfer search');
+        try {
+            const result = await search(authorization, { text: asked.text, rooms });
+            if (result.kind === 'revoked-authorization')
+                await refuse('revoked-authorization');
+            journal.record(`outcome search ${result.kind}`);
+            if (result.kind === 'rejected')
+                return result;
+            if (result.kind !== 'found')
+                return failure(result);
+            const kept = rooms === null ? null : new Set(rooms);
+            return {
+                kind: 'found',
+                documents: result.documents.filter((hit) => kept === null || kept.has(hit.room)),
             };
-            return complete
-                ? { ...hits, coverage }
-                : { pending, documents: hits.documents, messages: hits.messages, coverage };
+        }
+        catch {
+            journal.record('outcome search transport-uncertainty');
+            return UNCERTAIN;
         }
     }
-    const watch = (topic, input, deliver) => {
+    const watch = (topic, input, deliver, fail) => {
         if (topic === 'room-drafts') {
             const listener = { notify: deliver, ready: false };
             roomDraftListeners.add(listener);
@@ -5085,7 +5050,7 @@ export function composeRuntime(options) {
             };
         }
         if (topic === 'readiness') {
-            return watchReadiness({ target: '', code: 'stored', space: null, search: 'unused' }, null, deliver);
+            return watchReadiness({ target: '', code: 'stored' }, null, deliver);
         }
         if (topic === 'rooms') {
             unlistedRooms.add(deliver);
@@ -5130,6 +5095,13 @@ export function composeRuntime(options) {
                 memberListeners.delete(deliver);
             };
         }
+        if (topic === 'authority-changes') {
+            authorityChangeListeners.add(deliver);
+            deliver(authorityChanges);
+            return () => {
+                authorityChangeListeners.delete(deliver);
+            };
+        }
         if (topic === 'queue') {
             const queue = { locator: input[0], notify: deliver };
             queueSubscriptions.add(queue);
@@ -5138,7 +5110,7 @@ export function composeRuntime(options) {
                 queueSubscriptions.delete(queue);
             };
         }
-        return watchPlan(planned(input[0], null), deliver);
+        return watchPlan(planned(input[0], null), deliver, fail);
     };
     const md = {
         loaded() {
@@ -5158,7 +5130,7 @@ export function composeRuntime(options) {
             });
         },
         query: ((input) => rowsQuery(planned(input, null))),
-        search: (input) => searched(input, null, []),
+        search: (input) => searched(input, null),
         types(locator) {
             return {
                 collection: modelTypes(modelOf(locator)),
@@ -5283,7 +5255,7 @@ export function composeRuntime(options) {
             authorization = undefined;
             discoveryPaused = false;
             if (options.adapter.roomStream === undefined)
-                await sync('unstreamed');
+                await sync('unstreamed', null);
             else
                 await task(OPENING_LANE, ensureAuthorization);
         },
@@ -5306,7 +5278,6 @@ export function composeRuntime(options) {
         md,
         seed,
         stop,
-        lose: loseRooms,
         watch,
         persisted(answer) {
             if (answer === persistence)
@@ -5315,7 +5286,6 @@ export function composeRuntime(options) {
             journal.record(`persistence ${answer}`);
             queueReadiness();
         },
-        shown: screen,
         within: (reach, port) => {
             if (full)
                 void probed();