@agentshouse/mdruntime 0.1.0-c93103f5357ff → 0.1.0-c94cfdbdb6f68

package/dist/connection.js

@@ -1,11 +1,12 @@
 import { attachedModel } from './attached-model.js';
 import { cached, modelTypes, NO_MODEL, sameModel, } from './model.js';
 import { observing, whole } from './observation.js';
-import { filterOf, identityOf, planOf, queryKey, } from './query.js';
+import { filterOf, identityOf, planOf, plain, queryKey, } from './query.js';
 import { createReadSide } from './read-side.js';
 import { seededResult } from './seed.js';
 import { markdownPath, roomOfKey } from './rows.js';
 import { createSearchIndex, searchPlanOf, } from './search.js';
+import { capped, MAXIMUM_WINDOW } from './windows.js';
 import { bootstrapRoom } from './bootstrap.js';
 import { changeSet, entering, mergeChangeSets } from './change-set.js';
 import { createConversationStore, } from './conversation.js';
@@ -14,15 +15,15 @@ import { indexReferrers, referencesIndexed, validRoot, } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
 import { binaryRecord } from './binary.js';
-import { absentBinary, binaryAnswer, calledResult, failure, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
+import { absentBinary, binaryAnswer, binaryLinkAnswer, calledResult, failure, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
 import { createRecovery } from './recovery.js';
+import { doorReads } from './reads.js';
 import { refreshRoom } from './refresh.js';
-import { buildBatch, joined, limitedIn, requeued } from './save.js';
-import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicaOf, sameMembership, withdrawals, } from './replica.js';
-import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
+import { buildBatch, joined, limitedIn, queuedDocuments, requeued, } from './save.js';
+import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicaOf, sameMembership, standing, } from './replica.js';
+import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, moveTarget, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration } from './durability.js';
-import { demanded, narrower, WHOLE_DEMAND, wider } from './acquisition.js';
 import { readinessOf, SETTLED_ROOMS, } from './readiness.js';
 import { FencedMap } from './fence.js';
 import { tally } from './shared.js';
@@ -37,6 +38,7 @@ function roomsAlone(plan) {
         plan.root.types === null &&
         plan.root.where === null &&
         plan.root.pathPrefix === null &&
+        plan.paths === null &&
         plan.hop === null &&
         plan.backlinks === null);
 }
@@ -57,6 +59,10 @@ const OPENING_LANE = 'opening';
 const CONVERSATION_LANE = 'conversations';
 const ROOM_READS = 256;
 const ROOM_ATTEMPTS = 16;
+function operationOf(input) {
+    const operation = input?.operation_id;
+    return typeof operation === 'string' ? operation : null;
+}
 const outside = new Map();
 function outsideOf(roots) {
     const key = JSON.stringify(roots);
@@ -110,6 +116,7 @@ export function composeRuntime(options) {
     const liveModels = new FencedMap(isModelFenced);
     const invalidModels = new Set();
     const discovered = new Map();
+    const reads = doorReads(options.adapter, (locator) => discovered.get(locator), () => generation);
     let roomsListed = false;
     const scopedRefusals = new Map();
     const sourceRefusals = new Map();
@@ -146,6 +153,7 @@ export function composeRuntime(options) {
     let handed = false;
     const recovery = (options.recovery ?? createRecovery()).scope(ROOM_ATTEMPTS);
     const repairing = new Set();
+    const calling = new Set();
     const repairable = new Map();
     let outcomeRetention = null;
     const answering = new Map();
@@ -182,8 +190,6 @@ export function composeRuntime(options) {
     const unpreparedDemand = new Set();
     const unindexable = new Set();
     let preparing = false;
-    let demand = WHOLE_DEMAND;
-    let narrowing = null;
     let targets = {};
     let persistence = options.shell.persistence;
     let capacity = null;
@@ -200,7 +206,7 @@ export function composeRuntime(options) {
         durably,
         stream: () => options.adapter.conversations,
         publish: publishChangeSet,
-        online: () => !status.providerUnreachable && refusal === null,
+        online: () => connectionOf() !== 'unreachable' && refusal === null,
         closed: () => closed,
         unanswered: resendLater,
         expired: (operation) => pastHorizon(operation),
@@ -266,6 +272,15 @@ 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('', null, null, { presentation: app }));
+        });
+    }
     function emitPresentation(app) {
         if (closed)
             return;
@@ -377,7 +392,7 @@ export function composeRuntime(options) {
         if (closed)
             return;
         queueReadiness();
-        const next = status.state === 'synced' && demand.conversations && !conversations.current()
+        const next = status.state === 'synced' && !conversations.current()
             ? { ...status, state: 'syncing' }
             : status;
         if (same(shown, next))
@@ -410,8 +425,12 @@ export function composeRuntime(options) {
             ...set,
             documents: set.documents.filter(({ locator }) => prepared.has(locator) || projecting.has(locator)),
         };
-        readSide.apply(held);
-        searchIndex.changed(held);
+        const applied = readSide.apply(held, () => searchIndex.changed(held));
+        if (applied instanceof Promise)
+            void applied.catch(unpublished);
+    }
+    function unpublished(error) {
+        journal.record(`publication failed ${error instanceof Error ? error.name : 'unknown'}`);
     }
     async function referenced(locator) {
         for (;;) {
@@ -442,8 +461,8 @@ export function composeRuntime(options) {
                 if (current === undefined || closed)
                     return;
                 const set = entering(locator, current, chunk);
-                readSide.apply(set);
                 entered.push(set);
+                return readSide.apply(set);
             });
             if (!replicas.has(locator) || closed)
                 return;
@@ -536,57 +555,6 @@ export function composeRuntime(options) {
         if (waiting.length > 0)
             prepare(waiting.map(({ room }) => room));
     }
-    function acquires(room) {
-        return (demanded(demand, room) ||
-            (replicas.get(room.locator)?.queue.length ?? 0) > 0 ||
-            queuesWithoutReplica.has(room.locator));
-    }
-    function acquiredLocators() {
-        return [...discovered.values()]
-            .filter(acquires)
-            .map((room) => room.locator)
-            .sort();
-    }
-    function heldDemand(acquired) {
-        if (demand.whole)
-            return null;
-        return { rooms: acquired.map((room) => room.locator), conversations: demand.conversations };
-    }
-    function applyDemand(next) {
-        const before = acquiredLocators();
-        const conversed = demand.conversations;
-        demand = next;
-        const after = acquiredLocators();
-        queueReadiness();
-        if (!conversed && next.conversations)
-            scheduleCurrency();
-        if (JSON.stringify(before) === JSON.stringify(after) && conversed === next.conversations)
-            return;
-        journal.record(`acquisition ${next.whole ? 'whole' : after.length}`);
-        if (options.adapter.roomStream === undefined)
-            void sync('unstreamed');
-        else if (socketOpen)
-            options.adapter.roomStream.reopen();
-    }
-    function acquire(next) {
-        if (closed)
-            return;
-        if (narrowing !== null)
-            clearTimeout(narrowing);
-        narrowing = null;
-        const widening = wider(next, demand);
-        if (!widening && !narrower(next, demand))
-            return;
-        if (widening || !roomsListed) {
-            applyDemand(next);
-            return;
-        }
-        // A narrower demand waits five seconds, so a tab that reloads returns before the stream reopens twice.
-        narrowing = setTimeout(() => {
-            narrowing = null;
-            applyDemand(next);
-        }, 5_000);
-    }
     function requiredRooms(reach) {
         if (reach === null)
             return { listed: roomsListed, rooms: [...rooms.keys()].sort() };
@@ -784,10 +752,7 @@ export function composeRuntime(options) {
             void sync('unstreamed');
     }
     async function reclaimed(local) {
-        const unreferenced = [...transfers.keys()].filter((locator) => {
-            const room = discovered.get(locator);
-            return room === undefined || !acquires(room);
-        });
+        const unreferenced = [...transfers.keys()].filter((locator) => !discovered.has(locator));
         for (const locator of unreferenced) {
             await local.abandon(locator);
             transfers.delete(locator);
@@ -860,9 +825,7 @@ export function composeRuntime(options) {
         awaitPreparation(cover);
         if ('pending' in cover)
             return cover;
-        return 'groups' in rows
-            ? { groups: rows.groups, coverage: cover.coverage }
-            : { documents: rows.documents, coverage: cover.coverage };
+        return { ...rows, coverage: cover.coverage };
     }
     async function indexConversation(conversation) {
         searchIndex.indexMessages(conversation, [], false);
@@ -1006,7 +969,7 @@ export function composeRuntime(options) {
             refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
         });
     }
-    async function applyDiscovery(found, started) {
+    async function applyDiscovery(found, started, covered) {
         for (const room of found) {
             const fence = fences.get(room.locator);
             if (fence !== undefined && fence.erased && fence.at < started)
@@ -1019,10 +982,14 @@ export function composeRuntime(options) {
         const listedLocators = new Set(listed.map((room) => room.locator));
         for (const locator of listedLocators)
             scopedRefusals.delete(locator);
-        discovered.clear();
+        if (covered === undefined)
+            discovered.clear();
+        else
+            for (const locator of covered)
+                discovered.delete(locator);
         for (const room of listed)
             discovered.set(room.locator, room);
-        const unlisted = unlistedHeld(new Set(found.map((room) => room.locator)));
+        const unlisted = unlistedHeld(new Set(found.map((room) => room.locator))).filter((locator) => covered === undefined || covered.includes(locator));
         if (options.adapter.exhaustiveDiscovery === true)
             await loseRooms(unlisted);
         else
@@ -1280,8 +1247,9 @@ export function composeRuntime(options) {
     }
     async function settle(local, locator, before, confirmed, queue, settling = {}) {
         const previousQueue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
-        const withdrawn = withdrawals(confirmed, queue, withdrawable, localSaves);
-        const kept = queue.filter((batch) => !withdrawn.includes(batch));
+        const { withdrawn, kept } = standing(confirmed, queue, withdrawable, localSaves);
+        const founded = kept.filter((batch) => !queue.includes(batch));
+        const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
         const unqueued = withdrawn.map((batch) => ({
             batch,
             returned: localSaves || landed(batch, confirmed) ? null : returnedBy('withdrawn'),
@@ -1305,9 +1273,10 @@ export function composeRuntime(options) {
                 });
             }
         }
-        await local.keepAuthored({ locator, queue: kept, roomDrafts: [...written.values()] });
+        await local.keepAuthored({ locator, queue: kept, founded, roomDrafts: [...written.values()] });
+        const staying = new Set(kept.map((batch) => batch.id));
         for (const batch of previousQueue) {
-            if (!kept.includes(batch))
+            if (!staying.has(batch.id))
                 pendings.delete(batch.id);
         }
         for (const record of written.values())
@@ -1328,7 +1297,7 @@ export function composeRuntime(options) {
             else
                 queuesWithoutReplica.delete(locator);
             publishChangeSet(changeSet(locator, before ?? null, held, {
-                queue: kept.length !== previousQueue.length,
+                queue: queueChanged,
                 drafts: [...written.keys()],
             }));
             moveTo({ ...status, ...attention() });
@@ -1343,7 +1312,7 @@ export function composeRuntime(options) {
             replicas.set(locator, replicaOf(confirmed, kept, before));
             return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
                 room: settling.room,
-                queue: kept.length !== previousQueue.length,
+                queue: queueChanged,
                 drafts: [...written.keys()],
             });
         };
@@ -1435,7 +1404,7 @@ export function composeRuntime(options) {
             return true;
         });
     }
-    async function saveRoomDrafts(locator, named, writtenBy) {
+    async function savedRoom(locator) {
         const local = await openLocal();
         await referenced(locator);
         const replica = replicas.get(locator);
@@ -1443,6 +1412,10 @@ export function composeRuntime(options) {
         if (replica === undefined || room === undefined) {
             throw runtimeError('room-not-held', `No Local Replica for ${locator}`);
         }
+        return { local, replica, room };
+    }
+    async function saveRoomDrafts(locator, named, writtenBy) {
+        const target = await savedRoom(locator);
         const saved = [];
         for (const { path, revision } of named) {
             const record = roomDrafts.get(locator)?.get(path);
@@ -1452,6 +1425,38 @@ export function composeRuntime(options) {
             if (!saved.some((draft) => draft.path === path))
                 saved.push({ path, parts: record.parts });
         }
+        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 target = await savedRoom(locator);
+        const saved = [];
+        for (const { path, parts } of read) {
+            const file = parts.file === undefined
+                ? undefined
+                : await heldFile(parts.file.blob, binaryBase(target.replica.visible, path));
+            saved.push({ path, parts: held(undefined, parts, file) });
+        }
+        return committed(locator, target, saved, new Set(), writtenBy);
+    }
+    function carriedDrafts(locator, saved, consumed) {
+        const holding = roomDrafts.get(locator);
+        return new Map(saved.flatMap(({ path, parts }) => {
+            const record = holding?.get(path);
+            if (parts.move === undefined || record === undefined || consumed.has(path))
+                return [];
+            const to = moveTarget(parts.move);
+            if (to === path || holding?.has(to) === true)
+                return [];
+            return [[path, { ...record, path: to, revision: roomDraftRevision() }]];
+        }));
+    }
+    async function committed(locator, { local, replica, room }, saved, consumed, writtenBy) {
         const changed = saved.flatMap(({ path, parts }) => changedParts(path, underneath(parts, path, replica.visible)));
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
@@ -1484,6 +1489,7 @@ export function composeRuntime(options) {
             visible: replica.visible,
             changes,
             bases: parts.flatMap(({ bases }) => bases),
+            queued: queuedDocuments(replica.queue),
             writtenBy,
             clean: {
                 text: replica.confirmed.record.documents,
@@ -1491,7 +1497,9 @@ export function composeRuntime(options) {
                 composition: compositionOf(replica.confirmed.record),
             },
         };
-        const checked = withdrawing ? buildBatch({ ...input, queued: requeue.queued }) : null;
+        const checked = withdrawing
+            ? buildBatch({ ...input, queued: new Set([...input.queued, ...requeue.queued]) })
+            : null;
         if (checked?.kind === 'refused')
             return { outcome: 'refused', ...checked.refusal };
         const owners = [...requeue.owners].flatMap((origin) => {
@@ -1514,6 +1522,7 @@ export function composeRuntime(options) {
                     ...input,
                     visible: replicaOf(replica.confirmed, requeue.queue, replica).visible,
                     changes: requeue.changes,
+                    queued: queuedDocuments(requeue.queue),
                 });
         if (built?.kind === 'refused')
             return { outcome: 'refused', ...built.refusal };
@@ -1548,13 +1557,16 @@ export function composeRuntime(options) {
             if (limited !== null)
                 return { outcome: 'refused', ...limited };
         }
-        const consumed = saved.map(({ path }) => path);
+        const carried = carriedDrafts(locator, saved, consumed);
+        const left = [...consumed, ...carried.keys()];
+        const arrived = [...carried.values()];
         try {
             await local.keepAuthored({
                 locator,
                 queue: batches,
                 saved: drafted,
-                consumedRoomDrafts: consumed,
+                consumedRoomDrafts: left,
+                roomDrafts: arrived,
             });
         }
         catch {
@@ -1569,12 +1581,14 @@ export function composeRuntime(options) {
         }
         if (!localSaves)
             recorded = false;
-        for (const path of consumed)
+        for (const path of left)
             forgetRoomDraft(locator, path);
+        for (const record of arrived)
+            rememberRoomDraft(record);
         replicas.set(locator, replicaOf(replica.confirmed, batches, replica));
         publishChangeSet(changeSet(locator, replica, replicas.get(locator) ?? null, {
             queue: true,
-            drafts: consumed,
+            drafts: [...left, ...arrived.map(({ path }) => path)],
         }));
         moveTo({ ...(localSaves ? status : saving(status)), ...attention() });
         submitLater(locator);
@@ -1665,7 +1679,7 @@ export function composeRuntime(options) {
         const scope = options.adapter.referrerScope(request.referrer);
         return scope?.kind === 'room' ? scope.locator : null;
     }
-    async function readBinary(request) {
+    async function transferBinary(request, transfer, answer) {
         if (closed || refusal !== null)
             return UNCERTAIN;
         try {
@@ -1681,40 +1695,41 @@ export function composeRuntime(options) {
             ? `transfer binary ${request.locator} ${request.path}`
             : `transfer binary ${request.fileRef}`);
         try {
-            const result = await options.adapter.binary(authorization, request);
-            journal.record(`outcome binary ${result.kind}`);
+            const 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 (result.kind === 'scoped-refusal') {
-                const room = replicas.get(result.locator)?.confirmed.record;
+            if (settled.kind === 'scoped-refusal') {
+                const room = replicas.get(settled.locator)?.confirmed.record;
                 if (room !== undefined)
-                    await scoped(result, room, await openLocal());
+                    await scoped(settled, room, await openLocal());
             }
-            if (result.kind === 'revoked-authorization')
+            if (settled.kind === 'revoked-authorization')
                 await refuse('revoked-authorization');
-            return binaryAnswer(result);
+            return answer(result);
         }
         catch {
             journal.record('outcome binary transport-uncertainty');
             return UNCERTAIN;
         }
     }
-    async function readBinaryPath(locator, path, revision) {
-        await ready;
+    function readBinary(request) {
+        return transferBinary(request, (held) => options.adapter.binary(held, request), binaryAnswer);
+    }
+    function binaryPath(locator, path, revision) {
         if (revision !== undefined)
-            return readBinary({ kind: 'path', locator, path, revision });
+            return { kind: 'path', locator, path, revision };
         const visible = replicas.get(locator)?.visible;
         const held = visible?.binaries[path];
         if (visible === undefined || held === undefined)
-            return absentBinary(path);
-        if (held.state === 'pending') {
-            const blob = queuedBlob(locator, path, held.localId);
-            return blob === null ? absentBinary(path) : { kind: 'binary', blob };
-        }
+            return null;
+        if (held.state === 'pending')
+            return { kind: 'pending', localId: held.localId };
         const record = binaryRecord(path, held, visible.revisions[path]);
         if (record.state !== 'accepted')
-            return absentBinary(path);
+            return null;
         const replica = replicas.get(locator);
         const queued = (replica?.queue ?? []).flatMap((batch) => batch.changes);
         const holds = (at) => {
@@ -1729,13 +1744,31 @@ export function composeRuntime(options) {
             if (change.kind === 'move' && change.to === confirmed)
                 confirmed = change.path;
         }
-        return readBinary({
+        return {
             kind: 'path',
             locator,
             path: confirmed,
             revision: record.revision,
             fileRef: record.fileRef,
-        });
+        };
+    }
+    async function readBinaryPath(locator, path, revision) {
+        await ready;
+        const asked = binaryPath(locator, path, revision);
+        if (asked === null)
+            return absentBinary(path);
+        if (asked.kind === 'pending') {
+            const blob = queuedBlob(locator, path, asked.localId);
+            return blob === null ? absentBinary(path) : { kind: 'binary', blob };
+        }
+        return readBinary(asked);
+    }
+    async function linkBinaryPath(locator, path, revision) {
+        await ready;
+        const asked = binaryPath(locator, path, revision);
+        if (asked === null || asked.kind === 'pending')
+            return absentBinary(path);
+        return transferBinary(asked, (held) => options.adapter.link(held, asked), binaryLinkAnswer);
     }
     async function readBinaryReference(reference) {
         await ready;
@@ -1761,7 +1794,7 @@ export function composeRuntime(options) {
         }
         return undefined;
     }
-    async function invokeAction(name, input) {
+    async function invokeAction(name, input, dispatching) {
         await ready;
         if (closed || refusal !== null)
             return UNCERTAIN;
@@ -1775,6 +1808,7 @@ export function composeRuntime(options) {
         }
         if (closed || authorization === undefined || refusal !== null)
             return UNCERTAIN;
+        await dispatching?.();
         journal.record(`transfer action ${name}`);
         try {
             const result = await options.adapter.action(authorization, { name, input });
@@ -1795,6 +1829,60 @@ export function composeRuntime(options) {
             return UNCERTAIN;
         }
     }
+    function unsettled(result) {
+        return result.kind !== 'action' && result.retryable;
+    }
+    async function recoveredAction(name, input) {
+        const operation = operationOf(input);
+        if (operation === null)
+            return invokeAction(name, input);
+        const kept = async () => (await openLocal()).keepCall({ operation, name, input });
+        calling.add(operation);
+        try {
+            let result = await invokeAction(name, input, kept);
+            if (unsettled(result)) {
+                await recovery.attempt(`action ${operation}`, async () => {
+                    if (closed || refusal !== null)
+                        return 'done';
+                    if (!socketOpen)
+                        return 'again';
+                    result = await invokeAction(name, input, kept);
+                    return unsettled(result) ? 'again' : 'done';
+                }, { again: true });
+            }
+            if (!unsettled(result))
+                await (await openLocal()).dropCall(operation);
+            return result;
+        }
+        finally {
+            calling.delete(operation);
+        }
+    }
+    async function resendCalls(signal) {
+        if (!socketOpen || closed || stopping)
+            return 'done';
+        const local = await openLocal();
+        for (const held of await local.calls()) {
+            if (calling.has(held.operation))
+                continue;
+            if (closed || signal.aborted)
+                return 'done';
+            if (pastHorizon(held.operation)) {
+                await local.dropCall(held.operation);
+                continue;
+            }
+            calling.add(held.operation);
+            try {
+                if (unsettled(await invokeAction(held.name, held.input)))
+                    return 'again';
+                await local.dropCall(held.operation);
+            }
+            finally {
+                calling.delete(held.operation);
+            }
+        }
+        return 'done';
+    }
     function continuing() {
         return !closed && !discoveryPaused;
     }
@@ -1812,8 +1900,9 @@ export function composeRuntime(options) {
     async function pullRefresh(authorized, confirmed, live) {
         if (!live())
             return unconfirmed;
+        const turn = generation;
         try {
-            const result = await refreshRoom(options.adapter, authorized, confirmed, (models, held) => (live() ? remodel(confirmed.record.locator, models, held) : held), live);
+            const result = await refreshRoom(reads, authorized, confirmed, (models, held) => (live() ? remodel(confirmed.record.locator, models, held) : held), live);
             const detail = result.kind === 'advanced' ? result.confirmed.record.roomVersion : result.kind;
             journal.record(`transfer refresh ${confirmed.record.locator} ${detail}`);
             return result;
@@ -1822,6 +1911,9 @@ export function composeRuntime(options) {
             journal.record(`transfer refresh ${confirmed.record.locator} transport-uncertainty`);
             throw error;
         }
+        finally {
+            reads.finished(confirmed.record.locator, turn);
+        }
     }
     function staging(local, live) {
         return {
@@ -1864,12 +1956,13 @@ export function composeRuntime(options) {
     async function pullBootstrap(authorized, room, local, live) {
         if (!live())
             return unconfirmed;
+        const turn = generation;
         if (replicas.has(room.locator)) {
             catching.add(room.locator);
             readSide.recover();
         }
         try {
-            const result = await bootstrapRoom(options.adapter, authorized, room, {
+            const result = await bootstrapRoom(reads, authorized, room, {
                 collection: modelOf(room.locator),
                 selection: modelOf(room.locator, 'typed-selection'),
             }, (models, held) => (live() ? remodel(room.locator, models, held) : held), live, staging(local, live), reusable(room));
@@ -1884,12 +1977,28 @@ export function composeRuntime(options) {
             caughtUpTo(room.locator);
             throw error;
         }
+        finally {
+            reads.finished(room.locator, turn);
+        }
     }
     function caughtUpTo(locator) {
         if (catching.delete(locator))
             readSide.recover();
     }
+    function behind(room) {
+        const held = replicas.get(room.locator)?.confirmed.record.roomVersion;
+        return (held !== undefined &&
+            [announced.get(room.locator), room.roomVersion].some((later) => later !== undefined && !options.adapter.reached(room.locator, held, later)));
+    }
     async function advance(room, local, authorized, live) {
+        const carried = reads.carried(room.locator);
+        const withheld = await advanceOnce(room, local, authorized, live);
+        if (withheld !== null || reads.carried(room.locator) === carried || !behind(room)) {
+            return withheld;
+        }
+        return advanceOnce(room, local, authorized, live);
+    }
+    async function advanceOnce(room, local, authorized, live) {
         await referenced(room.locator);
         if (!live() || paused.has(room.locator))
             return unconfirmed;
@@ -2377,16 +2486,15 @@ export function composeRuntime(options) {
         });
     }
     async function synchronize(listed, local, progress, attempt, live) {
-        const acquired = listed.filter(acquires);
-        const prepared = await Promise.allSettled(acquired.map((room) => prepareRoom(room, local, progress)));
+        const prepared = await Promise.allSettled(listed.map((room) => prepareRoom(room, local, progress)));
         if (!live())
             return;
-        const ready = acquired.filter((_, index) => {
+        const ready = listed.filter((_, index) => {
             const outcome = prepared[index];
             return outcome?.status === 'fulfilled' && outcome.value;
         });
         if (attempt === 'opened') {
-            options.adapter.roomStream?.hold(heldRooms(ready), heldDemand(acquired));
+            options.adapter.roomStream?.hold(heldRooms(ready));
             handed = true;
         }
         discovering?.release();
@@ -2417,11 +2525,7 @@ export function composeRuntime(options) {
         return room.replica.admission === 'admitted';
     }
     async function caughtUp(room, local, progress, live) {
-        const held = replicas.get(room.locator)?.confirmed.record.roomVersion;
-        if (held === undefined || authorization === undefined || !live())
-            return;
-        const behind = [announced.get(room.locator), room.roomVersion].some((later) => later !== undefined && !options.adapter.reached(room.locator, held, later));
-        if (!behind)
+        if (authorization === undefined || !live() || !behind(room))
             return;
         const withheld = await advance(room, local, authorization, live);
         if (withheld !== null)
@@ -2465,7 +2569,7 @@ export function composeRuntime(options) {
             caughtUpTo(room.locator);
         }
     }
-    async function discoverRooms(local, progress, attempt, live) {
+    async function discoverRooms(local, progress, attempt, live, scope) {
         if (closed || authorization === undefined) {
             notifyReady();
             return;
@@ -2475,7 +2579,7 @@ export function composeRuntime(options) {
         const started = discoveries;
         let result;
         try {
-            result = await options.adapter.discover(authorization);
+            result = await options.adapter.discover(authorization, scope);
         }
         catch {
             result = { kind: 'transport-uncertainty' };
@@ -2552,7 +2656,7 @@ export function composeRuntime(options) {
             member = signedIn;
             emitMember();
         }
-        await synchronize(await applyDiscovery(result.rooms, started), local, progress, attempt, live);
+        await synchronize(await applyDiscovery(result.rooms, started, result.covered), local, progress, attempt, live);
     }
     async function ensureAuthorization() {
         if (authorization !== undefined)
@@ -2649,9 +2753,43 @@ export function composeRuntime(options) {
             options.adapter.roomStream?.reopen();
         });
     }
-    function closedSocket(revoked) {
+    function rediscover(scope) {
+        return task(OPENING_LANE, async (live) => {
+            if (!live() || !socketOpen)
+                return;
+            const progress = { complete: true, reachable: true };
+            const gate = discover();
+            moveTo(transferring(status));
+            try {
+                const local = await openLocal();
+                if (!live())
+                    return;
+                await ensureAuthorization();
+                if (!live())
+                    return;
+                await discoverRooms(local, progress, 'authorized', live, scope);
+            }
+            catch {
+                progress.complete = false;
+            }
+            finally {
+                gate.release();
+                notifyReady();
+            }
+            if (!live())
+                return;
+            if (!progress.complete)
+                complete = false;
+            await rest(progress, live);
+        });
+    }
+    function closedSocket(revoked, lost) {
         const opened = socketOpen;
         socketOpen = false;
+        if (lost) {
+            reads.lost();
+            conversations.lost();
+        }
         if (revoked) {
             void refuse('revoked-authorization');
             return;
@@ -2668,9 +2806,10 @@ export function composeRuntime(options) {
     function applyOpening(expired) {
         const progress = underway?.generation === generation ? underway.progress : null;
         const cycle = progress ?? { complete: true, reachable: true };
-        const replacing = reloadNow((room) => expired.includes(room.locator), cycle);
         if (opened === generation)
             opened = null;
+        const reloading = progress === null ? [] : owedReloads(expired);
+        const replacing = reloadNow((room) => expired.includes(room.locator) || reloading.includes(room.locator), cycle);
         return task(OPENING_LANE, async (live) => {
             underway = null;
             if (!live())
@@ -2680,24 +2819,17 @@ export function composeRuntime(options) {
                 await rest(cycle, live);
                 return;
             }
-            await roomsCarried(expired);
+            await roomsCarried([...expired, ...reloading]);
             if (!live())
                 return;
-            const replaced = new Set(owed);
-            owed.clear();
             try {
                 const local = await openLocal();
-                const held = [...discovered.values()].filter((room) => replicas.has(room.locator));
-                const reloading = held.filter((room) => !expired.includes(room.locator) &&
-                    (replaced.has(room.locator) || revoked(room.locator)));
-                for (const room of reloading)
-                    catching.add(room.locator);
-                readSide.recover();
-                const reloads = Promise.allSettled(reloading.map((room) => roomTask(room.locator, (current) => reload(room, local, progress, current))));
-                const reloaded = [...(await reloads), ...(await replacing)];
+                const reloaded = await replacing;
                 if (progress.reachable) {
-                    for (const room of held) {
-                        if (!expired.includes(room.locator) && !reloading.includes(room)) {
+                    for (const room of discovered.values()) {
+                        if (replicas.has(room.locator) &&
+                            !expired.includes(room.locator) &&
+                            !reloading.includes(room.locator)) {
                             await confirmModels(room, local);
                         }
                     }
@@ -2714,6 +2846,18 @@ export function composeRuntime(options) {
                 await finishOpening(progress, live);
         });
     }
+    function owedReloads(expired) {
+        const reloading = [...discovered.values()]
+            .filter((room) => replicas.has(room.locator) &&
+            !expired.includes(room.locator) &&
+            (owed.has(room.locator) || revoked(room.locator)))
+            .map((room) => room.locator);
+        owed.clear();
+        for (const locator of reloading)
+            catching.add(locator);
+        readSide.recover();
+        return reloading;
+    }
     async function reloadNow(replaced, progress) {
         try {
             const local = await openLocal();
@@ -2838,6 +2982,7 @@ export function composeRuntime(options) {
                 progress.complete = false;
                 return;
             }
+            reads.applied();
             submitAll();
             for (const locator of stale)
                 if (repairable.has(locator))
@@ -2846,10 +2991,11 @@ export function composeRuntime(options) {
             if (status.providerUnreachable)
                 conversations.reconnected();
             const reading = { complete: true, reachable: true };
-            if (demand.conversations)
-                await conversations.catchUp(reading);
+            await conversations.catchUp(reading);
             if (progress.reachable && reading.reachable)
                 await conversations.resend(reading);
+            if (progress.reachable)
+                void recovery.attempt('calls', resendCalls);
             if (!reading.reachable) {
                 progress.reachable = false;
                 resendLater();
@@ -2910,7 +3056,7 @@ export function composeRuntime(options) {
                 return;
             const room = discovered.get(locator);
             const held = replicas.get(locator);
-            if (room === undefined || room.replica.admission !== 'admitted' || !acquires(room))
+            if (room === undefined || room.replica.admission !== 'admitted')
                 return;
             if (held !== undefined &&
                 (held.confirmed.record.replica.selection !== room.replica.selection ||
@@ -2962,14 +3108,17 @@ export function composeRuntime(options) {
             if (event.kind === 'opened') {
                 socketOpen = true;
                 generation += 1;
+                reads.opened();
                 conversations.reopened();
                 recovery.resume();
                 void sync('opened');
             }
             else if (event.kind === 'closed')
-                closedSocket(event.revoked);
+                closedSocket(event.revoked, event.lost);
             else if (event.kind === 'opening')
                 void applyOpening(event.expired);
+            else if (event.kind === 'authority-changed')
+                void rediscover(event.scope);
             else
                 void applyRoom(event.locator, event.roomVersion);
         }, receipts);
@@ -3024,7 +3173,7 @@ export function composeRuntime(options) {
         if (!live())
             return;
         await conversations.reconcile();
-        if (conversations.current() || !demand.conversations) {
+        if (conversations.current()) {
             show();
             return;
         }
@@ -3042,8 +3191,6 @@ export function composeRuntime(options) {
         if (closed)
             return;
         closed = true;
-        if (narrowing !== null)
-            clearTimeout(narrowing);
         if (rechecking !== null)
             clearInterval(rechecking);
         readinessWatches.clear();
@@ -3091,7 +3238,11 @@ export function composeRuntime(options) {
     if (options.adapter.roomStream === undefined)
         void sync('unstreamed');
     function planned(input, reach) {
-        return planOf(input, roomFacts(reach), planReach(reach));
+        const plan = planOf(input, roomFacts(reach), planReach(reach));
+        const named = plan.paths !== null &&
+            plan.rooms !== null &&
+            plan.paths.length * plan.rooms.length <= MAXIMUM_WINDOW;
+        return plan.limit === null && named ? plan : { ...plan, limit: capped(plan.limit) };
     }
     function watchPlan(plan, deliver) {
         let seeded = false;
@@ -3128,7 +3279,8 @@ export function composeRuntime(options) {
         };
     }
     async function searched(input, reach) {
-        const plan = searchPlanOf(input);
+        const asked = searchPlanOf(input);
+        const plan = { ...asked, limit: capped(asked.limit) };
         const filter = filterOf(plan.documents ?? {}, roomFacts(reach), planReach(reach));
         for (;;) {
             const cover = covered(filter);
@@ -3167,6 +3319,7 @@ export function composeRuntime(options) {
             if ('pending' in answered)
                 continue;
             const searchedConversations = named.filter((one) => searchIndex.conversations().has(one));
+            await readSide.settled();
             const seen = searchIndex.changes();
             await searchIndex.caughtUp();
             const selected = roomsAlone(answering) ? null : await rowsQuery(answering);
@@ -3187,7 +3340,9 @@ export function composeRuntime(options) {
                 index: searchIndex.generation(),
                 overlay: answered.coverage.overlay,
             };
-            return complete ? { ...hits, coverage } : { pending, ...hits, coverage };
+            return complete
+                ? { ...hits, coverage }
+                : { pending, documents: hits.documents, messages: hits.messages, coverage };
         }
     }
     const watch = (topic, input, deliver) => {
@@ -3372,27 +3527,31 @@ export function composeRuntime(options) {
                 });
             },
             write(app, value) {
-                return exclusive(async () => {
-                    const local = await openLocal();
-                    const stored = structuredClone(value);
-                    await local.present({ app, value: stored });
-                    presentations.set(app, stored);
-                    publishChangeSet(changeSet('', null, null, { presentation: app }));
-                });
+                return keepPresentation(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),
+                ]));
             },
         },
         save(room, named, writtenBy) {
             return exclusive(() => saveRoomDrafts(room, named, writtenBy));
         },
+        saveParts(room, parts, writtenBy) {
+            return exclusive(() => saveParts(room, parts, writtenBy));
+        },
         history(locator, path, query) {
             return readHistory(locator, path, query);
         },
         binaryFile: {
             read: readBinaryPath,
+            link: linkBinaryPath,
             readReference: readBinaryReference,
         },
         call(name, input) {
-            return invokeAction(name, input);
+            return recoveredAction(name, input);
         },
         reached(locator, roomVersion, path) {
             return path === undefined
@@ -3444,7 +3603,6 @@ export function composeRuntime(options) {
         stop,
         lose: loseRooms,
         watch,
-        acquire,
         persisted(answer) {
             if (answer === persistence)
                 return;