@agentshouse/mdruntime 0.1.0-cf890bb538119 → 0.1.0-cfac557170cf3

package/dist/connection.js

@@ -1,5 +1,5 @@
 import { escapePointer, parseFrontmatter, roomTarget, target } from '@agentshouse/mdmodel';
-import { attachedModel, NO_ROOM_TYPES, roomTypesOf } from './attached-model.js';
+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';
@@ -12,27 +12,27 @@ 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, unreadable as unreadableIn, validRoot, } from './collection.js';
+import { available, collectionOf, composedOf, unreadable as unreadableIn, validRoot, } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
 import { binaryRecord } from './binary.js';
+import { attachedFile } from './file.js';
 import { openedFiles } from './opened.js';
-import { ABSENT_TARGET, absentBinary, absentReference, binaryAnswer, binaryLinkAnswer, calledResult, failure, historyAnswer, LOCKED_UNREADABLE, lockedRoom, undeclared, UNCERTAIN, UNREADABLE, } from './outcome.js';
+import { 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 { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, moveTarget, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.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 } from './durability.js';
-import { readinessOf, SETTLED_ROOMS, } from './readiness.js';
+import { detectStorageLoss, nextGeneration, refusedForSpace, } from './durability.js';
+import { readinessOf, } from './readiness.js';
 import { FencedMap } from './fence.js';
-import { fingerprint } from './stored.js';
 import { sameBinary } from './overlay.js';
 import { paced, ROW_WEIGHT, stepped, yielded } from './turn.js';
 import { identityTime, roomDraftRevision } from './identity.js';
-import { beneath, normalize } from './paths.js';
+import { ancestors, beneath, normalize } from './paths.js';
 import { openRuntimeStore, } from './store.js';
 import { changedCleanly, sameComposition, validatedCollection, } from './validation.js';
 import { unconfirmed } from './transfer.js';
@@ -55,10 +55,23 @@ const CONVERSATION_LANE = 'conversations';
 const ROOM_READS = 256;
 const ROOM_ATTEMPTS = 16;
 const ERASE_BATCH = 512;
-const REDERIVE_BATCH = 256;
+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, so a Room whose text costs ten times the usual still reports progress within the 2 s bound.
+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 QUEUED_BYTES = 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.
+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;
@@ -82,7 +95,7 @@ function pendingKey(locator, id) {
 }
 export function composeRuntime(options) {
     const localSaves = options.adapter.localSaves === true;
-    const roomTypes = roomTypesOf(options.adapter.roomTypes);
+    const roomTypes = roomTypesOf(options.adapter.roomTypes, options.adapter.nameableRoomTypes);
     let authorization = options.authorization;
     let opening;
     const fences = new Map();
@@ -92,20 +105,23 @@ export function composeRuntime(options) {
     const fencedSince = (locator, since) => fences.has(locator) || (lastFenced.get(locator) ?? 0) > since;
     let discoveries = 0;
     const replicas = new FencedMap(isFenced);
+    const reopened = new Set();
+    const usableWhenHeld = options.usableWhenHeld ?? [];
     const queuesWithoutReplica = new FencedMap(isFenced);
     const pendings = new Map();
     const seeds = new Map();
     const seedWatchers = new Map();
     const roomDrafts = new FencedMap(isFenced);
+    const attachedFiles = new FencedMap(isFenced);
     const presentations = new Map();
     let limits = [];
     let capabilities = [];
     const rooms = new FencedMap(isFenced);
     const counted = new Map();
     const unreadable = new Set();
-    const isModelFenced = (key) => isFenced(key.slice(key.indexOf(' ') + 1));
-    const models = new FencedMap(isModelFenced);
-    const liveModels = new FencedMap(isModelFenced);
+    const builtIn = builtInModel(roomTypes);
+    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);
@@ -113,23 +129,19 @@ export function composeRuntime(options) {
     const scopedRefusals = new Map();
     const sourceRefusals = new Map();
     const declarationRefusals = new Set();
-    function modelKey(locator, attached) {
-        return `${attached} ${locator}`;
+    function modelOf(locator) {
+        return models.get(locator) ?? NO_MODEL;
     }
-    function modelOf(locator, attached = 'collection') {
-        return models.get(modelKey(locator, attached)) ?? NO_MODEL;
-    }
-    function savedModel(locator, attached) {
-        return invalidModels.has(modelKey(locator, attached))
+    function savedModel(locator) {
+        return invalidModels.has(locator)
             ? { status: 'unavailable', reason: 'revoked' }
-            : modelOf(locator, attached);
+            : modelOf(locator);
+    }
+    function composed(record) {
+        return compositionOf(record, builtIn);
     }
     function compositionFor(record) {
-        return compositionOf({
-            ...record,
-            model: savedModel(record.locator, 'collection'),
-            selectionModel: savedModel(record.locator, 'typed-selection'),
-        });
+        return composed({ ...record, model: savedModel(record.locator) });
     }
     let refusal = null;
     let storageLoss = null;
@@ -161,7 +173,9 @@ export function composeRuntime(options) {
     let roomReads = { generation, free: ROOM_READS, waiting: [] };
     const working = new Set();
     let mutations = Promise.resolve();
+    let gathering = null;
     const roomListeners = new Set();
+    const unlistedRooms = new Set();
     const refusalListeners = new Set();
     const storageLossListeners = new Set();
     const statusListeners = new Set();
@@ -181,19 +195,55 @@ export function composeRuntime(options) {
     const serviceModeListeners = new Set();
     let member = null;
     const memberListeners = new Set();
-    const prepared = new Set();
     const unpreparedDemand = new Set();
     const unpreparable = new Set();
     let preparing = false;
     let targets = {};
     let persistence = options.shell.persistence;
-    let capacity = null;
-    const paused = new Set();
-    let rechecking = null;
+    let full = false;
+    let probing = null;
+    let testing = null;
+    const database = {
+        async ask(request) {
+            try {
+                return await options.database.ask(request);
+            }
+            catch (error) {
+                if (refusedForSpace(error))
+                    filled();
+                throw error;
+            }
+        },
+    };
     const readinessWatches = new Set();
     let readinessQueued = false;
     const catching = new Set();
     const transfers = new FencedMap(isFenced);
+    const installs = new Set();
+    const arrivals = new Map();
+    const streaming = new Set();
+    const underived = new Map();
+    const unindexed = new Map();
+    const unchecked = new Map();
+    let arrivalReported = 0;
+    let onScreen = options.shell.onScreen;
+    const shownWaiters = [];
+    let streams = { generation, free: STREAMS_HELD };
+    let queuedBytes = 0;
+    const installWaiters = [];
+    const stageBudget = {
+        bytes: STAGE_FLOOR * 4,
+        floor: STAGE_FLOOR,
+        ceiling: STAGE_BYTES,
+        aim: STAGE_AIM_MS,
+    };
+    const deriveBudget = {
+        bytes: DERIVE_FLOOR * 4,
+        floor: DERIVE_FLOOR,
+        ceiling: DERIVE_BYTES,
+        aim: DERIVE_AIM_MS,
+    };
+    const installTurns = { busy: false, ahead: 0, finishing: [], starting: [] };
     const conversations = createConversationStore({
         agents: declaredAgents,
         documents: (declaration, after) => rowsQuery(planOf({
@@ -214,16 +264,27 @@ export function composeRuntime(options) {
         stream: () => options.adapter.conversations,
         publish: publishChangeSet,
         online: () => connectionOf() !== 'unreachable' && refusal === null,
+        listed: () => roomsListed,
+        full: () => full,
         closed: () => closed,
         unanswered: resendLater,
         expired: (operation) => pastHorizon(operation),
     });
     const journal = createLog();
-    const keptFiles = openedFiles(options.database, isFenced);
-    let notifyReady = () => { };
+    const keptFiles = openedFiles(database, isFenced);
+    let readyFromStore = () => { };
     const ready = new Promise((resolve) => {
-        notifyReady = resolve;
+        readyFromStore = resolve;
     });
+    let notifyDiscovered = () => { };
+    const firstDiscovery = new Promise((resolve) => {
+        notifyDiscovered = resolve;
+    });
+    let roomsNamed = false;
+    function notifyReady() {
+        notifyDiscovered();
+        readyFromStore();
+    }
     function rememberRoomDraft(record) {
         const room = roomDrafts.get(record.locator) ?? new Map();
         room.set(record.path, record);
@@ -243,7 +304,7 @@ export function composeRuntime(options) {
             return undefined;
         const local = await openLocal();
         const slice = await stepped(slicing(await local.entries(held.record.key, 'visible', paths), paths));
-        return { ...slice, collection: collectionOf(slice.documents, compositionOf(held.record)) };
+        return { ...slice, collection: collectionOf(slice.documents, composed(held.record)) };
     }
     function roomDraftOf(record, visible) {
         return structuredClone({
@@ -299,14 +360,40 @@ export function composeRuntime(options) {
         const value = presentations.get(app);
         return value === undefined ? null : structuredClone(value);
     }
-    function keepPresentation(app, next) {
-        return exclusive(async () => {
-            const local = await openLocal();
-            const stored = next(presentations.get(app));
-            await local.present({ app, value: stored });
-            presentations.set(app, stored);
-            publishChangeSet(changeSet('', { presentation: app }));
-        });
+    async function writtenRoomDraft(room, path, revision, input, next) {
+        const parts = readParts(input);
+        if (path === '' || normalize(path) !== path)
+            throw runtimeError('room-draft-malformed');
+        const local = await openLocal();
+        const current = roomDrafts.get(room)?.get(path);
+        if ((current?.revision ?? null) !== revision) {
+            return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
+        }
+        const file = parts.file === undefined
+            ? undefined
+            : await heldFile(parts.file.blob, parts.file.base === undefined
+                ? binaryBase(await visibleOf(room, [path]), path)
+                : parts.file.base);
+        const record = {
+            locator: room,
+            path,
+            revision: next,
+            parts: held(current?.parts, parts, file),
+            returned: current?.returned ?? null,
+        };
+        await local.keepRoomDraft(record, parts.file === undefined || file === undefined
+            ? []
+            : [{ key: file.localId, blob: parts.file.blob }]);
+        rememberRoomDraft(record);
+        publishChangeSet(changeSet(room, { drafts: [path] }));
+        return { outcome: 'written', roomDraft: (await roomDraftsOf([record]))[0] ?? null };
+    }
+    async function keptPresentation(app, next) {
+        const local = await openLocal();
+        const stored = next(presentations.get(app));
+        await local.present({ app, value: stored });
+        presentations.set(app, stored);
+        publishChangeSet(changeSet('', { presentation: app }));
     }
     function emitPresentation(app) {
         if (closed)
@@ -321,6 +408,20 @@ export function composeRuntime(options) {
             (queuesWithoutReplica.size > 0 ||
                 [...replicas.values()].some((replica) => replica.queue.length > 0)));
     }
+    function unsent() {
+        const changed = new Map();
+        for (const room of [...replicas.keys(), ...queuesWithoutReplica.keys()]) {
+            for (const { batch, state } of entriesOf(room)) {
+                if (state === 'accepted' || state === 'local')
+                    continue;
+                for (const { path } of batch.changes)
+                    changed.set(`${room}\u0000${path}`, { room, path });
+            }
+        }
+        return [...changed]
+            .sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0))
+            .map(([, change]) => change);
+    }
     function attention() {
         const attentionRequired = [];
         for (const record of [...roomDrafts.values()].flatMap((room) => [...room.values()])) {
@@ -353,7 +454,7 @@ export function composeRuntime(options) {
             if (reset === null || submission.reset < reset)
                 reset = submission.reset;
         }
-        return { attentionRequired, reset };
+        return { attentionRequired, unsent: unsent(), reset };
     }
     function documentsIn(locator) {
         return replicas.get(locator)?.count ?? 0;
@@ -426,7 +527,7 @@ export function composeRuntime(options) {
             const governed = governs(reach, room);
             const attached = [
                 ...(governed.collection ? [modelOf(room.locator)] : []),
-                ...(governed.selection ? [modelOf(room.locator, 'typed-selection')] : []),
+                ...(governed.selection ? [builtIn] : []),
             ];
             return {
                 locator: room.locator,
@@ -442,11 +543,26 @@ export function composeRuntime(options) {
         const value = listed();
         for (const listener of roomListeners)
             listener(value);
+        emitKnownRooms();
+    }
+    function emitKnownRooms() {
+        conversations.learned();
+        if (unlistedRooms.size === 0)
+            return;
+        if (!roomsListed && rooms.size === 0 && refusal === null && !status.providerUnreachable)
+            return;
+        const value = listed();
+        for (const listener of [...unlistedRooms]) {
+            unlistedRooms.delete(listener);
+            roomListeners.add(listener);
+            listener(value);
+        }
     }
     function emitRefusal() {
         queueReadiness();
         for (const listener of refusalListeners)
             listener(refusal);
+        emitKnownRooms();
     }
     function emitStorageLoss() {
         queueReadiness();
@@ -467,6 +583,7 @@ export function composeRuntime(options) {
         if (closed)
             return;
         queueReadiness();
+        emitKnownRooms();
         const next = status.state === 'synced' && !conversations.current()
             ? { ...status, state: 'syncing' }
             : status;
@@ -501,18 +618,25 @@ export function composeRuntime(options) {
     function unpublished(error) {
         journal.record(`publication failed ${error instanceof Error ? error.name : 'unknown'}`);
     }
+    function indexed(locator) {
+        return replicas.get(locator)?.indexed === true;
+    }
     async function prepareReplica(locator) {
         for (;;) {
             const held = replicas.get(locator);
-            if (held === undefined || closed || prepared.has(locator))
+            if (held === undefined || closed || held.indexed)
                 return;
             const key = held.record.key;
-            const done = await exclusive(async () => (await openLocal()).rederive(key, REDERIVE_BATCH));
-            if (replicas.get(locator)?.record.key !== key)
+            const done = await exclusive(async () => {
+                const local = await openLocal();
+                return timed(deriveBudget, () => local.rederive(key, composed(held.record), deriveBudget.bytes, DERIVE_LONGEST_MS, DERIVE_FLOOR));
+            });
+            const now = replicas.get(locator);
+            if (now?.record.key !== key)
                 continue;
-            if (!done)
+            if (!done.done)
                 continue;
-            prepared.add(locator);
+            replicas.set(locator, { ...now, indexed: true });
             publishChangeSet(changeSet(locator, { documents: null }));
             liveQueries.recover();
             queueReadiness();
@@ -520,7 +644,7 @@ export function composeRuntime(options) {
         }
     }
     function unprepared() {
-        return [...unpreparedDemand, ...replicas.keys()].find((locator) => !prepared.has(locator) && !unpreparable.has(locator));
+        return [...unpreparedDemand, ...replicas.keys()].find((locator) => !indexed(locator) && !unpreparable.has(locator));
     }
     function unpreparedBy(locator, error) {
         unpreparable.add(locator);
@@ -549,7 +673,11 @@ export function composeRuntime(options) {
         })();
     }
     function roomsOfReach(reach) {
-        return new Set([...reach.rooms, ...reach.documents.map(roomOfKey)]);
+        return new Set([
+            ...reach.rooms,
+            ...reach.documents.map(roomOfKey),
+            ...reach.areas.flatMap((area) => (area.types.length === 0 ? [] : [area.room])),
+        ]);
     }
     function reachedRooms(plan) {
         const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
@@ -581,7 +709,7 @@ export function composeRuntime(options) {
                     pending.push({ room: locator, awaits: 'acquisition' });
                 continue;
             }
-            if (!prepared.has(locator)) {
+            if (!replica.indexed) {
                 pending.push({ room: locator, awaits: 'preparation' });
                 continue;
             }
@@ -625,7 +753,7 @@ export function composeRuntime(options) {
             return 'unadmitted';
         if (!replicas.has(locator))
             return 'acquiring';
-        if (!prepared.has(locator))
+        if (!indexed(locator))
             return 'preparing';
         return 'complete';
     }
@@ -655,6 +783,7 @@ export function composeRuntime(options) {
             return [
                 {
                     room,
+                    name: discovered.get(room)?.name ?? room,
                     file: typeof file === 'string' ? file : '',
                     rule: held.code,
                     location: typeof location === 'string' ? location : null,
@@ -662,6 +791,59 @@ export function composeRuntime(options) {
             ];
         });
     }
+    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 step = installing === 0
+            ? null
+            : downloading
+                ? 'downloading'
+                : bytes.done + checking < bytes.total
+                    ? 'writing'
+                    : 'replaying';
+        return {
+            step,
+            paused: installing > 0 && !onScreen ? 'hidden' : null,
+            rooms,
+            parts,
+            bytes,
+        };
+    }
     function readinessFor(port, reach) {
         const required = requiredRooms(reach);
         const search = port.search === 'required';
@@ -682,18 +864,18 @@ export function composeRuntime(options) {
             persistence,
             connection: connectionOf(),
             house: refusal !== null ? 'refused' : writesHeld() ? 'write-halted' : 'open',
-            capacity: capacity !== null &&
-                coverage.some(({ room, state }) => paused.has(room) || !SETTLED_ROOMS.has(state))
-                ? capacity
-                : port.capacity,
+            space: full ? 'full' : port.space,
+            installation: installationOf(coverage),
             refused: refusedIn(required.rooms),
             lost: storageLoss !== null,
-            established: targets[port.target]?.established === true,
+            established: targets[port.target]?.established === true ||
+                (usableWhenHeld.includes(port.target) && required.rooms.some((room) => reopened.has(room))),
         });
     }
     function establish(name) {
         targets = { ...targets, [name]: { established: true } };
         queueReadiness();
+        probeEachMinute();
         void durably((local) => local.fact('targets', targets)).catch(() => {
             journal.record(`target record failed ${name}`);
         });
@@ -731,87 +913,52 @@ export function composeRuntime(options) {
             readinessWatches.delete(watch);
         };
     }
-    function pageBytes(page) {
-        let bytes = 0;
-        for (const { path, content } of page.entries)
-            bytes += (path.length + (content?.length ?? 0)) * 2;
-        return bytes;
-    }
-    function exceeded(error) {
-        return (typeof error === 'object' &&
-            error !== null &&
-            error.name === 'QuotaExceededError');
-    }
-    async function estimated() {
-        const estimate = options.shell.estimate === undefined ? null : await options.shell.estimate();
-        return estimate === null ? null : Math.max(0, estimate.total - estimate.usage);
-    }
-    function pause(locator, cause) {
-        paused.add(locator);
-        capacity = cause;
-        journal.record(`capacity ${cause.cause} ${locator} ${cause.needed} ${cause.available ?? '-'}`);
+    function filled() {
+        if (full || closed)
+            return;
+        full = true;
+        journal.record('space full');
         queueReadiness();
-        if (rechecking !== null)
+        probeEachMinute();
+    }
+    function installedTarget() {
+        return ((usableWhenHeld.length > 0 && reopened.size > 0) ||
+            Object.values(targets).some((target) => target.established));
+    }
+    function probeEachMinute() {
+        if (!full || probing !== null || closed || !installedTarget())
             return;
-        // A paused preparation measures the browser's space again each minute, so space freed elsewhere resumes it without a retry.
-        rechecking = setInterval(() => {
-            void recheck();
+        // A device whose storage filled after its install tries a write each minute, so space freed elsewhere ends its read-only mode without a Retry.
+        probing = setInterval(() => {
+            void probed();
         }, 60_000);
     }
-    async function recheck() {
-        const held = capacity;
-        if (held === null || closed)
-            return;
-        const available = await estimated().catch(() => null);
-        if (available === null || available < (held.needed ?? 0))
-            return;
-        if (held.cause === 'storage-exceeded' &&
-            (held.available === null || available <= held.available))
-            return;
-        resume();
+    function probed() {
+        testing ??= database.ask({ kind: 'space.probe' }).then(() => {
+            testing = null;
+            spaceFreed();
+            return true;
+        }, () => {
+            testing = null;
+            return false;
+        });
+        return testing;
     }
-    function resume() {
-        if (rechecking !== null)
-            clearInterval(rechecking);
-        rechecking = null;
-        if (paused.size === 0 && capacity === null)
+    function spaceFreed() {
+        if (!full)
             return;
-        paused.clear();
-        capacity = null;
-        journal.record('capacity resumed');
+        full = false;
+        if (probing !== null)
+            clearInterval(probing);
+        probing = null;
+        unpreparable.clear();
+        journal.record('space freed');
         queueReadiness();
         if (!closed && authorization !== undefined)
             void sync('unstreamed');
     }
-    async function reclaimed(local) {
-        const unreferenced = [...transfers.keys()].filter((locator) => !discovered.has(locator));
-        for (const locator of unreferenced) {
-            await local.abandon(locator);
-            transfers.delete(locator);
-        }
-        if (unreferenced.length > 0)
-            journal.record(`capacity reclaimed ${unreferenced.length}`);
-        return unreferenced.length > 0;
-    }
-    async function admitted(local, locator, needed) {
-        if (paused.has(locator))
-            return false;
-        let available = await estimated().catch(() => null);
-        if (available === null || available >= needed)
-            return true;
-        if (await reclaimed(local))
-            available = await estimated().catch(() => null);
-        if (available === null || available >= needed)
-            return true;
-        pause(locator, { cause: 'insufficient-space', needed, available });
-        return false;
-    }
-    async function exceededOn(locator, bytes) {
-        const available = await estimated().catch(() => null);
-        pause(locator, { cause: 'storage-exceeded', needed: bytes, available });
-    }
     function seedRoomHeld(room, version) {
-        return prepared.has(room) && reachedBy(room, version);
+        return indexed(room) && reachedBy(room, version);
     }
     function seedHeld(at) {
         return Object.entries(at).every(([room, version]) => (roomsListed && !rooms.has(room)) || seedRoomHeld(room, version));
@@ -934,6 +1081,10 @@ export function composeRuntime(options) {
     }
     function publishChangeSet(set) {
         applyChangeSet(set);
+        for (const { locator, path } of set.documents) {
+            if (path !== null)
+                attachedFiles.get(locator)?.delete(path);
+        }
         if (set.rooms.length > 0 ||
             [...new Set(set.documents.map(({ locator }) => locator))].some((locator) => rooms.has(locator) && counted.get(locator) !== documentsIn(locator)))
             emitRooms();
@@ -959,27 +1110,24 @@ export function composeRuntime(options) {
                     const records = [...replicas].map(([locator, held]) => ({
                         locator,
                         held,
-                        record: { ...held.record, model: revoked, selectionModel: revoked },
+                        record: { ...held.record, model: revoked },
                     }));
+                    let answer = null;
                     try {
                         const local = await openLocal();
-                        await local.commit({
+                        answer = await local.commit({
                             rooms: records.map(({ locator, record }) => ({
                                 locator,
                                 key: record.key,
                                 record: storedRecord(record),
-                                composition: compositionOf(record),
+                                composed: composedOf(composed(record)),
                             })),
                         });
                     }
                     catch {
                         journal.record('model revocation persistence failed');
                     }
-                    const keys = new Set(models.keys());
-                    for (const locator of rooms.keys()) {
-                        keys.add(modelKey(locator, 'collection'));
-                        keys.add(modelKey(locator, 'typed-selection'));
-                    }
+                    const keys = new Set([...models.keys(), ...rooms.keys()]);
                     for (const key of keys) {
                         invalidModels.add(key);
                         models.set(key, revoked);
@@ -989,8 +1137,8 @@ export function composeRuntime(options) {
                     for (const { locator, held, record } of records) {
                         if (replicas.get(locator) !== held)
                             continue;
-                        recomposed(locator, held.record, record);
-                        replicas.set(locator, { ...held, record });
+                        const indexed = answer === null ? held.indexed : committedRoom(locator, answer).indexed;
+                        replicas.set(locator, { ...held, record, indexed });
                     }
                     for (const locator of [...rooms.keys()]) {
                         const room = rooms.get(locator);
@@ -1034,7 +1182,7 @@ export function composeRuntime(options) {
                 ? null
                 : {
                     roots: selection.roots,
-                    model: modelTypes(modelOf(room.locator, 'typed-selection')),
+                    model: modelTypes(builtIn),
                 },
             providerOwnedPaths: room.providerOwnedPaths,
             roomVersion: replicas.get(room.locator)?.record.roomVersion ?? null,
@@ -1123,7 +1271,8 @@ export function composeRuntime(options) {
             queuesWithoutReplica.delete(locator);
             rooms.delete(locator);
             roomDrafts.delete(locator);
-            transfers.delete(locator);
+            attachedFiles.delete(locator);
+            untransferred(locator);
             catching.delete(locator);
             discovered.delete(locator);
             announced.delete(locator);
@@ -1131,17 +1280,12 @@ export function composeRuntime(options) {
             stale.delete(locator);
             repairable.delete(locator);
             unpreparable.delete(locator);
-            paused.delete(locator);
-            prepared.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);
-            }
+            models.delete(locator);
+            liveModels.delete(locator);
+            invalidModels.delete(locator);
             journal.record(`room lost ${locator}`);
         }
         if (fresh.length === 0)
@@ -1189,7 +1333,14 @@ export function composeRuntime(options) {
         });
         await eraseFenced(fresh);
     }
-    function restored(key, persisted) {
+    function retyped(persisted) {
+        if (persisted.status === 'unavailable')
+            return persisted;
+        const { state } = attachedModel({ kind: 'model', snapshot: persisted.snapshot }, NO_MODEL, roomTypes);
+        return state.status === 'unavailable' ? state : { ...persisted, types: state.types };
+    }
+    function restored(key, held) {
+        const persisted = retyped(held);
         const prior = models.get(key);
         if (prior !== undefined &&
             prior.status !== 'unavailable' &&
@@ -1220,8 +1371,8 @@ export function composeRuntime(options) {
         const queuedBatches = new Map(queues.map((queue) => [queue.locator, queue.pending.map(({ batch }) => batch)]));
         targets = held.targets;
         transfers.clear();
-        for (const [locator, record] of held.transfers)
-            transfers.set(locator, record);
+        arrivals.clear();
+        streaming.clear();
         limits = held.providerLimits;
         capabilities = held.capabilities;
         member = held.member;
@@ -1231,7 +1382,7 @@ export function composeRuntime(options) {
         presentations.clear();
         for (const record of held.presentation)
             presentations.set(record.app, record.value);
-        conversations.hydrate(heldConversations, chatDrafts);
+        conversations.hydrate(heldConversations, chatDrafts, held.conversationList);
         pendings.clear();
         for (const queue of queues) {
             for (const { batch, state } of queue.pending) {
@@ -1239,7 +1390,7 @@ export function composeRuntime(options) {
             }
         }
         replicas.clear();
-        prepared.clear();
+        reopened.clear();
         queuesWithoutReplica.clear();
         for (const [locator, queue] of queuedBatches) {
             if (!held.rooms.has(locator))
@@ -1248,39 +1399,40 @@ export function composeRuntime(options) {
         records.forEach((stored, index) => {
             if (fences.has(stored.locator))
                 return;
-            const model = restored(modelKey(stored.locator, 'collection'), stored.model);
-            const selectionModel = restored(modelKey(stored.locator, 'typed-selection'), stored.selectionModel);
-            const record = { ...stored, model, selectionModel };
+            const record = { ...stored, model: restored(stored.locator, stored.model) };
+            reopened.add(record.locator);
             replicas.set(record.locator, {
                 record,
                 queue: queuedBatches.get(record.locator) ?? [],
                 overlaid: held.overlaid.get(record.key) ?? new Set(),
                 count: counts[index] ?? 0,
                 confirmed: 0,
+                indexed: !held.unindexed.has(record.key),
             });
-            if (!held.unprepared.has(record.key))
-                prepared.add(record.locator);
             const existing = rooms.get(record.locator);
             if (existing === undefined)
-                list(record, false);
+                list(record, record.roomVersion !== null);
             else {
                 rooms.set(record.locator, {
                     ...existing,
                     roomVersion: record.roomVersion,
                     operations: record.operations,
                     replica: record.replica,
-                    model: modelTypes(model),
+                    model: modelTypes(record.model),
                     typedSelection: record.typedSelection === null
                         ? null
-                        : {
-                            roots: record.typedSelection.roots,
-                            model: modelTypes(selectionModel),
-                        },
+                        : { roots: record.typedSelection.roots, model: modelTypes(builtIn) },
                 });
             }
         });
-        for (const key of held.orphans)
-            await opened.release(key);
+        try {
+            for (const key of held.orphans)
+                await opened.release(key);
+        }
+        catch (error) {
+            if (!refusedForSpace(error))
+                throw error;
+        }
         if (held.erasing || held.orphans.length > 0)
             queueMicrotask(sweep);
         return {
@@ -1305,7 +1457,7 @@ export function composeRuntime(options) {
     async function open() {
         if (closed)
             throw new Error('runtime closed');
-        const opened = openRuntimeStore(isFenced, options.database);
+        const opened = openRuntimeStore(isFenced, database);
         const interrupted = await opened.fences();
         for (const locator of interrupted) {
             fences.set(locator, { at: discoveries, erased: false });
@@ -1351,10 +1503,29 @@ export function composeRuntime(options) {
         return opening;
     }
     function exclusive(work) {
+        gathering = null;
         const next = mutations.then(work, work);
         mutations = next.then(() => undefined, () => undefined);
         return next;
     }
+    function gathered(key, input, merge, work) {
+        const tail = gathering;
+        if (tail !== null && tail.key === key) {
+            const merged = merge(tail.input, input);
+            if (merged !== null) {
+                tail.input = merged;
+                return tail.done;
+            }
+        }
+        const entry = { key, input, done: Promise.resolve() };
+        entry.done = exclusive(() => {
+            if (gathering === entry)
+                gathering = null;
+            return work(entry.input);
+        });
+        gathering = entry;
+        return entry.done;
+    }
     function withdrawable(locator) {
         return (batch) => {
             const state = pendings.get(pendingKey(locator, batch.id));
@@ -1436,26 +1607,14 @@ export function composeRuntime(options) {
             },
         };
     }
-    function recomposed(locator, before, after) {
-        if (before !== undefined &&
-            before.key === after.key &&
-            fingerprint(compositionOf(before)) === fingerprint(compositionOf(after))) {
-            return;
-        }
-        if (before !== undefined && before.key === after.key)
-            prepared.delete(locator);
-    }
-    function committedRoom(locator, record, answer) {
-        if (answer.prepared[locator] === false)
-            prepared.delete(locator);
-        else if (answer.prepared[locator] === true)
-            prepared.add(locator);
-        if (!prepared.has(locator))
+    function committedRoom(locator, answer) {
+        const indexed = answer.indexed[locator] ?? replicas.get(locator)?.indexed ?? false;
+        if (!indexed)
             prepare([locator]);
-        return { count: answer.counts[locator] ?? replicas.get(locator)?.count ?? 0 };
+        return { count: answer.counts[locator] ?? replicas.get(locator)?.count ?? 0, indexed };
     }
     function replayed(record, confirmedLayer, queue) {
-        return stepped(replaying(confirmedLayer, queue, record.locator, compositionOf(record)));
+        return stepped(replaying(confirmedLayer, queue, record.locator, composed(record)));
     }
     async function overlayDiff(record, before, visible, touched) {
         const kept = before !== undefined && before.record.key === record.key
@@ -1518,7 +1677,7 @@ export function composeRuntime(options) {
         const confirmedLayer = overrides === undefined
             ? read
             : await stepped(slicingWith(read, overrides.set, overrides.removed));
-        const composition = compositionOf(record);
+        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 queueChanged = kept.length !== previousQueue.length || founded.length > 0;
@@ -1561,6 +1720,7 @@ export function composeRuntime(options) {
                     key: record.key,
                     record: storedRecord(record),
                     roots: record.typedSelection?.roots ?? [],
+                    composed: composedOf(composition),
                     ...settling.commit,
                     ...(overrides === undefined
                         ? {}
@@ -1602,14 +1762,14 @@ export function composeRuntime(options) {
                 const confirmedChanged = settling.commit?.published !== undefined ||
                     settling.commit?.refreshed === true ||
                     overrides !== undefined;
-                recomposed(locator, before?.record, record);
-                const { count } = committedRoom(locator, record, answer);
+                const { count, indexed } = committedRoom(locator, answer);
                 replicas.set(locator, {
                     record,
                     queue: kept,
                     overlaid: touched,
                     count,
                     confirmed: (before?.confirmed ?? 0) + (confirmedChanged ? 1 : 0),
+                    indexed,
                 });
                 return mergeChangeSets([
                     changeSet(locator, {
@@ -1624,38 +1784,28 @@ export function composeRuntime(options) {
         };
     }
     function adoptModels(locator, record) {
-        for (const [attached, model] of [
-            ['collection', record.model],
-            ['typed-selection', record.selectionModel],
-        ]) {
-            const key = modelKey(locator, attached);
-            models.set(key, model);
-            invalidModels.delete(key);
-            if (model.status === 'current')
-                liveModels.set(key, JSON.stringify(model.snapshot));
-            else if (model.status === 'unavailable')
-                liveModels.delete(key);
-        }
+        const model = record.model;
+        models.set(locator, model);
+        invalidModels.delete(locator);
+        if (model.status === 'current')
+            liveModels.set(locator, JSON.stringify(model.snapshot));
+        else if (model.status === 'unavailable')
+            liveModels.delete(locator);
     }
     function remodel(locator, answers, held) {
-        const taken = (answer, previous, attached) => {
-            if (answer === undefined)
-                return previous;
-            const { state, refused } = attachedModel(answer, previous, attached === 'collection' ? roomTypes : NO_ROOM_TYPES);
-            if (refused !== null) {
-                const where = refused.location === undefined ? '' : ` ${refused.location}`;
-                journal.record(`model invalid ${locator} ${attached} ${refused.identity} ${refused.rule}${where}`);
-            }
-            models.set(modelKey(locator, attached), state);
-            return state;
-        };
-        return {
-            collection: taken(answers?.collection, held.collection, 'collection'),
-            selection: taken(answers?.selection, held.selection, 'typed-selection'),
-        };
+        const answer = answers?.collection;
+        if (answer === undefined)
+            return held;
+        const { state, refused } = attachedModel(answer, held.collection, roomTypes);
+        if (refused !== null) {
+            const where = refused.location === undefined ? '' : ` ${refused.location}`;
+            journal.record(`model invalid ${locator} collection ${refused.identity} ${refused.rule}${where}`);
+        }
+        models.set(locator, state);
+        return { collection: state };
     }
     function publish(local, room, record, landing, live) {
-        return exclusive(async () => {
+        const landed = exclusive(async () => {
             if (!live()) {
                 caughtUpTo(room.locator);
                 return true;
@@ -1679,29 +1829,28 @@ export function composeRuntime(options) {
                     ? {
                         room: true,
                         view: 'refreshed',
-                        commit: { refreshed: true, composition: compositionOf(record) },
+                        commit: { refreshed: true },
                     }
                     : {
                         room: true,
                         view: landing.refreshed ? 'refreshed' : 'confirmed',
                         commit: {
                             published: { from: prior?.record.key ?? null },
-                            composition: compositionOf(record),
                             ...(landing.refreshed ? { refreshed: true } : {}),
                         },
                     });
             }
             catch (error) {
-                if (!exceeded(error))
+                if (!refusedForSpace(error))
                     throw error;
-                await exceededOn(room.locator, null);
                 caughtUpTo(room.locator);
                 return true;
             }
             if (landing.kind === 'bootstrapped') {
-                transfers.delete(room.locator);
+                untransferred(room.locator);
                 catching.delete(room.locator);
-                sweep();
+                if (prior !== undefined && prior.record.key !== record.key)
+                    sweep();
             }
             for (const batch of accepted)
                 pendings.delete(pendingKey(room.locator, batch.id));
@@ -1721,6 +1870,7 @@ export function composeRuntime(options) {
             }
             return true;
         });
+        return landing.kind === 'refreshed' ? landed : landed.finally(() => installed(room.locator));
     }
     async function savedRoom(locator) {
         const local = await openLocal();
@@ -1745,12 +1895,7 @@ export function composeRuntime(options) {
         return committed(locator, target, saved, new Set(saved.map(({ path }) => path)), writtenBy);
     }
     async function saveParts(locator, named, writtenBy) {
-        const read = named.map(({ path, parts }) => ({ path, parts: readParts(parts) }));
-        if (read.some(({ path }, at) => path === '' ||
-            normalize(path) !== path ||
-            read.findIndex((one) => one.path === path) !== at)) {
-            throw runtimeError('room-draft-malformed');
-        }
+        const read = readSavedParts(named);
         const target = await savedRoom(locator);
         const saved = [];
         const files = [];
@@ -1759,7 +1904,7 @@ export function composeRuntime(options) {
         for (const { path, parts } of read) {
             const file = parts.file === undefined
                 ? undefined
-                : await heldFile(parts.file.blob, binaryBase(visible, path));
+                : await heldFile(parts.file.blob, parts.file.base === undefined ? binaryBase(visible, path) : parts.file.base);
             if (parts.file !== undefined && file !== undefined) {
                 files.push({ key: file.localId, blob: parts.file.blob });
             }
@@ -1794,13 +1939,14 @@ export function composeRuntime(options) {
         const referring = removed.length === 0
             ? []
             : (await local.referrers(record.key, 'confirmed', removed, CHECKED_LINKS)).map(({ path }) => path);
-        const confirmedLayer = await sliceAt(record, 'confirmed', replica.queue, [...paths, ...referring], moved);
+        const confirmedLayer = await sliceAt(record, 'confirmed', replica.queue, [...paths, ...paths.flatMap(ancestors), ...referring], moved);
         const { visible } = await replayed(record, confirmedLayer, replica.queue);
-        const composition = compositionOf(record);
+        const composition = composed(record);
         return {
             record,
             confirmed: confirmedLayer,
             visible,
+            folders: new Set(await local.folders(record.key, 'visible', paths)),
             *visibleOver(queue) {
                 return (yield* replaying(confirmedLayer, queue, record.locator, composition)).visible;
             },
@@ -1812,13 +1958,7 @@ export function composeRuntime(options) {
             return false;
         const local = await openLocal();
         const roots = record.typedSelection?.roots ?? [];
-        if (composition.model.status === 'unavailable' &&
-            (await local.typedWithin(record.key, 'visible', roots, false))) {
-            return true;
-        }
-        return (composition.selection !== null &&
-            composition.selection.model.status === 'unavailable' &&
-            (await local.typedWithin(record.key, 'visible', roots, true)));
+        return local.typedWithin(record.key, 'visible', roots, false);
     }
     function textDiffers(left, right) {
         return ((left?.content ?? undefined) !== (right?.content ?? undefined) ||
@@ -1923,7 +2063,7 @@ export function composeRuntime(options) {
             const lookup = overriddenLookup(lookupOf(local, record.key, 'confirmed'), overrides);
             const clean = available(composition) &&
                 changed.length <= CLEAN_CHANGES &&
-                (await changedCleanly(changed, compositionOf(record), composition, {
+                (await changedCleanly(changed, composed(record), composition, {
                     lookup,
                     texts: textsOf(local, record.key, 'confirmed'),
                     referrers: referrersOf(local, record.key, 'confirmed'),
@@ -1954,6 +2094,7 @@ export function composeRuntime(options) {
             operations: room.operations,
             providerOwnedPaths: room.providerOwnedPaths,
             visible: saving.visible,
+            folders: saving.folders,
             queued: queuedDocuments(replica.queue),
             unmodeled: await unmodeledIn(record),
             validate: validatorOf(record, saving.confirmed),
@@ -1974,6 +2115,7 @@ export function composeRuntime(options) {
                 locator,
                 key: saving.record.key,
                 roots: saving.record.typedSelection?.roots ?? [],
+                composed: composedOf(composed(saving.record)),
                 overlay: diff.overlay,
             });
         }
@@ -2005,7 +2147,7 @@ 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));
-        const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, sourceSaving.visible)));
+        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);
@@ -2117,6 +2259,8 @@ export function composeRuntime(options) {
         submitLater(locator);
     }
     async function committed(locator, target, saved, consumed, writtenBy, files = []) {
+        if (full)
+            return { outcome: 'refused', code: 'durable-write', retryable: true };
         const into = movedInto(locator, saved);
         if (into !== null) {
             return committedMove(locator, into, target, saved, consumed, writtenBy, files);
@@ -2128,7 +2272,7 @@ export function composeRuntime(options) {
             ...saved.map(({ path }) => path),
             ...parts.flatMap(({ bases }) => bases.map(({ path }) => path)),
         ]);
-        const changed = saved.flatMap(({ path, parts: held }) => changedParts(path, underneath(held, path, saving.visible)));
+        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 };
         const requeue = await stepped(requeuing(replica.queue, changes, saving.visible, withdrawable(locator), saving.visibleOver));
@@ -2156,6 +2300,7 @@ export function composeRuntime(options) {
             providerLimits: limits,
             handle: room.handle,
             visible: saving.visible,
+            folders: saving.folders,
             changes,
             bases: parts.flatMap(({ bases }) => bases),
             queued: queuedDocuments(replica.queue),
@@ -2306,6 +2451,9 @@ export function composeRuntime(options) {
     async function readHistory(locator, path, query = {}) {
         if (closed || refusal !== null)
             return UNCERTAIN;
+        await firstDiscovery;
+        if (!roomsNamed)
+            return UNCERTAIN;
         try {
             await ensureAuthorization();
         }
@@ -2395,14 +2543,12 @@ export function composeRuntime(options) {
             return (await openLocal()).file(localId, change?.kind === 'binary' ? change.mediaType : '');
         };
     }
-    function binaryRoom(request) {
-        if (request.kind === 'path')
-            return request.locator;
-        return options.adapter.referrerScope(request.referrer)?.locator ?? null;
-    }
     async function transferBinary(request, transfer, answer) {
         if (closed || refusal !== null)
             return UNCERTAIN;
+        await firstDiscovery;
+        if (!roomsNamed)
+            return UNCERTAIN;
         try {
             await ensureAuthorization();
         }
@@ -2412,16 +2558,13 @@ 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}`);
+        journal.record(`transfer binary ${request.locator} ${request.path}`);
         try {
             const result = await transfer(authorization);
             const settled = result;
             journal.record(`outcome binary ${settled.kind}`);
-            const locator = binaryRoom(request);
-            if (locator !== null && fencedSince(locator, since))
-                return failure({ kind: 'room-not-readable', locator });
+            if (fencedSince(request.locator, since))
+                return failure({ kind: 'room-not-readable', locator: request.locator });
             if (settled.kind === 'scoped-refusal') {
                 const room = replicas.get(settled.locator)?.record;
                 if (room !== undefined)
@@ -2436,23 +2579,27 @@ export function composeRuntime(options) {
             return UNCERTAIN;
         }
     }
+    function fetchBinary(request, name) {
+        return transferBinary(request, (authorization) => keptFiles.fetch(name, () => options.adapter.binary(authorization, request)), binaryAnswer);
+    }
     async function readBinary(request, name) {
         if (closed)
             return UNCERTAIN;
         const held = await keptFiles.find(name);
         if (held !== null)
             return held;
-        return transferBinary(request, (authorization) => keptFiles.fetch(name, () => options.adapter.binary(authorization, request)), binaryAnswer);
+        return fetchBinary(request, name);
     }
     async function binaryPath(locator, path, revision) {
         if (revision !== undefined)
             return { kind: 'path', locator, path, revision };
         const replica = replicas.get(locator);
-        if (replica === undefined)
-            return null;
         const local = await openLocal();
-        const [held] = await local.entries(replica.record.key, 'visible', [path]);
-        if (held?.binary === undefined || held.binary === null)
+        const [held] = replica === undefined ? [] : await local.entries(replica.record.key, 'visible', [path]);
+        const attached = held === undefined ? attachedFiles.get(locator)?.get(path) : undefined;
+        if (attached !== undefined)
+            return { kind: 'path', locator, path, revision: attached.revision };
+        if (replica === undefined || held?.binary === undefined || held.binary === null)
             return null;
         if (held.binary.state === 'pending')
             return { kind: 'pending', localId: held.binary.localId };
@@ -2468,7 +2615,7 @@ export function composeRuntime(options) {
         const holds = (at) => {
             const kept = confirmedLayer.binaries[at];
             return (kept?.state === 'accepted' &&
-                kept.fileRef === record.fileRef &&
+                kept.sha256 === record.sha256 &&
                 confirmedLayer.revisions[at] === record.revision);
         };
         let confirmedAt = path;
@@ -2482,49 +2629,91 @@ export function composeRuntime(options) {
             locator,
             path: confirmedAt,
             revision: record.revision,
-            fileRef: record.fileRef,
         };
     }
-    async function readBinaryPath(locator, path, revision) {
+    async function askedBinary(locator, path, revision) {
         await ready;
         const drafted = roomDrafts.get(locator)?.get(path)?.parts.file;
-        const asked = drafted !== undefined && drafted.localId === revision
+        return drafted !== undefined && drafted.localId === revision
             ? { kind: 'pending', localId: revision }
-            : await binaryPath(locator, path, revision);
+            : binaryPath(locator, path, revision);
+    }
+    function pendingBinary(locator, path, localId) {
+        const facts = queuedFacts(locator, path, localId);
+        return facts === null
+            ? absentBinary(path)
+            : {
+                kind: 'binary',
+                file: localId,
+                byteLength: facts.byteLength,
+                mediaType: facts.mediaType,
+            };
+    }
+    async function readBinaryPath(locator, path, revision) {
+        const asked = await askedBinary(locator, path, revision);
         if (asked === null)
             return absentBinary(path);
-        if (asked.kind === 'pending') {
-            const facts = queuedFacts(locator, path, asked.localId);
-            return facts === null
-                ? absentBinary(path)
-                : {
-                    kind: 'binary',
-                    file: asked.localId,
-                    byteLength: facts.byteLength,
-                    mediaType: facts.mediaType,
-                };
-        }
+        if (asked.kind === 'pending')
+            return pendingBinary(locator, path, asked.localId);
         return readBinary(asked, { locator, path: asked.path, revision: asked.revision });
     }
+    async function heldMediaType(locator, path) {
+        const replica = replicas.get(locator);
+        const [held] = replica === undefined
+            ? []
+            : await (await openLocal()).entries(replica.record.key, 'visible', [path]);
+        return held === undefined
+            ? attachedFiles.get(locator)?.get(path)?.mediaType
+            : held.binary?.mediaType;
+    }
+    function linkOf(asked, held) {
+        return transferBinary(asked, (authorization) => options.adapter.link(authorization, asked), (result) => binaryLinkAnswer(result, held));
+    }
     async function linkBinaryPath(locator, path, revision) {
         await ready;
         const asked = await binaryPath(locator, path, revision);
         if (asked === null || asked.kind === 'pending')
             return absentBinary(path);
-        return transferBinary(asked, (held) => options.adapter.link(held, asked), binaryLinkAnswer);
+        return linkOf(asked, revision === undefined ? await heldMediaType(locator, path) : undefined);
     }
-    async function readBinaryReference(reference) {
+    async function showBinaryPath(locator, path, revision) {
+        const asked = await askedBinary(locator, path, revision);
+        if (asked === null)
+            return absentBinary(path);
+        if (asked.kind === 'pending')
+            return pendingBinary(locator, path, asked.localId);
+        if (closed)
+            return UNCERTAIN;
+        const name = { locator, path: asked.path, revision: asked.revision };
+        const kept = await keptFiles.find(name);
+        if (kept !== null)
+            return kept;
+        const mediaType = await heldMediaType(locator, path);
+        if (mediaType?.startsWith('image/') === true)
+            return fetchBinary(asked, name);
+        return linkOf(asked, revision === undefined ? mediaType : undefined);
+    }
+    async function attachBinary(locator, file) {
         await ready;
-        const scope = options.adapter.referrerScope(reference.referrer);
-        if (scope === null)
-            return absentReference(reference.fileRef);
-        return readBinary({ kind: 'reference', fileRef: reference.fileRef, referrer: reference.referrer }, { locator: scope.locator, path: scope.path ?? '', revision: reference.fileRef });
+        await firstDiscovery;
+        if (closed || !roomsNamed || connectionOf() === 'unreachable' || refusal !== null)
+            return OFFLINE;
+        const request = await attachedFile(locator, file);
+        return transferBinary({ locator, path: file.name }, async (held) => {
+            const result = await options.adapter.attach(held, request);
+            if (result.kind === 'attached') {
+                const landed = attachedFiles.get(locator) ?? new Map();
+                landed.set(result.path, { revision: result.revision, mediaType: request.mediaType });
+                attachedFiles.set(locator, landed);
+            }
+            return result;
+        }, attachAnswer);
     }
     function readPart(file, part) {
-        return options.database.ask({ kind: 'file.part', key: file, part });
+        return database.ask({ kind: 'file.part', key: file, part });
     }
     async function cleanUp() {
-        const freed = await options.database.ask({ kind: 'opened.clean' });
+        const freed = await database.ask({ kind: 'opened.clean' });
         return freed + ((await options.shell.cleanUp?.()) ?? 0);
     }
     function declaredAgents() {
@@ -2693,18 +2882,25 @@ export function composeRuntime(options) {
             after = page.next;
         }
     }
-    async function validatedRoom(local, record, view, previous, overrides = null) {
-        const composition = compositionOf(record);
-        const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+    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 walk = overrides === null
+        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) {
@@ -2729,11 +2925,11 @@ export function composeRuntime(options) {
         }
         const named = changes === null ? null : changes.map(({ path }) => path);
         const textChanged = changes === null || changes.length > 0 || reshaped;
-        const modelsChanged = previous === null || !sameComposition(compositionOf(previous.record), composition);
+        const modelsChanged = previous === null || !sameComposition(composed(previous.record), composition);
         if (modeled && (textChanged || modelsChanged)) {
             const clean = previous !== null &&
                 changes !== null &&
-                (await changedCleanly(changes, compositionOf(previous.record), composition, {
+                (await changedCleanly(changes, composed(previous.record), composition, {
                     lookup,
                     texts,
                     referrers: referrersOf(local, record.key, 'confirmed'),
@@ -2751,43 +2947,210 @@ export function composeRuntime(options) {
             return unreadableRoom(texts, walk, named);
         return null;
     }
-    function refreshingOf(local, key, liveness) {
+    function refreshingOf(local, key, composition, liveness, replaying = null) {
+        const write = replaying === null ? exclusive : finishingWrite;
         return {
+            async turn() {
+                if (replaying === null)
+                    return;
+                installing(replaying);
+                await screened();
+            },
             prior: async (paths) => new Map((await local.entries(key, 'refreshed', paths)).map((entry) => [entry.path, entry])),
             async stage(page) {
-                const batches = batched(page.entries);
-                for (const [index, entries] of batches.entries()) {
-                    const last = index === batches.length - 1;
-                    const staged = await exclusive(async () => {
+                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);
+                    const staged = await write(async () => {
                         if (!liveness())
                             return false;
-                        await local.refresh(key, last
+                        await timed(stageBudget, () => local.refresh(key, composition, last
                             ? { ...page, entries }
-                            : { entries, removals: [], folders: [], folderRemovals: [] });
+                            : { entries, removals: [], folders: [], folderRemovals: [] }));
                         return true;
                     });
                     if (!staged)
                         return false;
+                    if (last)
+                        return true;
+                    written = end;
                 }
-                return true;
             },
         };
     }
-    function batched(entries) {
-        const batches = [[]];
+    function batchEnd(entries, from) {
+        let end = from;
         let spent = 0;
-        for (const entry of entries) {
-            const size = (entry.content?.length ?? 0) + ROW_WEIGHT;
-            if (spent + size > STAGE_BYTES && batches.at(-1).length > 0) {
-                batches.push([]);
-                spent = 0;
-            }
-            batches.at(-1).push(entry);
+        while (end < entries.length) {
+            const size = (entries[end].content?.length ?? 0) + ROW_WEIGHT;
+            if (spent + size > stageBudget.bytes && end > from)
+                break;
             spent += size;
+            end += 1;
+        }
+        return end;
+    }
+    async function timed(budget, work) {
+        const started = performance.now();
+        const done = await work();
+        const spent = performance.now() - started;
+        if (spent < budget.aim / 2)
+            budget.bytes = Math.min(budget.ceiling, Math.round(budget.bytes * 1.5));
+        else if (spent > budget.aim * 2) {
+            budget.bytes = Math.max(budget.floor, Math.round(budget.bytes / 1.5));
+        }
+        return done;
+    }
+    function installWrite(work) {
+        return installTurn(installTurns.starting, work);
+    }
+    function finishingWrite(work) {
+        return installTurn(installTurns.finishing, work);
+    }
+    function installTurn(queue, work) {
+        return new Promise((resolve, reject) => {
+            queue.push(() => void exclusive(work)
+                .then(resolve, reject)
+                .finally(() => {
+                installTurns.busy = false;
+                nextInstallTurn();
+            }));
+            nextInstallTurn();
+        });
+    }
+    function nextInstallTurn() {
+        if (installTurns.busy || installTurns.ahead > 0)
+            return;
+        const turn = installTurns.finishing.shift() ?? installTurns.starting.shift();
+        if (turn === undefined)
+            return;
+        installTurns.busy = true;
+        turn();
+    }
+    async function ahead(work) {
+        let taken = false;
+        const hold = {
+            take() {
+                if (taken)
+                    return;
+                taken = true;
+                installTurns.ahead += 1;
+            },
+            release() {
+                if (!taken)
+                    return;
+                taken = false;
+                installTurns.ahead -= 1;
+                resumeInstall();
+            },
+        };
+        hold.take();
+        try {
+            return await work(hold);
+        }
+        finally {
+            hold.release();
+        }
+    }
+    function resumeInstall() {
+        if (installTurns.ahead > 0)
+            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;
+                });
+            }
+            await new Promise((admit) => installWaiters.push(admit));
+        }
+    }
+    async function unqueued() {
+        while (queuedBytes >= QUEUED_BYTES) {
+            await new Promise((admit) => installWaiters.push(admit));
+        }
+    }
+    function once(release) {
+        let released = false;
+        return () => {
+            if (released)
+                return;
+            released = true;
+            release();
+            for (const admit of installWaiters.splice(0))
+                admit();
+        };
+    }
+    function installing(locator) {
+        installs.add(locator);
+        queueReadiness();
+    }
+    function untransferred(locator) {
+        transfers.delete(locator);
+        arrivals.delete(locator);
+        streaming.delete(locator);
+        underived.delete(locator);
+        unindexed.delete(locator);
+        unchecked.delete(locator);
+    }
+    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 });
+    }
+    function built(locator, { done, text }) {
+        const owed = unindexed.get(locator) ?? [];
+        let left = text;
+        while (!done && left > 0 && owed.length > 0) {
+            const [first] = owed;
+            if (left >= first.text) {
+                left -= first.text;
+                owed.shift();
+                continue;
+            }
+            owed[0] = {
+                bytes: (first.bytes * (first.text - left)) / first.text,
+                text: first.text - left,
+            };
+            left = 0;
         }
-        return batches;
+        if (done || owed.length === 0)
+            unindexed.delete(locator);
+        queueReadiness();
+    }
+    function installed(locator) {
+        if (installs.delete(locator))
+            queueReadiness();
     }
-    async function pullRefresh(authorized, held, liveness) {
+    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) {
         if (!liveness())
             return unconfirmed;
         const turn = generation;
@@ -2796,7 +3159,18 @@ export function composeRuntime(options) {
         const local = await openLocal();
         try {
             await exclusive(() => local.unrefresh(record.key));
-            const result = await advancement(reads, authorized, record, (models, kept) => (liveness() ? remodel(record.locator, models, kept) : kept), liveness, refreshingOf(local, record.key, liveness));
+            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));
             if (result.kind !== 'advanced') {
                 journal.record(`transfer refresh ${record.locator} ${result.kind}`);
                 return result;
@@ -2813,6 +3187,8 @@ export function composeRuntime(options) {
             return { kind: 'advanced', record: result.record, base };
         }
         catch (error) {
+            if (refusedForSpace(error))
+                return unconfirmed;
             journal.record(`transfer refresh ${record.locator} transport-uncertainty`);
             throw error;
         }
@@ -2837,62 +3213,142 @@ export function composeRuntime(options) {
         return made;
     }
     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()
+                    ? timed(deriveBudget, () => local.rederive(key, composition, deriveBudget.bytes, DERIVE_LONGEST_MS, DERIVE_FLOOR))
+                    : null);
+                if (done === null)
+                    return false;
+                built(locator, done);
+                if (done.done)
+                    return true;
+            }
+        };
         return {
             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();
+                }
+            },
+            unqueued,
+            queued(bytes) {
+                queuedBytes += bytes;
+                return once(() => {
+                    queuedBytes -= bytes;
+                });
+            },
+            arriving(locator) {
+                let ended = false;
+                return {
+                    at(bytes) {
+                        if (ended)
+                            return;
+                        arrivals.set(locator, { parts: arrivals.get(locator)?.parts ?? 0, bytes });
+                        streaming.add(locator);
+                        const now = performance.now();
+                        if (now - arrivalReported < ARRIVAL_REPORT_MS)
+                            return;
+                        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;
+                        ended = true;
+                        if (streaming.delete(locator))
+                            queueReadiness();
+                    },
+                };
+            },
+            announced(locator) {
+                const later = announced.get(locator);
+                return later === undefined ? [] : [later];
+            },
             async stage(record, page, composition) {
-                const bytes = pageBytes(page);
-                const batches = batched(page.entries);
-                let key = record.key;
-                for (const [index, entries] of batches.entries()) {
-                    const last = index === batches.length - 1;
-                    const staged = await exclusive(async () => {
-                        if (!liveness())
-                            return null;
-                        if (index === 0 && !(await admitted(local, record.locator, bytes)))
-                            return null;
-                        try {
-                            return await local.stage(record, composition, { entries, folders: last ? page.folders : [] }, key, last);
-                        }
-                        catch (error) {
-                            if (!exceeded(error))
-                                throw error;
-                            await exceededOn(record.locator, bytes);
-                            return null;
-                        }
-                    });
-                    if (staged === null)
+                const { locator } = record;
+                installing(locator);
+                await screened();
+                if (!liveness())
+                    return null;
+                const key = await installWrite(async () => {
+                    if (!liveness())
                         return null;
-                    key = staged;
-                }
-                transfers.set(record.locator, { ...record, key });
+                    return local.stage(record, composition, page);
+                });
+                if (key === null || !liveness())
+                    return null;
+                const arrived = !transfers.has(locator);
+                const prior = transfers.get(locator)?.done.bytes ?? 0;
+                const held = { ...record, key };
+                transfers.set(locator, held);
+                if (arrived)
+                    liveQueries.recover();
+                installing(locator);
                 liveQueries.recover();
-                return key;
+                const text = page.entries.reduce((sum, entry) => sum + (entry.content?.length ?? 0), 0);
+                owedIndexes(locator, record.done.bytes - prior, text);
+                const owed = text + (underived.get(locator) ?? 0);
+                underived.set(locator, owed);
+                if (owed < deriveBudget.bytes)
+                    return held;
+                return (await derived(locator, key, composition)) ? held : null;
             },
-            async refreshing(key) {
+            derive: derived,
+            async refreshing(locator, key, composition) {
                 await exclusive(() => local.unrefresh(key));
-                return refreshingOf(local, key, liveness);
+                return refreshingOf(local, key, composition, liveness, locator);
             },
             abandon: (locator) => exclusive(async () => {
                 if (!liveness())
                     return;
                 await local.abandon(locator);
-                transfers.delete(locator);
+                untransferred(locator);
                 liveQueries.recover();
                 sweep();
             }),
-            setAside: (locator) => exclusive(async () => {
+            setAside: async (locator) => {
                 if (!liveness())
                     return;
-                await local.abandon(locator, true);
-                transfers.delete(locator);
+                untransferred(locator);
                 liveQueries.recover();
-            }),
+            },
             release: (key) => exclusive(async () => {
                 await local.release(key);
                 sweep();
             }),
             content: (key) => heldContentOf(local, key),
-            validate: (record, view) => validatedRoom(local, record, view, null),
+            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) {
@@ -2910,19 +3366,21 @@ export function composeRuntime(options) {
             liveQueries.recover();
         }
         try {
-            const result = await bootstrapRoom(reads, authorized, room, {
-                collection: modelOf(room.locator),
-                selection: modelOf(room.locator, 'typed-selection'),
-            }, (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, (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')
+            if (result.kind !== 'staged') {
                 caughtUpTo(room.locator);
+                installed(room.locator);
+            }
             return result;
         }
         catch (error) {
-            journal.record(`transfer bootstrap ${room.locator} transport-uncertainty`);
             caughtUpTo(room.locator);
+            installed(room.locator);
+            if (refusedForSpace(error))
+                return unconfirmed;
+            journal.record(`transfer bootstrap ${room.locator} transport-uncertainty`);
             throw error;
         }
         finally {
@@ -2946,37 +3404,16 @@ export function composeRuntime(options) {
         }
         return advanceOnce(room, local, authorized, live);
     }
-    async function advanceOnce(room, local, authorized, live) {
-        if (!live() || paused.has(room.locator))
+    async function advanceOnce(room, local, authorized, running) {
+        const live = () => running() && !full;
+        if (!live())
             return unconfirmed;
         const held = replicas.get(room.locator);
         if (held !== undefined) {
-            const refreshed = await pullRefresh(authorized, held, live);
-            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);
-                    emitRooms();
-                }
-                return null;
-            }
-            if (refreshed.kind === 'advanced') {
-                const landing = { kind: 'refreshed', base: refreshed.base };
-                if (!(await publish(local, room, refreshed.record, landing, live))) {
-                    const now = replicas.get(room.locator)?.record.roomVersion;
-                    const reached = now !== undefined &&
-                        options.adapter.reached(room.locator, now, refreshed.record.roomVersion);
-                    return reached ? null : advance(room, local, authorized, live);
-                }
-                await retainModel(local, room, 'collection', modelOf(room.locator));
-                return null;
-            }
-            if (refreshed.kind !== 'beyond-horizon')
+            const refreshed = await ahead((hold) => refreshedRoom(room, local, authorized, held, live, hold));
+            if (refreshed === 'behind')
+                return advance(room, local, authorized, live);
+            if (refreshed !== 'beyond-horizon')
                 return refreshed;
             if (opened !== null) {
                 owed.add(room.locator);
@@ -2987,12 +3424,39 @@ export function composeRuntime(options) {
                 return unconfirmed;
         }
         const bootstrapped = await pullBootstrap(authorized, room, local, live);
+        if (bootstrapped.kind === 'staged') {
+            await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
+            return live() ? null : unconfirmed;
+        }
+        return live() ? bootstrapped : unconfirmed;
+    }
+    async function refreshedRoom(room, local, authorized, held, live, hold) {
+        const refreshed = await pullRefresh(authorized, held, live, hold);
         if (!live())
             return unconfirmed;
-        if (bootstrapped.kind !== 'staged')
-            return bootstrapped;
-        await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
-        return null;
+        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);
+                emitRooms();
+            }
+            return null;
+        }
+        if (refreshed.kind === 'advanced') {
+            const landing = { kind: 'refreshed', base: refreshed.base };
+            if (!(await publish(local, room, refreshed.record, landing, live))) {
+                const now = replicas.get(room.locator)?.record.roomVersion;
+                const reached = now !== undefined &&
+                    options.adapter.reached(room.locator, now, refreshed.record.roomVersion);
+                return reached ? null : 'behind';
+            }
+            await retainModel(local, room, modelOf(room.locator));
+            return null;
+        }
+        return refreshed.kind === 'beyond-horizon' ? 'beyond-horizon' : refreshed;
     }
     async function withhold(withheld, room, local, progress) {
         if (withheld.kind === 'unconfirmed')
@@ -3515,6 +3979,7 @@ export function composeRuntime(options) {
                             locator: room.locator,
                             key: before.record.key,
                             roots: before.record.typedSelection?.roots ?? [],
+                            composed: composedOf(composed(before.record)),
                             overlay: { set: [], cleared: [...before.overlaid] },
                         },
                     ]),
@@ -3570,16 +4035,17 @@ export function composeRuntime(options) {
             release();
         };
     }
-    async function retainModel(local, room, attached, next) {
-        const key = modelKey(room.locator, attached);
-        const previous = modelOf(room.locator, attached);
-        const heldBefore = replicas.get(room.locator)?.record;
-        if (JSON.stringify(previous) === JSON.stringify(next) &&
-            (heldBefore === undefined ||
-                (JSON.stringify(heldBefore.operations) === JSON.stringify(room.operations) &&
-                    JSON.stringify(heldBefore.replica) === JSON.stringify(room.replica) &&
-                    JSON.stringify(heldBefore.typedSelection) ===
-                        JSON.stringify(room.typedSelection ?? null))))
+    function declaredAsHeld(room) {
+        const held = replicas.get(room.locator)?.record;
+        return (held === undefined ||
+            (JSON.stringify(held.operations) === JSON.stringify(room.operations) &&
+                JSON.stringify(held.replica) === JSON.stringify(room.replica) &&
+                JSON.stringify(held.typedSelection) === JSON.stringify(room.typedSelection ?? null)));
+    }
+    async function retainModel(local, room, next) {
+        const key = room.locator;
+        const previous = modelOf(room.locator);
+        if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(room))
             return;
         if (next.status === 'unavailable') {
             invalidModels.add(key);
@@ -3596,11 +4062,11 @@ export function composeRuntime(options) {
                     operations: room.operations,
                     replica: room.replica,
                     typedSelection: room.typedSelection ?? null,
-                    ...(attached === 'collection' ? { model: next } : { selectionModel: next }),
+                    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'), compositionOf(declared));
+                    const verdict = await validatedCollection(walkOf(local, held.record.key, 'confirmed'), lookupOf(local, held.record.key, 'confirmed'), composed(declared));
                     read =
                         verdict.verdict !== 'refuse'
                             ? 'staged'
@@ -3621,14 +4087,13 @@ export function composeRuntime(options) {
                             key: record.key,
                             record: storedRecord(record),
                             roots: record.typedSelection?.roots ?? [],
-                            composition: compositionOf(record),
+                            composed: composedOf(composed(record)),
                             overlay: diff.overlay,
                         },
                     ],
                 });
-                recomposed(room.locator, held.record, record);
-                const { count } = committedRoom(room.locator, record, answer);
-                replicas.set(room.locator, { ...held, record, overlaid: diff.touched, count });
+                const { count, indexed } = committedRoom(room.locator, answer);
+                replicas.set(room.locator, { ...held, record, overlaid: diff.touched, count, indexed });
                 changed = changeSet(room.locator, {
                     documents: answer.changed[room.locator] ?? [],
                     room: true,
@@ -3644,18 +4109,21 @@ export function composeRuntime(options) {
                     declarationRefusals.add(room.locator);
                 }
             }
-            models.set(key, next);
-            if (next.status === 'current') {
-                liveModels.set(key, JSON.stringify(next.snapshot));
-                invalidModels.delete(key);
-            }
-            list(room, room.replica.admission === 'admitted' && !unreadable.has(room.locator));
+            heldModel(room, next);
             if (changed === null)
                 emitRooms();
             else
                 publishChangeSet(changed);
         });
     }
+    function heldModel(room, next) {
+        models.set(room.locator, next);
+        if (next.status === 'current') {
+            liveModels.set(room.locator, JSON.stringify(next.snapshot));
+            invalidModels.delete(room.locator);
+        }
+        list(room, room.replica.admission === 'admitted' && !unreadable.has(room.locator));
+    }
     async function scoped(result, room, local) {
         if (result.scope === 'content' && !result.retryable) {
             journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
@@ -3669,14 +4137,14 @@ export function composeRuntime(options) {
         });
         let scopedAway = room;
         if (result.scope === 'model')
-            await retainModel(local, room, 'collection', {
+            await retainModel(local, room, {
                 status: 'unavailable',
                 reason: 'not-readable',
             });
         else if (result.scope !== 'operation') {
             unreadable.add(room.locator);
             scopedAway = { ...room, replica: { ...room.replica, admission: 'unavailable' } };
-            await retainModel(local, scopedAway, 'collection', modelOf(room.locator));
+            await retainModel(local, scopedAway, modelOf(room.locator));
         }
         if (!continuing())
             return;
@@ -3726,7 +4194,7 @@ export function composeRuntime(options) {
             return false;
         }
         if (prior !== undefined)
-            await retainModel(local, room, 'collection', modelOf(room.locator));
+            await retainModel(local, room, modelOf(room.locator));
         if (discoveryPaused || authorization === undefined)
             return false;
         return room.replica.admission === 'admitted';
@@ -3739,10 +4207,8 @@ export function composeRuntime(options) {
             await withhold(withheld, room, local, progress);
     }
     function revoked(locator) {
-        return ['collection', 'typed-selection'].some((attached) => {
-            const model = modelOf(locator, attached);
-            return model.status === 'unavailable' && model.reason === 'revoked';
-        });
+        const model = modelOf(locator);
+        return model.status === 'unavailable' && model.reason === 'revoked';
     }
     async function loadRoom(room, local, progress, live) {
         if (!live() || authorization === undefined)
@@ -3765,10 +4231,9 @@ export function composeRuntime(options) {
             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);
+                if (live())
+                    await withhold(bootstrapped, room, local, progress);
                 return;
             }
             await publish(local, room, bootstrapped.record, { kind: 'bootstrapped', refreshed: bootstrapped.refreshed }, live);
@@ -3793,6 +4258,8 @@ export function composeRuntime(options) {
         catch {
             result = { kind: 'transport-uncertainty' };
         }
+        if (result.kind === 'discovery')
+            roomsNamed = true;
         if (!live()) {
             progress.complete = false;
             notifyReady();
@@ -3800,12 +4267,7 @@ export function composeRuntime(options) {
         }
         journal.record(`connection discover ${result.kind}`);
         if (result.kind === 'transport-uncertainty') {
-            for (const room of rooms.values()) {
-                await retainModel(local, room, 'collection', cached(modelOf(room.locator)));
-                if (room.typedSelection !== null) {
-                    await retainModel(local, room, 'typed-selection', cached(modelOf(room.locator, 'typed-selection')));
-                }
-            }
+            await settleModels([...rooms.values()].map((room) => discovered.get(room.locator) ?? room), 'cached', local);
             progress.reachable = false;
             progress.complete = false;
             notifyReady();
@@ -3860,6 +4322,7 @@ 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)) {
@@ -3917,7 +4380,7 @@ export function composeRuntime(options) {
     function sync(attempt) {
         return task(OPENING_LANE, async (live) => {
             if (!live()) {
-                notifyReady();
+                readyFromStore();
                 return;
             }
             const progress = { complete: true, reachable: true };
@@ -3995,6 +4458,7 @@ export function composeRuntime(options) {
         });
     }
     function closedSocket(revoked, lost) {
+        notifyDiscovered();
         const opened = socketOpen;
         socketOpen = false;
         connectionLost();
@@ -4038,13 +4502,9 @@ export function composeRuntime(options) {
                 const local = await openLocal();
                 const reloaded = await replacing;
                 if (progress.reachable) {
-                    for (const room of discovered.values()) {
-                        if (replicas.has(room.locator) &&
-                            !expired.includes(room.locator) &&
-                            !reloading.includes(room.locator)) {
-                            await confirmModels(room, local);
-                        }
-                    }
+                    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)
@@ -4085,12 +4545,30 @@ export function composeRuntime(options) {
             return [];
         }
     }
-    async function confirmModels(room, local) {
-        for (const attached of ['collection', 'typed-selection']) {
-            const model = modelOf(room.locator, attached);
-            if (model.status === 'cached') {
-                await retainModel(local, room, attached, { ...model, status: 'current' });
+    async function settleModels(held, status, local) {
+        const owed = (room) => {
+            const model = modelOf(room.locator);
+            return model.status !== 'unavailable' && model.status !== status;
+        };
+        const settled = await exclusive(async () => {
+            if (!continuing())
+                return [];
+            const unchanged = held.filter((room) => owed(room) && !declarationRefusals.has(room.locator) && declaredAsHeld(room));
+            for (const room of unchanged) {
+                const next = { ...modelOf(room.locator), status };
+                const replica = replicas.get(room.locator);
+                if (replica !== undefined)
+                    replicas.set(room.locator, { ...replica, record: { ...replica.record, model: next } });
+                heldModel(room, next);
             }
+            if (unchanged.length > 0)
+                emitRooms();
+            return unchanged;
+        });
+        for (const room of held) {
+            if (settled.includes(room) || !owed(room))
+                continue;
+            await retainModel(local, room, { ...modelOf(room.locator), status });
         }
     }
     function submitLater(locator) {
@@ -4203,8 +4681,6 @@ export function composeRuntime(options) {
                 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 (progress.reachable && reading.reachable)
@@ -4312,6 +4788,7 @@ export function composeRuntime(options) {
         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;
@@ -4324,6 +4801,8 @@ export function composeRuntime(options) {
                 socketOpen = true;
                 connectionLive();
                 generation += 1;
+                for (const admit of installWaiters.splice(0))
+                    admit();
                 reads.opened();
                 conversations.reopened();
                 recovery.resume();
@@ -4343,7 +4822,7 @@ export function composeRuntime(options) {
         const held = replicas.get(locator);
         if (held === undefined || paths.length === 0)
             return new Map();
-        const entries = await (await openLocal()).entries(held.record.key, 'confirmed', paths);
+        const entries = await ahead(async () => (await openLocal()).entries(held.record.key, 'confirmed', paths));
         return new Map(entries.flatMap(({ path, revision }) => revision === null ? [] : [[path, revision]]));
     }
     function writesHeld() {
@@ -4414,8 +4893,11 @@ export function composeRuntime(options) {
         if (closed)
             return;
         closed = true;
-        if (rechecking !== null)
-            clearInterval(rechecking);
+        notifyDiscovered();
+        if (probing !== null)
+            clearInterval(probing);
+        for (const resolve of shownWaiters.splice(0))
+            resolve();
         connectionLive();
         lockListeners.clear();
         readinessWatches.clear();
@@ -4427,6 +4909,7 @@ export function composeRuntime(options) {
         conversations.close();
         void recovery.retire();
         roomListeners.clear();
+        unlistedRooms.clear();
         refusalListeners.clear();
         storageLossListeners.clear();
         statusListeners.clear();
@@ -4452,9 +4935,9 @@ export function composeRuntime(options) {
     observeStream();
     void openLocal().then(() => {
         if (capabilities.length > 0)
-            notifyReady();
+            readyFromStore();
     }, () => {
-        notifyReady();
+        readyFromStore();
     });
     if (options.adapter.roomStream === undefined)
         void sync('unstreamed');
@@ -4602,12 +5085,13 @@ export function composeRuntime(options) {
             };
         }
         if (topic === 'readiness') {
-            return watchReadiness({ target: '', code: 'stored', capacity: null, search: 'unused' }, null, deliver);
+            return watchReadiness({ target: '', code: 'stored', space: null, search: 'unused' }, null, deliver);
         }
         if (topic === 'rooms') {
-            roomListeners.add(deliver);
-            deliver(listed());
+            unlistedRooms.add(deliver);
+            emitKnownRooms();
             return () => {
+                unlistedRooms.delete(deliver);
                 roomListeners.delete(deliver);
             };
         }
@@ -4661,7 +5145,17 @@ export function composeRuntime(options) {
             return openLocal().then(() => undefined);
         },
         rooms() {
-            return listed();
+            if (closed)
+                return Promise.resolve([]);
+            return new Promise((settle) => {
+                const answer = (value) => {
+                    unlistedRooms.delete(answer);
+                    roomListeners.delete(answer);
+                    settle(value);
+                };
+                unlistedRooms.add(answer);
+                emitKnownRooms();
+            });
         },
         query: ((input) => rowsQuery(planned(input, null))),
         search: (input) => searched(input, null, []),
@@ -4671,7 +5165,7 @@ export function composeRuntime(options) {
                 typedSelection: rooms.get(locator)?.typedSelection === undefined ||
                     rooms.get(locator)?.typedSelection === null
                     ? null
-                    : modelTypes(modelOf(locator, 'typed-selection')),
+                    : modelTypes(builtIn),
             };
         },
         roomDraft: {
@@ -4688,33 +5182,17 @@ export function composeRuntime(options) {
                 const record = roomDrafts.get(room)?.get(path);
                 return record === undefined ? null : ((await roomDraftsOf([record]))[0] ?? null);
             },
-            write(room, path, revision, input) {
-                return exclusive(async () => {
-                    const parts = readParts(input);
-                    if (path === '' || normalize(path) !== path)
-                        throw runtimeError('room-draft-malformed');
-                    const local = await openLocal();
-                    const current = roomDrafts.get(room)?.get(path);
-                    if ((current?.revision ?? null) !== revision) {
-                        return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
-                    }
-                    const file = parts.file === undefined
-                        ? undefined
-                        : await heldFile(parts.file.blob, binaryBase(await visibleOf(room, [path]), path));
-                    const record = {
-                        locator: room,
-                        path,
-                        revision: roomDraftRevision(),
-                        parts: held(current?.parts, parts, file),
-                        returned: current?.returned ?? null,
-                    };
-                    await local.keepRoomDraft(record, parts.file === undefined || file === undefined
-                        ? []
-                        : [{ key: file.localId, blob: parts.file.blob }]);
-                    rememberRoomDraft(record);
-                    publishChangeSet(changeSet(room, { drafts: [path] }));
-                    return { outcome: 'written', roomDraft: (await roomDraftsOf([record]))[0] ?? null };
-                });
+            write(room, path, revision, input, next = roomDraftRevision()) {
+                if (typeof next !== 'string' || next === '')
+                    return Promise.reject(runtimeError('room-draft-malformed'));
+                return gathered(`room-draft\u0000${room}\u0000${path}`, { revision, input, next }, (earlier, later) => {
+                    if (later.revision !== earlier.next)
+                        return null;
+                    const parts = gatheredParts(earlier.input, later.input);
+                    return parts === null
+                        ? null
+                        : { revision: earlier.revision, input: parts, next: later.next };
+                }, (written) => writtenRoomDraft(room, path, written.revision, written.input, written.next));
             },
             discard(room, path, revision) {
                 return exclusive(async () => {
@@ -4741,13 +5219,13 @@ export function composeRuntime(options) {
                 });
             },
             write(app, value) {
-                return keepPresentation(app, () => structuredClone(value));
+                return exclusive(() => keptPresentation(app, () => structuredClone(value)));
             },
             edit(app, members) {
-                return keepPresentation(app, (held) => Object.fromEntries([
-                    ...Object.entries(plain(held) ? held : {}).filter(([member]) => !Object.hasOwn(members, member)),
-                    ...Object.entries(structuredClone(members)).filter(([, value]) => value !== null),
-                ]));
+                return gathered(`presentation\u0000${app}`, structuredClone(members), (earlier, later) => ({ ...earlier, ...later }), (edited) => keptPresentation(app, (held) => Object.fromEntries([
+                    ...Object.entries(plain(held) ? held : {}).filter(([member]) => !Object.hasOwn(edited, member)),
+                    ...Object.entries(edited).filter(([, value]) => value !== null),
+                ])));
             },
         },
         save(room, named, writtenBy) {
@@ -4766,7 +5244,8 @@ export function composeRuntime(options) {
             part: readPart,
             read: readBinaryPath,
             link: linkBinaryPath,
-            readReference: readBinaryReference,
+            show: showBinaryPath,
+            attach: attachBinary,
         },
         async call(name, input) {
             await ready;
@@ -4789,7 +5268,8 @@ export function composeRuntime(options) {
             journal.record('retry');
             unpreparable.clear();
             queueReadiness();
-            resume();
+            if (full)
+                await probed();
         },
         observe: observing(watch),
         async reauthorize() {
@@ -4811,7 +5291,6 @@ export function composeRuntime(options) {
     const reachable = {
         md,
         watch,
-        referrerScope: (referrer) => options.adapter.referrerScope(referrer),
         plan: planned,
         query: (plan) => rowsQuery(plan),
         watchPlan,
@@ -4821,6 +5300,7 @@ export function composeRuntime(options) {
         lockedRooms,
         watchLocks,
         located,
+        room: (locator) => listed().find((one) => one.locator === locator),
     };
     return {
         md,
@@ -4835,6 +5315,11 @@ export function composeRuntime(options) {
             journal.record(`persistence ${answer}`);
             queueReadiness();
         },
-        within: (reach, port) => narrowed(reachable, reach, port),
+        shown: screen,
+        within: (reach, port) => {
+            if (full)
+                void probed();
+            return narrowed(reachable, reach, port);
+        },
     };
 }