@agentshouse/mdruntime-adapter 0.1.0-cd23c45caa798 → 0.1.0-cd519a0f878dc

package/README.md

@@ -24,8 +24,8 @@ host.attach(port, 'my-app');
 ```
 
 App code never imports this package; it reaches the Runtime only through the
-client its host hands it. The rules an App's agent follows are in the
-package's `AGENTS.md`.
+client its host hands it. The rules an App's agent follows are the `apps/` pages
+of House's Guide, which House's `open_guide` opens.
 
 ## License
 

package/dist/actions.d.ts

@@ -1,5 +1,7 @@
 import { type AcceptedMessage, type ActionDeclaration, type ActionRequest, type ActionResult, type ConversationAgents, type ConversationHistories, type ConversationHistoryRequest, type FileDeclaration } from '@agentshouse/mdruntime';
 import type { HouseDoorAnswer, HouseTransport } from './transport.js';
+export declare const HISTORY_PAGE = 100;
+export declare const TRIGGER_ROOMS = 100;
 type Operated = {
     readonly operation_id?: string;
 };
@@ -19,6 +21,7 @@ export type AppInputs = {
     };
     readonly 'conversation.create': Operated & {
         readonly agent_id: string;
+        readonly replaces?: string;
     };
     readonly 'conversation.delete': ConversationControl;
     readonly 'conversation.history': ConversationHistoryRequest;
@@ -45,22 +48,6 @@ export type AppAnswerAdditions = {
     readonly 'conversation.send': {
         readonly turn: string;
     };
-    readonly 'record.list': {
-        readonly attachments: readonly {
-            readonly referrer: {
-                readonly room_ref: string;
-                readonly record: string;
-            };
-        }[];
-        readonly records: readonly {
-            readonly attachments: readonly {
-                readonly referrer: {
-                    readonly room_ref: string;
-                    readonly record: string;
-                };
-            }[];
-        }[];
-    };
 };
 export declare const HOUSE_APP_ACTS: Readonly<Record<string, string>>;
 export declare const SITE_SUBMIT = "submit";

package/dist/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAE1B,KAAK,0BAA0B,EAC/B,KAAK,eAAe,EACrB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAUtE,KAAK,QAAQ,GAAG;IAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnD,KAAK,mBAAmB,GAAG,QAAQ,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,qBAAqB,EAAE,eAAe,GAAG;QAChD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;KACrB,CAAC;IACF,QAAQ,CAAC,qBAAqB,EAAE,mBAAmB,GAAG;QACpD,QAAQ,CAAC,MAAM,EAAE;YAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;SAAE,CAAC;KAClF,CAAC;IACF,QAAQ,CAAC,qBAAqB,EAAE,QAAQ,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,qBAAqB,EAAE,mBAAmB,CAAC;IACpD,QAAQ,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;IAC5D,QAAQ,CAAC,wBAAwB,EAAE,mBAAmB,CAAC;IACvD,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAClD,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,GAAG;QAClD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,QAAQ,CAAC,cAAc,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC;CACpE,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,qBAAqB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,sBAAsB,EAAE,qBAAqB,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,qBAAqB,EAAE;QAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE,QAAQ,CAAC,mBAAmB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,QAAQ,CAAC,aAAa,EAAE;QACtB,QAAQ,CAAC,WAAW,EAAE,SAAS;YAC7B,QAAQ,CAAC,QAAQ,EAAE;gBAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAC;SAC3E,EAAE,CAAC;QACJ,QAAQ,CAAC,OAAO,EAAE,SAAS;YACzB,QAAQ,CAAC,WAAW,EAAE,SAAS;gBAC7B,QAAQ,CAAC,QAAQ,EAAE;oBAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;oBAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAC;aAC3E,EAAE,CAAC;SACL,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AA6EF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE3D,CAAC;AAEF,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE5D,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAKhF,CAAC;AAYJ,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAE3E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,iBAAiB,EAAE,CAKvF;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAQvB;AA6ED,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAQjF;AAyID,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,GAAG,IAAI,CAUtE"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"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"}

package/dist/actions.js

@@ -1,8 +1,8 @@
-import { changeBatchIdentity, } from '@agentshouse/mdruntime';
+import { changeBatchIdentity, HISTORY_CONVERSATIONS, } from '@agentshouse/mdruntime';
 import { doorRefusal } from './refusal.js';
-const HISTORY_PAGE = 100;
-const HISTORY_CONVERSATIONS = 64;
-const TRIGGER_ROOMS = 100;
+import { finishedUpload, houseUpload } from './upload.js';
+export const HISTORY_PAGE = 100;
+export const TRIGGER_ROOMS = 100;
 const OCTET_STREAM = 'application/octet-stream';
 function mapped(door, input = (given) => given) {
     return {
@@ -37,10 +37,13 @@ const APP_ACTS = {
     'feature.list': mapped('apps/features/read'),
     'holder.list': mapped('apps/holders'),
     'holder.ring': mapped('apps/ring'),
+    'inboxChat.assign': mapped('chats/assign'),
+    'inboxChat.return': mapped('chats/return'),
+    'inboxChat.takeControl': mapped('chats/take-control'),
     'member.list': mapped('rooms/members'),
     'message.send': mapped('apps/messages/send'),
     'processing.read': mapped('rooms/settings/processing/read'),
-    'record.list': carried('records/read', recordsAction),
+    'record.list': mapped('records/read'),
     'relay.read': mapped('apps/relay'),
     'routine.list': mapped('routines/access'),
     'routineAccess.list': mapped('routines/granted'),
@@ -106,7 +109,12 @@ function unimplemented(name) {
     return { kind: 'rejected', code: 'action-unimplemented', fields: { name }, retryable: false };
 }
 function createBody(input) {
-    return { agent_id: text(input, 'agent_id'), operation_id: operationId(input) };
+    const replaces = text(input, 'replaces');
+    return {
+        agent_id: text(input, 'agent_id'),
+        operation_id: operationId(input),
+        ...(replaces === undefined ? {} : { replaces }),
+    };
 }
 function controlBody(input) {
     return { conversation_id: text(input, 'conversation'), operation_id: operationId(input) };
@@ -154,32 +162,6 @@ export function actionOutcome(answer, name) {
         return { kind: 'transport-uncertainty' };
     return { kind: 'action', result: answer.body };
 }
-function referredRecord(view, roomRef) {
-    const held = record(view);
-    if (roomRef === undefined || typeof held.record !== 'string' || !Array.isArray(held.attachments))
-        return view;
-    const referrer = {
-        room_ref: roomRef,
-        record: held.record,
-    };
-    return {
-        ...held,
-        attachments: held.attachments.map((attachment) => ({ ...record(attachment), referrer })),
-    };
-}
-async function recordsAction(transport, route, input, name) {
-    const outcome = actionOutcome(await transport.door(route, input), name);
-    if (outcome.kind !== 'action')
-        return outcome;
-    const roomRef = text(input, 'room_ref');
-    const read = record(outcome.result);
-    return {
-        ...outcome,
-        result: Array.isArray(read.records)
-            ? { ...read, records: read.records.map((view) => referredRecord(view, roomRef)) }
-            : referredRecord(outcome.result, roomRef),
-    };
-}
 async function carry(transport, route, name, input) {
     return actionOutcome(await transport.door(route, input), name);
 }
@@ -217,14 +199,6 @@ function attachBody(input) {
         media_type: mediaType !== undefined && mediaType.length > 0 ? mediaType : OCTET_STREAM,
     };
 }
-function uploadGrant(answer) {
-    const upload = record(record(answer).upload);
-    if (upload.method !== 'POST')
-        return null;
-    if (typeof upload.operation !== 'string' || typeof upload.url !== 'string')
-        return null;
-    return { operation: upload.operation, url: upload.url };
-}
 async function attachAction(transport, route, input, name) {
     const body = attachBody(input);
     const blob = record(input).blob;
@@ -233,20 +207,16 @@ async function attachAction(transport, route, input, name) {
     const outcome = actionOutcome(await transport.door(route, body), name);
     if (outcome.kind !== 'action')
         return outcome;
-    const grant = uploadGrant(outcome.result);
-    if (grant === null)
+    const upload = houseUpload(record(outcome.result).upload);
+    if (upload === null)
         return { kind: 'transport-uncertainty' };
-    const sent = await transport.transfer({
-        act: 'file_upload',
-        url: grant.url,
-        body: new Uint8Array(await blob.arrayBuffer()),
-        operation: grant.operation,
-    });
-    if (sent.status !== 200) {
-        const refusal = doorRefusal(sent.body);
-        return refusal === null ? { kind: 'transport-uncertainty' } : { kind: 'rejected', ...refusal };
-    }
-    const path = text(sent.body, 'path');
+    const finished = await finishedUpload(transport, upload, blob);
+    if (finished === null)
+        return { kind: 'transport-uncertainty' };
+    const settled = actionOutcome(finished, name);
+    if (settled.kind !== 'action')
+        return settled;
+    const path = text(settled.result, 'path');
     if (path === undefined)
         return { kind: 'transport-uncertainty' };
     const result = { path };

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,OAAO,EACP,aAAa,EAmBd,MAAM,wBAAwB,CAAC;AA6ChC,OAAO,EASL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,gBAAgB,CAAC;AA0BxB,MAAM,MAAM,yBAAyB,GACjC;IACE,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CACrC,GACD;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAuFrD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CA2mBpF"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,OAAO,EACP,aAAa,EAkBd,MAAM,wBAAwB,CAAC;AA0ChC,OAAO,EASL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,gBAAgB,CAAC;AA0BxB,MAAM,MAAM,yBAAyB,GACjC;IACE,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CACrC,GACD;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AA8ErD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAmoBpF"}

package/dist/adapter.js

@@ -1,60 +1,48 @@
-import { sortedKeys, stepped } from '@agentshouse/mdruntime';
+import { stepped } from '@agentshouse/mdruntime';
 import { DISCOVER_PREFIXES, capabilities, discoveredRoom, mapDiscovery, parseDiscovery, trackedFrom, } from './discovery.js';
-import { partModels, streamedModels, viewModels } from './model.js';
+import { manifestedModels, partModels, streamedModels, viewModels } from './model.js';
 import { gathered, gatheredEach, selections } from './gather.js';
 import { createSiteAdapter } from './site.js';
-import { authorityRoot, bootstrapping, emptyScope, housePart, parseEnumeration, parseGrant, parseParted, refreshFrom, viewOf, wholeView, } from './read.js';
-import { PART_ATTEMPTS, unverifiedPart } from './part.js';
+import { authorityRoot, bootstrapping, emptyScope, housePart, manifested, parseEnumeration, parseFileAddress, parseGrant, parseParted, partInventory, refreshFrom, viewOf, wholeView, } from './read.js';
+import { PART_ATTEMPTS, partArrival, partFrame, unverifiedPart } from './part.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, houseMove, mutationOutcome, operationHead, rejectedMapping, revisionBody, uploadable, } from './write.js';
-import { houseReferrer } from './referrer.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 EXPIRED_ADDRESS = 403;
 function lapsedGrant(outcome) {
     return outcome.kind === 'rejected' && outcome.code === 'upload_unavailable';
 }
-const heldPaths = new WeakMap();
-async function sortedHeld(held) {
-    const known = heldPaths.get(held.documents);
-    if (known !== undefined)
-        return known;
-    const sorted = await stepped(sortedKeys(held.documents));
-    heldPaths.set(held.documents, sorted);
-    return sorted;
-}
-function heldFiles(authority, held, paths, bound) {
-    const files = [];
-    let through = null;
-    for (let at = 0; at < paths.length && through === null; at += 1) {
-        const revision = held.revisions[paths[at]];
-        if (revision === undefined)
-            continue;
-        if (files.length === bound)
-            through = files.at(-1).path;
-        else
-            files.push({ path: paths[at], revision });
-    }
+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 };
 }
@@ -65,51 +53,56 @@ export function createAgentsHouseAdapter(options) {
     const notifications = houseNotifications(transport, 'credential');
     const tracked = new Map();
     const handed = new Map();
+    let heldRevisions;
     let bounds;
     function declared() {
         if (bounds === undefined)
             throw new Error('no Discovery declared the bounds');
         return bounds;
     }
-    function hand(locator, steps) {
-        const held = handed.get(locator);
-        const next = stepped(steps);
-        if (!(next instanceof Promise)) {
-            handed.set(locator, next);
-            return;
+    async function fetchedPart(entry, continued, listed, received, arriving) {
+        if (received !== undefined) {
+            const kept = new Uint8Array(received);
+            const held = await housePart(continued.room, kept, listed, 'credential');
+            if (held !== null)
+                return 'kind' in held ? held : { scope: held, frame: kept };
         }
-        return next.then((room) => {
-            if (handed.get(locator) === held)
-                handed.set(locator, room);
-            else
-                handed.delete(locator);
-        });
-    }
-    async function fetchedPart(entry, continued, listed) {
         for (let attempt = 0; attempt < PART_ATTEMPTS; attempt += 1) {
             const answered = await transport.door(DOOR_BOOTSTRAP, {
                 prefixes: [authorityRoot(entry.handle)],
                 part: listed.part,
                 ...(continued.held === undefined ? {} : { held: [continued.held] }),
-            });
+            }, partArrival(listed, arriving));
             const failure = classifyRead(answered.status, answered.body, entry.locator);
             if (failure !== null)
                 return failure;
-            const scope = await housePart(continued.room, answered.body, listed, 'credential');
+            const frame = partFrame(answered.body);
+            if (frame === null)
+                continue;
+            const scope = await housePart(continued.room, frame, listed, 'credential');
             if (scope !== null)
-                return scope;
+                return 'kind' in scope ? scope : { scope, frame };
         }
         return unverifiedPart(entry.locator);
     }
-    async function partPage(asked, continued) {
+    async function manifestPage(asked, continued) {
+        const inventory = partInventory(continued.room);
+        if (inventory.parts === 0) {
+            const page = await partPage(asked, continued, undefined, undefined);
+            return page.kind === 'bootstrap' ? { ...page, inventory } : page;
+        }
+        const { models, seen } = await manifestedModels(continued.room, asked.entry);
+        return manifested(continued.room, inventory, JSON.stringify({ ...continued, seen }), models);
+    }
+    async function partPage(asked, continued, received, arriving) {
         const { entry } = asked;
         const listed = continued.room.parts[continued.next];
         const sent = listed === undefined
-            ? emptyScope(continued.room)
-            : await fetchedPart(entry, continued, listed);
+            ? { scope: emptyScope(continued.room), frame: null }
+            : await fetchedPart(entry, continued, listed, received, arriving);
         if ('kind' in sent)
             return sent;
-        const scope = await reused(sent, asked.held);
+        const scope = await reused(sent.scope, asked.held);
         if (scope === null) {
             return asked.held === undefined
                 ? UNCERTAIN_READ
@@ -118,19 +111,20 @@ export function createAgentsHouseAdapter(options) {
         const next = continued.next + 1;
         const more = next < continued.room.parts.length;
         if (continued.next === 0 && !more)
-            await hand(entry.locator, scopeHanded(scope));
+            handed.set(entry.locator, roomVersion(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)),
+            ...(scope.files.some((file) => file.path === entry.schema) ? [entry.schema] : []),
         ];
         const models = await partModels(scope, entry, new Set(seen), !more);
         return {
             ...(await stepped(bootstrapping(scope))),
             ...(models === undefined ? {} : { models }),
             ...(more ? { pageToken: JSON.stringify({ ...continued, next, seen }) } : {}),
+            ...(sent.frame === null ? {} : { received: sent.frame }),
         };
     }
     async function enumeratedPage(ask, page) {
@@ -162,18 +156,21 @@ export function createAgentsHouseAdapter(options) {
         const answer = await refreshFrom(view, ask.fromRoomVersion);
         if (answer.kind !== 'net-advancement')
             return answer;
-        await hand(ask.entry.locator, enumeratedHanded(view, handed.get(ask.entry.locator)));
+        handed.set(ask.entry.locator, roomVersion(view));
         const models = await viewModels(view, ask.entry);
         return models === undefined ? answer : { ...answer, models };
     }
     async function streamed(entry, request, from) {
-        const held = handed.get(entry.locator);
-        if (held?.roomVersion !== request.fromRoomVersion)
+        if (handed.get(entry.locator) !== request.fromRoomVersion)
             return null;
-        const advanced = await stepped(notifications.advance(entry, from, (path, revision) => held.revisions[path] === revision));
+        const asked = notifications.edited(entry, from);
+        const kept = asked.length === 0 || heldRevisions === undefined
+            ? new Map()
+            : await heldRevisions(entry.locator, asked);
+        const advanced = await stepped(notifications.advance(entry, from, (path, revision) => kept.get(path) === revision));
         if (advanced === null)
             return null;
-        await hand(entry.locator, streamedHanded(held, advanced));
+        handed.set(entry.locator, advanced.page.roomVersion);
         const models = await streamedModels(advanced.schemas, entry, 'credential');
         return models === undefined ? advanced.page : { ...advanced.page, models };
     }
@@ -183,7 +180,7 @@ export function createAgentsHouseAdapter(options) {
             const at = logPosition(room.roomVersion);
             if (entry === undefined || at === null)
                 return [];
-            handed.set(room.locator, heldHanded(room));
+            handed.set(room.locator, room.roomVersion);
             notifications.reach(entry.authority, at);
             return [presented(entry.authority, at)];
         });
@@ -201,8 +198,9 @@ export function createAgentsHouseAdapter(options) {
         const held = handed.get(entry.locator);
         if (held === undefined)
             return outcome;
-        const follows = followsVersion(held.roomVersion, outcome.roomVersion);
-        await hand(entry.locator, acceptedHanded(held, outcome, follows ? outcome.roomVersion : held.roomVersion));
+        const follows = followsVersion(held, outcome.roomVersion);
+        if (follows)
+            handed.set(entry.locator, outcome.roomVersion);
         const at = logPosition(outcome.roomVersion);
         if (follows && at !== null)
             notifications.reach(entry.authority, at);
@@ -231,8 +229,7 @@ export function createAgentsHouseAdapter(options) {
         for (const ask of asks) {
             if (ask.held === undefined || bound === 0)
                 continue;
-            const paths = await sortedHeld(ask.held);
-            const files = heldFiles(ask.entry.authority, ask.held, paths, bound);
+            const files = await heldFiles(ask.entry.authority, ask.held, bound);
             if (files !== null)
                 held.push(files);
         }
@@ -270,7 +267,7 @@ export function createAgentsHouseAdapter(options) {
                         continue;
                     }
                     const kept = held.find((files) => files.room === asked.entry.authority);
-                    answer(asked.ask, await partPage(asked.asked, {
+                    answer(asked.ask, await manifestPage(asked.asked, {
                         room,
                         next: 0,
                         seen: [],
@@ -342,7 +339,7 @@ export function createAgentsHouseAdapter(options) {
             };
         }
         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',
@@ -352,36 +349,31 @@ 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, into) {
+    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)
@@ -389,11 +381,11 @@ export function createAgentsHouseAdapter(options) {
         if ('outcome' in prepared)
             return prepared.outcome;
         const answer = await transport.door(DOOR_BATCH, prepared.body);
-        const stagedFiles = await staged(answer, batch);
+        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)
+        if (stagedFiles === true && (await staged(settled, request)) !== null)
             return UNCERTAIN;
         return stepped(mutationOutcome(settled.status, settled.body, entry.locator, entry.handle, into === undefined
             ? undefined
@@ -402,7 +394,7 @@ export function createAgentsHouseAdapter(options) {
                 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'
@@ -414,33 +406,48 @@ 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 }
+            : 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)
+    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(DOOR_FILES_GET, {
             room_ref: entry.authority,
             path: request.path,
             revision: request.revision,
         });
     }
     return {
+        roomTypes: HOUSE_ROOM_TYPES,
+        nameableRoomTypes: HOUSE_NAMEABLE_ROOM_TYPES,
         async authorize() {
             return options.authorize();
         },
@@ -490,7 +497,7 @@ export function createAgentsHouseAdapter(options) {
                 return { kind: 'room-not-readable', locator: request.locator };
             const asked = { entry, held: request.held };
             if (request.pageToken !== undefined) {
-                return partPage(asked, JSON.parse(request.pageToken));
+                return partPage(asked, JSON.parse(request.pageToken), request.received, request.arriving);
             }
             return bootstrapTogether(asked);
         },
@@ -527,7 +534,7 @@ export function createAgentsHouseAdapter(options) {
             const delta = deltaBody(mapped.changes);
             const bytes = deltaBytes(delta);
             const handed = request.upload;
-            const answer = (upload) => submit(batch, head, mapped.changes, delta, bytes, entry, upload, keep, into);
+            const answer = (upload) => submit(request, head, mapped.changes, delta, bytes, entry, upload, keep, into);
             const settle = (outcome) => into === undefined ? adopted(entry, outcome) : adoptedMove(entry, into, outcome);
             const outcome = await answer(handed);
             if (handed === undefined || !lapsedGrant(outcome))
@@ -550,34 +557,16 @@ 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);
-        },
-        referrerScope(referrer) {
-            const held = houseReferrer(referrer, tracked);
-            if (held === null)
-                return null;
-            const { path } = held.referrer;
-            return { locator: held.locator, ...(path === undefined ? {} : { path }) };
+            return linked(await ask(), request.locator);
         },
         reached(locator, version, target) {
             return reachedVersion(version, target, authorityFor(locator)?.logEpoch);
@@ -591,7 +580,10 @@ export function createAgentsHouseAdapter(options) {
         roomStream: {
             hold: held,
             reopen: notifications.reopen,
-            observe: notifications.observe,
+            observe(notify, receipts, revisions) {
+                heldRevisions = revisions;
+                return notifications.observe(notify, receipts);
+            },
             published(locator, roomVersion) {
                 const at = logPosition(roomVersion);
                 if (at !== null)