@agentshouse/mdruntime 0.1.0-c8c4b020a3ec7 → 0.1.0-c8ca66ac9e99d

package/dist/memory.js

@@ -1,5 +1,3 @@
-import { ROOM_CONTRACT_VERSION, } from './adapter.js';
-import { MD_MODEL } from './collection.js';
 import { sameChange } from './overlay.js';
 const FIXTURE_RETENTION = {
     history: { kind: 'duration', seconds: 1 },
@@ -15,6 +13,19 @@ function declaredRetention(value) {
     }
     throw new Error('history retention duration must be a finite positive number of seconds');
 }
+const MODEL_ABSENT = { kind: 'model-unavailable', reason: 'not-readable' };
+function modelsOf(room) {
+    return {
+        collection: room.model ?? MODEL_ABSENT,
+        ...(room.typedSelection === undefined
+            ? {}
+            : { selection: room.selectionModel ?? MODEL_ABSENT }),
+    };
+}
+function changedModels(room, from) {
+    const now = modelsOf(room);
+    return JSON.stringify(now) === JSON.stringify(modelsOf(from)) ? undefined : now;
+}
 function named(source, paths) {
     const taken = {};
     for (const path of paths) {
@@ -31,8 +42,6 @@ async function resolveScript(answer, fallback, request) {
 }
 export function createMemoryAdapter(options = {}) {
     let rooms = options.rooms === undefined ? [] : [...options.rooms];
-    const mdModel = options.mdModel ?? MD_MODEL;
-    const supportedVersions = options.supportedVersions ?? [ROOM_CONTRACT_VERSION];
     const capabilities = options.capabilities ?? [];
     const providerLimits = options.providerLimits ?? [];
     const retention = declaredRetention(options.retention);
@@ -47,7 +56,8 @@ export function createMemoryAdapter(options = {}) {
     const unsealed = new Map();
     const sealed = new Set();
     const historyPageSize = options.historyPageSize;
-    let selected = [];
+    let held = [];
+    let expiring = [];
     let replicated = [];
     let issued = 0;
     function scriptConversations(entries) {
@@ -89,36 +99,38 @@ export function createMemoryAdapter(options = {}) {
         return {
             name: room.name,
             locator: room.locator,
+            handle: room.handle,
             roomVersion: room.roomVersion,
             operations: room.operations,
             replica: room.replica,
-            attachedModel: room.attachedModel,
             ...(room.typedSelection === undefined ? {} : { typedSelection: room.typedSelection }),
             providerOwnedPaths: room.providerOwnedPaths,
         };
     }
-    function page(room, from) {
+    function page(room, after) {
         const paths = Object.keys(room.documents ?? {}).sort();
+        const opening = after === undefined;
+        const from = opening ? 0 : paths.filter((path) => path <= after).length;
         const size = pageSize ?? paths.length;
         const taken = paths.slice(from, from + size);
         const next = from + taken.length;
-        const targets = from === 0 ? (room.binaryTargets ?? []) : [];
+        const targets = opening ? Object.keys(room.binaryFiles ?? {}) : [];
         return {
             kind: 'bootstrap',
             roomVersion: room.roomVersion,
+            ...(opening ? { models: modelsOf(room) } : {}),
             documents: named(room.documents ?? {}, taken),
-            revisions: named(room.revisions ?? {}, taken),
+            revisions: named(room.revisions ?? {}, [...taken, ...targets]),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
-            binaryTargets: targets,
-            ...(from === 0 && room.attachments !== undefined ? { attachments: room.attachments } : {}),
-            ...(next < paths.length ? { pageToken: String(next) } : {}),
+            binaryFiles: named(room.binaryFiles ?? {}, targets),
+            ...(next < paths.length ? { pageToken: taken.at(-1) } : {}),
         };
     }
     function advancement(room, from, at) {
         const current = room.documents ?? {};
         const previous = from.documents ?? {};
-        const currentTargets = new Set(room.binaryTargets ?? []);
-        const previousTargets = new Set(from.binaryTargets ?? []);
+        const currentTargets = new Set(Object.keys(room.binaryFiles ?? {}));
+        const previousTargets = new Set(Object.keys(from.binaryFiles ?? {}));
         const headMoved = (path) => room.revisions?.[path] !== from.revisions?.[path] ||
             !sameChange(room.changes?.[path], from.changes?.[path]);
         const changed = Object.keys(current)
@@ -134,22 +146,21 @@ export function createMemoryAdapter(options = {}) {
         const targets = opening
             ? [...currentTargets].filter((target) => !previousTargets.has(target) || headMoved(target))
             : [];
-        const attachments = room.attachments ?? [];
-        const declared = opening && JSON.stringify(attachments) !== JSON.stringify(from.attachments ?? []);
+        const models = opening ? changedModels(room, from) : undefined;
         return {
             kind: 'net-advancement',
             roomVersion: room.roomVersion,
+            ...(models === undefined ? {} : { models }),
             documents: named(current, taken),
-            revisions: named(room.revisions ?? {}, taken),
+            revisions: named(room.revisions ?? {}, [...taken, ...targets]),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
-            binaryTargets: targets,
+            binaryFiles: named(room.binaryFiles ?? {}, targets),
             removals: opening
                 ? [
                     ...Object.keys(previous).filter((path) => !(path in current) && !currentTargets.has(path)),
                     ...[...previousTargets].filter((target) => !currentTargets.has(target) && !(target in current)),
                 ].sort()
                 : [],
-            ...(declared ? { attachments } : {}),
             ...(pageToken === undefined ? {} : { pageToken }),
         };
     }
@@ -170,7 +181,7 @@ export function createMemoryAdapter(options = {}) {
     function historiesOf(input) {
         const asked = input?.conversations;
         if (!Array.isArray(asked))
-            return { kind: 'rejected', code: 'invalid_request', fields: {} };
+            return { kind: 'rejected', code: 'invalid_request', fields: {}, retryable: false };
         const histories = [];
         for (const entry of asked) {
             const conversation = typeof entry.conversation === 'string' ? scripted.get(entry.conversation) : undefined;
@@ -198,7 +209,12 @@ export function createMemoryAdapter(options = {}) {
         const named = typeof input.conversation === 'string' ? input.conversation : '';
         const conversation = scripted.get(named);
         if (conversation === undefined) {
-            return { kind: 'rejected', code: 'unknown-conversation', fields: { conversation: named } };
+            return {
+                kind: 'rejected',
+                code: 'unknown-conversation',
+                fields: { conversation: named },
+                retryable: false,
+            };
         }
         const outcome = conversation.outcomes?.[name];
         if (outcome !== undefined)
@@ -212,7 +228,7 @@ export function createMemoryAdapter(options = {}) {
         if (name === 'conversation.cancel') {
             const turn = typeof input.turn === 'string' ? input.turn : '';
             if (sealed.has(turn) || !unsealed.has(turn)) {
-                return { kind: 'rejected', code: 'turn-sealed', fields: { turn } };
+                return { kind: 'rejected', code: 'turn-sealed', fields: { turn }, retryable: false };
             }
             unsealed.delete(turn);
             return { kind: 'action', result: { turn, cancelled: true } };
@@ -221,15 +237,19 @@ export function createMemoryAdapter(options = {}) {
             scripted.delete(named);
         return { kind: 'action', result: { conversation: named } };
     }
+    function announceList() {
+        const entries = [...scripted.values()].flatMap(({ conversation, listed }) => listed === undefined ? [] : [{ conversation, ...listed }]);
+        for (const listener of listeners)
+            listener({ kind: 'list', entries });
+    }
     function discovery() {
         return {
             kind: 'discovery',
-            supportedVersions,
-            mdModel,
             rooms: rooms.map(declared),
             capabilities,
             providerLimits,
             retention,
+            ...(options.member === undefined ? {} : { member: options.member }),
         };
     }
     return {
@@ -240,9 +260,21 @@ export function createMemoryAdapter(options = {}) {
         setConversations(next) {
             scriptConversations(next);
         },
-        notifyRoomVersion(notification) {
+        open() {
+            announceList();
+            for (const observer of observers)
+                observer({ kind: 'opened' });
+        },
+        close(revoked = false) {
             for (const observer of observers)
-                observer(notification);
+                observer({ kind: 'closed', revoked });
+        },
+        expire(locators) {
+            expiring = [...locators];
+        },
+        notifyRoomVersion({ locator, roomVersion }) {
+            for (const observer of observers)
+                observer({ kind: 'room-version', locator, roomVersion });
         },
         notifyConversation(event) {
             if (event.kind === 'accepted-message') {
@@ -256,8 +288,8 @@ export function createMemoryAdapter(options = {}) {
             for (const observer of modeObservers)
                 observer(mode);
         },
-        selectedRooms() {
-            return selected;
+        heldRooms() {
+            return held;
         },
         replicatedConversations() {
             return replicated;
@@ -281,12 +313,45 @@ export function createMemoryAdapter(options = {}) {
                 };
             },
         },
-        roomVersions: {
-            select(locators) {
-                selected = [...locators];
+        roomStream: {
+            hold(asked) {
+                held = asked.map((room) => room.locator);
+                const expired = expiring.filter((locator) => held.includes(locator));
+                expiring = [];
+                const moved = asked.flatMap((room) => {
+                    const current = rooms.find((entry) => entry.locator === room.locator);
+                    return current === undefined ||
+                        expired.includes(room.locator) ||
+                        current.roomVersion === room.roomVersion
+                        ? []
+                        : [{ locator: room.locator, roomVersion: current.roomVersion }];
+                });
+                queueMicrotask(() => {
+                    for (const observer of observers) {
+                        for (const room of moved)
+                            observer({ kind: 'room-version', ...room });
+                        observer({ kind: 'opening', expired });
+                    }
+                });
+            },
+            reopen() {
+                queueMicrotask(() => {
+                    for (const observer of observers)
+                        observer({ kind: 'closed', revoked: false });
+                });
             },
             observe(notify) {
                 observers.add(notify);
+                queueMicrotask(() => {
+                    if (!observers.has(notify))
+                        return;
+                    if (options.unopened === true) {
+                        notify({ kind: 'closed', revoked: false });
+                        return;
+                    }
+                    announceList();
+                    notify({ kind: 'opened' });
+                });
                 return () => {
                     observers.delete(notify);
                 };
@@ -298,13 +363,6 @@ export function createMemoryAdapter(options = {}) {
             else
                 scripts[operation] = answer;
         },
-        async model(_authorization, request) {
-            return resolveScript(scripts.model, () => {
-                const room = rooms.find((entry) => entry.locator === request.locator);
-                const answer = request.attached === 'collection' ? room?.model : room?.selectionModel;
-                return answer ?? { kind: 'model-unavailable', reason: 'not-readable' };
-            }, request);
-        },
         async authorize() {
             return resolveScript(scripts.authorize, () => ({}), undefined);
         },
@@ -317,13 +375,21 @@ export function createMemoryAdapter(options = {}) {
             });
         },
         reached,
+        follows(locator, roomVersion, next) {
+            const scripted = scripts.follows;
+            if (typeof scripted === 'boolean')
+                return scripted;
+            if (scripted !== undefined)
+                return scripted(locator, roomVersion, next);
+            return true;
+        },
         async bootstrap(_authorization, request) {
             return resolveScript(scripts.bootstrap, () => {
                 const room = rooms.find((entry) => entry.locator === request.locator);
                 if (room === undefined) {
                     return { kind: 'room-not-readable', locator: request.locator };
                 }
-                return page(room, request.pageToken === undefined ? 0 : Number(request.pageToken));
+                return page(room, request.pageToken);
             }, request).then((answer) => note(request.locator, answer));
         },
         async refresh(_authorization, request) {
@@ -341,10 +407,6 @@ export function createMemoryAdapter(options = {}) {
                     }
                     return advancement(continuation.room, continuation.from, continuation.at);
                 }
-                if (request.minPosition !== undefined &&
-                    !reached(room.locator, room.roomVersion, request.minPosition)) {
-                    return { kind: 'retryable-refusal', code: 'replica_behind', fields: {} };
-                }
                 if (request.fromRoomVersion === room.roomVersion) {
                     return { kind: 'still-current' };
                 }
@@ -360,7 +422,13 @@ export function createMemoryAdapter(options = {}) {
                 if (room === undefined) {
                     return { kind: 'room-not-readable', locator: request.locator };
                 }
-                return { kind: 'rejected', code: 'unscripted-mutation', fields: {}, affected: {} };
+                return {
+                    kind: 'rejected',
+                    code: 'unscripted-mutation',
+                    fields: {},
+                    retryable: false,
+                    affected: {},
+                };
             }, request).then((answer) => note(request.locator, answer));
         },
         async history(_authorization, request) {
@@ -375,11 +443,35 @@ export function createMemoryAdapter(options = {}) {
                 };
             }, request);
         },
+        async binary(_authorization, request) {
+            return resolveScript(scripts.binary, () => {
+                if (request.kind === 'reference') {
+                    return { kind: 'rejected', code: 'unscripted-binary', fields: {}, retryable: false };
+                }
+                const room = rooms.find((entry) => entry.locator === request.locator);
+                if (room === undefined)
+                    return { kind: 'room-not-readable', locator: request.locator };
+                const blob = room.blobs?.[request.path];
+                return blob === undefined
+                    ? { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false }
+                    : { kind: 'binary', blob };
+            }, request);
+        },
+        referrerScope(referrer) {
+            if (typeof referrer !== 'object' || referrer === null)
+                return null;
+            const { room, path, message } = referrer;
+            if (typeof message === 'string')
+                return { kind: 'conversations' };
+            if (typeof room !== 'string')
+                return null;
+            return { kind: 'room', locator: room, ...(typeof path === 'string' ? { path } : {}) };
+        },
         async action(_authorization, request) {
             return resolveScript(scripts.action, () => {
                 if (request.name.startsWith('conversation.'))
                     return conversationAction(request);
-                return { kind: 'rejected', code: 'unscripted-action', fields: {} };
+                return { kind: 'rejected', code: 'unscripted-action', fields: {}, retryable: false };
             }, request).then((answer) => {
                 if (answer.kind === 'action' && answer.at !== undefined)
                     note(answer.at.locator, answer.at);

package/dist/model.d.ts

@@ -1,31 +1,27 @@
-import type { Definition, FieldSpec, SectionSpec, VerifiedModel } from '@agentshouse/mdmodel';
+import type { Definition, ValueFacts, VerifiedModel } from '@agentshouse/mdmodel';
+import type { Open } from './open.js';
 export type ModelIdentity = {
     identity: string;
     version: string;
 };
 export type ModelSnapshot = ModelIdentity & {
     schema: string | null;
+    revision: string | null;
 };
-export type ModelUnavailableReason = 'not-readable' | 'revoked' | 'not-acquired' | 'version-changed' | 'invalid';
+export type ModelUnavailableReason = Open<'not-readable' | 'revoked' | 'not-acquired' | 'invalid'>;
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
 } | {
     kind: 'model-unavailable';
     reason: ModelUnavailableReason;
-} | {
-    kind: 'transport-uncertainty';
-} | {
-    kind: 'revoked-authorization';
-};
-export type MdType = {
-    name: string;
-    fields: Readonly<Record<string, FieldSpec>>;
-    sections: Readonly<Record<string, SectionSpec>>;
 };
+export type MdType = Definition;
 export type ModelState = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
+    schema?: string | null;
+    revision?: string | null;
 } | {
     status: 'current' | 'cached';
     snapshot: ModelSnapshot;
@@ -35,21 +31,26 @@ export type ModelState = {
 export type TypesResult = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
+    schema?: string | null;
+    revision?: string | null;
 } | {
     status: 'current' | 'cached';
     identity: string;
     version: string;
     verifiedWith: ModelIdentity;
     types: readonly MdType[];
+    schema: string | null;
+    revision: string | null;
 };
 export type ValidationReceipt = {
     identity: string;
     version: string;
-    source: 'current' | 'cached';
+    source: Open<'current' | 'cached'>;
 };
 export declare const NO_MODEL: ModelState;
 export declare function definitionOf(state: ModelState, type: string | undefined): Definition | undefined;
 export declare function modelTypes(state: ModelState): TypesResult;
 export declare function cached(state: ModelState): ModelState;
 export declare function sameModel(left: ModelIdentity, right: ModelIdentity): boolean;
+export declare function referenceField(facts: ValueFacts | undefined): boolean;
 //# sourceMappingURL=model.d.ts.map

package/dist/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9F,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AACtE,MAAM,MAAM,sBAAsB,GAC9B,cAAc,GACd,SAAS,GACT,cAAc,GACd,iBAAiB,GACjB,SAAS,CAAC;AACd,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,CAAC;AACtC,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;CACjD,CAAC;AACF,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,GACzD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAczD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC/F,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC,CAAC;AACnG,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAClE,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC;AAChC,MAAM,MAAM,UAAU,GAClB;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AACN,MAAM,MAAM,WAAW,GACnB;IACE,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,GACD;IACE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AACN,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC;CACpC,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,UAA8D,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAGhG;AACD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,WAAW,CAgBzD;AACD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAEpD;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAE5E;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAErE"}

package/dist/model.js

@@ -12,9 +12,9 @@ export function modelTypes(state) {
             identity: state.snapshot.identity,
             version: state.snapshot.version,
             verifiedWith: { ...state.verifiedWith },
-            types: structuredClone(Object.values(state.types)
-                .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0))
-                .map(({ name, fields, sections }) => ({ name, fields, sections }))),
+            schema: state.snapshot.schema,
+            revision: state.snapshot.revision,
+            types: structuredClone(Object.values(state.types).sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0)),
         };
 }
 export function cached(state) {
@@ -23,3 +23,6 @@ export function cached(state) {
 export function sameModel(left, right) {
     return left.identity === right.identity && left.version === right.version;
 }
+export function referenceField(facts) {
+    return facts?.reference !== undefined || facts?.items?.reference !== undefined;
+}

package/dist/observation.d.ts

@@ -20,6 +20,8 @@ export type Observed = {
     end(): void;
 };
 export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
+export declare function applied(keyed: KeyedResult, change: QueryChange): KeyedResult;
 export declare function observed(first: unknown, stop: () => void, keyed: boolean): Observed;
 export declare function opened(watch: (deliver: (message: unknown) => void) => () => void, keyed: boolean): Promise<Observation<unknown>>;
+export declare function observing<Topic extends string>(watch: (topic: Topic, input: readonly unknown[], deliver: (message: unknown) => void) => () => void): (topic: Topic, ...input: unknown[]) => Promise<Observation<unknown>>;
 //# sourceMappingURL=observation.d.ts.map

package/dist/observation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,CAAC;IACb,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACpD,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,CAEnF;AA0BD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAkCnF;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAAK,MAAM,IAAI,EAC1D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAiB/B"}
+{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,IAAI,CAAC,CAAC;IACb,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACpD,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC;IACpE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,GAAG,IAAI,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,CAEnF;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,CAc5E;AAiBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAkCnF;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAAK,MAAM,IAAI,EAC1D,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAiB/B;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAC5C,KAAK,EAAE,CACL,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,KAChC,MAAM,IAAI,WAEA,KAAK,YAAY,OAAO,EAAE,KAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAQ1E"}

package/dist/observation.js

@@ -1,24 +1,29 @@
 export function rowsOf(result) {
     return 'groups' in result ? result.groups : result.documents;
 }
+export function applied(keyed, change) {
+    const rows = rowsOf(keyed.result);
+    const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
+    for (const key of change.removed)
+        byKey.delete(key);
+    for (const [key, row] of change.changed)
+        byKey.set(key, row);
+    const keys = change.order ?? keyed.keys.filter((key) => byKey.has(key));
+    const next = keys.map((key) => byKey.get(key));
+    return {
+        result: 'groups' in keyed.result
+            ? { groups: next }
+            : { documents: next },
+        keys,
+    };
+}
 function keyedResult(first) {
-    const grouped = 'groups' in first.result;
-    const rows = rowsOf(first.result);
-    const byKey = new Map(first.keys.map((key, index) => [key, rows[index]]));
-    let keys = first.keys;
+    let keyed = first;
     return {
         value: first.result,
         next(message) {
-            const change = message;
-            for (const key of change.removed)
-                byKey.delete(key);
-            for (const [key, row] of change.changed)
-                byKey.set(key, row);
-            keys = change.order ?? keys.filter((key) => byKey.has(key));
-            const next = keys.map((key) => byKey.get(key));
-            return grouped
-                ? { groups: next }
-                : { documents: next };
+            keyed = applied(keyed, message);
+            return keyed.result;
         },
     };
 }
@@ -83,3 +88,8 @@ export function opened(watch, keyed) {
         }
     });
 }
+export function observing(watch) {
+    return (topic, ...input) => opened((deliver) => watch(topic, input, (message) => {
+        deliver(structuredClone(message));
+    }), topic === 'query');
+}

package/dist/open.d.ts

@@ -0,0 +1,2 @@
+export type Open<Value extends string> = Value | (string & {});
+//# sourceMappingURL=open.d.ts.map

package/dist/open.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open.d.ts","sourceRoot":"","sources":["../src/open.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,IAAI,CAAC,KAAK,SAAS,MAAM,IAAI,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC"}

package/dist/open.js

@@ -0,0 +1 @@
+export {};

package/dist/outcome.d.ts

@@ -1,8 +1,30 @@
-import type { ActionResult } from './adapter.js';
+import type { ActionResult, AdapterFailure, BinaryResult, HistoryResult, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
 import type { ChangeBatch } from './change.js';
-export type CallResult = ActionResult | {
-    kind: 'undeclared';
+type Refused<Kind extends string> = ProviderRefusal & {
+    kind: Kind;
 };
+export type Failure = Refused<'transport-uncertainty'> | Refused<'revoked-authorization'> | (Refused<'room-not-readable'> & {
+    locator: string;
+}) | ScopedRefusal;
+export type CallResult = {
+    kind: 'action';
+    result: unknown;
+    at?: RoomVersionAt;
+} | Refused<'rejected'> | Refused<'undeclared'> | Failure;
+export type HistoryAnswer = Exclude<HistoryResult, {
+    kind: Failure['kind'];
+}> | Failure;
+export type BinaryAnswer = {
+    kind: 'binary';
+    blob: Blob;
+} | Refused<'rejected'> | Refused<'absent'> | Failure;
+export declare function absentBinary(path: string): BinaryAnswer;
+export declare function binaryAnswer(result: BinaryResult): BinaryAnswer;
+export declare const UNCERTAIN: Failure;
+export declare function undeclared(name: string): CallResult;
+export declare function failure(result: AdapterFailure): Failure;
+export declare function calledResult(result: ActionResult): CallResult;
+export declare function historyAnswer(result: HistoryResult): HistoryAnswer;
 export type Submission = {
     readonly state: 'waiting' | 'submitted';
 } | {
@@ -12,7 +34,10 @@ export type Submission = {
 export type QueueEntry = {
     readonly batch: ChangeBatch;
 } & (Submission | {
+    readonly state: 'local';
+} | {
     readonly state: 'accepted';
     readonly roomVersion: string;
 });
+export {};
 //# sourceMappingURL=outcome.d.ts.map

package/dist/outcome.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAA;CAAE,GAC3C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG,CACvD,UAAU,GACV;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAC/D,CAAC"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,aAAa,EACb,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,KAAK,OAAO,CAAC,IAAI,SAAS,MAAM,IAAI,eAAe,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,OAAO,GACf,OAAO,CAAC,uBAAuB,CAAC,GAChC,OAAO,CAAC,uBAAuB,CAAC,GAChC,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,GACpD,aAAa,CAAC;AAElB,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,EAAE,CAAC,EAAE,aAAa,CAAA;CAAE,GACvD,OAAO,CAAC,UAAU,CAAC,GACnB,OAAO,CAAC,YAAY,CAAC,GACrB,OAAO,CAAC;AAEZ,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC;AAExF,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,IAAI,CAAA;CAAE,GAC9B,OAAO,CAAC,UAAU,CAAC,GACnB,OAAO,CAAC,QAAQ,CAAC,GACjB,OAAO,CAAC;AAEZ,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAEvD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAE/D;AAED,eAAO,MAAM,SAAS,EAAE,OAKvB,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAEnD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAiBvD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAE7D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAIlE;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAA;CAAE,GAC3C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAAG,CACvD,UAAU,GACV;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAC/D,CAAC"}

package/dist/outcome.js

@@ -1 +1,41 @@
-export {};
+export function absentBinary(path) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { path }, retryable: false };
+}
+export function binaryAnswer(result) {
+    return result.kind === 'binary' || result.kind === 'rejected' ? result : failure(result);
+}
+export const UNCERTAIN = {
+    kind: 'transport-uncertainty',
+    code: 'transport-uncertainty',
+    fields: {},
+    retryable: true,
+};
+export function undeclared(name) {
+    return { kind: 'undeclared', code: 'action-undeclared', fields: { name }, retryable: false };
+}
+export function failure(result) {
+    switch (result.kind) {
+        case 'transport-uncertainty':
+            return UNCERTAIN;
+        case 'revoked-authorization':
+            return { kind: result.kind, code: result.kind, fields: {}, retryable: false };
+        case 'room-not-readable':
+            return {
+                kind: result.kind,
+                locator: result.locator,
+                code: result.kind,
+                fields: {},
+                retryable: false,
+            };
+        case 'scoped-refusal':
+            return result;
+    }
+}
+export function calledResult(result) {
+    return result.kind === 'action' || result.kind === 'rejected' ? result : failure(result);
+}
+export function historyAnswer(result) {
+    return result.kind === 'history' || result.kind === 'revision' || result.kind === 'no-history'
+        ? result
+        : failure(result);
+}