@agentshouse/mdruntime 0.1.0-cebcd51f70ed1 → 0.1.0-cede5a74284be

package/dist/memory.js

@@ -107,29 +107,30 @@ export function createMemoryAdapter(options = {}) {
             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,
-            ...(from === 0 ? { models: modelsOf(room) } : {}),
+            ...(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)
@@ -145,24 +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 }),
         };
     }
@@ -183,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;
@@ -211,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)
@@ -225,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 } };
@@ -246,6 +249,7 @@ export function createMemoryAdapter(options = {}) {
             capabilities,
             providerLimits,
             retention,
+            ...(options.member === undefined ? {} : { member: options.member }),
         };
     }
     return {
@@ -330,6 +334,12 @@ export function createMemoryAdapter(options = {}) {
                     }
                 });
             },
+            reopen() {
+                queueMicrotask(() => {
+                    for (const observer of observers)
+                        observer({ kind: 'closed', revoked: false });
+                });
+            },
             observe(notify) {
                 observers.add(notify);
                 queueMicrotask(() => {
@@ -379,7 +389,7 @@ export function createMemoryAdapter(options = {}) {
                 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) {
@@ -412,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) {
@@ -427,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,12 +1,14 @@
 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' | 'invalid';
+export type ModelUnavailableReason = Open<'not-readable' | 'revoked' | 'not-acquired' | 'invalid'>;
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
@@ -18,6 +20,8 @@ export type MdType = Definition;
 export type ModelState = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
+    schema?: string | null;
+    revision?: string | null;
 } | {
     status: 'current' | 'cached';
     snapshot: ModelSnapshot;
@@ -27,17 +31,21 @@ 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;

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,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAElF,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,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;AAC7F,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;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;AACD,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAErE"}
+{"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,6 +12,8 @@ export function modelTypes(state) {
             identity: state.snapshot.identity,
             version: state.snapshot.version,
             verifiedWith: { ...state.verifiedWith },
+            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)),
         };
 }

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);
+}

package/dist/overlay.d.ts

@@ -1,15 +1,26 @@
-import type { HeadChange } from './adapter.js';
+import type { BinaryFile, HeadChange } from './adapter.js';
 import type { ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
     changes: Readonly<Record<string, HeadChange>>;
 };
+export type HeldBinary = ({
+    readonly state: 'accepted';
+} & BinaryFile) | {
+    readonly state: 'pending';
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+};
 export type Layer = Heads & {
     documents: Readonly<Record<string, string>>;
-    binaryTargets: readonly string[];
+    binaries: Readonly<Record<string, HeldBinary>>;
 };
+export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Record<string, HeldBinary>;
+export declare function sameBinary(left: HeldBinary | undefined, right: HeldBinary | undefined): boolean;
 export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
-export declare function overlay(base: Layer, queue: readonly ChangeBatch[]): Layer;
+export declare function overlay(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Layer;
 export declare function sameLayerText(left: Layer, right: Layer): boolean;
 export declare function overlayChanged(base: Layer, queue: readonly ChangeBatch[], previousBase: Layer, previousQueue: readonly ChangeBatch[], previousVisible: Layer): Layer;
 //# sourceMappingURL=overlay.d.ts.map

package/dist/overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AAoJD,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,KAAK,CAiBzE;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAQhE;AAmBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,KAAK,EACnB,aAAa,EAAE,SAAS,WAAW,EAAE,EACrC,eAAe,EAAE,KAAK,GACrB,KAAK,CA4FP"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAErE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAAC,GAC7C;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAI5B;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAW/F;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AAoKD,wBAAgB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,KAAK,CAmBjG;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAOhE;AAiCD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,KAAK,EACnB,aAAa,EAAE,SAAS,WAAW,EAAE,EACrC,eAAe,EAAE,KAAK,GACrB,KAAK,CAyFP"}

package/dist/overlay.js

@@ -1,4 +1,18 @@
 import { apply, parse, serialize } from '@agentshouse/mdmodel';
+export function acceptedBinaries(files) {
+    return Object.fromEntries(Object.entries(files).map(([path, file]) => [path, { state: 'accepted', ...file }]));
+}
+export function sameBinary(left, right) {
+    if (left === undefined || right === undefined)
+        return left === right;
+    return (left.state === right.state &&
+        left.byteLength === right.byteLength &&
+        left.mediaType === right.mediaType &&
+        left.sha256 === right.sha256 &&
+        (left.state === 'accepted'
+            ? right.state === 'accepted' && left.fileRef === right.fileRef
+            : right.state === 'pending' && left.localId === right.localId));
+}
 export function sameChange(left, right) {
     if (left === undefined || right === undefined)
         return left === right;
@@ -76,13 +90,15 @@ function edited(document, change, priors) {
 function edit(staged, change, priors) {
     const text = staged.documents[change.path];
     if (text === undefined)
-        return;
+        return false;
     const parsed = parse(text, change.path);
     if (!parsed.ok)
-        return;
+        return false;
     const next = edited(parsed.document, change, priors);
-    if (next?.outcome === 'applied')
-        staged.documents[change.path] = serialize(next.document);
+    if (next?.outcome !== 'applied')
+        return false;
+    staged.documents[change.path] = serialize(next.document);
+    return true;
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
@@ -90,13 +106,15 @@ function relocate(staged, from, to) {
         delete staged.documents[from];
         staged.documents[to] = text;
     }
-    else if (staged.binaryTargets.delete(from)) {
-        staged.binaryTargets.add(to);
+    else if (staged.binaries[from] !== undefined) {
+        staged.binaries[to] = staged.binaries[from];
+        delete staged.binaries[from];
     }
     else {
-        return;
+        return false;
     }
     moveHead(staged, from, to);
+    return true;
 }
 function moveHead(heads, from, to) {
     const revision = heads.revisions[from];
@@ -113,46 +131,61 @@ function erase(staged, path) {
     delete staged.documents[path];
     delete staged.revisions[path];
     delete staged.changes[path];
-    staged.binaryTargets.delete(path);
+    delete staged.binaries[path];
 }
 function stage(staged, change, priors) {
     if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
-        edit(staged, change, priors);
-        return;
+        return edit(staged, change, priors);
     }
     if (change.kind === 'create') {
         staged.documents[change.path] =
             'content' in change ? change.content : compose(change.fields, change.sections);
         delete staged.changes[change.path];
-        return;
+        return true;
     }
     if (change.kind === 'replace') {
         if (staged.documents[change.path] === undefined)
-            return;
+            return false;
         staged.documents[change.path] = change.content;
-        return;
+        return true;
+    }
+    if (change.kind === 'binary') {
+        if (staged.documents[change.path] !== undefined)
+            return false;
+        staged.binaries[change.path] = {
+            state: 'pending',
+            localId: change.localId,
+            byteLength: change.byteLength,
+            mediaType: change.mediaType,
+            sha256: change.sha256,
+        };
+        delete staged.revisions[change.path];
+        delete staged.changes[change.path];
+        return true;
     }
     if (change.kind === 'move') {
-        relocate(staged, change.path, change.to);
-        return;
+        return relocate(staged, change.path, change.to);
     }
     erase(staged, change.path);
+    return true;
 }
-export function overlay(base, queue) {
+export function overlay(base, queue, unapplied) {
     const staged = {
         documents: { ...base.documents },
-        binaryTargets: new Set(base.binaryTargets),
+        binaries: { ...base.binaries },
         revisions: { ...base.revisions },
         changes: { ...base.changes },
     };
     for (const batch of queue) {
         const priors = priorsOf(batch.preconditions);
-        for (const change of batch.changes)
-            stage(staged, change, priors);
+        for (const change of batch.changes) {
+            if (!stage(staged, change, priors))
+                unapplied?.();
+        }
     }
     return {
         documents: staged.documents,
-        binaryTargets: [...staged.binaryTargets].sort(),
+        binaries: staged.binaries,
         revisions: staged.revisions,
         changes: staged.changes,
     };
@@ -164,8 +197,12 @@ export function sameLayerText(left, right) {
     const paths = Object.keys(left.documents);
     return (paths.length === Object.keys(right.documents).length &&
         paths.every((path) => left.documents[path] === right.documents[path]) &&
-        left.binaryTargets.length === right.binaryTargets.length &&
-        left.binaryTargets.every((path) => right.binaryTargets.includes(path)));
+        sameBinaries(left.binaries, right.binaries));
+}
+function sameBinaries(left, right) {
+    const paths = Object.keys(left);
+    return (paths.length === Object.keys(right).length &&
+        paths.every((path) => sameBinary(left[path], right[path])));
 }
 function replayHeads(base, queue) {
     const heads = { revisions: { ...base.revisions }, changes: { ...base.changes } };
@@ -178,6 +215,10 @@ function replayHeads(base, queue) {
             else if (change.kind === 'create') {
                 delete heads.changes[change.path];
             }
+            else if (change.kind === 'binary') {
+                delete heads.revisions[change.path];
+                delete heads.changes[change.path];
+            }
             else if (change.kind === 'move') {
                 moveHead(heads, change.path, change.to);
             }
@@ -193,7 +234,7 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
         sameLayerText(base, previousBase)) {
         return {
             documents: previousVisible.documents,
-            binaryTargets: previousVisible.binaryTargets,
+            binaries: previousVisible.binaries,
             ...replayHeads(base, queue),
         };
     }
@@ -205,14 +246,14 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
         ...Object.keys(previousBase.revisions),
         ...Object.keys(base.changes),
         ...Object.keys(previousBase.changes),
-        ...base.binaryTargets,
-        ...previousBase.binaryTargets,
+        ...Object.keys(base.binaries),
+        ...Object.keys(previousBase.binaries),
     ]);
     for (const path of paths) {
         if (base.documents[path] !== previousBase.documents[path] ||
             base.revisions[path] !== previousBase.revisions[path] ||
             !sameChange(base.changes[path], previousBase.changes[path]) ||
-            base.binaryTargets.includes(path) !== previousBase.binaryTargets.includes(path))
+            !sameBinary(base.binaries[path], previousBase.binaries[path]))
             affected.add(path);
     }
     const oldIds = new Set(before);
@@ -245,6 +286,7 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
     const documents = {};
     const revisions = {};
     const changes = {};
+    const binaries = {};
     for (const path of affected) {
         if (base.documents[path] !== undefined)
             documents[path] = base.documents[path];
@@ -252,32 +294,28 @@ export function overlayChanged(base, queue, previousBase, previousQueue, previou
             revisions[path] = base.revisions[path];
         if (base.changes[path] !== undefined)
             changes[path] = base.changes[path];
+        if (base.binaries[path] !== undefined)
+            binaries[path] = base.binaries[path];
     }
-    const staged = overlay({
-        documents,
-        revisions,
-        changes,
-        binaryTargets: base.binaryTargets.filter((path) => affected.has(path)),
-    }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
+    const staged = overlay({ documents, revisions, changes, binaries }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
     const mergedDocuments = { ...previousVisible.documents };
     const mergedRevisions = { ...previousVisible.revisions };
     const mergedChanges = { ...previousVisible.changes };
-    const mergedTargets = new Set(previousVisible.binaryTargets);
+    const mergedBinaries = { ...previousVisible.binaries };
     for (const path of affected) {
         delete mergedDocuments[path];
         delete mergedRevisions[path];
         delete mergedChanges[path];
-        mergedTargets.delete(path);
+        delete mergedBinaries[path];
     }
     Object.assign(mergedDocuments, staged.documents);
     Object.assign(mergedRevisions, staged.revisions);
     Object.assign(mergedChanges, staged.changes);
-    for (const path of staged.binaryTargets)
-        mergedTargets.add(path);
+    Object.assign(mergedBinaries, staged.binaries);
     return {
         documents: mergedDocuments,
         revisions: mergedRevisions,
         changes: mergedChanges,
-        binaryTargets: [...mergedTargets].sort(),
+        binaries: mergedBinaries,
     };
 }

package/dist/query.d.ts

@@ -1,5 +1,6 @@
 import { type Definition } from '@agentshouse/mdmodel';
 import type { HeadChange } from './adapter.js';
+import type { BinaryFileRecord } from './binary.js';
 export type Value = string | number | boolean | null;
 export type Predicate = Value | {
     $eq: Value;
@@ -93,6 +94,7 @@ export type QueryDocument = {
     markdown?: string;
     backlinks?: readonly Backlink[];
     change?: HeadChange | null;
+    binaryFile?: BinaryFileRecord;
 };
 export type QueryGroup = {
     key: readonly unknown[];
@@ -204,6 +206,8 @@ export type Plan = {
     limit: number | null;
 };
 export declare class QueryError extends Error {
+    readonly code: QueryErrorCode;
+    readonly retryable = false;
     constructor(code: QueryErrorCode, at: string, problem: string);
 }
 type Entries = Readonly<Record<string, unknown>>;