@agentshouse/mdruntime-adapter 0.1.0-ce3fe65a95f49 → 0.1.0-ce5ef9afd7e9a

package/dist/site.js

@@ -1,126 +1,127 @@
+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, } from './read.js';
-import { sha256Hex } from './digest.js';
+import { advancedScope, bootstrapping, emptyScope, housePart, parseEnumeration, parseSiteParted, refreshFrom, viewOf, wholeView, } from './read.js';
+import { PART_ATTEMPTS, unverifiedPart } from './part.js';
 import { classifyDoor, classifyRead, discoveryFailure } from './refusal.js';
+import { 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 { 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) {
+export function createSiteAdapter(transport, snapshot = false) {
     const notifications = houseNotifications(transport, 'site');
     const tracked = new Map();
+    const expired = new Map();
     function published(referrer) {
         const named = houseReferrer(referrer, tracked);
         return named === null || !tracked.has(named.locator) ? null : named;
     }
-    async function enumeration(entry, from) {
+    function fileRoute(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 unfound();
+        const { room_ref, path, record } = named.referrer;
+        return `${SITE_FILES}${room_ref}/${encodeURIComponent(request.fileRef)}/${path === undefined
+            ? `${SITE_FILE_RECORD}/${encodeURIComponent(record)}`
+            : encodeURIComponent(path)}`;
+    }
+    async function enumerated(entry, from, page) {
         const answer = await transport.door(SITE_DOOR_ENUMERATE, {
-            positions: [presented(entry.authority, from)],
+            positions: [
+                page === undefined
+                    ? presented(entry.authority, from)
+                    : {
+                        ...presented(entry.authority, { position: page.after, logEpoch: from.logEpoch }),
+                        page: { through: page.through, read: page.read },
+                    },
+            ],
         });
         const classified = classifyRead(answer.status, answer.body, entry.locator);
         if (classified !== null)
             return classified;
-        return parseEnumeration(answer.body, 'site') ?? UNCERTAIN;
+        const found = parseEnumeration(answer.body, 'site');
+        if (found === null)
+            return UNCERTAIN;
+        return viewOf(found, entry) ?? { kind: 'room-not-readable', locator: entry.locator };
+    }
+    async function enumeration(entry, from) {
+        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 };
+            return classified;
+        const room = parseSiteParted(answer.body);
+        return room === null || room.anchor !== entry.authority ? UNCERTAIN : room;
     }
-    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;
+    async function fetchedPart(entry, room, listed) {
+        for (let attempt = 0; attempt < PART_ATTEMPTS; attempt += 1) {
+            const answer = await transport.read(`${SITE_DOOR_BOOTSTRAP}${entry.authority}?part=${encodeURIComponent(listed.part)}`);
+            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 scope = await housePart(room, answer.body, listed, 'site');
+            if (scope !== null)
+                return scope;
         }
-        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 unverifiedPart(entry.locator);
     }
-    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 };
-        }
-        const { scope } = part;
-        if (after !== null || next !== null || roomVersion(scope) === roomVersion(entry)) {
-            return { scope, next };
-        }
-        const found = await enumeration(entry, scope);
-        if ('kind' in found)
-            return { failure: settled(found) };
-        const view = viewOf(found, entry);
-        if (view === undefined)
-            return { failure: { kind: 'room-not-readable', locator: entry.locator } };
-        return { scope: advancedScope(scope, view), next: null };
+    async function caughtUp(entry, continued) {
+        const listed = continued.room.parts[continued.next];
+        const scope = listed === undefined
+            ? emptyScope(continued.room)
+            : await fetchedPart(entry, continued.room, listed);
+        if ('kind' in scope)
+            return scope;
+        if (continued.room.parts.length > 1 || roomVersion(scope) === roomVersion(entry))
+            return scope;
+        const view = await enumeration(entry, scope);
+        if ('kind' in view)
+            return settled(view);
+        return stepped(advancedScope(scope, view));
     }
     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 };
         }
-        const found = await enumeration(entry, from);
-        if ('kind' in found)
-            return found;
-        const view = viewOf(found, entry);
-        if (view === undefined)
-            return { kind: 'room-not-readable', locator: entry.locator };
+        const view = await enumeration(entry, from);
+        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);
@@ -128,6 +129,8 @@ export function createSiteAdapter(transport) {
     }
     return {
         localSaves: true,
+        exhaustiveDiscovery: true,
+        roomTypes: HOUSE_ROOM_TYPES,
         async authorize() {
             return {};
         },
@@ -150,23 +153,31 @@ export function createSiteAdapter(transport) {
             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;
+            if (request.pageToken === undefined) {
+                const room = await partedRoom(entry);
+                if ('kind' in room)
+                    return room;
+                continued = { room, next: 0, seen: [] };
+            }
+            else
+                continued = JSON.parse(request.pageToken);
+            const scope = await caughtUp(entry, continued);
+            if ('kind' in scope)
+                return scope;
+            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,
+                ...entry.schemas.filter((schema) => scope.files.some((file) => file.path === 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 }) } : {}),
             };
         },
         async refresh(_authorization, request) {
@@ -175,6 +186,11 @@ export function createSiteAdapter(transport) {
                 return { kind: 'room-not-readable', locator: request.locator };
             if (request.pageToken !== undefined)
                 return UNCERTAIN;
+            if (snapshot) {
+                return request.fromRoomVersion === roomVersion(entry)
+                    ? { kind: 'still-current' }
+                    : { kind: 'beyond-horizon' };
+            }
             return refreshed(entry, request.fromRoomVersion);
         },
         async mutate() {
@@ -184,30 +200,32 @@ export function createSiteAdapter(transport) {
             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;
         },
+        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),
+            };
+        },
         referrerScope(referrer) {
             const named = published(referrer);
             if (named === null)
                 return null;
             const { path } = named.referrer;
-            return { kind: 'room', locator: named.locator, ...(path === undefined ? {} : { path }) };
+            return { locator: named.locator, ...(path === undefined ? {} : { path }) };
         },
         reached(locator, version, target) {
             return reachedVersion(version, target, tracked.get(locator)?.logEpoch);
@@ -228,20 +246,27 @@ export function createSiteAdapter(transport) {
                 return UNCERTAIN;
             return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), SITE_SUBMIT);
         },
-        roomStream: {
-            hold(rooms) {
-                notifications.send(rooms.flatMap((room) => {
-                    const entry = tracked.get(room.locator);
-                    const at = logPosition(room.roomVersion);
-                    if (entry === undefined || at === null)
-                        return [];
-                    notifications.reach(entry.authority, at);
-                    return [presented(entry.authority, at)];
-                }));
+        roomStream: snapshot
+            ? undefined
+            : {
+                hold(rooms) {
+                    notifications.send(rooms.flatMap((room) => {
+                        const entry = tracked.get(room.locator);
+                        const at = logPosition(room.roomVersion);
+                        if (entry === undefined || at === null)
+                            return [];
+                        notifications.reach(entry.authority, at);
+                        return [presented(entry.authority, at)];
+                    }));
+                },
+                reopen: notifications.reopen,
+                observe: notifications.observe,
+                published(locator, roomVersion) {
+                    const at = logPosition(roomVersion);
+                    if (at !== null)
+                        notifications.published(locator, at);
+                },
             },
-            reopen: notifications.reopen,
-            observe: notifications.observe,
-        },
         serviceMode: notifications.serviceMode,
     };
 }

package/dist/stream.d.ts

@@ -1,21 +1,22 @@
-import type { ConversationStream, RefreshPage, RoomStreamEvent, ServiceModeSignal } 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 { 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): () => void;
+    observe(notify: (event: RoomStreamEvent) => void, receipts: StreamReceipts): () => 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,EAElB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EAEb,SAAS,EAET,gBAAgB,EAEjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAwB7D,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,GAAG,MAAM,IAAI,CAAC;IAC9D,IAAI,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAAC;IAC5C,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;AA0DF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CAoX5F"}
+{"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"}