@agentshouse/mdruntime 0.1.0-ca9afacd5aebd → 0.1.0-cb0eb0d87ff49

package/dist/connection.js

@@ -6,21 +6,25 @@ import { createReadSide } from './read-side.js';
 import { markdownPath, roomOfKey } from './rows.js';
 import { createSearchIndex, searchPlanOf, } from './search.js';
 import { bootstrapRoom } from './bootstrap.js';
-import { changeSet, mergeChangeSets } from './change-set.js';
+import { changeSet, entering, mergeChangeSets } from './change-set.js';
 import { createConversationStore, } from './conversation.js';
 import { queuedFile } from './change.js';
-import { validRoot } from './collection.js';
+import { indexReferrers, referencesIndexed, validRoot, } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
 import { binaryRecord } from './binary.js';
-import { absentBinary, binaryAnswer, calledResult, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
+import { absentBinary, binaryAnswer, calledResult, failure, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
+import { createRecovery } from './recovery.js';
 import { refreshRoom } from './refresh.js';
 import { buildBatch, joined, limitedIn, requeued } from './save.js';
 import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicaOf, sameMembership, withdrawals, } from './replica.js';
 import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration } from './durability.js';
-import { roomDraftRevision } from './identity.js';
+import { FencedMap } from './fence.js';
+import { tally } from './shared.js';
+import { inChunks, ROW_WEIGHT, yielded } from './turn.js';
+import { identityTime, roomDraftRevision } from './identity.js';
 import { beneath, normalize } from './paths.js';
 import { openRuntimeStore, } from './store.js';
 import { unconfirmed } from './transfer.js';
@@ -38,23 +42,59 @@ function declaredSelection(room) {
         root !== '' &&
         selection.roots.every((other, at) => at === index || !within(other, root)));
 }
+const OPENING_LANE = 'opening';
+const CONVERSATION_LANE = 'conversations';
+const ROOM_READS = 256;
+const ROOM_ATTEMPTS = 16;
+const outside = new Map();
+function outsideOf(roots) {
+    const key = JSON.stringify(roots);
+    const held = outside.get(key);
+    if (held !== undefined)
+        return held;
+    const counted = (path) => (roots.some((root) => beneath(root, path)) ? 0 : 1);
+    const made = {
+        documents: (path) => (markdownPath(path) ? counted(path) : 0),
+        binaries: counted,
+    };
+    outside.set(key, made);
+    return made;
+}
+function abandonedOn(signal) {
+    return new Promise((resolve) => {
+        if (signal.aborted)
+            resolve(null);
+        else
+            signal.addEventListener('abort', () => resolve(null), { once: true });
+    });
+}
+function roomLane(locator) {
+    return `room ${locator}`;
+}
 export function composeRuntime(options) {
     const localSaves = options.adapter.localSaves === true;
     let authorization = options.authorization;
     let opening;
     let store;
-    const replicas = new Map();
-    const queuesWithoutReplica = new Map();
+    const fences = new Map();
+    const isFenced = (locator) => fences.has(locator);
+    let fencings = 0;
+    const lastFenced = new Map();
+    const fencedSince = (locator, since) => fences.has(locator) || (lastFenced.get(locator) ?? 0) > since;
+    let discoveries = 0;
+    const replicas = new FencedMap(isFenced);
+    const queuesWithoutReplica = new FencedMap(isFenced);
     const pendings = new Map();
-    const roomDrafts = new Map();
+    const roomDrafts = new FencedMap(isFenced);
     const presentations = new Map();
     let limits = [];
     let capabilities = [];
-    const rooms = new Map();
+    const rooms = new FencedMap(isFenced);
     const counted = new Map();
     const unreadable = new Set();
-    const models = new Map();
-    const liveModels = new Map();
+    const isModelFenced = (key) => isFenced(key.slice(key.indexOf(' ') + 1));
+    const models = new FencedMap(isModelFenced);
+    const liveModels = new FencedMap(isModelFenced);
     const invalidModels = new Set();
     const discovered = new Map();
     let roomsListed = false;
@@ -84,7 +124,6 @@ export function composeRuntime(options) {
     let status = STARTING;
     let shown = STARTING;
     let discoveryPaused = false;
-    let resetTimer;
     let closed = false;
     let stopping = false;
     let withdrawStream;
@@ -92,12 +131,21 @@ export function composeRuntime(options) {
     let underway = null;
     let streamed = null;
     let handed = false;
-    const submitting = new Map();
+    const recovery = (options.recovery ?? createRecovery()).scope(ROOM_ATTEMPTS);
+    const repairing = new Set();
+    const repairable = new Map();
+    let outcomeRetention = null;
     const answering = new Map();
     let complete = false;
     let recorded = false;
     const stale = new Set();
-    let chain = Promise.resolve();
+    let generation = 0;
+    let discovering = null;
+    let opened = null;
+    const owed = new Set();
+    const lanes = new Map();
+    let roomReads = { generation, free: ROOM_READS, waiting: [] };
+    const working = new Set();
     let mutations = Promise.resolve();
     const roomListeners = new Set();
     const refusalListeners = new Set();
@@ -108,7 +156,7 @@ export function composeRuntime(options) {
     const presentationListeners = new Set();
     const readSide = createReadSide();
     let withdrawConversations;
-    let currencyQueued = false;
+    let currencyQueued = null;
     let socketOpen = false;
     let serviceMode = 'open';
     let haltedRefusal = false;
@@ -116,24 +164,31 @@ export function composeRuntime(options) {
     const serviceModeListeners = new Set();
     let member = null;
     const memberListeners = new Set();
-    const materialized = new Set();
-    let everyRoom = false;
-    const transfers = new Map();
+    const prepared = new Set();
+    const projecting = new Set();
+    const demanded = new Set();
+    let preparing = false;
+    const catching = new Set();
+    const transfers = new FencedMap(isFenced);
     const conversations = createConversationStore({
         agents: declaredAgents,
-        documents: (locator) => rowsQuery(planOf({ rooms: [locator], select: 'all' }, roomFacts())),
+        documents: ({ locator }) => rowsQuery(planOf({ rooms: [locator], select: { fields: 'all' } }, roomFacts())),
         call: (name, input) => invokeAction(name, input),
         durably,
         stream: () => options.adapter.conversations,
         publish: publishChangeSet,
+        online: () => !status.providerUnreachable && refusal === null,
         closed: () => closed,
+        unanswered: resendLater,
+        expired: (operation) => pastHorizon(operation),
     });
     const searchIndex = createSearchIndex({
-        documents: () => readSide.documents(),
+        room: (room) => readSide.room(room),
         document: (room, path) => readSide.document(room, path),
-        messages: () => conversations.messages(),
-        message: (conversation, identity) => conversations.message(conversation, identity),
     });
+    const roomsToIndex = new Set();
+    const conversationsToIndex = new Set();
+    let indexing = false;
     const journal = createLog();
     let notifyReady = () => { };
     const ready = new Promise((resolve) => {
@@ -233,12 +288,9 @@ export function composeRuntime(options) {
         if (replica === undefined)
             return 0;
         const roots = replica.confirmed.record.typedSelection?.roots ?? [];
-        let count = 0;
-        for (const path of Object.keys(replica.visible.documents)) {
-            if (markdownPath(path) && !roots.some((root) => beneath(root, path)))
-                count += 1;
-        }
-        return count;
+        const weighed = outsideOf(roots);
+        return (tally(replica.visible.documents, weighed.documents) +
+            tally(replica.visible.binaries, weighed.binaries));
     }
     function listed() {
         return structuredClone([...rooms.values()].map((room) => {
@@ -265,6 +317,7 @@ export function composeRuntime(options) {
         return { listed: roomsListed, rooms: held };
     }
     function emitRooms() {
+        readSide.recover();
         const value = listed();
         for (const listener of roomListeners)
             listener(value);
@@ -319,42 +372,186 @@ export function composeRuntime(options) {
         }
     }
     function applyChangeSet(set) {
-        const held = everyRoom
-            ? set
-            : { ...set, documents: set.documents.filter(({ locator }) => materialized.has(locator)) };
+        const held = {
+            ...set,
+            documents: set.documents.filter(({ locator }) => prepared.has(locator) || projecting.has(locator)),
+        };
         readSide.apply(held);
         searchIndex.changed(held);
     }
-    function materialize(locators) {
-        if (everyRoom)
+    async function referenced(locator) {
+        for (;;) {
+            const record = replicas.get(locator)?.confirmed.record;
+            if (record === undefined || closed)
+                return;
+            const held = { text: record.documents, binaries: record.binaries };
+            const composition = compositionOf(record);
+            if (referencesIndexed(held, composition))
+                return;
+            await indexReferrers(held, composition);
+        }
+    }
+    async function prepareReplica(locator) {
+        await referenced(locator);
+        const replica = replicas.get(locator);
+        if (replica === undefined || closed || prepared.has(locator))
             return;
-        if (locators === null)
-            everyRoom = true;
-        const sets = [];
-        for (const locator of locators ?? [...replicas.keys()]) {
-            if (materialized.has(locator))
-                continue;
-            materialized.add(locator);
-            const replica = replicas.get(locator);
-            if (replica !== undefined)
-                sets.push(changeSet(locator, null, replica));
+        const visible = replica.visible;
+        const paths = [
+            ...new Set([...Object.keys(visible.documents), ...Object.keys(visible.binaries)]),
+        ];
+        const entered = [];
+        projecting.add(locator);
+        try {
+            await inChunks(paths, (path) => ROW_WEIGHT + (visible.documents[path]?.length ?? 0), (chunk) => {
+                const current = replicas.get(locator);
+                if (current === undefined || closed)
+                    return;
+                const set = entering(locator, current, chunk);
+                readSide.apply(set);
+                entered.push(set);
+            });
+            if (!replicas.has(locator) || closed)
+                return;
+            prepared.add(locator);
         }
-        if (sets.length === 0)
+        finally {
+            projecting.delete(locator);
+        }
+        conversations.changed(mergeChangeSets(entered));
+        readSide.recover();
+    }
+    function unprepared() {
+        return [...demanded, ...replicas.keys()].find((locator) => !prepared.has(locator));
+    }
+    function prepare(locators = []) {
+        for (const locator of locators)
+            demanded.add(locator);
+        if (preparing)
             return;
-        const set = mergeChangeSets(sets);
-        readSide.apply(set);
-        searchIndex.changed(set);
+        preparing = true;
+        void (async () => {
+            try {
+                for (let waiting = unprepared(); waiting !== undefined; waiting = unprepared()) {
+                    await yielded();
+                    if (closed)
+                        return;
+                    demanded.delete(waiting);
+                    await prepareReplica(waiting);
+                }
+            }
+            finally {
+                preparing = false;
+            }
+        })();
     }
     function reachedRooms(plan) {
-        if (plan.rooms !== null)
-            return plan.rooms;
-        if (plan.reach === null)
-            return null;
-        return [...plan.reach.rooms, ...plan.reach.documents.map(roomOfKey)];
+        const reach = plan.reach;
+        const reached = reach === null ? null : new Set([...reach.rooms, ...reach.documents.map(roomOfKey)]);
+        const named = plan.rooms ??
+            (reached === null
+                ? [...new Set([...rooms.keys(), ...replicas.keys(), ...queuesWithoutReplica.keys()])]
+                : [...reached]);
+        return [...new Set(named)].filter((locator) => reached === null || reached.has(locator)).sort();
+    }
+    function awaited(locator) {
+        return rooms.has(locator) || !roomsListed;
+    }
+    function covered(plan) {
+        const locators = reachedRooms(plan);
+        if (locators.length === 0 && plan.rooms === null && plan.reach === null && !roomsListed) {
+            return { pending: [] };
+        }
+        const pending = [];
+        const coverage = [];
+        const overlay = [];
+        for (const locator of locators) {
+            const replica = replicas.get(locator);
+            if (replica === undefined) {
+                if (awaited(locator))
+                    pending.push({ room: locator, awaits: 'acquisition' });
+                continue;
+            }
+            if (!prepared.has(locator)) {
+                pending.push({ room: locator, awaits: 'preparation' });
+                continue;
+            }
+            coverage.push({
+                room: locator,
+                generation: replica.confirmed.record.transfer,
+                current: !(catching.has(locator) || owed.has(locator) || transfers.has(locator)),
+            });
+            for (const batch of replica.queue)
+                overlay.push(batch.id);
+        }
+        if (pending.length > 0)
+            return { pending };
+        return { coverage: { rooms: coverage, indexes: [], overlay } };
     }
-    function rowsQuery(plan) {
-        materialize(reachedRooms(plan));
-        return readSide.query(plan);
+    function awaitPreparation(cover) {
+        if (!('pending' in cover))
+            return;
+        const waiting = cover.pending.filter(({ awaits }) => awaits === 'preparation');
+        if (waiting.length > 0)
+            prepare(waiting.map(({ room }) => room));
+    }
+    async function rowsQuery(plan) {
+        const before = covered(plan);
+        awaitPreparation(before);
+        if ('pending' in before)
+            return before;
+        const { rows, at: cover } = await readSide.query(plan, () => covered(plan));
+        awaitPreparation(cover);
+        if ('pending' in cover)
+            return cover;
+        return 'groups' in rows
+            ? { groups: rows.groups, coverage: cover.coverage }
+            : { documents: rows.documents, coverage: cover.coverage };
+    }
+    async function indexConversation(conversation) {
+        searchIndex.indexMessages(conversation, [], false);
+        let after = null;
+        for (;;) {
+            const batch = await durably((local) => local.messagesAfter(conversation, after));
+            if (closed)
+                return;
+            searchIndex.indexMessages(conversation, batch.map(({ identity, text }) => ({ conversation, identity, text })), batch.length === 0);
+            if (batch.length === 0)
+                return;
+            after = batch[batch.length - 1].identity;
+        }
+    }
+    function indexNext() {
+        const room = [...roomsToIndex].find((locator) => !searchIndex.rooms().has(locator));
+        if (room !== undefined) {
+            roomsToIndex.delete(room);
+            return () => (prepared.has(room) ? searchIndex.indexRoom(room) : undefined);
+        }
+        const conversation = [...conversationsToIndex].find((one) => !searchIndex.conversations().has(one));
+        if (conversation === undefined)
+            return null;
+        conversationsToIndex.delete(conversation);
+        return () => indexConversation(conversation);
+    }
+    function index(rooms, named) {
+        for (const room of rooms)
+            roomsToIndex.add(room);
+        for (const conversation of named)
+            conversationsToIndex.add(conversation);
+        if (indexing)
+            return;
+        indexing = true;
+        void (async () => {
+            try {
+                for (let unit = indexNext(); unit !== null && !closed; unit = indexNext()) {
+                    await yielded();
+                    await unit();
+                }
+            }
+            finally {
+                indexing = false;
+            }
+        })().catch(() => { });
     }
     function publishChangeSet(set) {
         applyChangeSet(set);
@@ -371,34 +568,7 @@ export function composeRuntime(options) {
             emitPresentation(app);
         conversations.changed(set);
     }
-    function stopTimer() {
-        if (resetTimer === undefined)
-            return;
-        clearTimeout(resetTimer);
-        resetTimer = undefined;
-    }
-    function armTimer() {
-        stopTimer();
-        if (closed || stopping)
-            return;
-        let earliest = null;
-        for (const { submission } of pendings.values()) {
-            if (submission.state !== 'reset')
-                continue;
-            const at = Date.parse(submission.reset);
-            if (earliest === null || at < earliest)
-                earliest = at;
-        }
-        if (earliest === null)
-            return;
-        // A Save House held back goes again only once the reset its answer named has passed.
-        resetTimer = setTimeout(() => {
-            resetTimer = undefined;
-            submitAll();
-        }, Math.max(0, earliest - Date.now()));
-    }
     async function refuse(reason, provider = null) {
-        stopTimer();
         discoveryPaused = true;
         try {
             if (reason === 'revoked-authorization') {
@@ -477,14 +647,24 @@ export function composeRuntime(options) {
             refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
         });
     }
-    async function applyDiscovery(listed, local) {
+    async function applyDiscovery(found, started) {
+        for (const room of found) {
+            const fence = fences.get(room.locator);
+            if (fence !== undefined && fence.erased && fence.at < started)
+                fences.delete(room.locator);
+        }
+        const listed = found.filter((room) => !fences.has(room.locator));
         const listedLocators = new Set(listed.map((room) => room.locator));
         for (const locator of listedLocators)
             scopedRefusals.delete(locator);
         discovered.clear();
         for (const room of listed)
             discovered.set(room.locator, room);
-        await dropUnlisted(listedLocators, local);
+        const unlisted = unlistedHeld(new Set(found.map((room) => room.locator)));
+        if (options.adapter.exhaustiveDiscovery === true)
+            await loseRooms(unlisted);
+        else
+            unlistedKept(unlisted);
         for (const room of listed) {
             const held = replicas.get(room.locator)?.confirmed.record;
             if (held !== undefined && held.replica.selection !== room.replica.selection) {
@@ -495,6 +675,7 @@ export function composeRuntime(options) {
         }
         roomsListed = true;
         emitRooms();
+        return listed;
     }
     function unlistedHeld(listed) {
         return [
@@ -506,41 +687,71 @@ export function composeRuntime(options) {
             ]),
         ].filter((locator) => !listed.has(locator));
     }
-    async function dropUnlisted(listed, local) {
-        if (unlistedHeld(listed).length === 0)
-            return;
-        await exclusive(async () => {
-            const unlisted = unlistedHeld(listed);
-            await local.dropRooms(unlisted);
-            const removed = unlisted.map((locator) => changeSet(locator, replicas.get(locator) ?? null, null, {
-                room: true,
-                queue: true,
-                drafts: [...(roomDrafts.get(locator)?.keys() ?? [])],
-            }));
-            for (const locator of unlisted) {
-                for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [])
-                    pendings.delete(batch.id);
-                replicas.delete(locator);
-                queuesWithoutReplica.delete(locator);
+    function unlistedKept(unlisted) {
+        for (const locator of unlisted) {
+            const held = replicas.get(locator)?.confirmed.record;
+            if (held !== undefined)
+                list(held, false);
+            else
                 rooms.delete(locator);
-                roomDrafts.delete(locator);
-                transfers.delete(locator);
-                unreadable.delete(locator);
-                stale.delete(locator);
-                scopedRefusals.delete(locator);
-                sourceRefusals.delete(locator);
-                declarationRefusals.delete(locator);
-                for (const attached of ['collection', 'typed-selection']) {
-                    const key = modelKey(locator, attached);
-                    models.delete(key);
-                    liveModels.delete(key);
-                    invalidModels.delete(key);
-                }
-                journal.record(`room unlisted ${locator}`);
+        }
+    }
+    function fence(locators) {
+        const fresh = [...new Set(locators)].filter((locator) => !fences.has(locator));
+        const removed = fresh.map((locator) => changeSet(locator, replicas.get(locator) ?? null, null, {
+            room: true,
+            queue: true,
+            drafts: [...(roomDrafts.get(locator)?.keys() ?? [])],
+        }));
+        for (const locator of fresh) {
+            fences.set(locator, { at: discoveries, erased: false });
+            lastFenced.set(locator, ++fencings);
+            for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [])
+                pendings.delete(batch.id);
+            replicas.delete(locator);
+            queuesWithoutReplica.delete(locator);
+            rooms.delete(locator);
+            roomDrafts.delete(locator);
+            transfers.delete(locator);
+            catching.delete(locator);
+            discovered.delete(locator);
+            announced.delete(locator);
+            unreadable.delete(locator);
+            stale.delete(locator);
+            repairable.delete(locator);
+            scopedRefusals.delete(locator);
+            sourceRefusals.delete(locator);
+            declarationRefusals.delete(locator);
+            for (const attached of ['collection', 'typed-selection']) {
+                const key = modelKey(locator, attached);
+                models.delete(key);
+                liveModels.delete(key);
+                invalidModels.delete(key);
             }
-            publishChangeSet(mergeChangeSets(removed));
-            moveTo({ ...status, ...attention() });
-        });
+            journal.record(`room lost ${locator}`);
+        }
+        if (fresh.length === 0)
+            return fresh;
+        publishChangeSet(mergeChangeSets(removed));
+        for (const locator of fresh)
+            prepared.delete(locator);
+        searchIndex.forget(fresh);
+        readSide.recover();
+        moveTo({ ...status, ...attention() });
+        return fresh;
+    }
+    async function erased(local, locators) {
+        await local.erase(locators);
+        for (const locator of locators) {
+            const held = fences.get(locator);
+            if (held !== undefined)
+                held.erased = true;
+        }
+    }
+    async function loseRooms(locators) {
+        const fresh = fence(locators);
+        if (fresh.length > 0)
+            await durably((local) => erased(local, fresh));
     }
     function restored(key, persisted) {
         const prior = models.get(key);
@@ -635,6 +846,7 @@ export function composeRuntime(options) {
     async function readState(opened) {
         const { lastCompleted, locators, read } = await hydrate(opened);
         applyChangeSet(read);
+        prepare();
         if (replicas.size > 0)
             emitRooms();
         if (member !== null)
@@ -645,8 +857,15 @@ export function composeRuntime(options) {
         return lastCompleted;
     }
     async function open() {
-        const opened = await openRuntimeStore();
+        if (closed)
+            throw new Error('runtime closed');
+        const opened = await openRuntimeStore(isFenced);
         store = opened;
+        const interrupted = await opened.fences();
+        for (const locator of interrupted) {
+            fences.set(locator, { at: discoveries, erased: false });
+            lastFenced.set(locator, ++fencings);
+        }
         const kept = options.shell.generation;
         const storedGeneration = await opened.generation();
         const loss = detectStorageLoss(storedGeneration, kept);
@@ -660,6 +879,8 @@ export function composeRuntime(options) {
             emitStorageLoss();
         }
         const lastCompleted = await readState(opened);
+        if (interrupted.length > 0)
+            await erased(opened, interrupted);
         moveTo({ ...status, lastCompleted, ...attention() });
         return opened;
     }
@@ -741,17 +962,19 @@ export function composeRuntime(options) {
             moveTo({ ...status, ...attention() });
             throw error;
         }
-        queuesWithoutReplica.delete(locator);
-        for (const { batch, returned } of unqueued) {
-            const outcome = localSaves ? 'dropped' : returned === null ? 'landed' : 'withdrawn';
-            journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
-        }
-        replicas.set(locator, replicaOf(confirmed, kept, before));
-        return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
-            room: settling.room,
-            queue: kept.length !== previousQueue.length,
-            drafts: [...written.keys()],
-        });
+        return () => {
+            queuesWithoutReplica.delete(locator);
+            for (const { batch, returned } of unqueued) {
+                const outcome = localSaves ? 'dropped' : returned === null ? 'landed' : 'withdrawn';
+                journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
+            }
+            replicas.set(locator, replicaOf(confirmed, kept, before));
+            return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
+                room: settling.room,
+                queue: kept.length !== previousQueue.length,
+                drafts: [...written.keys()],
+            });
+        };
     }
     function adoptModels(locator, record) {
         for (const [attached, model] of [
@@ -784,11 +1007,16 @@ export function composeRuntime(options) {
             selection: taken(answers?.selection, held.selection, 'typed-selection'),
         };
     }
-    function publish(local, room, confirmed, landing = {}) {
+    function publish(local, room, confirmed, landing, live) {
         const { base, stored } = landing;
         return exclusive(async () => {
-            if (!continuing())
+            if (stored !== undefined) {
+                await indexReferrers({ text: confirmed.record.documents, binaries: confirmed.record.binaries }, compositionOf(confirmed.record));
+            }
+            if (!live()) {
+                caughtUpTo(room.locator);
                 return true;
+            }
             const prior = replicas.get(room.locator);
             if (base !== undefined &&
                 (prior?.confirmed.record.roomVersion !== base.record.roomVersion ||
@@ -802,9 +1030,11 @@ export function composeRuntime(options) {
                 const accepted = pendings.get(batch.id)?.accepted;
                 return (accepted !== undefined && options.adapter.reached(room.locator, roomVersion, accepted));
             });
-            const set = await settle(local, room.locator, prior, confirmed, queue.filter((batch) => !accepted.includes(batch)), { room: true, ...(stored === undefined ? {} : { stored }) });
-            if (stored !== undefined)
+            const set = (await settle(local, room.locator, prior, confirmed, queue.filter((batch) => !accepted.includes(batch)), { room: true, ...(stored === undefined ? {} : { stored }) }))();
+            if (stored !== undefined) {
                 transfers.delete(room.locator);
+                catching.delete(room.locator);
+            }
             for (const batch of accepted)
                 pendings.delete(batch.id);
             stale.delete(room.locator);
@@ -813,13 +1043,17 @@ export function composeRuntime(options) {
             sourceRefusals.delete(room.locator);
             declarationRefusals.delete(room.locator);
             list(room, true);
+            if (prior === undefined)
+                prepared.add(room.locator);
             publishChangeSet(set);
             moveTo({ ...status, ...attention() });
+            options.adapter.roomStream?.published(room.locator, roomVersion);
             return true;
         });
     }
     async function saveRoomDrafts(locator, named, writtenBy) {
         const local = await openLocal();
+        await referenced(locator);
         const replica = replicas.get(locator);
         const room = rooms.get(locator);
         if (replica === undefined || room === undefined) {
@@ -867,6 +1101,11 @@ export function composeRuntime(options) {
             changes,
             bases: parts.flatMap(({ bases }) => bases),
             writtenBy,
+            clean: {
+                text: replica.confirmed.record.documents,
+                binaries: replica.confirmed.record.binaries,
+                composition: compositionOf(replica.confirmed.record),
+            },
         };
         const checked = withdrawing ? buildBatch({ ...input, queued: requeue.queued }) : null;
         if (checked?.kind === 'refused')
@@ -937,6 +1176,8 @@ export function composeRuntime(options) {
         catch {
             return { outcome: 'refused', code: 'durable-write', retryable: true };
         }
+        if (fences.has(locator))
+            throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
         for (const origin of withdrawn.keys())
             pendings.delete(origin);
         for (const [id, drafts] of drafted) {
@@ -966,6 +1207,8 @@ export function composeRuntime(options) {
             return;
         }
         await local.submit(locator, identifier, submission, lost);
+        if (fences.has(locator))
+            return;
         pendings.set(identifier, { ...state, submission, lost });
         const replica = replicas.get(locator);
         if (replica !== undefined)
@@ -976,6 +1219,8 @@ export function composeRuntime(options) {
         if (!continuing())
             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}`);
         pendings.set(identifier, { ...pendings.get(identifier), upload });
         if (!continuing())
             throw new Error('connection refused');
@@ -991,6 +1236,7 @@ export function composeRuntime(options) {
         }
         if (closed || authorization === undefined || refusal !== null)
             return UNCERTAIN;
+        const since = fencings;
         const transfer = ['transfer', 'history', locator, path];
         if (query.revision !== undefined)
             transfer.push(query.revision);
@@ -1005,6 +1251,8 @@ export function composeRuntime(options) {
                 ...(query.pageToken === undefined ? {} : { pageToken: query.pageToken }),
             });
             journal.record(`outcome history ${result.kind}`);
+            if (fencedSince(locator, since))
+                return failure({ kind: 'room-not-readable', locator });
             if (result.kind === 'scoped-refusal') {
                 const room = replicas.get(result.locator)?.confirmed.record;
                 if (room !== undefined)
@@ -1027,6 +1275,12 @@ export function composeRuntime(options) {
         }
         return null;
     }
+    function binaryRoom(request) {
+        if (request.kind === 'path')
+            return request.locator;
+        const scope = options.adapter.referrerScope(request.referrer);
+        return scope?.kind === 'room' ? scope.locator : null;
+    }
     async function readBinary(request) {
         if (closed || refusal !== null)
             return UNCERTAIN;
@@ -1038,12 +1292,16 @@ export function composeRuntime(options) {
         }
         if (closed || authorization === undefined || refusal !== null)
             return UNCERTAIN;
+        const since = fencings;
         journal.record(request.kind === 'path'
             ? `transfer binary ${request.locator} ${request.path}`
             : `transfer binary ${request.fileRef}`);
         try {
             const result = await options.adapter.binary(authorization, request);
             journal.record(`outcome binary ${result.kind}`);
+            const locator = binaryRoom(request);
+            if (locator !== null && fencedSince(locator, since))
+                return failure({ kind: 'room-not-readable', locator });
             if (result.kind === 'scoped-refusal') {
                 const room = replicas.get(result.locator)?.confirmed.record;
                 if (room !== undefined)
@@ -1167,11 +1425,11 @@ export function composeRuntime(options) {
             options.adapter.reached(locator, written, roomVersion) &&
             !options.adapter.reached(locator, roomVersion, written));
     }
-    async function pullRefresh(authorized, confirmed) {
-        if (!continuing())
+    async function pullRefresh(authorized, confirmed, live) {
+        if (!live())
             return unconfirmed;
         try {
-            const result = await refreshRoom(options.adapter, authorized, confirmed, (models, held) => remodel(confirmed.record.locator, models, held), continuing);
+            const result = await refreshRoom(options.adapter, authorized, confirmed, (models, held) => (live() ? remodel(confirmed.record.locator, models, held) : held), live);
             const detail = result.kind === 'advanced' ? result.confirmed.record.roomVersion : result.kind;
             journal.record(`transfer refresh ${confirmed.record.locator} ${detail}`);
             return result;
@@ -1181,47 +1439,69 @@ export function composeRuntime(options) {
             throw error;
         }
     }
-    function staging(local) {
+    function staging(local, live) {
         return {
             held: (locator) => transfers.get(locator) ?? null,
             staged: (record) => local.staged(record),
             stage: (record, page) => exclusive(async () => {
-                if (!continuing())
+                if (!live())
                     return false;
                 await local.stage(record, page);
                 transfers.set(record.locator, record);
+                readSide.recover();
                 return true;
             }),
             abandon: (locator) => exclusive(async () => {
-                if (!continuing())
+                if (!live())
                     return;
                 await local.abandon(locator);
                 transfers.delete(locator);
+                readSide.recover();
             }),
         };
     }
-    async function pullBootstrap(authorized, room, local) {
-        if (!continuing())
+    function reusable(room) {
+        const record = replicas.get(room.locator)?.confirmed.record;
+        if (record === undefined || record.replica.selection !== room.replica.selection)
+            return null;
+        return { documents: record.documents, revisions: record.revisions };
+    }
+    async function pullBootstrap(authorized, room, local, live) {
+        if (!live())
             return unconfirmed;
+        if (replicas.has(room.locator)) {
+            catching.add(room.locator);
+            readSide.recover();
+        }
         try {
             const result = await bootstrapRoom(options.adapter, authorized, room, {
                 collection: modelOf(room.locator),
                 selection: modelOf(room.locator, 'typed-selection'),
-            }, (models, held) => remodel(room.locator, models, held), continuing, staging(local));
+            }, (models, held) => (live() ? remodel(room.locator, models, held) : held), live, staging(local, live), reusable(room));
             const detail = result.kind === 'staged' ? result.confirmed.record.roomVersion : result.kind;
             journal.record(`transfer bootstrap ${room.locator} ${detail}`);
+            if (result.kind !== 'staged')
+                caughtUpTo(room.locator);
             return result;
         }
         catch (error) {
             journal.record(`transfer bootstrap ${room.locator} transport-uncertainty`);
+            caughtUpTo(room.locator);
             throw error;
         }
     }
-    async function advance(room, local, authorized) {
+    function caughtUpTo(locator) {
+        if (catching.delete(locator))
+            readSide.recover();
+    }
+    async function advance(room, local, authorized, live) {
+        await referenced(room.locator);
+        if (!live())
+            return unconfirmed;
         const held = replicas.get(room.locator);
         if (held !== undefined) {
-            const refreshed = await pullRefresh(authorized, held.confirmed);
-            if (!continuing())
+            const refreshed = await pullRefresh(authorized, held.confirmed, live);
+            if (!live())
                 return unconfirmed;
             if (refreshed.kind === 'still-current') {
                 stale.delete(room.locator);
@@ -1235,31 +1515,45 @@ export function composeRuntime(options) {
                 return null;
             }
             if (refreshed.kind === 'advanced') {
-                if (!(await publish(local, room, refreshed.confirmed, { base: held.confirmed }))) {
+                if (!(await publish(local, room, refreshed.confirmed, { base: held.confirmed }, live))) {
                     const now = replicas.get(room.locator)?.confirmed.record.roomVersion;
                     const reached = now !== undefined &&
                         options.adapter.reached(room.locator, now, refreshed.confirmed.record.roomVersion);
-                    return reached ? null : advance(room, local, authorized);
+                    return reached ? null : advance(room, local, authorized, live);
                 }
                 await retainModel(local, room, 'collection', modelOf(room.locator));
                 return null;
             }
             if (refreshed.kind !== 'beyond-horizon')
                 return refreshed;
+            if (opened !== null) {
+                owed.add(room.locator);
+                readSide.recover();
+                return unconfirmed;
+            }
         }
-        const bootstrapped = await pullBootstrap(authorized, room, local);
-        if (!continuing())
+        const bootstrapped = await pullBootstrap(authorized, room, local, live);
+        if (!live())
             return unconfirmed;
         if (bootstrapped.kind !== 'staged')
             return bootstrapped;
-        await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored });
+        await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored }, live);
         return null;
     }
     async function withhold(withheld, room, local, progress) {
+        if (withheld.kind === 'unconfirmed')
+            return;
         if (withheld.kind === 'refused')
             stale.delete(room.locator);
         else
             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);
+            repairLater(room.locator, reset === undefined ? { again: true } : { at: Date.parse(reset) });
+        }
+        else
+            repairable.delete(room.locator);
         if (withheld.kind === 'scoped-refusal') {
             await scoped(withheld, room, local);
         }
@@ -1316,6 +1610,7 @@ export function composeRuntime(options) {
             (accepted.time === undefined ? '' : ` time ${accepted.time}`));
     }
     async function adoptAccepted(room, local, submitted, accepted) {
+        await referenced(room.locator);
         if (!continuing())
             return unconfirmed;
         const current = replicas.get(room.locator);
@@ -1332,16 +1627,17 @@ export function composeRuntime(options) {
         if (applied.kind !== 'staged') {
             const state = pendings.get(submitted.id);
             await local.accept(room.locator, submitted.id, accepted.roomVersion);
-            if (state !== undefined)
+            if (state !== undefined && !fences.has(room.locator))
                 pendings.set(submitted.id, { ...state, accepted: accepted.roomVersion });
             emitQueue(room.locator);
             return applied;
         }
-        const set = await settle(local, room.locator, current, applied.confirmed, current.queue.filter((batch) => batch.id !== submitted.id), { room: true });
+        const settled = await settle(local, room.locator, current, applied.confirmed, current.queue.filter((batch) => batch.id !== submitted.id), { room: true });
         pendings.delete(submitted.id);
         unreadable.delete(room.locator);
         sourceRefusals.delete(room.locator);
         declarationRefusals.delete(room.locator);
+        const set = settled();
         list(room, true);
         publishChangeSet(set);
         moveTo({ ...status, ...attention() });
@@ -1355,14 +1651,14 @@ export function composeRuntime(options) {
             refusedSource(room, failed);
         return false;
     }
-    async function submitRoom(room, local, authorized, progress) {
-        while (continuing() && authorization !== undefined) {
+    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];
             if (replica === undefined || head === undefined)
-                return;
+                return 'done';
             if (pendings.get(head.id)?.accepted !== undefined)
-                return;
+                return 'done';
             const state = pendings.get(head.id);
             const { submission, lost: earlier } = state ?? {
                 submission: { state: 'waiting' },
@@ -1370,24 +1666,30 @@ export function composeRuntime(options) {
             };
             if (submission.state === 'reset' && Date.now() < Date.parse(submission.reset)) {
                 progress.complete = false;
-                return;
+                return { at: Date.parse(submission.reset) };
             }
             if (writesHeld()) {
                 progress.complete = false;
                 journal.record(`submission ${room.locator} ${head.id} held`);
-                return;
+                return 'done';
             }
             const lost = earlier || submission.state === 'submitted';
+            if (lost && pastHorizon(head.id)) {
+                await discardPending(room, local, signal);
+                return 'done';
+            }
             let result;
             journal.record(`submission ${room.locator} ${head.id}`);
             await exclusive(() => mark(local, room.locator, head.id, { state: 'submitted' }, lost));
-            if (discoveryPaused)
-                return;
-            if (writesHeld()) {
+            if (discoveryPaused || fences.has(room.locator))
+                return 'done';
+            if (signal.aborted || writesHeld()) {
                 await exclusive(() => mark(local, room.locator, head.id, submission, earlier));
+                if (signal.aborted)
+                    return 'done';
                 progress.complete = false;
                 journal.record(`submission ${room.locator} ${head.id} held`);
-                return;
+                return 'done';
             }
             const opensBefore = openSignals;
             const answered = awaitingAnswer(room.locator);
@@ -1403,32 +1705,36 @@ export function composeRuntime(options) {
                 progress.complete = false;
                 if (continuing())
                     progress.reachable = false;
-                return;
+                return 'again';
+            }
+            if (signal.aborted) {
+                answered();
+                return 'done';
             }
             if (result.kind !== 'accepted' || !continuing())
                 answered();
             if (!continuing())
-                return;
+                return 'done';
             if (result.kind === 'transport-uncertainty') {
                 progress.complete = false;
                 progress.reachable = false;
-                return;
+                return 'again';
             }
             if (result.kind === 'room-not-readable') {
                 progress.complete = false;
                 unreadable.add(room.locator);
                 list(room, false);
                 emitRooms();
-                return;
+                return 'done';
             }
             if (result.kind === 'revoked-authorization') {
                 await refuse('revoked-authorization');
-                return;
+                return 'done';
             }
             if (result.kind === 'scoped-refusal') {
                 await scoped(result, room, local);
                 progress.complete = false;
-                return;
+                return 'done';
             }
             if (result.kind === 'write-halted') {
                 journal.record(`outcome ${room.locator} ${head.id} write-halted`);
@@ -1437,16 +1743,24 @@ export function composeRuntime(options) {
                     continue;
                 haltedRefusal = true;
                 progress.complete = false;
-                return;
+                return 'done';
             }
             if (result.kind === 'conflicted' ||
                 result.kind === 'rejected' ||
                 result.kind === 'expired' ||
                 result.kind === 'retryable-refusal') {
+                if (result.kind === 'expired' && lost && result.restored !== true) {
+                    journal.record(`outcome ${room.locator} ${head.id} expired`);
+                    await discardPending(room, local, signal);
+                    return 'done';
+                }
                 if (result.kind === 'expired') {
-                    const withheld = await advance(room, local, authorized);
-                    if (withheld !== null)
-                        return withhold(withheld, room, local, progress);
+                    await exclusive(() => mark(local, room.locator, head.id, { state: 'waiting' }, false));
+                    const withheld = await advance(room, local, authorized, continuing);
+                    if (withheld !== null) {
+                        await withhold(withheld, room, local, progress);
+                        return 'done';
+                    }
                 }
                 journal.record(`outcome ${room.locator} ${head.id} ${result.kind}` +
                     (result.kind === 'conflicted' && result.roomVersion !== undefined
@@ -1459,8 +1773,7 @@ export function composeRuntime(options) {
                 const reset = result.reset;
                 progress.complete = false;
                 await exclusive(() => mark(local, room.locator, head.id, reset === undefined ? { state: 'waiting' } : { state: 'reset', reset }, lost));
-                armTimer();
-                return;
+                return reset === undefined ? 'again' : { at: Date.parse(reset) };
             }
             if (result.kind === 'conflicted' || result.kind === 'rejected' || result.kind === 'expired') {
                 const left = leaving(head, result);
@@ -1471,37 +1784,82 @@ export function composeRuntime(options) {
                     if (current === undefined || !current.queue.some((batch) => batch.id === head.id)) {
                         return;
                     }
-                    const set = await settle(local, room.locator, current, current.confirmed, current.queue.filter((batch) => batch.id !== head.id), {
+                    const settled = await settle(local, room.locator, current, current.confirmed, current.queue.filter((batch) => batch.id !== head.id), {
                         leaving: (result.kind === 'expired' && landed(head, current.confirmed)) ||
                             (result.kind === 'conflicted' && landed(head, current.confirmed, result.affected))
                             ? { ...left, returned: null }
                             : left,
                     });
-                    publishChangeSet(set);
+                    publishChangeSet(settled());
                     moveTo({ ...status, ...attention() });
                 });
                 if (result.kind === 'expired')
                     continue;
-                const withheld = await advance(room, local, authorized);
-                if (withheld !== null)
-                    return withhold(withheld, room, local, progress);
+                const withheld = await advance(room, local, authorized, continuing);
+                if (withheld !== null) {
+                    await withhold(withheld, room, local, progress);
+                    return 'done';
+                }
                 continue;
             }
             const kept = await adopted(room, local, head, result).finally(answered);
             if (!kept) {
                 progress.complete = false;
-                return;
+                return 'done';
             }
         }
+        return 'done';
+    }
+    function pastHorizon(identity) {
+        return (outcomeRetention !== null && identityTime(identity) + outcomeRetention * 1000 <= Date.now());
+    }
+    async function discardPending(room, local, signal) {
+        const { locator } = room;
+        const discarded = await exclusive(async () => {
+            if (fences.has(locator))
+                return false;
+            const before = replicas.get(locator);
+            const queue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
+            fences.set(locator, { at: discoveries, erased: false });
+            lastFenced.set(locator, ++fencings);
+            try {
+                await local.discard(locator);
+            }
+            finally {
+                fences.delete(locator);
+            }
+            for (const batch of queue)
+                pendings.delete(batch.id);
+            queuesWithoutReplica.delete(locator);
+            const after = before === undefined ? null : replicaOf(before.confirmed, [], before);
+            if (after !== null)
+                replicas.set(locator, after);
+            journal.record(`room discarded ${locator}`);
+            publishChangeSet(changeSet(locator, before ?? null, after, { queue: true }));
+            moveTo({ ...status, ...attention() });
+            return true;
+        });
+        if (!discarded)
+            return;
+        const progress = { complete: true, reachable: true };
+        await roomTask(locator, async (live) => {
+            await Promise.race([
+                reload(room, local, progress, () => live() && !signal.aborted),
+                abandonedOn(signal),
+            ]);
+        });
+        if (signal.aborted)
+            return;
+        await rest(progress);
     }
     function awaitingAnswer(locator) {
         let release = () => { };
         const awaited = new Promise((resolve) => {
             release = resolve;
         });
-        answering.set(locator, awaited);
+        answering.set(locator, { generation, answered: awaited });
         return () => {
-            if (answering.get(locator) === awaited)
+            if (answering.get(locator)?.answered === awaited)
                 answering.delete(locator);
             release();
         };
@@ -1617,8 +1975,10 @@ export function composeRuntime(options) {
             ];
         });
     }
-    async function synchronize(listed, local, progress, attempt) {
+    async function synchronize(listed, local, progress, attempt, live) {
         const prepared = await Promise.allSettled(listed.map((room) => prepareRoom(room, local, progress)));
+        if (!live())
+            return;
         const ready = listed.filter((_, index) => {
             const outcome = prepared[index];
             return outcome?.status === 'fulfilled' && outcome.value;
@@ -1627,9 +1987,10 @@ export function composeRuntime(options) {
             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) => loadRoom(room, local, progress)));
+            .map((room) => roomTask(room.locator, (held) => loadRoom(room, local, progress, held))));
         const failed = [...prepared, ...loaded].find((room) => room.status === 'rejected');
         if (failed !== undefined)
             throw failed.reason;
@@ -1658,14 +2019,14 @@ export function composeRuntime(options) {
         }
         return true;
     }
-    async function caughtUp(room, local, progress) {
+    async function caughtUp(room, local, progress, live) {
         const held = replicas.get(room.locator)?.confirmed.record.roomVersion;
-        if (held === undefined || authorization === undefined)
+        if (held === undefined || authorization === undefined || !live())
             return;
         const behind = [announced.get(room.locator), room.roomVersion].some((later) => later !== undefined && !options.adapter.reached(room.locator, held, later));
         if (!behind)
             return;
-        const withheld = await advance(room, local, authorization);
+        const withheld = await advance(room, local, authorization, live);
         if (withheld !== null)
             await withhold(withheld, room, local, progress);
     }
@@ -1675,39 +2036,46 @@ export function composeRuntime(options) {
             return model.status === 'unavailable' && model.reason === 'revoked';
         });
     }
-    async function loadRoom(room, local, progress) {
-        if (discoveryPaused || authorization === undefined)
+    async function loadRoom(room, local, progress, live) {
+        if (!live() || authorization === undefined)
             return;
         if (replicas.has(room.locator) && revoked(room.locator)) {
-            await reload(room, local, progress);
+            await reload(room, local, progress, live);
             return;
         }
-        const withheld = await advance(room, local, authorization);
+        const withheld = await advance(room, local, authorization, live);
         if (withheld !== null) {
             await withhold(withheld, room, local, progress);
             return;
         }
-        await caughtUp(room, local, progress);
+        await caughtUp(room, local, progress, live);
     }
-    async function reload(room, local, progress) {
-        if (discoveryPaused || authorization === undefined)
-            return;
-        const bootstrapped = await pullBootstrap(authorization, room, local);
-        if (!continuing())
-            return;
-        if (bootstrapped.kind !== 'staged') {
-            await withhold(bootstrapped, room, local, progress);
-            return;
+    async function reload(room, local, progress, live) {
+        try {
+            if (!live() || authorization === undefined)
+                return;
+            const bootstrapped = await pullBootstrap(authorization, room, local, live);
+            if (!live())
+                return;
+            if (bootstrapped.kind !== 'staged') {
+                await withhold(bootstrapped, room, local, progress);
+                return;
+            }
+            await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored }, live);
+            await caughtUp(room, local, progress, live);
+        }
+        finally {
+            caughtUpTo(room.locator);
         }
-        await publish(local, room, bootstrapped.confirmed, { stored: bootstrapped.stored });
-        await caughtUp(room, local, progress);
     }
-    async function discoverRooms(local, progress, attempt) {
+    async function discoverRooms(local, progress, attempt, live) {
         if (closed || authorization === undefined) {
             notifyReady();
             return;
         }
         moveTo(transferring(status));
+        discoveries += 1;
+        const started = discoveries;
         let result;
         try {
             result = await options.adapter.discover(authorization);
@@ -1715,7 +2083,8 @@ export function composeRuntime(options) {
         catch {
             result = { kind: 'transport-uncertainty' };
         }
-        if (closed) {
+        if (!live()) {
+            progress.complete = false;
             notifyReady();
             return;
         }
@@ -1773,6 +2142,7 @@ export function composeRuntime(options) {
         }
         const previousCapabilities = capabilities;
         capabilities = result.capabilities;
+        outcomeRetention = result.retention.outcome;
         notifyReady();
         if (JSON.stringify(result.providerLimits) !== JSON.stringify(limits) ||
             JSON.stringify(result.capabilities) !== JSON.stringify(previousCapabilities)) {
@@ -1785,8 +2155,7 @@ export function composeRuntime(options) {
             member = signedIn;
             emitMember();
         }
-        await applyDiscovery(result.rooms, local);
-        await synchronize(result.rooms, local, progress, attempt);
+        await synchronize(await applyDiscovery(result.rooms, started), local, progress, attempt, live);
     }
     async function ensureAuthorization() {
         if (authorization !== undefined)
@@ -1800,20 +2169,50 @@ export function composeRuntime(options) {
             throw error;
         }
     }
-    function task(work) {
+    async function admittedRead(work) {
+        if (roomReads.generation !== generation) {
+            roomReads = { generation, free: ROOM_READS, waiting: [] };
+        }
+        const reads = roomReads;
+        while (reads.free === 0)
+            await new Promise((admit) => reads.waiting.push(admit));
+        reads.free -= 1;
+        try {
+            await work();
+        }
+        finally {
+            reads.free += 1;
+            reads.waiting.shift()?.();
+        }
+    }
+    function roomTask(locator, work) {
+        return task(roomLane(locator), (live) => admittedRead(() => work(live)));
+    }
+    function task(lane, work) {
         if (stopping)
-            return chain;
-        chain = chain.then(work, work).catch(() => undefined);
-        return chain;
+            return Promise.resolve();
+        const held = lanes.get(lane);
+        const current = held?.generation === generation ? held : { generation, chain: Promise.resolve() };
+        const turn = current.generation;
+        const live = () => turn === generation && continuing();
+        const run = current.chain.then(() => work(live)).catch(() => undefined);
+        current.chain = run;
+        lanes.set(lane, current);
+        working.add(run);
+        void run.finally(() => working.delete(run));
+        return run;
     }
     function sync(attempt) {
-        return task(async () => {
-            if (closed || stopping || discoveryPaused) {
+        return task(OPENING_LANE, async (live) => {
+            if (!live()) {
                 notifyReady();
                 return;
             }
             const progress = { complete: true, reachable: true };
-            underway = attempt === 'opened' ? progress : null;
+            const gate = discover();
+            if (attempt === 'opened')
+                opened = generation;
+            underway = attempt === 'opened' ? { generation, progress } : null;
             if (attempt === 'opened')
                 streamed = progress;
             complete = false;
@@ -1822,12 +2221,12 @@ export function composeRuntime(options) {
             handed = false;
             try {
                 const local = await openLocal();
-                if (closed)
+                if (!live())
                     return;
                 await ensureAuthorization();
-                if (closed)
+                if (!live())
                     return;
-                await discoverRooms(local, progress, attempt);
+                await discoverRooms(local, progress, attempt, live);
             }
             catch {
                 progress.complete = false;
@@ -1835,17 +2234,21 @@ export function composeRuntime(options) {
                     progress.reachable = false;
             }
             finally {
+                gate.release();
                 notifyReady();
             }
+            if (!live())
+                return;
             if (attempt !== 'opened') {
-                await finishOpening(progress);
+                await finishOpening(progress, live);
                 return;
             }
             if (handed || closed || progress.reachable)
                 return;
             underway = null;
+            opened = null;
             journal.record('connection reopen');
-            await rest(progress);
+            await rest(progress, live);
             options.adapter.roomStream?.reopen();
         });
     }
@@ -1866,24 +2269,41 @@ export function composeRuntime(options) {
         });
     }
     function applyOpening(expired) {
-        return task(async () => {
-            const progress = underway;
+        const progress = underway?.generation === generation ? underway.progress : null;
+        const cycle = progress ?? { complete: true, reachable: true };
+        const replacing = reloadNow((room) => expired.includes(room.locator), cycle);
+        return task(OPENING_LANE, async (live) => {
             underway = null;
-            if (closed || stopping)
+            if (!live())
                 return;
             if (progress === null) {
-                await reloadExpired(expired);
+                await replacing;
+                await rest(cycle, live);
                 return;
             }
+            await roomsCarried(expired);
+            if (!live())
+                return;
+            if (opened === generation)
+                opened = null;
+            const replaced = new Set(owed);
+            owed.clear();
             try {
                 const local = await openLocal();
                 const held = [...discovered.values()].filter((room) => replicas.has(room.locator));
-                const reloading = held.filter((room) => expired.includes(room.locator) || revoked(room.locator));
-                const reloaded = await Promise.allSettled(reloading.map((room) => reload(room, local, progress)));
+                const reloading = held.filter((room) => !expired.includes(room.locator) &&
+                    (replaced.has(room.locator) || revoked(room.locator)));
+                for (const room of reloading)
+                    catching.add(room.locator);
+                readSide.recover();
+                const reloads = Promise.allSettled(reloading.map((room) => roomTask(room.locator, (current) => reload(room, local, progress, current))));
+                const reloaded = [...(await reloads), ...(await replacing)];
                 if (progress.reachable) {
-                    for (const room of held)
-                        if (!reloading.includes(room))
+                    for (const room of held) {
+                        if (!expired.includes(room.locator) && !reloading.includes(room)) {
                             await confirmModels(room, local);
+                        }
+                    }
                 }
                 const failed = reloaded.find((outcome) => outcome.status === 'rejected');
                 if (failed !== undefined)
@@ -1893,21 +2313,21 @@ export function composeRuntime(options) {
                 progress.complete = false;
                 progress.reachable = false;
             }
-            await finishOpening(progress);
+            if (live())
+                await finishOpening(progress, live);
         });
     }
-    async function reloadExpired(expired) {
-        const progress = { complete: true, reachable: true };
+    async function reloadNow(replaced, progress) {
         try {
             const local = await openLocal();
-            await Promise.allSettled([...discovered.values()]
-                .filter((room) => replicas.has(room.locator) && expired.includes(room.locator))
-                .map((room) => reload(room, local, progress)));
+            return await Promise.allSettled([...discovered.values()]
+                .filter((room) => replicas.has(room.locator) && replaced(room))
+                .map((room) => roomTask(room.locator, (live) => reload(room, local, progress, live))));
         }
         catch {
             progress.reachable = false;
+            return [];
         }
-        await rest(progress);
     }
     async function confirmModels(room, local) {
         for (const attached of ['collection', 'typed-selection']) {
@@ -1920,38 +2340,94 @@ export function composeRuntime(options) {
     function submitLater(locator) {
         if (localSaves)
             return;
-        const running = submitting.get(locator);
-        if (running !== undefined) {
-            running.again = true;
+        void recovery.attempt(`submit ${locator}`, (signal) => submitPass(locator, signal));
+    }
+    async function submitPass(locator, signal) {
+        const room = discovered.get(locator);
+        if (closed || stopping || discoveryPaused || room === undefined)
+            return 'done';
+        const progress = { complete: true, reachable: true };
+        let next;
+        try {
+            await ensureAuthorization();
+            if (authorization === undefined)
+                return 'done';
+            next = await submitRoom(room, await openLocal(), authorization, progress, signal);
+        }
+        catch {
+            progress.reachable = false;
+            next = 'again';
+        }
+        if (signal.aborted)
+            return 'done';
+        await rest(progress);
+        return next === 'again' && !socketOpen ? 'done' : next;
+    }
+    function repairLater(locator, when) {
+        if (!socketOpen || repairing.has(locator))
             return;
+        void recovery.attempt(`repair ${locator}`, (signal) => repairPass(locator, signal), when);
+    }
+    async function repairPass(locator, signal) {
+        const room = discovered.get(locator);
+        if (!socketOpen || closed || stopping || discoveryPaused || !stale.has(locator))
+            return 'done';
+        if (room === undefined || room.replica.admission !== 'admitted')
+            return 'done';
+        const progress = { complete: true, reachable: true };
+        repairing.add(locator);
+        try {
+            const local = await openLocal();
+            await roomTask(locator, async (live) => {
+                const current = () => live() && !signal.aborted;
+                if (!current() || authorization === undefined)
+                    return;
+                const withheld = await Promise.race([
+                    advance(room, local, authorization, current),
+                    abandonedOn(signal),
+                ]);
+                if (withheld !== null && current())
+                    await withhold(withheld, room, local, progress);
+            });
         }
-        const run = { again: false, done: Promise.resolve() };
-        submitting.set(locator, run);
-        run.done = (async () => {
-            try {
-                do {
-                    run.again = false;
-                    const room = discovered.get(locator);
-                    if (closed || stopping || discoveryPaused || room === undefined)
-                        return;
-                    const progress = { complete: true, reachable: true };
-                    try {
-                        await ensureAuthorization();
-                        if (authorization === undefined)
-                            return;
-                        await submitRoom(room, await openLocal(), authorization, progress);
-                    }
-                    catch {
-                        progress.reachable = false;
-                    }
-                    armTimer();
-                    await rest(progress);
-                } while (run.again);
-            }
-            finally {
-                submitting.delete(locator);
-            }
-        })();
+        catch {
+            stale.add(locator);
+            progress.reachable = false;
+        }
+        finally {
+            repairing.delete(locator);
+        }
+        if (signal.aborted)
+            return 'done';
+        await rest(progress);
+        if (!stale.has(locator)) {
+            if ((replicas.get(locator)?.queue.length ?? 0) > 0)
+                submitLater(locator);
+            return 'done';
+        }
+        if (!repairable.has(locator))
+            return 'done';
+        const reset = repairable.get(locator);
+        return reset === undefined ? 'again' : { at: Date.parse(reset) };
+    }
+    function resendLater() {
+        if (!socketOpen)
+            return;
+        void recovery.attempt('resend', resendPass, { again: true });
+    }
+    async function resendPass(signal) {
+        if (!socketOpen || closed || stopping || discoveryPaused)
+            return 'done';
+        const reading = { complete: true, reachable: true };
+        try {
+            await conversations.resend(reading);
+        }
+        catch {
+            reading.reachable = false;
+        }
+        if (signal.aborted)
+            return 'done';
+        return reading.reachable && reading.complete ? 'done' : 'again';
     }
     function submitAll() {
         for (const [locator, replica] of replicas) {
@@ -1959,31 +2435,40 @@ export function composeRuntime(options) {
                 submitLater(locator);
         }
     }
-    async function finishOpening(progress) {
+    async function finishOpening(progress, live) {
         try {
-            if (closed || discoveryPaused) {
+            if (!live()) {
                 progress.complete = false;
                 return;
             }
             submitAll();
+            for (const locator of stale)
+                if (repairable.has(locator))
+                    repairLater(locator, {});
             await conversations.reconcile();
             if (status.providerUnreachable)
                 conversations.reconnected();
             const reading = { complete: true, reachable: true };
             await conversations.catchUp(reading);
-            if (!reading.reachable)
+            if (progress.reachable && reading.reachable)
+                await conversations.resend(reading);
+            if (!reading.reachable) {
                 progress.reachable = false;
+                resendLater();
+            }
         }
         catch {
             progress.complete = false;
         }
         finally {
-            complete = progress.complete;
-            await rest(progress);
+            if (live()) {
+                complete = progress.complete;
+                await rest(progress, live);
+            }
         }
     }
-    async function rest(progress) {
-        if (closed)
+    async function rest(progress, live = () => !closed) {
+        if (!live())
             return;
         let lastCompleted = status.lastCompleted;
         let synced = complete && stale.size === 0 && !pending();
@@ -1991,6 +2476,8 @@ export function composeRuntime(options) {
             const completedAt = new Date().toISOString();
             try {
                 await (await openLocal()).complete(completedAt);
+                if (!live())
+                    return;
                 recorded = true;
                 lastCompleted = completedAt;
             }
@@ -2005,11 +2492,23 @@ export function composeRuntime(options) {
             ...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(async () => {
-            await answering.get(locator);
-            if (closed || stopping || discoveryPaused || authorization === undefined)
+        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);
@@ -2020,25 +2519,41 @@ export function composeRuntime(options) {
                     options.adapter.reached(locator, held.confirmed.record.roomVersion, roomVersion))) {
                 return;
             }
-            const during = underway;
+            const during = underway?.generation === generation ? underway.progress : null;
             const progress = during ?? { complete: true, reachable: true };
             if (during === null)
                 moveTo(transferring(status));
             try {
                 const local = await openLocal();
-                const withheld = await advance(room, local, authorization);
-                if (withheld !== null)
-                    await withhold(withheld, room, local, progress);
+                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);
+                });
             }
             catch {
                 stale.add(locator);
             }
             finally {
                 if (during === null)
-                    await rest(progress);
+                    await rest(progress, live);
             }
         });
     }
+    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),
+    };
     function observeStream() {
         const stream = options.adapter.roomStream;
         if (stream === undefined || withdrawStream !== undefined)
@@ -2048,6 +2563,9 @@ export function composeRuntime(options) {
                 return;
             if (event.kind === 'opened') {
                 socketOpen = true;
+                generation += 1;
+                conversations.reopened();
+                recovery.resume();
                 void sync('opened');
             }
             else if (event.kind === 'closed')
@@ -2056,7 +2574,7 @@ export function composeRuntime(options) {
                 void applyOpening(event.expired);
             else
                 void applyRoom(event.locator, event.roomVersion);
-        });
+        }, receipts);
     }
     function writesHeld() {
         return serviceMode === 'write-halted' || haltedRefusal;
@@ -2094,14 +2612,15 @@ export function composeRuntime(options) {
         });
     }
     function scheduleCurrency() {
-        if (currencyQueued || closed || stopping)
+        if (currencyQueued === generation || closed || stopping)
             return;
-        currencyQueued = true;
-        void task(runCurrency);
+        currencyQueued = generation;
+        void task(CONVERSATION_LANE, runCurrency);
     }
-    async function runCurrency() {
-        currencyQueued = false;
-        if (closed || stopping || discoveryPaused)
+    async function runCurrency(live) {
+        if (currencyQueued === generation)
+            currencyQueued = null;
+        if (!live())
             return;
         await conversations.reconcile();
         if (conversations.current()) {
@@ -2116,7 +2635,7 @@ export function composeRuntime(options) {
         catch {
             progress.reachable = false;
         }
-        await rest(progress);
+        await rest(progress, live);
     }
     function close() {
         if (closed)
@@ -2128,7 +2647,7 @@ export function composeRuntime(options) {
         withdrawConversations = undefined;
         withdrawServiceMode?.();
         conversations.close();
-        stopTimer();
+        void recovery.retire();
         store?.close();
         void opening?.then((opened) => {
             opened.close();
@@ -2146,9 +2665,8 @@ export function composeRuntime(options) {
     }
     async function stop() {
         stopping = true;
-        stopTimer();
-        await chain.catch(() => undefined);
-        await Promise.all([...submitting.values()].map((run) => run.done));
+        await recovery.retire();
+        await Promise.all(working);
         await mutations;
         close();
     }
@@ -2170,17 +2688,54 @@ export function composeRuntime(options) {
         return planOf(input, roomFacts(reach), planReach(reach));
     }
     function watchPlan(plan, deliver) {
-        materialize(reachedRooms(plan));
-        return readSide.watch(plan, identityOf(plan), deliver);
+        return readSide.watch(plan, identityOf(plan), () => {
+            const cover = covered(plan);
+            awaitPreparation(cover);
+            return cover;
+        }, deliver);
     }
     async function searched(input, reach) {
         const plan = searchPlanOf(input);
-        const selected = plan.documents === undefined && reach === null
-            ? null
-            : (await rowsQuery(filterOf(plan.documents ?? {}, roomFacts(reach), planReach(reach)))).documents;
-        if (selected === null)
-            materialize(null);
-        return searchIndex.search(reach === null || reach.conversations ? plan : { ...plan, conversations: [] }, selected);
+        const filter = filterOf(plan.documents ?? {}, roomFacts(reach), planReach(reach));
+        for (;;) {
+            const cover = covered(filter);
+            awaitPreparation(cover);
+            const pending = 'pending' in cover ? [...cover.pending] : [];
+            const covering = 'pending' in cover ? [] : cover.coverage.rooms;
+            const unindexed = covering
+                .filter(({ room }) => !searchIndex.rooms().has(room))
+                .map(({ room }) => room);
+            for (const room of unindexed)
+                pending.push({ room, awaits: 'index' });
+            const held = conversations.searchable();
+            const named = reach !== null && !reach.conversations
+                ? []
+                : (plan.conversations ?? held).filter((one) => held.includes(one) && conversations.acquired(one));
+            const waiting = named.filter((one) => !searchIndex.conversations().has(one));
+            for (const conversation of waiting)
+                pending.push({ conversation, awaits: 'index' });
+            if (unindexed.length > 0 || waiting.length > 0)
+                index(unindexed, waiting);
+            if (pending.length > 0 || 'pending' in cover)
+                return { pending };
+            const seen = searchIndex.changes();
+            await searchIndex.caughtUp();
+            const selected = plan.documents === undefined && reach === null ? null : await rowsQuery(filter);
+            if (selected !== null && 'pending' in selected)
+                return selected;
+            if (searchIndex.changes() !== seen ||
+                JSON.stringify(covered(filter)) !== JSON.stringify(cover))
+                continue;
+            return {
+                ...searchIndex.search(plan, selected === null ? null : selected.documents, named),
+                coverage: {
+                    rooms: covering,
+                    conversations: named,
+                    index: searchIndex.generation(),
+                    overlay: cover.coverage.overlay,
+                },
+            };
+        }
     }
     const watch = (topic, input, deliver) => {
         if (topic === 'room-drafts') {
@@ -2399,14 +2954,16 @@ export function composeRuntime(options) {
             if (refusal === null || !refusal.reauthorizationOffered)
                 return;
             journal.record('connection reauthorize');
-            await chain.catch(() => undefined);
+            await Promise.all([...lanes.values()]
+                .filter((held) => held.generation === generation)
+                .map((held) => held.chain));
             await mutations;
             authorization = undefined;
             discoveryPaused = false;
             if (options.adapter.roomStream === undefined)
                 await sync('unstreamed');
             else
-                await task(ensureAuthorization);
+                await task(OPENING_LANE, ensureAuthorization);
         },
     };
     const reachable = {
@@ -2418,5 +2975,5 @@ export function composeRuntime(options) {
         watchPlan,
         search: searched,
     };
-    return { md, stop, watch, within: (reach) => narrowed(reachable, reach) };
+    return { md, stop, lose: loseRooms, watch, within: (reach) => narrowed(reachable, reach) };
 }