@agentshouse/mdruntime-adapter 0.1.0-cc63dd043d0e2 → 0.1.0-cc710a8825617

package/dist/adapter.js

@@ -1,107 +1,171 @@
-import { DISCOVER_PREFIXES, capabilities, discoveredRoom, locatorOf, mapDiscovery, parseDiscovery, trackedFrom, } from './discovery.js';
-import { MODEL_ABSENT, failedModel, heldModel, modelKey, modelShelf, } from './model.js';
-import { gathered, selections } from './gather.js';
+import { DISCOVER_PREFIXES, capabilities, discoveredRoom, mapDiscovery, parseDiscovery, trackedFrom, } from './discovery.js';
+import { partModels, streamedModels, viewModels } from './model.js';
+import { gathered, gatheredEach, selections } from './gather.js';
 import { createSiteAdapter } from './site.js';
-import { bootstrapOf, contentPrefixes, matchesScope, parseEnumeration, parseEnvelope, parseGrant, refreshFrom, schemaFrom, schemaPath, viewOf, } from './read.js';
-import { enumeratedLinks, scopeLinks, streamedLinks } from './links.js';
+import { bootstrapOf, contentPrefixes, matchesScope, parseEnumeration, parseEnvelope, parseGrant, refreshFrom, viewOf, wholeView, } from './read.js';
+import { sha256Hex } from './digest.js';
+import { acceptedHanded, enumeratedHanded, heldHanded, scopeHanded, streamedHanded, } from './handed.js';
 import { houseAction } from './actions.js';
-import { classifyDoor, discoveryFailure, doorRefusal } from './refusal.js';
+import { classifyDoor, classifyRead, discoveryFailure, doorRefusal } from './refusal.js';
 import { houseNotifications } from './stream.js';
-import { DOOR_BATCH, DOOR_BATCH_UPLOAD, DOOR_BOOTSTRAP, DOOR_DISCOVER, DOOR_ENUMERATE, DOOR_REVISIONS, PRIVATE_LOCATOR, } from './transport.js';
+import { DOOR_BATCH, DOOR_BATCH_UPLOAD, DOOR_BOOTSTRAP, DOOR_DISCOVER, DOOR_ENUMERATE, DOOR_FILES_GET, DOOR_REVISIONS, } from './transport.js';
 import { batchPaths, deltaBody, deltaBytes, deltaDigest, historyOutcome, houseChanges, mutationOutcome, operationHead, rejectedMapping, revisionBody, uploadable, } from './write.js';
-import { logPosition, presented, reachedVersion, roomVersion, } from './version.js';
+import { houseReferrer } from './referrer.js';
+import { followsVersion, logPosition, presented, reachedVersion, roomVersion, } from './version.js';
 const UNCERTAIN = { kind: 'transport-uncertainty' };
 const UNCERTAIN_READ = { kind: 'transport-uncertainty' };
 function lapsedGrant(outcome) {
     return outcome.kind === 'rejected' && outcome.code === 'upload_unavailable';
 }
-function modelFailure(classified, envelope) {
-    if (classified === null) {
-        return envelope === null ? { kind: 'transport-uncertainty' } : MODEL_ABSENT;
+function heldFiles(authority, held, after, budget) {
+    if (held === undefined || budget === 0)
+        return null;
+    const paths = Object.keys(held.revisions)
+        .filter((path) => held.documents[path] !== undefined && (after === null || path > after))
+        .sort();
+    if (paths.length === 0)
+        return null;
+    const files = paths.slice(0, budget).map((path) => ({ path, revision: held.revisions[path] }));
+    return { room: authority, through: paths.length > budget ? files.at(-1).path : null, files };
+}
+async function reused(scope, held) {
+    const sent = new Set(scope.contents.map((entry) => entry.path));
+    const contents = [...scope.contents];
+    for (const file of scope.files) {
+        if (file.binary !== undefined || sent.has(file.path))
+            continue;
+        const content = held?.documents[file.path];
+        if (content === undefined ||
+            held?.revisions[file.path] !== file.revision ||
+            (await sha256Hex(content)) !== file.sha256) {
+            return null;
+        }
+        contents.push({ path: file.path, content });
     }
-    return failedModel(classified);
+    return { ...scope, contents };
 }
 export function createAgentsHouseAdapter(options) {
     if ('site' in options)
-        return createSiteAdapter(options.site);
+        return createSiteAdapter(options.site, options.snapshot === true);
     const transport = options.transport;
     const notifications = houseNotifications(transport, 'credential');
     const tracked = new Map();
     const handed = new Map();
-    const models = modelShelf();
     let bounds;
     function declared() {
         if (bounds === undefined)
             throw new Error('no Discovery declared the bounds');
         return bounds;
     }
-    function bootstrappedRoom(envelope, entry) {
-        const scope = envelope.scopes.find((candidate) => matchesScope(candidate, entry));
-        if (scope === undefined)
+    async function bootstrappedRoom(envelope, sent, asked, continued) {
+        const { entry } = asked;
+        if (sent === undefined)
             return { kind: 'room-not-readable', locator: entry.locator };
-        handed.set(entry.locator, scopeLinks(scope));
-        notifications.hold(entry.authority, scope);
-        return bootstrapOf(scope);
+        const scope = await reused(sent, asked.held);
+        if (scope === null) {
+            return asked.held === undefined
+                ? UNCERTAIN_READ
+                : continued === null
+                    ? bootstrapTogether({ entry, held: undefined })
+                    : continuedBootstrap({ entry, held: undefined }, continued);
+        }
+        const cursor = envelope.next?.room === entry.authority ? envelope.next : undefined;
+        const next = cursor?.path ?? null;
+        if (continued === null && next === null)
+            handed.set(entry.locator, scopeHanded(scope));
+        else
+            handed.delete(entry.locator);
+        notifications.reach(entry.authority, scope);
+        const seen = [
+            ...(continued?.seen ?? []),
+            ...entry.schemas.filter((schema) => scope.files.some((file) => file.path === schema)),
+        ];
+        const models = await partModels(scope, entry, new Set(seen), next === null);
+        const continuation = next === null
+            ? null
+            : { after: next, seen, ...(cursor?.cut === undefined ? {} : { cut: cursor.cut }) };
+        return {
+            ...bootstrapOf(scope),
+            ...(models === undefined ? {} : { models }),
+            ...(continuation === null ? {} : { pageToken: JSON.stringify(continuation) }),
+        };
+    }
+    async function enumeratedPage(ask, page) {
+        const answer = await transport.door(DOOR_ENUMERATE, {
+            prefixes: contentPrefixes(ask.entry),
+            positions: [
+                {
+                    ...presented(ask.entry.authority, { position: page.after, logEpoch: ask.from.logEpoch }),
+                    page: { through: page.through, read: page.read },
+                },
+            ],
+        });
+        const failure = classifyRead(answer.status, answer.body, ask.entry.locator);
+        if (failure !== null)
+            return failure;
+        const enumeration = parseEnumeration(answer.body, 'credential');
+        if (enumeration === null)
+            return UNCERTAIN_READ;
+        return (viewOf(enumeration, ask.entry) ?? { kind: 'room-not-readable', locator: ask.entry.locator });
     }
-    function enumeratedRoom(enumeration, ask) {
-        const view = viewOf(enumeration, ask.entry);
-        if (view === undefined)
+    async function enumeratedRoom(enumeration, ask) {
+        const first = viewOf(enumeration, ask.entry);
+        if (first === undefined)
             return { kind: 'room-not-readable', locator: ask.entry.locator };
-        notifications.hold(ask.entry.authority, view);
+        const view = await wholeView(first, (page) => enumeratedPage(ask, page));
+        if ('kind' in view)
+            return view;
+        notifications.reach(ask.entry.authority, view);
         const answer = refreshFrom(view, ask.fromRoomVersion);
-        if (answer.kind === 'net-advancement') {
-            handed.set(ask.entry.locator, enumeratedLinks(view, handed.get(ask.entry.locator)));
-        }
-        return answer;
+        if (answer.kind !== 'net-advancement')
+            return answer;
+        handed.set(ask.entry.locator, enumeratedHanded(view, handed.get(ask.entry.locator)));
+        const models = await viewModels(view, ask.entry);
+        return models === undefined ? answer : { ...answer, models };
     }
-    function streamed(entry, request, from) {
-        const links = handed.get(entry.locator);
-        if (links?.roomVersion !== request.fromRoomVersion)
+    async function streamed(entry, request, from) {
+        const held = handed.get(entry.locator);
+        if (held?.roomVersion !== request.fromRoomVersion)
             return null;
-        const advanced = notifications.advance(entry, from, (path, revision) => links.revisions.get(path) === revision);
+        const advanced = notifications.advance(entry, from, (path, revision) => held.revisions.get(path) === revision);
         if (advanced === null)
             return null;
-        if (request.minPosition !== undefined &&
-            !reachedVersion(advanced.page.roomVersion, request.minPosition, entry.logEpoch))
-            return null;
-        const relinked = streamedLinks(links, advanced);
-        if (relinked === null)
-            return null;
-        handed.set(entry.locator, relinked);
-        return advanced.page;
-    }
-    function held(envelope, entry, schema, failure) {
-        return heldModel(envelope === null ? null : schemaFrom(envelope, entry, schema), schemaPath(entry.handle, schema), failure);
-    }
-    function modelPrefixes(entry) {
-        return entry.schemas.map((schema) => schemaPath(entry.handle, schema));
+        handed.set(entry.locator, streamedHanded(held, advanced));
+        const models = await streamedModels(advanced.schemas, entry, 'credential');
+        return models === undefined ? advanced.page : { ...advanced.page, models };
     }
-    async function acquireModels(entries) {
-        const acquired = new Map();
-        for (const part of selections(entries, (entry) => modelPrefixes(entry).length, declared().max_prefixes)) {
-            const answer = await transport.door(DOOR_BOOTSTRAP, {
-                prefixes: part.flatMap((entry) => modelPrefixes(entry)),
+    function held(rooms, demand) {
+        const kept = rooms.flatMap((room) => {
+            const entry = tracked.get(room.locator);
+            const at = logPosition(room.roomVersion);
+            if (entry === undefined || at === null)
+                return [];
+            handed.set(room.locator, heldHanded(room));
+            notifications.reach(entry.authority, at);
+            return [presented(entry.authority, at)];
+        });
+        notifications.send(kept, demand === null
+            ? null
+            : {
+                rooms: demand.rooms.flatMap((locator) => {
+                    const entry = tracked.get(locator);
+                    return entry === undefined ? [] : [entry.authority];
+                }),
+                conversations: demand.conversations,
             });
-            const classified = classifyDoor(answer.status, answer.body, PRIVATE_LOCATOR);
-            const envelope = classified === null ? parseEnvelope(await bundled(answer.body)) : null;
-            const failure = modelFailure(classified, envelope);
-            for (const entry of part) {
-                acquired.set(modelKey(entry.locator, 'collection'), await held(envelope, entry, entry.schema, failure));
-                if (entry.houseModel === null)
-                    continue;
-                acquired.set(modelKey(entry.locator, 'typed-selection'), await held(envelope, entry, entry.houseModel.root, failure));
-            }
-        }
-        return acquired;
     }
-    function roomOf(authority, acquired) {
-        const locator = locatorOf(authority);
-        const key = modelKey(locator, 'collection');
-        const collection = models.retain(key, acquired.get(key));
-        const selection = authority.houseModel === null
-            ? undefined
-            : models.retain(modelKey(locator, 'typed-selection'), acquired.get(modelKey(locator, 'typed-selection')));
-        return discoveredRoom(authority, collection?.identity ?? null, selection?.identity ?? null);
+    function adopted(entry, outcome) {
+        if (outcome.kind !== 'accepted')
+            return outcome;
+        const held = handed.get(entry.locator);
+        if (held === undefined)
+            return outcome;
+        const follows = followsVersion(held.roomVersion, outcome.roomVersion);
+        handed.set(entry.locator, acceptedHanded(held, outcome, follows ? outcome.roomVersion : held.roomVersion));
+        const at = logPosition(outcome.roomVersion);
+        if (follows && at !== null)
+            notifications.reach(entry.authority, at);
+        return outcome;
     }
     function authorityFor(locator) {
         return tracked.get(locator);
@@ -115,116 +179,126 @@ export function createAgentsHouseAdapter(options) {
         const { authority, position, log_epoch: logEpoch } = body;
         if (typeof position !== 'string' || typeof logEpoch !== 'string')
             return result;
-        const locator = authority === undefined
-            ? PRIVATE_LOCATOR
-            : [...tracked.values()].find((entry) => entry.authority === authority)?.locator;
+        const locator = [...tracked.values()].find((entry) => entry.authority === authority)?.locator;
         if (locator === undefined)
             return result;
         return { ...result, at: { locator, roomVersion: roomVersion({ position, logEpoch }) } };
     }
-    async function bundled(body) {
-        const grant = parseGrant(body);
-        if (grant === null)
-            return body;
-        if (grant.method !== 'GET')
-            return null;
-        const answer = await transport.transfer({
-            act: 'local_copy_bundle',
-            method: 'GET',
-            url: grant.url,
-            answer: 'json',
-        });
-        return answer.status === 200 ? answer.body : null;
-    }
     function weight(entry) {
         return contentPrefixes(entry).length;
     }
-    async function bootstrapped(entries) {
-        const answers = [];
-        for (const part of selections(entries, weight, declared().max_prefixes)) {
-            const answer = await transport.door(DOOR_BOOTSTRAP, {
-                prefixes: part.flatMap((entry) => contentPrefixes(entry)),
-            });
-            const classified = part.map((entry) => classifyDoor(answer.status, answer.body, entry.locator));
-            const envelope = classified[0] === null ? parseEnvelope(await bundled(answer.body)) : null;
-            part.forEach((entry, index) => {
-                const failure = classified[index];
-                if (failure === null || failure === undefined) {
-                    answers.push(envelope === null ? UNCERTAIN_READ : bootstrappedRoom(envelope, entry));
-                    return;
+    function holding(asks, after) {
+        const budget = Math.floor(declared().max_held_files / Math.max(1, asks.filter((ask) => ask.held !== undefined).length));
+        return asks.flatMap((ask) => heldFiles(ask.entry.authority, ask.held, after, budget) ?? []);
+    }
+    async function bootstrapped(asks, answer) {
+        let open = asks.map((asked, ask) => ({ entry: asked.entry, asked, ask }));
+        while (open.length > 0) {
+            const unreached = [];
+            for (const part of selections(open, ({ entry }) => weight(entry), declared().max_prefixes)) {
+                const held = holding(part.map(({ asked }) => asked), null);
+                const answered = await transport.door(DOOR_BOOTSTRAP, {
+                    prefixes: part.flatMap(({ entry }) => contentPrefixes(entry)),
+                    ...(held.length === 0 ? {} : { held }),
+                });
+                const classified = part.map(({ entry }) => classifyDoor(answered.status, answered.body, entry.locator));
+                const envelope = classified[0] === null ? parseEnvelope(answered.body) : null;
+                for (const [index, asked] of part.entries()) {
+                    const failure = classified[index];
+                    if (failure !== null && failure !== undefined) {
+                        answer(asked.ask, failure);
+                        continue;
+                    }
+                    if (envelope === null) {
+                        answer(asked.ask, UNCERTAIN_READ);
+                        continue;
+                    }
+                    const scope = envelope.scopes.find((candidate) => matchesScope(candidate, asked.entry));
+                    if (scope === undefined && envelope.next !== undefined) {
+                        unreached.push(asked);
+                        continue;
+                    }
+                    answer(asked.ask, await bootstrappedRoom(envelope, scope, asked.asked, null));
                 }
-                answers.push(failure.kind === 'beyond-horizon' ? UNCERTAIN_READ : failure);
-            });
+            }
+            open = unreached;
         }
-        return answers;
+    }
+    async function continuedBootstrap(asked, continued) {
+        const { entry } = asked;
+        const after = {
+            room: entry.authority,
+            path: continued.after,
+            ...(continued.cut === undefined ? {} : { cut: continued.cut }),
+        };
+        const held = holding([asked], continued.after);
+        const answered = await transport.door(DOOR_BOOTSTRAP, {
+            prefixes: contentPrefixes(entry),
+            after,
+            ...(held.length === 0 ? {} : { held }),
+        });
+        const failure = classifyRead(answered.status, answered.body, entry.locator);
+        if (failure !== null)
+            return failure;
+        const envelope = parseEnvelope(answered.body);
+        if (envelope === null)
+            return UNCERTAIN_READ;
+        const scope = envelope.scopes.find((candidate) => matchesScope(candidate, entry));
+        return bootstrappedRoom(envelope, scope, asked, continued);
     }
     function layered(asks) {
         const depths = new Map();
         const layers = [];
         for (const ask of asks) {
-            const depth = depths.get(ask.entry.authority) ?? 0;
-            depths.set(ask.entry.authority, depth + 1);
+            const depth = depths.get(ask.ask.entry.authority) ?? 0;
+            depths.set(ask.ask.entry.authority, depth + 1);
             (layers[depth] ??= []).push(ask);
         }
         return layers;
     }
     async function enumerated(asks) {
-        const answers = new Map();
-        const parts = layered(asks).flatMap((layer) => selections(layer, (ask) => weight(ask.entry), declared().max_prefixes));
+        const answers = [];
+        const parts = layered(asks.map((ask, index) => ({ ask, index }))).flatMap((layer) => selections(layer, ({ ask }) => weight(ask.entry), declared().max_prefixes));
         for (const part of parts) {
             let open = [...part];
             while (open.length > 0) {
                 const answer = await transport.door(DOOR_ENUMERATE, {
-                    prefixes: open.flatMap((ask) => contentPrefixes(ask.entry)),
-                    positions: open.map((ask) => ({
-                        ...presented(ask.entry.authority, ask.from),
-                        ...(ask.minPosition === undefined ? {} : { min_position: ask.minPosition }),
-                    })),
+                    prefixes: open.flatMap(({ ask }) => contentPrefixes(ask.entry)),
+                    positions: open.map(({ ask }) => presented(ask.entry.authority, ask.from)),
                 });
-                const refusal = doorRefusal(answer.body);
-                if (refusal?.code === 'replica_behind') {
-                    const named = open.filter((ask) => ask.entry.authority === refusal.fields.authority);
-                    const behind = named.length === 0 ? open : named;
-                    for (const ask of behind) {
-                        answers.set(ask, refusal.retryable
-                            ? { kind: 'retryable-refusal', code: refusal.code, fields: refusal.fields }
-                            : (classifyDoor(answer.status, answer.body, ask.entry.locator) ?? UNCERTAIN_READ));
-                    }
-                    open = open.filter((ask) => !behind.includes(ask));
-                    continue;
-                }
-                const classified = open.map((ask) => classifyDoor(answer.status, answer.body, ask.entry.locator));
+                const classified = open.map(({ ask }) => classifyRead(answer.status, answer.body, ask.entry.locator));
                 if (classified[0]?.kind === 'beyond-horizon') {
                     const named = doorRefusal(answer.body)?.fields.authority;
-                    const expired = open.filter((ask) => ask.entry.authority === named);
+                    const expired = open.filter(({ ask }) => ask.entry.authority === named);
                     const answered = expired.length === 0 ? UNCERTAIN_READ : { kind: 'beyond-horizon' };
                     const gone = expired.length === 0 ? open : expired;
                     for (const ask of gone)
-                        answers.set(ask, answered);
+                        answers[ask.index] = answered;
                     open = open.filter((ask) => !gone.includes(ask));
                     continue;
                 }
                 const enumeration = classified[0] === null ? parseEnumeration(answer.body, 'credential') : null;
-                open.forEach((ask, index) => {
-                    const failure = classified[index];
+                for (const [answerIndex, { ask, index }] of open.entries()) {
+                    const failure = classified[answerIndex];
                     if (failure !== null && failure !== undefined) {
-                        answers.set(ask, failure);
-                        return;
+                        answers[index] = failure;
+                        continue;
                     }
-                    answers.set(ask, enumeration === null ? UNCERTAIN_READ : enumeratedRoom(enumeration, ask));
-                });
+                    answers[index] =
+                        enumeration === null ? UNCERTAIN_READ : await enumeratedRoom(enumeration, ask);
+                }
                 open = [];
             }
         }
-        return asks.map((ask) => answers.get(ask) ?? UNCERTAIN_READ);
+        return answers;
     }
-    const bootstrapTogether = gathered(bootstrapped);
+    const bootstrapTogether = gatheredEach(bootstrapped);
     const enumerateTogether = gathered(enumerated);
     async function uploaded(head, changes, delta, bytes, entry, handed, keep) {
         const paths = batchPaths(changes);
         const sha256 = await deltaDigest(delta);
         if (handed !== undefined && handed.sha256 === sha256) {
-            return { body: { ...head, paths, upload: handed } };
+            return { body: { ...head, paths, upload: handed, runtime: notifications.runtime } };
         }
         const minted = await transport.door(DOOR_BATCH_UPLOAD, { ...head, paths, bytes, sha256 });
         if (minted.status !== 200) {
@@ -235,9 +309,7 @@ export function createAgentsHouseAdapter(options) {
             return { outcome: UNCERTAIN };
         const delivered = await transport.transfer({
             act: 'authored_batch_upload',
-            method: 'POST',
             url: grant.url,
-            answer: 'json',
             body: `${grant.operation}\n${delta}`,
         });
         if (delivered.status !== 200)
@@ -247,30 +319,76 @@ export function createAgentsHouseAdapter(options) {
             return { outcome: UNCERTAIN };
         const upload = { url: holding.url, operation: holding.operation, bytes, sha256 };
         await keep(upload);
-        return { body: { ...head, paths, upload } };
+        return { body: { ...head, paths, upload, runtime: notifications.runtime } };
+    }
+    async function staged(answer, batch) {
+        const refusal = doorRefusal(answer.body);
+        if (refusal?.code !== 'files_unstaged')
+            return null;
+        const grants = refusal.fields.upload;
+        if (!Array.isArray(grants))
+            return false;
+        for (const grant of grants) {
+            const { url, operation, sha256 } = grant;
+            const change = batch.changes.find((held) => held.kind === 'binary' && held.sha256 === sha256);
+            if (typeof url !== 'string' || typeof operation !== 'string' || change === undefined)
+                return false;
+            const delivered = await transport.transfer({
+                act: 'binary_stage',
+                url,
+                body: change.blob,
+                operation,
+            });
+            if (delivered.status !== 200)
+                return false;
+        }
+        return true;
     }
-    async function submit(head, changes, delta, bytes, entry, handed, keep) {
-        const inline = { ...head, changes };
+    async function submit(batch, head, changes, delta, bytes, entry, handed, keep) {
+        const inline = { ...head, changes, runtime: notifications.runtime };
         const prepared = uploadable(inline, bytes, declared())
             ? await uploaded(head, changes, delta, bytes, entry, handed, keep)
             : { body: inline };
         if ('outcome' in prepared)
             return prepared.outcome;
         const answer = await transport.door(DOOR_BATCH, prepared.body);
-        return mutationOutcome(answer.status, answer.body, entry.locator, entry.handle);
+        const stagedFiles = await staged(answer, batch);
+        if (stagedFiles === false)
+            return UNCERTAIN;
+        const settled = stagedFiles === null ? answer : await transport.door(DOOR_BATCH, prepared.body);
+        if (stagedFiles === true && (await staged(settled, batch)) !== null)
+            return UNCERTAIN;
+        return mutationOutcome(settled.status, settled.body, entry.locator, entry.handle);
+    }
+    async function downloaded(answer, locator) {
+        const failure = classifyDoor(answer.status, answer.body, locator);
+        if (failure !== null) {
+            return failure.kind === 'scoped-refusal'
+                ? {
+                    kind: 'rejected',
+                    code: failure.code,
+                    fields: failure.fields,
+                    retryable: failure.retryable,
+                }
+                : failure;
+        }
+        const grant = parseGrant(answer.body);
+        if (grant === null || grant.method !== 'GET')
+            return UNCERTAIN_READ;
+        const read = await transport.download(grant.url);
+        if (read.status !== 200 || read.blob === null)
+            return UNCERTAIN_READ;
+        return { kind: 'binary', blob: read.blob };
     }
     return {
         async authorize() {
             return options.authorize();
         },
-        async model(_authorization, request) {
-            return models.answer(request);
-        },
         async discover(_authorization) {
             const answer = await transport.door(DOOR_DISCOVER, { prefixes: [...DISCOVER_PREFIXES] });
-            const classified = classifyDoor(answer.status, answer.body, PRIVATE_LOCATOR);
-            if (classified !== null)
-                return discoveryFailure(classified);
+            const failed = discoveryFailure(answer.status, answer.body);
+            if (failed !== null)
+                return failed;
             const document = parseDiscovery(answer.body);
             if (document === null)
                 return { kind: 'transport-uncertainty' };
@@ -283,17 +401,20 @@ export function createAgentsHouseAdapter(options) {
                 if (!tracked.has(locator))
                     handed.delete(locator);
             notifications.track(entries);
-            const acquired = await acquireModels(entries);
-            models.keep(entries.map((entry) => entry.locator));
-            return mapDiscovery(document, document.authorities.map((authority) => roomOf(authority, acquired)), capabilities(document.actions));
+            return {
+                ...mapDiscovery(document, document.authorities.map((authority) => discoveredRoom(authority)), capabilities(document)),
+                member: document.member,
+            };
         },
         async bootstrap(_authorization, request) {
             const entry = authorityFor(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            if (request.pageToken !== undefined)
-                return { kind: 'transport-uncertainty' };
-            return bootstrapTogether(entry);
+            const asked = { entry, held: request.held };
+            if (request.pageToken !== undefined) {
+                return continuedBootstrap(asked, JSON.parse(request.pageToken));
+            }
+            return bootstrapTogether(asked);
         },
         async refresh(_authorization, request) {
             const entry = authorityFor(request.locator);
@@ -304,16 +425,10 @@ export function createAgentsHouseAdapter(options) {
             const from = logPosition(request.fromRoomVersion);
             if (from === null)
                 return { kind: 'beyond-horizon' };
-            const answered = streamed(entry, request, from);
+            const answered = await streamed(entry, request, from);
             if (answered !== null)
                 return answered;
-            const minPosition = request.minPosition === undefined ? null : logPosition(request.minPosition);
-            return enumerateTogether({
-                entry,
-                from,
-                fromRoomVersion: request.fromRoomVersion,
-                ...(minPosition?.logEpoch === from.logEpoch ? { minPosition: minPosition.position } : {}),
-            });
+            return enumerateTogether({ entry, from, fromRoomVersion: request.fromRoomVersion });
         },
         async mutate(_authorization, request, keep) {
             const entry = authorityFor(request.locator);
@@ -326,10 +441,11 @@ export function createAgentsHouseAdapter(options) {
             const delta = deltaBody(mapped.changes);
             const bytes = deltaBytes(delta);
             const handed = request.upload;
-            const outcome = await submit(head, mapped.changes, delta, bytes, entry, handed, keep);
+            const batch = request.changeBatch;
+            const outcome = await submit(batch, head, mapped.changes, delta, bytes, entry, handed, keep);
             if (handed === undefined || !lapsedGrant(outcome))
-                return outcome;
-            return submit(head, mapped.changes, delta, bytes, entry, undefined, keep);
+                return adopted(entry, outcome);
+            return adopted(entry, await submit(batch, head, mapped.changes, delta, bytes, entry, undefined, keep));
         },
         async history(_authorization, request) {
             const entry = authorityFor(request.locator);
@@ -346,13 +462,56 @@ export function createAgentsHouseAdapter(options) {
                 ...(request.revision === undefined ? {} : { revision: request.revision }),
             });
         },
+        async binary(_authorization, request) {
+            if (request.kind === 'path') {
+                const entry = authorityFor(request.locator);
+                if (entry === undefined)
+                    return { kind: 'room-not-readable', locator: request.locator };
+                const answer = await transport.door(DOOR_FILES_GET, {
+                    room_ref: entry.authority,
+                    path: request.path,
+                    revision: request.revision,
+                });
+                return downloaded(answer, request.locator);
+            }
+            const referrer = houseReferrer(request.referrer, tracked);
+            if (referrer === null) {
+                return { kind: 'rejected', code: 'referrer_unknown', fields: {}, retryable: false };
+            }
+            const answer = await transport.door(DOOR_FILES_GET, {
+                file: request.fileRef,
+                referrer: referrer.referrer,
+            });
+            return downloaded(answer, referrer.locator);
+        },
+        referrerScope(referrer) {
+            const held = houseReferrer(referrer, tracked);
+            if (held === null)
+                return null;
+            if (held.locator === '')
+                return { kind: 'conversations' };
+            const { path } = held.referrer;
+            return { kind: 'room', locator: held.locator, ...(path === undefined ? {} : { path }) };
+        },
         reached(locator, version, target) {
             return reachedVersion(version, target, authorityFor(locator)?.logEpoch);
         },
+        follows(_locator, version, next) {
+            return followsVersion(version, next);
+        },
         async action(_authorization, request) {
             return withAt(await houseAction(transport, request));
         },
-        roomVersions: notifications,
+        roomStream: {
+            hold: held,
+            reopen: notifications.reopen,
+            observe: notifications.observe,
+            published(locator, roomVersion) {
+                const at = logPosition(roomVersion);
+                if (at !== null)
+                    notifications.published(locator, at);
+            },
+        },
         conversations: notifications.conversations,
         serviceMode: notifications.serviceMode,
     };