@agentshouse/mdruntime-adapter 0.1.0-cda5b3be3317e → 0.1.0-cdcec0737ac0e

package/dist/adapter.js

@@ -1,46 +1,50 @@
-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 { stepped } from '@agentshouse/mdruntime';
+import { capabilities, discoveredRoom, mapDiscovery, parseAuthorityChange, parseDiscovery, trackedFrom, } from './discovery.js';
 import { createSiteAdapter } from './site.js';
-import { bootstrapOf, contentPrefixes, matchesScope, parseEnumeration, parseEnvelope, parseGrant, refreshFrom, viewOf, wholeView, } from './read.js';
+import { authorityRoot, bootstrapping, parseFileAddress, parseGrant, } from './read.js';
+import { roomStreams } from './room-stream.js';
+import { spaceSchemas } from './space-schema.js';
 import { sha256Hex } from './digest.js';
-import { acceptedHanded, enumeratedHanded, heldHanded, scopeHanded, streamedHanded, } from './handed.js';
+import { finishedUpload, houseUpload } from './upload.js';
 import { houseAction } from './actions.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_FILES_GET, DOOR_REVISIONS, } from './transport.js';
-import { batchPaths, deltaBody, deltaBytes, deltaDigest, historyOutcome, houseChanges, mutationOutcome, operationHead, rejectedMapping, revisionBody, uploadable, } from './write.js';
-import { houseReferrer } from './referrer.js';
-import { followsVersion, logPosition, presented, reachedVersion, roomVersion, } from './version.js';
+import { houseSearch } from './search.js';
+import { classifyDoor, doorRefusal } from './refusal.js';
+import { houseNotifications, } from './stream.js';
+import { houseDoorRoute, } from './transport.js';
+import { batchPaths, deltaBody, deltaBytes, deltaDigest, historyOutcome, houseChanges, houseMove, mutationOutcome, operationHead, rejectedMapping, revisionBody, uploadable, } from './write.js';
+import { HOUSE_TYPED_PATHS } from './house-model.js';
+import { HOUSE_NAMEABLE_ROOM_TYPES, HOUSE_ROOM_TYPES } from './room-types.js';
+import { followsVersion, logPosition, presented, reachedVersion, roomVersion } from './version.js';
 const UNCERTAIN = { kind: 'transport-uncertainty' };
 const UNCERTAIN_READ = { kind: 'transport-uncertainty' };
+const OCTET_STREAM = 'application/octet-stream';
+const EXPIRED_ADDRESS = 403;
 function lapsedGrant(outcome) {
     return outcome.kind === 'rejected' && outcome.code === 'upload_unavailable';
 }
-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 heldFiles(authority, held, bound) {
+    const listed = await held.files(null, bound + 1);
+    const files = listed.slice(0, bound);
+    const through = listed.length > bound ? (files.at(-1)?.path ?? null) : null;
+    return files.length === 0 ? null : { room: authority, through, 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) {
+    const asked = scope.files.filter((file) => file.binary === undefined && !sent.has(file.path));
+    if (asked.length === 0)
+        return scope;
+    if (held === undefined)
+        return null;
+    const kept = await held.contents(asked.map(({ path }) => path));
+    for (const file of asked) {
+        const found = kept.get(file.path);
+        if (found === undefined ||
+            found.revision !== file.revision ||
+            (await sha256Hex(found.content)) !== file.sha256) {
             return null;
         }
-        contents.push({ path: file.path, content });
+        contents.push({ path: file.path, content: found.content });
     }
     return { ...scope, contents };
 }
@@ -48,116 +52,86 @@ export function createAgentsHouseAdapter(options) {
     if ('site' in options)
         return createSiteAdapter(options.site, options.snapshot === true);
     const transport = options.transport;
-    const notifications = houseNotifications(transport, 'credential');
+    const spaces = spaceSchemas();
+    const notifications = houseNotifications(transport, 'credential', {
+        opened: async (frame) => (frame === null ? null : opened(frame)),
+        changed,
+    }, spaces);
     const tracked = new Map();
-    const handed = new Map();
+    const rooms = roomStreams('credential', spaces);
+    const unreused = new Set();
     let bounds;
     function declared() {
         if (bounds === undefined)
             throw new Error('no Discovery declared the bounds');
         return bounds;
     }
-    async function bootstrappedRoom(envelope, sent, asked, continued) {
-        const { entry } = asked;
-        if (sent === undefined)
-            return { kind: 'room-not-readable', locator: entry.locator };
-        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 }) };
+    function opened(frame) {
+        const document = parseDiscovery(frame);
+        if (document === null)
+            return null;
+        bounds = document.bounds;
+        tracked.clear();
+        for (const entry of trackedFrom(document))
+            tracked.set(entry.locator, entry);
+        notifications.track([...tracked.values()]);
         return {
-            ...bootstrapOf(scope),
-            ...(models === undefined ? {} : { models }),
-            ...(continuation === null ? {} : { pageToken: JSON.stringify(continuation) }),
+            ...mapDiscovery(document, document.authorities.map((authority) => discoveredRoom(authority)), capabilities(document.actions)),
+            member: document.member,
         };
     }
-    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 changed(frame) {
+        const change = parseAuthorityChange(frame);
+        if (change === null)
+            return null;
+        for (const locator of change.left)
+            tracked.delete(locator);
+        for (const entry of trackedFrom(change))
+            tracked.set(entry.locator, entry);
+        notifications.track([...tracked.values()]);
+        return {
+            kind: 'authority-changed',
+            rooms: change.authorities.map((authority) => discoveredRoom(authority)),
+            left: change.left,
+            member: change.member,
+        };
     }
-    async function enumeratedRoom(enumeration, ask) {
-        const first = viewOf(enumeration, ask.entry);
-        if (first === undefined)
-            return { kind: 'room-not-readable', locator: ask.entry.locator };
-        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')
-            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 };
+    async function streamedPage(entry, token, held) {
+        const part = await rooms.part(entry, token);
+        if ('kind' in part)
+            return part;
+        const scope = await reused(part.scope, held);
+        if (scope === null) {
+            unreused.add(entry.locator);
+            return UNCERTAIN_READ;
+        }
+        return {
+            ...(await stepped(bootstrapping(scope))),
+            ...(part.models === undefined ? {} : { models: part.models }),
+            ...(part.pageToken === undefined ? {} : { pageToken: part.pageToken }),
+            bytes: part.bytes,
+        };
     }
-    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) => held.revisions.get(path) === revision);
-        if (advanced === null)
-            return null;
-        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 openedRoom(entry, request) {
+        const reusing = unreused.delete(entry.locator) ? undefined : request.held;
+        const files = reusing === undefined
+            ? null
+            : await heldFiles(entry.authority, reusing, declared().max_held_files);
+        const answered = await transport.streamed(houseDoorRoute('bootstrap'), {
+            room_ref: entry.authority,
+            prefixes: [authorityRoot(entry.handle)],
+            ...(files === null ? {} : { held: [files] }),
+        }, request.signal ?? new AbortController().signal);
+        if (answered.room === null)
+            return classifyDoor(answered.status, answered.body, entry.locator) ?? UNCERTAIN_READ;
+        return rooms.head(entry, answered.room, request.arriving, request.signal);
     }
     function held(rooms) {
-        const kept = rooms.flatMap((room) => {
+        notifications.send(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);
-    }
-    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;
+            return entry === undefined || at === null ? [] : [presented(entry.authority, at)];
+        }));
     }
     function authorityFor(locator) {
         return tracked.get(locator);
@@ -176,128 +150,25 @@ export function createAgentsHouseAdapter(options) {
             return result;
         return { ...result, at: { locator, roomVersion: roomVersion({ position, logEpoch }) } };
     }
-    function weight(entry) {
-        return contentPrefixes(entry).length;
-    }
-    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));
-                }
-            }
-            open = unreached;
-        }
-    }
-    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.ask.entry.authority) ?? 0;
-            depths.set(ask.ask.entry.authority, depth + 1);
-            (layers[depth] ??= []).push(ask);
-        }
-        return layers;
-    }
-    async function enumerated(asks) {
-        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)),
-                });
-                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 answered = expired.length === 0 ? UNCERTAIN_READ : { kind: 'beyond-horizon' };
-                    const gone = expired.length === 0 ? open : expired;
-                    for (const ask of gone)
-                        answers[ask.index] = answered;
-                    open = open.filter((ask) => !gone.includes(ask));
-                    continue;
-                }
-                const enumeration = classified[0] === null ? parseEnumeration(answer.body, 'credential') : null;
-                for (const [answerIndex, { ask, index }] of open.entries()) {
-                    const failure = classified[answerIndex];
-                    if (failure !== null && failure !== undefined) {
-                        answers[index] = failure;
-                        continue;
-                    }
-                    answers[index] =
-                        enumeration === null ? UNCERTAIN_READ : await enumeratedRoom(enumeration, ask);
-                }
-                open = [];
-            }
-        }
-        return answers;
-    }
-    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, runtime: notifications.runtime } };
         }
-        const minted = await transport.door(DOOR_BATCH_UPLOAD, { ...head, paths, bytes, sha256 });
+        const minted = await transport.door(houseDoorRoute('batch-upload'), {
+            ...head,
+            paths,
+            bytes,
+            sha256,
+        });
         if (minted.status !== 200) {
-            return { outcome: mutationOutcome(minted.status, minted.body, entry.locator, entry.handle) };
+            return {
+                outcome: await stepped(mutationOutcome(minted.status, minted.body, entry.locator, entry.handle)),
+            };
         }
         const grant = parseGrant(minted.body);
-        if (grant === null || grant.method !== 'POST')
+        if (grant === null)
             return { outcome: UNCERTAIN };
         const delivered = await transport.transfer({
             act: 'authored_batch_upload',
@@ -307,52 +178,52 @@ export function createAgentsHouseAdapter(options) {
         if (delivered.status !== 200)
             return { outcome: UNCERTAIN };
         const holding = parseGrant(delivered.body);
-        if (holding === null || holding.method !== 'POST')
+        if (holding === null)
             return { outcome: UNCERTAIN };
         const upload = { url: holding.url, operation: holding.operation, bytes, sha256 };
         await keep(upload);
         return { body: { ...head, paths, upload, runtime: notifications.runtime } };
     }
-    async function staged(answer, batch) {
+    async function staged(answer, { changeBatch: batch, file }) {
         const refusal = doorRefusal(answer.body);
         if (refusal?.code !== 'files_unstaged')
             return null;
-        const grants = refusal.fields.upload;
-        if (!Array.isArray(grants))
+        const uploads = refusal.fields.upload;
+        if (!Array.isArray(uploads))
             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)
+        for (const named of uploads) {
+            const upload = houseUpload(named);
+            const change = batch.changes.find((held) => held.kind === 'binary' && held.sha256 === named.sha256);
+            if (upload === null || change === undefined)
                 return false;
-            const delivered = await transport.transfer({
-                act: 'binary_stage',
-                url,
-                body: change.blob,
-                operation,
-            });
-            if (delivered.status !== 200)
+            const finished = await finishedUpload(transport, upload, await file(change.localId));
+            if (finished?.body?.staged !== true)
                 return false;
         }
         return true;
     }
-    async function submit(batch, head, changes, delta, bytes, entry, handed, keep) {
+    async function submit(request, head, changes, delta, bytes, entry, handed, keep, into) {
         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);
-        const stagedFiles = await staged(answer, batch);
+        const answer = await transport.door(houseDoorRoute('batch'), prepared.body);
+        const stagedFiles = await staged(answer, request);
         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)
+        const settled = stagedFiles === null ? answer : await transport.door(houseDoorRoute('batch'), prepared.body);
+        if (stagedFiles === true && (await staged(settled, request)) !== null)
             return UNCERTAIN;
-        return mutationOutcome(settled.status, settled.body, entry.locator, entry.handle);
+        return stepped(mutationOutcome(settled.status, settled.body, entry.locator, entry.handle, into === undefined
+            ? undefined
+            : {
+                source: { authority: entry.authority, handle: entry.handle },
+                destination: { authority: into.authority, handle: into.handle },
+            }));
     }
-    function granted(answer, locator) {
+    function addressed(answer, locator) {
         const failure = classifyDoor(answer.status, answer.body, locator);
         if (failure !== null) {
             return failure.kind === 'scoped-refusal'
@@ -364,122 +235,103 @@ export function createAgentsHouseAdapter(options) {
                 }
                 : failure;
         }
-        const grant = parseGrant(answer.body);
-        const name = answer.body.name;
-        if (grant === null || grant.method !== 'GET' || typeof name !== 'string') {
-            return UNCERTAIN_READ;
-        }
-        return { kind: 'link', url: grant.url, name };
+        const address = parseFileAddress(answer.body);
+        return address === null ? UNCERTAIN_READ : { kind: 'address', ...address };
+    }
+    function linked(answer, locator) {
+        const address = addressed(answer, locator);
+        return address.kind === 'address'
+            ? { kind: 'link', url: address.url, name: address.name, mediaType: address.mediaType }
+            : address;
     }
-    async function downloaded(answer, locator) {
-        const link = granted(answer, locator);
-        if (link.kind !== 'link')
-            return link;
-        const read = await transport.download(link.url);
-        if (read.status !== 200 || read.blob === null)
+    function refusedAttach(answer, locator) {
+        const failure = classifyDoor(answer.status, answer.body, locator);
+        if (failure === null)
+            return null;
+        return failure.kind === 'scoped-refusal'
+            ? {
+                kind: 'rejected',
+                code: failure.code,
+                fields: failure.fields,
+                retryable: failure.retryable,
+            }
+            : failure;
+    }
+    async function downloaded(ask, locator) {
+        let address = addressed(await ask(), locator);
+        if (address.kind !== 'address')
+            return address;
+        let read = await transport.download(address.url);
+        if (read.status === EXPIRED_ADDRESS) {
+            address = addressed(await ask(), locator);
+            if (address.kind !== 'address')
+                return address;
+            read = await transport.download(address.url);
+        }
+        if (read.status !== 200 || read.body === null)
             return UNCERTAIN_READ;
-        return { kind: 'binary', blob: read.blob };
+        return {
+            kind: 'binary',
+            body: read.body,
+            mediaType: address.mediaType,
+            sha256: address.sha256,
+        };
     }
-    function pathGrant(request) {
+    function pathAddress(request) {
         const entry = authorityFor(request.locator);
         if (entry === undefined)
             return null;
-        return transport.door(DOOR_FILES_GET, {
+        return () => transport.door(houseDoorRoute('files/get'), {
             room_ref: entry.authority,
             path: request.path,
             revision: request.revision,
         });
     }
     return {
+        roomTypes: HOUSE_ROOM_TYPES,
+        nameableRoomTypes: HOUSE_NAMEABLE_ROOM_TYPES,
+        typedPaths: HOUSE_TYPED_PATHS,
         async authorize() {
             return options.authorize();
         },
-        async discover(_authorization, scope) {
-            const answer = await transport.door(DOOR_DISCOVER, {
-                prefixes: [...DISCOVER_PREFIXES],
-                ...(scope === undefined ? {} : { rooms: scope.authorities }),
-            });
-            const failed = discoveryFailure(answer.status, answer.body);
-            if (failed !== null)
-                return failed;
-            const document = parseDiscovery(answer.body);
-            if (document === null)
-                return { kind: 'transport-uncertainty' };
-            bounds = document.bounds;
-            const entries = trackedFrom(document);
-            const covered = scope === undefined
-                ? null
-                : [
-                    ...new Set([
-                        ...[...tracked.values()]
-                            .filter((entry) => scope.authorities.includes(entry.authority))
-                            .map((entry) => entry.locator),
-                        ...entries.map((entry) => entry.locator),
-                    ]),
-                ];
-            if (covered === null)
-                tracked.clear();
-            else
-                for (const locator of covered)
-                    tracked.delete(locator);
-            for (const entry of entries)
-                tracked.set(entry.locator, entry);
-            for (const locator of handed.keys())
-                if (!tracked.has(locator))
-                    handed.delete(locator);
-            notifications.track([...tracked.values()]);
-            return {
-                ...mapDiscovery(document, document.authorities.map((authority) => discoveredRoom(authority)), capabilities(document.actions, [...tracked.values()])),
-                member: document.member,
-                ...(covered === null ? {} : { covered }),
-            };
-        },
         async bootstrap(_authorization, request) {
             const entry = authorityFor(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            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);
-            if (entry === undefined)
-                return { kind: 'room-not-readable', locator: request.locator };
-            if (request.pageToken !== undefined)
-                return { kind: 'transport-uncertainty' };
-            const from = logPosition(request.fromRoomVersion);
-            if (from === null)
-                return { kind: 'beyond-horizon' };
-            const answered = await streamed(entry, request, from);
-            if (answered !== null)
-                return answered;
-            return enumerateTogether({ entry, from, fromRoomVersion: request.fromRoomVersion });
+            return request.pageToken === undefined
+                ? openedRoom(entry, request)
+                : streamedPage(entry, request.pageToken, request.held);
         },
         async mutate(_authorization, request, keep) {
             const entry = authorityFor(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            const mapped = houseChanges(request.changeBatch, entry.handle);
+            const batch = request.changeBatch;
+            const destination = batch.between?.destination.room;
+            const into = destination === undefined ? undefined : authorityFor(destination);
+            if (destination !== undefined && into === undefined) {
+                return { kind: 'room-not-readable', locator: destination };
+            }
+            const mapped = into === undefined
+                ? houseChanges(batch, entry.handle)
+                : houseMove(batch, entry.handle, into.handle);
             if (mapped.kind === 'unmapped')
                 return rejectedMapping(mapped);
-            const head = operationHead(request.changeBatch);
+            const head = operationHead(batch, entry.authority);
             const delta = deltaBody(mapped.changes);
             const bytes = deltaBytes(delta);
             const handed = request.upload;
-            const batch = request.changeBatch;
-            const outcome = await submit(batch, head, mapped.changes, delta, bytes, entry, handed, keep);
+            const answer = (upload) => submit(request, head, mapped.changes, delta, bytes, entry, upload, keep, into);
+            const outcome = await answer(handed);
             if (handed === undefined || !lapsedGrant(outcome))
-                return adopted(entry, outcome);
-            return adopted(entry, await submit(batch, head, mapped.changes, delta, bytes, entry, undefined, keep));
+                return outcome;
+            return answer(undefined);
         },
         async history(_authorization, request) {
             const entry = authorityFor(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            const answer = await transport.door(DOOR_REVISIONS, revisionBody({
+            const answer = await transport.door(houseDoorRoute('revisions'), revisionBody({
                 path: request.path,
                 handle: entry.handle,
                 ...(request.revision === undefined ? {} : { revision: request.revision }),
@@ -491,36 +343,45 @@ export function createAgentsHouseAdapter(options) {
             });
         },
         async binary(_authorization, request) {
-            if (request.kind === 'path') {
-                const asked = pathGrant(request);
-                if (asked === null)
-                    return { kind: 'room-not-readable', locator: request.locator };
-                return downloaded(await asked, 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);
+            const ask = pathAddress(request);
+            if (ask === null)
+                return { kind: 'room-not-readable', locator: request.locator };
+            return downloaded(ask, request.locator);
         },
         async link(_authorization, request) {
-            const asked = pathGrant(request);
-            if (asked === null)
+            const ask = pathAddress(request);
+            if (ask === null)
                 return { kind: 'room-not-readable', locator: request.locator };
-            return granted(await asked, request.locator);
+            return linked(await ask(), request.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 }) };
+        async attach(_authorization, request) {
+            const entry = authorityFor(request.locator);
+            if (entry === undefined)
+                return { kind: 'room-not-readable', locator: request.locator };
+            const declared = await transport.door(houseDoorRoute('files/attach'), {
+                room_ref: entry.authority,
+                name: request.name,
+                bytes: request.byteLength,
+                sha256: request.sha256,
+                media_type: request.mediaType.length > 0 ? request.mediaType : OCTET_STREAM,
+            });
+            const refused = refusedAttach(declared, request.locator);
+            if (refused !== null)
+                return refused;
+            const upload = houseUpload(declared.body?.upload);
+            if (upload === null)
+                return UNCERTAIN_READ;
+            const finished = await finishedUpload(transport, upload, request.blob);
+            if (finished === null)
+                return UNCERTAIN_READ;
+            const unfinished = refusedAttach(finished, request.locator);
+            if (unfinished !== null)
+                return unfinished;
+            const { path, revision } = (finished.body ?? {});
+            const root = `/rooms/${entry.handle}/`;
+            return typeof path === 'string' && path.startsWith(root) && typeof revision === 'string'
+                ? { kind: 'attached', path: path.slice(root.length), revision }
+                : UNCERTAIN_READ;
         },
         reached(locator, version, target) {
             return reachedVersion(version, target, authorityFor(locator)?.logEpoch);
@@ -531,15 +392,12 @@ export function createAgentsHouseAdapter(options) {
         async action(_authorization, request) {
             return withAt(await houseAction(transport, request));
         },
+        search(_authorization, request) {
+            return houseSearch(transport, [...tracked.values()], request);
+        },
         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,