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

package/dist/site.js

@@ -1,100 +1,150 @@
-import { actionOutcome } from './actions.js';
+import { actionOutcome, SITE_SUBMIT } from './actions.js';
 import { mapDiscovery, parseSiteDiscovery, siteCapabilities, siteTracked, } from './discovery.js';
-import { MODEL_ABSENT, failedModel, heldModel, modelKey, modelShelf, } from './model.js';
-import { advancedScope, bootstrapOf, parseEnumeration, parseSiteBootstrap, refreshFrom, schemaOf, schemaPath, viewOf, } from './read.js';
-import { classifyDoor, discoveryFailure, doorRefusal } from './refusal.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 { classifyDoor, classifyRead, discoveryFailure } from './refusal.js';
 import { houseNotifications } from './stream.js';
-import { PRIVATE_LOCATOR, SITE_DOOR_BOOTSTRAP, SITE_DOOR_DISCOVER, SITE_DOOR_ENUMERATE, SITE_DOOR_SUBMIT, } from './transport.js';
-import { logPosition, presented, reachedVersion, roomVersion, } from './version.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 siteRoom(tracked, attachedModel) {
+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' },
-        attachedModel,
         providerOwnedPaths: [],
     };
 }
 function settled(refused) {
-    return refused.kind === 'beyond-horizon' || refused.kind === 'retryable-refusal'
-        ? UNCERTAIN
-        : 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 models = modelShelf();
-    const acquired = new Map();
-    let caught = new Map();
-    async function enumeration(entry, from) {
+    function published(referrer) {
+        const named = houseReferrer(referrer, tracked);
+        return named === null || !tracked.has(named.locator) ? null : named;
+    }
+    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 behind = doorRefusal(answer.body);
-        if (behind?.code === 'replica_behind' && behind.retryable) {
-            return { kind: 'retryable-refusal', code: behind.code, fields: behind.fields };
-        }
-        const classified = classifyDoor(answer.status, answer.body, entry.locator);
+        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 caughtUp(entry) {
-        const answer = await transport.read(`${SITE_DOOR_BOOTSTRAP}${entry.authority}`);
+    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('&')}`}`);
         const classified = classifyDoor(answer.status, answer.body, entry.locator);
         if (classified !== null)
-            return { failure: settled(classified) };
+            return { failure: classified };
         const scope = parseSiteBootstrap(answer.body);
-        if (scope === null)
-            return { failure: UNCERTAIN };
-        if (roomVersion(scope) === roomVersion(entry))
-            return { scope };
-        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) };
+        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 }] };
+    }
+    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 view = await enumeration(entry, scope);
+        if ('kind' in view)
+            return { failure: settled(view) };
+        return { scope: advancedScope(scope, view), next: null };
     }
     async function refreshed(entry, fromRoomVersion) {
         const from = logPosition(fromRoomVersion);
         if (from === null)
             return { kind: 'beyond-horizon' };
         const streamed = notifications.advance(entry, from);
-        if (streamed !== null)
-            return streamed.page;
-        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 };
-        notifications.hold(entry.authority, view);
-        return refreshFrom(view, fromRoomVersion);
-    }
-    async function acquire(entry, held) {
-        if ('failure' in held)
-            return { snapshot: failedModel(held.failure), identity: null };
-        const model = await heldModel(schemaOf(held.scope, entry.schema), schemaPath(entry.handle, entry.schema), MODEL_ABSENT);
-        acquired.set(entry.authority, { roomVersion: roomVersion(held.scope), model });
-        return model;
+        if (streamed !== null) {
+            const models = await streamedModels(streamed.schemas, entry, 'site');
+            return models === undefined ? streamed.page : { ...streamed.page, models };
+        }
+        const view = await enumeration(entry, from);
+        if ('kind' in view)
+            return view;
+        notifications.reach(entry.authority, view);
+        const answer = refreshFrom(view, fromRoomVersion);
+        if (answer.kind !== 'net-advancement')
+            return answer;
+        const models = await viewModels(view, entry);
+        return models === undefined ? answer : { ...answer, models };
     }
     return {
+        localSaves: true,
+        exhaustiveDiscovery: true,
         async authorize() {
             return {};
         },
-        async model(_authorization, request) {
-            return models.answer(request);
-        },
         async discover() {
             const answer = await transport.read(SITE_DOOR_DISCOVER);
-            const classified = classifyDoor(answer.status, answer.body, PRIVATE_LOCATOR);
-            if (classified !== null)
-                return discoveryFailure(classified);
+            const failed = discoveryFailure(answer.status, answer.body);
+            if (failed !== null)
+                return failed;
             const document = parseSiteDiscovery(answer.body);
             if (document === null)
                 return UNCERTAIN;
@@ -103,42 +153,30 @@ export function createSiteAdapter(transport) {
             for (const entry of entries)
                 tracked.set(entry.locator, entry);
             notifications.track(entries);
-            const published = new Set(entries.map((entry) => entry.authority));
-            for (const authority of [...acquired.keys()]) {
-                if (!published.has(authority))
-                    acquired.delete(authority);
-            }
-            const fresh = new Map();
-            const current = new Map();
-            for (const entry of entries) {
-                const kept = acquired.get(entry.authority);
-                if (kept !== undefined && kept.roomVersion === roomVersion(entry)) {
-                    current.set(entry.authority, kept.model);
-                    continue;
-                }
-                const held = await caughtUp(entry);
-                fresh.set(entry.authority, held);
-                current.set(entry.authority, await acquire(entry, held));
-            }
-            caught = fresh;
-            const rooms = entries.map((entry) => {
-                const shelved = models.retain(modelKey(entry.locator, 'collection'), current.get(entry.authority));
-                return siteRoom(entry, shelved?.identity ?? null);
-            });
-            models.keep(entries.map((entry) => entry.locator));
-            return mapDiscovery(document, rooms, siteCapabilities());
+            return mapDiscovery(document, entries.map(siteRoom), siteCapabilities());
         },
         async bootstrap(_authorization, request) {
             const entry = tracked.get(request.locator);
             if (entry === undefined)
                 return { kind: 'room-not-readable', locator: request.locator };
-            if (request.pageToken !== undefined)
-                return UNCERTAIN;
-            const held = caught.get(entry.authority) ?? (await caughtUp(entry));
+            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.hold(entry.authority, held.scope);
-            return bootstrapOf(held.scope);
+            notifications.reach(entry.authority, held.scope);
+            const seen = [
+                ...(continued?.seen ?? []),
+                ...entry.schemas.filter((schema) => held.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 };
+            return {
+                ...bootstrapOf(held.scope),
+                ...(models === undefined ? {} : { models }),
+                ...(continuation === null ? {} : { pageToken: JSON.stringify(continuation) }),
+            };
         },
         async refresh(_authorization, request) {
             const entry = tracked.get(request.locator);
@@ -146,39 +184,85 @@ export function createSiteAdapter(transport) {
                 return { kind: 'room-not-readable', locator: request.locator };
             if (request.pageToken !== undefined)
                 return UNCERTAIN;
-            const result = await refreshed(entry, request.fromRoomVersion);
-            if (result.kind === 'beyond-horizon')
-                caught.delete(entry.authority);
-            const answered = result.kind === 'net-advancement'
-                ? result.roomVersion
-                : result.kind === 'still-current'
-                    ? request.fromRoomVersion
-                    : null;
-            if (request.minPosition !== undefined &&
-                answered !== null &&
-                !reachedVersion(answered, request.minPosition, entry.logEpoch)) {
-                return { kind: 'retryable-refusal', code: 'replica_behind', fields: {} };
+            if (snapshot) {
+                return request.fromRoomVersion === roomVersion(entry)
+                    ? { kind: 'still-current' }
+                    : { kind: 'beyond-horizon' };
             }
-            return result;
+            return refreshed(entry, request.fromRoomVersion);
         },
         async mutate() {
-            return { kind: 'rejected', affected: {}, code: 'write-grant', fields: {} };
+            return { kind: 'rejected', affected: {}, 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 }
+                : 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 }) };
+        },
         reached(locator, version, target) {
             return reachedVersion(version, target, tracked.get(locator)?.logEpoch);
         },
+        follows(_locator, version, next) {
+            return followsVersion(version, next);
+        },
         async action(_authorization, request) {
-            if (request.name !== 'submit') {
-                return { kind: 'rejected', code: 'action-unimplemented', fields: { name: request.name } };
+            if (request.name !== SITE_SUBMIT) {
+                return {
+                    kind: 'rejected',
+                    code: 'action-unimplemented',
+                    fields: { name: request.name },
+                    retryable: false,
+                };
             }
             if (!transport.online())
                 return UNCERTAIN;
-            return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), 'submit');
+            return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), SITE_SUBMIT);
         },
-        roomVersions: notifications,
+        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)];
+                    }), null);
+                },
+                reopen: notifications.reopen,
+                observe: notifications.observe,
+                published(locator, roomVersion) {
+                    const at = logPosition(roomVersion);
+                    if (at !== null)
+                        notifications.published(locator, at);
+                },
+            },
         serviceMode: notifications.serviceMode,
     };
 }

package/dist/stream.d.ts

@@ -1,15 +1,21 @@
-import type { ConversationStream, RefreshPage, SelectedRooms, ServiceModeSignal } from '@agentshouse/mdruntime';
+import type { ConversationStream, RefreshPage, RoomStreamEvent, ServiceModeSignal, StreamReceipts } from '@agentshouse/mdruntime';
 import type { TrackedAuthority } from './discovery.js';
-import type { HouseDoor, HouseMode, HouseStreamEntry } from './transport.js';
+import type { HouseDemand, 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 = SelectedRooms & {
+export type HouseNotifications = {
+    runtime: string;
+    observe(notify: (event: RoomStreamEvent) => void, receipts: StreamReceipts): () => void;
+    send(rooms: readonly HouseHeldRoom[], demand: HouseDemand | null): void;
+    published(locator: string, at: LogPosition): void;
+    reopen(): void;
     track(authorities: readonly TrackedAuthority[]): void;
-    hold(authority: string, at: LogPosition): void;
+    reach(authority: string, at: LogPosition): void;
     advance(tracked: TrackedAuthority, from: LogPosition, holds?: HeldRevision): StreamedAdvancement | null;
     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,EAEV,kBAAkB,EAClB,WAAW,EAEX,aAAa,EAEb,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAoB,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAgB7D,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;CACtC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,WAAW,GAAG,IAAI,CAAC;IAC/C,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;AAYF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,kBAAkB,CA2P5F"}
+{"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,CAohB5F"}