@agentshouse/mdruntime-adapter 0.1.0-cc1bdabaf4e28 → 0.1.0-cc34762b70bb0

package/dist/site.js

@@ -1,14 +1,14 @@
 import { stepped } from '@agentshouse/mdruntime';
-import { actionOutcome, SITE_SUBMIT } from './actions.js';
+import { actionOutcome } from './actions.js';
 import { mapDiscovery, parseSiteDiscovery, siteCapabilities, siteTracked, } from './discovery.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 { bootstrapping } from './read.js';
+import { roomStreams } from './room-stream.js';
+import { classifyDoor, discoveryFailure } from './refusal.js';
+import { HOUSE_TYPED_PATHS } from './house-model.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_FILES, } from './transport.js';
-import { followsVersion, logPosition, presented, reachedVersion, roomVersion, } from './version.js';
+import { houseSiteRoute, SITE_DOOR_SUBMIT, SITE_FILES, SITE_SUBMISSION, } 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 };
@@ -25,171 +25,97 @@ function siteRoom(tracked) {
     };
 }
 export function createSiteAdapter(transport, snapshot = false) {
-    const notifications = houseNotifications(transport, 'site');
+    const notifications = houseNotifications(transport, 'site', {
+        opened: async () => {
+            const found = await discovered();
+            return found.kind === 'discovery' ? found : null;
+        },
+        changed: () => null,
+    });
     const tracked = new Map();
-    const expired = new Map();
+    const read = new Map();
+    const rooms = roomStreams('site');
     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, {
-            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;
-        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 openedRoom(entry, arriving, signal) {
+        const cut = read.get(entry.locator);
+        const answered = await transport.streamed(`${houseSiteRoute('bootstrap')}/${entry.authority}${cut === undefined ? '' : `?expired=${cut}`}`, signal ?? new AbortController().signal);
+        if (answered.room === null)
+            return classifyDoor(answered.status, answered.body, entry.locator) ?? UNCERTAIN;
+        const head = await rooms.head(entry, answered.room, arriving, signal);
+        const at = head.kind === 'bootstrap' ? logPosition(head.roomVersion) : null;
+        if (at !== null)
+            read.set(entry.locator, at.position);
+        return head;
     }
-    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 classified;
-        const room = parseSiteParted(answer.body);
-        return room === null || room.anchor !== entry.authority ? UNCERTAIN : room;
+    async function streamedPage(entry, token) {
+        const part = await rooms.part(entry, token);
+        if ('kind' in part)
+            return part;
+        const { folders: _folders, ...page } = await stepped(bootstrapping(part.scope));
+        return {
+            ...page,
+            ...(part.models === undefined ? {} : { models: part.models }),
+            ...(part.pageToken === undefined ? {} : { pageToken: part.pageToken }),
+            bytes: part.bytes,
+        };
     }
-    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 };
-        }
-        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 };
-        }
-        return unverifiedPart(entry.locator);
-    }
-    async function refreshed(entry, fromRoomVersion) {
-        const from = logPosition(fromRoomVersion);
-        if (from === null)
-            return { kind: 'beyond-horizon' };
-        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 view = await enumeration(entry, from);
-        if ('kind' in view)
-            return view;
-        notifications.reach(entry.authority, view);
-        const answer = await refreshFrom(view, fromRoomVersion);
-        if (answer.kind !== 'net-advancement')
-            return answer;
-        const models = await viewModels(view, entry);
-        return models === undefined ? answer : { ...answer, models };
+    async function discovered() {
+        const answer = await transport.read(houseSiteRoute('discover'));
+        const failed = discoveryFailure(answer.status, answer.body);
+        if (failed !== null)
+            return failed;
+        const document = parseSiteDiscovery(answer.body);
+        if (document === null)
+            return UNCERTAIN;
+        const entries = siteTracked(document);
+        tracked.clear();
+        for (const entry of entries)
+            tracked.set(entry.locator, entry);
+        notifications.track(entries);
+        return mapDiscovery(document, entries.map(siteRoom), siteCapabilities());
     }
     return {
         localSaves: true,
-        exhaustiveDiscovery: true,
         roomTypes: HOUSE_ROOM_TYPES,
         nameableRoomTypes: HOUSE_NAMEABLE_ROOM_TYPES,
+        typedPaths: HOUSE_TYPED_PATHS,
         async authorize() {
             return {};
         },
-        async discover() {
-            const answer = await transport.read(SITE_DOOR_DISCOVER);
-            const failed = discoveryFailure(answer.status, answer.body);
-            if (failed !== null)
-                return failed;
-            const document = parseSiteDiscovery(answer.body);
-            if (document === null)
-                return UNCERTAIN;
-            const entries = siteTracked(document);
-            tracked.clear();
-            for (const entry of entries)
-                tracked.set(entry.locator, entry);
-            notifications.track(entries);
-            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 };
-            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,
-                ...(scope.files.some((file) => file.path === entry.schema) ? [entry.schema] : []),
-            ];
-            const models = await partModels(scope, entry, new Set(seen), !more);
-            const { folders: _folders, ...page } = await stepped(bootstrapping(scope));
-            return {
-                ...page,
-                ...(models === undefined ? {} : { models }),
-                ...(more ? { pageToken: JSON.stringify({ ...continued, next, seen }) } : {}),
-                ...(inventory === undefined ? {} : { inventory }),
-                ...(sent.frame === null ? {} : { received: sent.frame }),
-            };
+            return request.pageToken === undefined
+                ? openedRoom(entry, request.arriving, request.signal)
+                : streamedPage(entry, request.pageToken);
         },
-        async refresh(_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;
-            if (snapshot) {
-                return request.fromRoomVersion === roomVersion(entry)
-                    ? { kind: 'still-current' }
-                    : { kind: 'beyond-horizon' };
+        ...(snapshot
+            ? {
+                discover: discovered,
+                async refresh(_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;
+                    return request.fromRoomVersion === roomVersion(entry)
+                        ? { kind: 'still-current' }
+                        : { kind: 'beyond-horizon' };
+                },
             }
-            return refreshed(entry, request.fromRoomVersion);
-        },
+            : {}),
         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' };
         },
@@ -221,7 +147,7 @@ export function createSiteAdapter(transport, snapshot = false) {
             return followsVersion(version, next);
         },
         async action(_authorization, request) {
-            if (request.name !== SITE_SUBMIT) {
+            if (request.name !== SITE_SUBMISSION) {
                 return {
                     kind: 'rejected',
                     code: 'action-unimplemented',
@@ -231,7 +157,7 @@ export function createSiteAdapter(transport, snapshot = false) {
             }
             if (!transport.online())
                 return UNCERTAIN;
-            return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), SITE_SUBMIT);
+            return actionOutcome(await transport.door(SITE_DOOR_SUBMIT, request.input), SITE_SUBMISSION, request.input);
         },
         roomStream: snapshot
             ? undefined
@@ -240,19 +166,10 @@ export function createSiteAdapter(transport, snapshot = false) {
                     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)];
+                        return entry === undefined || at === null ? [] : [presented(entry.authority, at)];
                     }));
                 },
-                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,24 +1,23 @@
-import { type ConversationStream, type RefreshPage, type RoomStreamEvent, type ServiceModeSignal, type StreamReceipts } from '@agentshouse/mdruntime';
+import { type AuthorityChange, type Discovery, type ConversationStream, type RoomStreamEvent, type ServiceModeSignal } 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;
-    schemas: ReadonlyMap<string, HouseStreamEntry>;
+import { type HouseDoor, type HouseHeldRoom, type HouseMode, type HouseStreamFrame } from './transport.js';
+export type HouseOpeningFrame = Extract<HouseStreamFrame, {
+    type: 'opening';
+}>;
+export type HouseAuthorityChangedFrame = Extract<HouseStreamFrame, {
+    type: 'authority_changed';
+}>;
+export type HouseDiscovering = {
+    opened(frame: HouseOpeningFrame | null): Promise<Discovery | null>;
+    changed(frame: HouseAuthorityChangedFrame): AuthorityChange | null;
 };
 export type HouseNotifications = {
     runtime: string;
-    observe(notify: (event: RoomStreamEvent) => void, receipts: StreamReceipts): () => void;
+    observe(notify: (event: RoomStreamEvent) => void): () => 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;
-    edited(tracked: TrackedAuthority, from: LogPosition): readonly string[];
-    advance(tracked: TrackedAuthority, from: LogPosition, holds?: HeldRevision): Generator<number, StreamedAdvancement | null, void>;
     conversations: ConversationStream;
     serviceMode: ServiceModeSignal;
 };
-export declare function houseNotifications(transport: HouseDoor, mode: HouseMode): HouseNotifications;
+export declare function houseNotifications(transport: HouseDoor, mode: HouseMode, discovering: HouseDiscovering): HouseNotifications;
 //# sourceMappingURL=stream.d.ts.map

package/dist/stream.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAEpB,KAAK,SAAS,EACd,KAAK,kBAAkB,EAIvB,KAAK,eAAe,EAEpB,KAAK,iBAAiB,EAEvB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAWvD,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAaxB,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,CAAC;AAE/E,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAAC;AAElG,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IACnE,OAAO,CAAC,KAAK,EAAE,0BAA0B,GAAG,eAAe,GAAG,IAAI,CAAC;CACpE,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,KAAK,CAAC,WAAW,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtD,aAAa,EAAE,kBAAkB,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAmFF,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,gBAAgB,GAC5B,kBAAkB,CA6TpB"}