@agentshouse/mdruntime-adapter 0.1.0-ca0d16f904a93 → 0.1.0-ca231c2cbedb4

package/dist/site.js

@@ -1,34 +1,38 @@
+import { stepped } from '@agentshouse/mdruntime';
 import { actionOutcome, SITE_SUBMIT } from './actions.js';
 import { mapDiscovery, parseSiteDiscovery, siteCapabilities, siteTracked, } from './discovery.js';
-import { partModels, streamedModels, viewModels } from './model.js';
-import { advancedScope, bootstrapOf, parseEnumeration, parseSiteBootstrap, refreshFrom, siteBootstrapNext, siteBootstrapOffset, viewOf, wholeView, } from './read.js';
-import { sha256Hex } from './digest.js';
+import { manifestedModels, partModels, streamedModels, viewModels } from './model.js';
+import { bootstrapping, emptyScope, housePart, manifested, parseEnumeration, parseSiteParted, partInventory, refreshFrom, viewOf, wholeView, } from './read.js';
+import { PART_ATTEMPTS, partArrival, partFrame, unverifiedPart } from './part.js';
 import { classifyDoor, classifyRead, discoveryFailure } from './refusal.js';
+import { HOUSE_NAMEABLE_ROOM_TYPES, HOUSE_ROOM_TYPES } from './room-types.js';
 import { houseNotifications } from './stream.js';
-import { SITE_DOOR_BOOTSTRAP, SITE_DOOR_DISCOVER, SITE_DOOR_ENUMERATE, SITE_DOOR_SUBMIT, SITE_FILE_RECORD, SITE_FILES, } from './transport.js';
-import { houseReferrer } from './referrer.js';
+import { SITE_DOOR_BOOTSTRAP, SITE_DOOR_DISCOVER, SITE_DOOR_ENUMERATE, SITE_DOOR_SUBMIT, SITE_FILES, } from './transport.js';
 import { followsVersion, logPosition, presented, reachedVersion, roomVersion, } from './version.js';
 const UNCERTAIN = { kind: 'transport-uncertainty' };
+function unfound() {
+    return { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false };
+}
 function siteRoom(tracked) {
     return {
         name: tracked.handle,
         locator: tracked.locator,
         handle: tracked.handle,
         roomVersion: roomVersion(tracked),
-        operations: { read: [''], sync: [''], write: [], delete: [] },
-        replica: { selection: tracked.locator, admission: 'admitted' },
+        operations: { write: [], delete: [] },
+        replica: { selection: tracked.locator, admission: 'admitted', offline: 'open' },
         providerOwnedPaths: [],
     };
 }
-function settled(refused) {
-    return refused.kind === 'beyond-horizon' ? UNCERTAIN : refused;
-}
 export function createSiteAdapter(transport, snapshot = false) {
     const notifications = houseNotifications(transport, 'site');
     const tracked = new Map();
-    function published(referrer) {
-        const named = houseReferrer(referrer, tracked);
-        return named === null || !tracked.has(named.locator) ? null : named;
+    const expired = new Map();
+    function fileRoute(request) {
+        const entry = tracked.get(request.locator);
+        if (entry === undefined)
+            return { kind: 'room-not-readable', locator: request.locator };
+        return `${SITE_FILES}${entry.authority}/${encodeURIComponent(request.revision)}/${encodeURIComponent(request.path)}`;
     }
     async function enumerated(entry, from, page) {
         const answer = await transport.door(SITE_DOOR_ENUMERATE, {
@@ -53,73 +57,43 @@ export function createSiteAdapter(transport, snapshot = false) {
         const first = await enumerated(entry, from);
         return 'kind' in first ? first : wholeView(first, (page) => enumerated(entry, from, page));
     }
-    async function bootstrapPart(entry, after, offset) {
-        const query = [
-            ...(after === null ? [] : [`after=${encodeURIComponent(after)}`]),
-            ...(offset === null ? [] : [`offset=${offset}`]),
-        ];
-        const answer = await transport.read(`${SITE_DOOR_BOOTSTRAP}${entry.authority}${query.length === 0 ? '' : `?${query.join('&')}`}`);
+    async function partedRoom(entry) {
+        const cut = expired.get(entry.locator);
+        const answer = await transport.read(`${SITE_DOOR_BOOTSTRAP}${entry.authority}${cut === undefined ? '' : `?expired=${cut}`}`);
         const classified = classifyDoor(answer.status, answer.body, entry.locator);
         if (classified !== null)
-            return { failure: classified };
-        const scope = parseSiteBootstrap(answer.body);
-        return scope === null ? { failure: UNCERTAIN } : { body: answer.body, scope };
-    }
-    async function assembled(entry, scope, path, offset) {
-        const opened = scope.contents.at(-1);
-        if (opened === undefined || opened.path !== path || opened.content.length !== offset) {
-            return UNCERTAIN;
-        }
-        let text = opened.content;
-        for (;;) {
-            const part = await bootstrapPart(entry, path, text.length);
-            if ('failure' in part)
-                return part.failure;
-            const [piece] = part.scope.contents;
-            if (piece === undefined ||
-                part.scope.contents.length !== 1 ||
-                piece.path !== path ||
-                piece.content.length === 0) {
-                return UNCERTAIN;
-            }
-            text += piece.content;
-            const more = siteBootstrapOffset(part.body);
-            if (more === null)
-                break;
-            if (more !== text.length)
-                return UNCERTAIN;
-        }
-        const file = scope.files.find((held) => held.path === path);
-        if (file === undefined || (await sha256Hex(text)) !== file.version)
-            return UNCERTAIN;
-        return { ...scope, contents: [...scope.contents.slice(0, -1), { path, content: text }] };
+            return classified;
+        const room = parseSiteParted(answer.body);
+        return room === null || room.anchor !== entry.authority ? UNCERTAIN : room;
     }
-    async function caughtUp(entry, after) {
-        const part = await bootstrapPart(entry, after, null);
-        if ('failure' in part)
-            return part;
-        const next = siteBootstrapNext(part.body);
-        const offset = siteBootstrapOffset(part.body);
-        if (offset !== null) {
-            if (next === null)
-                return { failure: UNCERTAIN };
-            const scope = await assembled(entry, part.scope, next, offset);
-            return 'kind' in scope ? { failure: scope } : { scope, next };
+    async function fetchedPart(entry, room, listed, received, arriving) {
+        if (received !== undefined) {
+            const kept = new Uint8Array(received);
+            const held = await housePart(room, kept, listed, 'site');
+            if (held !== null)
+                return 'kind' in held ? held : { scope: held, frame: kept };
         }
-        const { scope } = part;
-        if (after !== null || next !== null || roomVersion(scope) === roomVersion(entry)) {
-            return { scope, next };
+        for (let attempt = 0; attempt < PART_ATTEMPTS; attempt += 1) {
+            const answer = await transport.read(`${SITE_DOOR_BOOTSTRAP}${entry.authority}?part=${encodeURIComponent(listed.part)}`, partArrival(listed, arriving));
+            const failure = classifyRead(answer.status, answer.body, entry.locator);
+            if (failure?.kind === 'beyond-horizon')
+                expired.set(entry.locator, room.position);
+            if (failure !== null)
+                return failure;
+            const frame = partFrame(answer.body);
+            if (frame === null)
+                continue;
+            const scope = await housePart(room, frame, listed, 'site');
+            if (scope !== null)
+                return 'kind' in scope ? scope : { scope, frame };
         }
-        const view = await enumeration(entry, scope);
-        if ('kind' in view)
-            return { failure: settled(view) };
-        return { scope: advancedScope(scope, view), next: null };
+        return unverifiedPart(entry.locator);
     }
     async function refreshed(entry, fromRoomVersion) {
         const from = logPosition(fromRoomVersion);
         if (from === null)
             return { kind: 'beyond-horizon' };
-        const streamed = notifications.advance(entry, from);
+        const streamed = await stepped(notifications.advance(entry, from));
         if (streamed !== null) {
             const models = await streamedModels(streamed.schemas, entry, 'site');
             return models === undefined ? streamed.page : { ...streamed.page, models };
@@ -128,7 +102,7 @@ export function createSiteAdapter(transport, snapshot = false) {
         if ('kind' in view)
             return view;
         notifications.reach(entry.authority, view);
-        const answer = refreshFrom(view, fromRoomVersion);
+        const answer = await refreshFrom(view, fromRoomVersion);
         if (answer.kind !== 'net-advancement')
             return answer;
         const models = await viewModels(view, entry);
@@ -137,6 +111,8 @@ export function createSiteAdapter(transport, snapshot = false) {
     return {
         localSaves: true,
         exhaustiveDiscovery: true,
+        roomTypes: HOUSE_ROOM_TYPES,
+        nameableRoomTypes: HOUSE_NAMEABLE_ROOM_TYPES,
         async authorize() {
             return {};
         },
@@ -159,23 +135,43 @@ export function createSiteAdapter(transport, snapshot = false) {
             const entry = tracked.get(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            const continued = request.pageToken === undefined
-                ? null
-                : JSON.parse(request.pageToken);
-            const held = await caughtUp(entry, continued?.after ?? null);
-            if ('failure' in held)
-                return held.failure;
-            notifications.reach(entry.authority, held.scope);
+            let continued;
+            let inventory;
+            if (request.pageToken === undefined) {
+                const room = await partedRoom(entry);
+                if ('kind' in room)
+                    return room;
+                const { models, seen } = await manifestedModels(room, entry);
+                continued = { room, next: 0, seen };
+                inventory = partInventory(room);
+                if (inventory.parts > 0) {
+                    return manifested(room, inventory, JSON.stringify(continued), models);
+                }
+            }
+            else
+                continued = JSON.parse(request.pageToken);
+            const listed = continued.room.parts[continued.next];
+            const sent = listed === undefined
+                ? { scope: emptyScope(continued.room), frame: null }
+                : await fetchedPart(entry, continued.room, listed, request.received, request.arriving);
+            if ('kind' in sent)
+                return sent;
+            const { scope } = sent;
+            notifications.reach(entry.authority, scope);
+            const next = continued.next + 1;
+            const more = next < continued.room.parts.length;
             const seen = [
-                ...(continued?.seen ?? []),
-                ...entry.schemas.filter((schema) => held.scope.files.some((file) => file.path === schema)),
+                ...continued.seen,
+                ...(scope.files.some((file) => file.path === entry.schema) ? [entry.schema] : []),
             ];
-            const models = await partModels(held.scope, entry, new Set(seen), held.next === null);
-            const continuation = held.next === null ? null : { after: held.next, seen };
+            const models = await partModels(scope, entry, new Set(seen), !more);
+            const { folders: _folders, ...page } = await stepped(bootstrapping(scope));
             return {
-                ...bootstrapOf(held.scope),
+                ...page,
                 ...(models === undefined ? {} : { models }),
-                ...(continuation === null ? {} : { pageToken: JSON.stringify(continuation) }),
+                ...(more ? { pageToken: JSON.stringify({ ...continued, next, seen }) } : {}),
+                ...(inventory === undefined ? {} : { inventory }),
+                ...(sent.frame === null ? {} : { received: sent.frame }),
             };
         },
         async refresh(_authorization, request) {
@@ -194,34 +190,32 @@ export function createSiteAdapter(transport, snapshot = false) {
         async mutate() {
             return { kind: 'rejected', affected: {}, code: 'write-grant', fields: {}, retryable: false };
         },
+        async attach() {
+            return { kind: 'rejected', code: 'write-grant', fields: {}, retryable: false };
+        },
         async history() {
             return { kind: 'no-history' };
         },
         async binary(_authorization, request) {
-            const named = published(request.kind === 'path' ? { room: request.locator, path: request.path } : request.referrer);
-            if (named === null) {
-                return { kind: 'rejected', code: 'referrer_unknown', fields: {}, retryable: false };
-            }
-            if (request.fileRef === undefined) {
-                return { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false };
-            }
-            const { room_ref, path, record } = named.referrer;
-            const read = await transport.download(`${SITE_FILES}${room_ref}/${encodeURIComponent(request.fileRef)}/${path === undefined
-                ? `${SITE_FILE_RECORD}/${encodeURIComponent(record)}`
-                : encodeURIComponent(path)}`);
-            if (read.status === 404) {
-                return { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false };
-            }
-            return read.status === 200 && read.blob !== null
-                ? { kind: 'binary', blob: read.blob }
+            const route = fileRoute(request);
+            if (typeof route !== 'string')
+                return route;
+            const read = await transport.download(route);
+            if (read.status === 404)
+                return unfound();
+            return read.status === 200 && read.body !== null
+                ? { kind: 'binary', body: read.body, mediaType: read.mediaType }
                 : UNCERTAIN;
         },
-        referrerScope(referrer) {
-            const named = published(referrer);
-            if (named === null)
-                return null;
-            const { path } = named.referrer;
-            return { kind: 'room', locator: named.locator, ...(path === undefined ? {} : { path }) };
+        async link(_authorization, request) {
+            const route = fileRoute(request);
+            if (typeof route !== 'string')
+                return route;
+            return {
+                kind: 'link',
+                url: route,
+                name: request.path.slice(request.path.lastIndexOf('/') + 1),
+            };
         },
         reached(locator, version, target) {
             return reachedVersion(version, target, tracked.get(locator)?.logEpoch);
@@ -253,7 +247,7 @@ export function createSiteAdapter(transport, snapshot = false) {
                             return [];
                         notifications.reach(entry.authority, at);
                         return [presented(entry.authority, at)];
-                    }), null);
+                    }));
                 },
                 reopen: notifications.reopen,
                 observe: notifications.observe,

package/dist/stream.d.ts

@@ -1,22 +1,22 @@
-import type { ConversationStream, RefreshPage, RoomStreamEvent, ServiceModeSignal, StreamReceipts } from '@agentshouse/mdruntime';
+import { type ConversationStream, type RefreshPage, type RoomStreamEvent, type ServiceModeSignal, type StreamReceipts } from '@agentshouse/mdruntime';
 import type { TrackedAuthority } from './discovery.js';
-import type { HouseDemand, HouseDoor, HouseHeldRoom, HouseMode, HouseStreamEntry } from './transport.js';
+import type { HouseDoor, HouseHeldRoom, HouseMode, HouseStreamEntry } from './transport.js';
 import { type LogPosition } from './version.js';
 export type HeldRevision = (path: string, revision: string) => boolean;
 export type StreamedAdvancement = {
     page: RefreshPage;
-    entries: readonly HouseStreamEntry[];
     schemas: ReadonlyMap<string, HouseStreamEntry>;
 };
 export type HouseNotifications = {
     runtime: string;
     observe(notify: (event: RoomStreamEvent) => void, receipts: StreamReceipts): () => void;
-    send(rooms: readonly HouseHeldRoom[], demand: HouseDemand | null): void;
+    send(rooms: readonly HouseHeldRoom[]): void;
     published(locator: string, at: LogPosition): void;
     reopen(): void;
     track(authorities: readonly TrackedAuthority[]): void;
     reach(authority: string, at: LogPosition): void;
-    advance(tracked: TrackedAuthority, from: LogPosition, holds?: HeldRevision): StreamedAdvancement | null;
+    edited(tracked: TrackedAuthority, from: LogPosition): readonly string[];
+    advance(tracked: TrackedAuthority, from: LogPosition, holds?: HeldRevision): Generator<number, StreamedAdvancement | null, void>;
     conversations: ConversationStream;
     serviceMode: ServiceModeSignal;
 };

package/dist/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,kBAAkB,EAElB,WAAW,EACX,eAAe,EAEf,iBAAiB,EACjB,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACT,aAAa,EAEb,SAAS,EAET,gBAAgB,EAEjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AA0C7D,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;AAEvE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,EAAE,QAAQ,EAAE,cAAc,GAAG,MAAM,IAAI,CAAC;IACxF,IAAI,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;IACxE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAClD,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAChD,OAAO,CACL,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,EACjB,KAAK,CAAC,EAAE,YAAY,GACnB,mBAAmB,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAkFF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAmhB5F"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EAEvB,KAAK,WAAW,EAChB,KAAK,eAAe,EAEpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAUvD,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EAEb,SAAS,EAET,gBAAgB,EAEjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AA0C7D,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;AAEvE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,EAAE,QAAQ,EAAE,cAAc,GAAG,MAAM,IAAI,CAAC;IACxF,IAAI,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAAC;IAC5C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAClD,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAChD,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,SAAS,MAAM,EAAE,CAAC;IACxE,OAAO,CACL,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,EACjB,KAAK,CAAC,EAAE,YAAY,GACnB,SAAS,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC;IACvD,aAAa,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAmFF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CA8jB5F"}

package/dist/stream.js

@@ -1,6 +1,7 @@
+import { ROW_WEIGHT, } from '@agentshouse/mdruntime';
 import { acceptedMessage } from './actions.js';
 import { sha256Hex } from './digest.js';
-import { binaryFileOf, headChange } from './read.js';
+import { answered, answering, binaryFileOf, folded, forgotten, headChange, revised, } from './read.js';
 import { roomVersion } from './version.js';
 const HELD_FRAMES_MAX = 256;
 function turnOperation(frame) {
@@ -15,6 +16,7 @@ function listedConversation(listed) {
         created: listed.created_at,
         finished: listed.finished_at,
         outcome: listed.outcome,
+        waiting: listed.waiting,
     };
 }
 function position(value) {
@@ -111,7 +113,10 @@ export function houseNotifications(transport, mode) {
             event.kind === 'questions' ||
             event.kind === 'process' ||
             event.kind === 'commands' ||
-            event.kind === 'options') {
+            event.kind === 'options' ||
+            event.kind === 'starting' ||
+            event.kind === 'link' ||
+            event.kind === 'deliveries') {
             live.add(event.conversation);
         }
         for (const observer of conversationObservers)
@@ -157,6 +162,18 @@ export function houseNotifications(transport, mode) {
             emitConversation({ kind: 'options', conversation, options: structuredClone(frame.options) });
             return;
         }
+        if (frame.type === 'starting') {
+            emitConversation({ kind: 'starting', conversation, step: frame.step });
+            return;
+        }
+        if (frame.type === 'link') {
+            emitConversation({ kind: 'link', conversation, connected: frame.connected });
+            return;
+        }
+        if (frame.type === 'deliveries') {
+            emitConversation({ kind: 'deliveries', conversation, unknown: [...frame.unknown] });
+            return;
+        }
         if (frame.type === 'interactions') {
             emitConversation({
                 kind: 'questions',
@@ -352,6 +369,10 @@ export function houseNotifications(transport, mode) {
             });
             return;
         }
+        if (frame.type === 'authority_changed') {
+            emit({ kind: 'authority-changed', scope: { authorities: frame.rooms } });
+            return;
+        }
         if (frame.type === 'conversations') {
             emitConversation({ kind: 'list', entries: frame.conversations.map(listedConversation) });
             return;
@@ -368,6 +389,9 @@ export function houseNotifications(transport, mode) {
             frame.type === 'process' ||
             frame.type === 'commands' ||
             frame.type === 'options' ||
+            frame.type === 'starting' ||
+            frame.type === 'link' ||
+            frame.type === 'deliveries' ||
             frame.type === 'interactions' ||
             frame.type === 'message') {
             converse(frame);
@@ -421,10 +445,10 @@ export function houseNotifications(transport, mode) {
         });
     });
     stream.opened(reopened);
-    stream.closed((revoked) => {
+    stream.closed(({ revoked, lost }) => {
         opening = null;
         acknowledging = null;
-        emit({ kind: 'closed', revoked });
+        emit({ kind: 'closed', revoked, lost });
     });
     return {
         runtime,
@@ -463,7 +487,7 @@ export function houseNotifications(transport, mode) {
                 observers.delete(notify);
             };
         },
-        send(rooms, demand) {
+        send(rooms) {
             for (const room of rooms) {
                 const line = lines.get(room.authority);
                 const held = position(room.position);
@@ -478,7 +502,7 @@ export function houseNotifications(transport, mode) {
             void loaded
                 .then(() => Promise.all(rooms.map(restored)))
                 .then((presented) => {
-                current.hold(presented, runtime, demand);
+                current.hold(presented, runtime);
                 for (const [index, room] of presented.entries()) {
                     if (room.position === rooms[index].position)
                         continue;
@@ -532,7 +556,18 @@ export function houseNotifications(transport, mode) {
                 held,
             });
         },
-        advance(tracked, from, holds) {
+        edited(tracked, from) {
+            const line = lines.get(tracked.authority);
+            const start = position(from.position);
+            if (line === undefined || start === null || line.logEpoch !== from.logEpoch)
+                return [];
+            return [
+                ...new Set(line.frames
+                    .filter((frame) => frame.position > start)
+                    .flatMap((frame) => frame.entries.flatMap((entry) => entry.kind === 'edited' && entry.revision !== undefined ? [entry.path] : []))),
+            ];
+        },
+        *advance(tracked, from, holds) {
             const line = lines.get(tracked.authority);
             const start = position(from.position);
             if (line === undefined || start === null || line.logEpoch !== from.logEpoch)
@@ -541,36 +576,26 @@ export function houseNotifications(transport, mode) {
             const first = pending[0];
             if (first === undefined || first.after > start)
                 return null;
-            const documents = {};
-            const revisions = {};
-            const changes = {};
-            const binaryFiles = {};
-            const removals = [];
-            const applied = [];
+            const answer = answering();
             const schemas = new Map();
-            const forget = (path) => {
-                delete documents[path];
-                delete revisions[path];
-                delete changes[path];
-                delete binaryFiles[path];
-                const removed = removals.indexOf(path);
-                if (removed !== -1)
-                    removals.splice(removed, 1);
-            };
             for (const frame of pending) {
                 for (const entry of frame.entries) {
+                    yield ROW_WEIGHT + (entry.text?.length ?? 0);
+                    if (entry.kind === 'folder') {
+                        folded(answer, entry.path, entry.removed === true);
+                        continue;
+                    }
                     if (entry.kind === 'edited' &&
                         entry.revision !== undefined &&
                         holds?.(entry.path, entry.revision) === true) {
-                        forget(entry.path);
+                        forgotten(answer, entry.path);
                         continue;
                     }
-                    applied.push(entry);
-                    if (tracked.schemas.includes(entry.path))
+                    if (entry.path === tracked.schema)
                         schemas.set(entry.path, entry);
                     if (entry.kind === 'removed') {
-                        forget(entry.path);
-                        removals.push(entry.path);
+                        forgotten(answer, entry.path);
+                        answer.removals.add(entry.path);
                         continue;
                     }
                     const binary = binaryFileOf(entry);
@@ -581,31 +606,33 @@ export function houseNotifications(transport, mode) {
                     const head = headChange(entry);
                     if (head === null)
                         return null;
-                    forget(entry.path);
+                    forgotten(answer, entry.path);
                     if (binary === undefined)
-                        documents[entry.path] = entry.text;
+                        answer.documents.set(entry.path, entry.text);
                     else
-                        binaryFiles[entry.path] = binary;
+                        answer.binaryFiles.set(entry.path, binary);
                     const revision = entry.revision ?? binary?.sha256;
                     if (revision !== undefined)
-                        revisions[entry.path] = revision;
+                        revised(answer, entry.path, revision);
                     if (head !== undefined)
-                        changes[entry.path] = head;
+                        answer.changes.set(entry.path, head);
                 }
             }
             const last = pending.at(-1);
-            lines.set(tracked.authority, { ...line, frames: pending, held: last.position });
+            const current = lines.get(tracked.authority);
+            if (current?.logEpoch === line.logEpoch) {
+                lines.set(tracked.authority, {
+                    ...current,
+                    frames: current.frames.filter((frame) => frame.position > start),
+                    held: current.held !== null && current.held > last.position ? current.held : last.position,
+                });
+            }
             return {
                 page: {
                     kind: 'net-advancement',
                     roomVersion: roomVersion({ position: last.position.toString(), logEpoch: line.logEpoch }),
-                    documents,
-                    revisions,
-                    changes,
-                    binaryFiles,
-                    removals: removals.sort(),
+                    ...(yield* answered(answer)),
                 },
-                entries: applied,
                 schemas,
             };
         },

package/dist/transport.d.ts

@@ -15,27 +15,27 @@ export type HouseDoorAnswer = {
     body: unknown;
 };
 export declare const DOOR_FILES_GET = "/door/files/get";
+export declare const DOOR_FILES_ATTACH = "/door/files/attach";
+export declare const DOOR_FILES_FINISH = "/door/files/finish";
 export declare const SITE_FILES = "/_house/files/";
-export declare const SITE_FILE_RECORD = "record";
-export type HouseByteAct = 'authored_batch_upload' | 'conversation_file_upload' | 'binary_stage';
-export type HouseByteBody = string | ArrayBuffer | Uint8Array | Blob;
+export type HouseByteAct = 'authored_batch_upload';
 export type HouseBytesAnswer = {
     status: number;
-    blob: Blob | null;
+    body: ReadableStream<Uint8Array> | null;
+    mediaType: string;
 };
 export type HouseByteTransfer = {
     act: HouseByteAct;
     url: string;
-    body: HouseByteBody;
-    operation?: string;
+    body: string;
 };
 export type HouseStreamEntry = {
     path: string;
-    kind: 'edited' | 'removed' | 'piece';
+    kind: 'edited' | 'removed' | 'piece' | 'folder';
+    removed?: true;
     revision?: string;
     sha256?: string;
     text?: string;
-    file?: string;
     bytes?: number;
     media_type?: string;
     author?: {
@@ -58,6 +58,7 @@ export type HouseListedConversation = {
     created_at: string;
     finished_at: string | null;
     outcome: string | null;
+    waiting: boolean;
 };
 export type HouseStreamFrame = {
     type: 'part';
@@ -80,6 +81,9 @@ export type HouseStreamFrame = {
 } | {
     type: 'opening';
     expired: readonly string[];
+} | {
+    type: 'authority_changed';
+    rooms: readonly string[];
 } | ({
     type: 'turn';
     conversation_id: string;
@@ -92,6 +96,10 @@ export type HouseStreamFrame = {
     type: 'interactions';
     conversation_id: string;
     interactions: readonly unknown[];
+} | {
+    type: 'deliveries';
+    conversation_id: string;
+    unknown: readonly string[];
 } | {
     type: 'process';
     conversation_id: string;
@@ -104,6 +112,14 @@ export type HouseStreamFrame = {
     type: 'options';
     conversation_id: string;
     options: LiveFact<'options'>['options'];
+} | {
+    type: 'starting';
+    conversation_id: string;
+    step: string | null;
+} | {
+    type: 'link';
+    conversation_id: string;
+    connected: boolean;
 } | {
     type: 'conversations';
     conversations: readonly HouseListedConversation[];
@@ -134,31 +150,32 @@ export type HouseHeldRoom = {
     log_epoch: string;
     carry?: HouseHeldCarry;
 };
-export type HouseDemand = {
-    rooms: readonly string[];
-    conversations: boolean;
-};
 export type HouseOpening = {
-    hold(rooms: readonly HouseHeldRoom[], runtime: string, demand: HouseDemand | null): void;
+    hold(rooms: readonly HouseHeldRoom[], runtime: string): void;
     received(authority: string, carry: string, index: number): void;
     close(): void;
 };
+export type HouseClosing = {
+    revoked: boolean;
+    lost: boolean;
+};
 export type HouseStream = {
     observe(receive: (frame: HouseStreamFrame) => void): () => void;
     opened(notify: (opening: HouseOpening) => void): () => void;
-    closed(notify: (revoked: boolean) => void): () => void;
+    closed(notify: (closing: HouseClosing) => void): () => void;
 };
 export type HouseDoor = {
-    door(route: string, body: unknown): Promise<HouseDoorAnswer>;
+    door(route: string, body: unknown, arriving?: (bytes: number) => void): Promise<HouseDoorAnswer>;
     stream: HouseStream;
 };
 export type HouseTransport = HouseDoor & {
     transfer(request: HouseByteTransfer): Promise<HouseDoorAnswer>;
+    put(url: string, body: Blob, headers: Readonly<Record<string, string>>): Promise<number>;
     download(url: string): Promise<HouseBytesAnswer>;
 };
 export type HouseSiteTransport = HouseDoor & {
     online(): boolean;
-    read(route: string): Promise<HouseDoorAnswer>;
+    read(route: string, arriving?: (bytes: number) => void): Promise<HouseDoorAnswer>;
     download(route: string): Promise<HouseBytesAnswer>;
 };
 export {};