@agentshouse/mdruntime 0.1.0-c0136de3edfbe → 0.1.0-c01d4615bfe46

package/dist/models.js

@@ -1,193 +1,153 @@
+import { equalValue } from '@agentshouse/mdmodel';
 import { changeSet } from './change-set.js';
 import { composedOf } from './collection.js';
-import { admitted, declarationOf, list, listedLocators } from './listing.js';
+import { declared, sameDeclaration } from './declaration.js';
+import { uncaught } from './failure.js';
+import { declarationOf, listedLocators } from './listing.js';
 import { loseRooms } from './lost.js';
 import { NO_MODEL } from './model.js';
+import { settle } from './queue.js';
 import { storedRecord } from './replica.js';
-import { overlayDiff, preparedAfter, replayed, sliceAt } from './saves.js';
 import { emitRooms } from './shown.js';
-export function declaredAsHeld(held, room) {
-    return (held === undefined ||
-        (JSON.stringify(held.operations) === JSON.stringify(room.operations) &&
-            JSON.stringify(held.replica) === JSON.stringify(room.replica) &&
-            JSON.stringify(held.providerOwnedPaths) === JSON.stringify(room.providerOwnedPaths) &&
-            JSON.stringify(held.typedSelection) === JSON.stringify(room.typedSelection ?? null)));
+function declaredAsHeld(held, declaration) {
+    return held === undefined || sameDeclaration(held.declaration, declaration);
 }
 export function revoked(model) {
     return model?.status === 'unavailable' && model.reason === 'revoked';
 }
-function unheldModelOf({ socket }, locator) {
-    return socket.rooms.standing(locator).unheldModel ?? NO_MODEL;
+function unheldModelOf({ presence }, locator) {
+    return presence.unheldModel(locator) ?? NO_MODEL;
 }
-export async function keepNaming(runtime, local, room) {
+async function modelNow(runtime, locator) {
+    return (await runtime.store.record(locator))?.model ?? unheldModelOf(runtime, locator);
+}
+function restands(held, model, declaration) {
+    return (JSON.stringify(held.model) !== JSON.stringify(model) ||
+        !equalValue(held.declaration.typedSelection, declaration.typedSelection));
+}
+function recordAlone(store, record) {
+    return {
+        locator: record.locator,
+        key: record.key,
+        record: storedRecord(record),
+        composed: composedOf(store.composed(record)),
+    };
+}
+function unheld(runtime, locator, model) {
+    runtime.presence.modelled(locator, model);
+    emitRooms(runtime);
+}
+function recorded(runtime, locator, declaration, model) {
     const { store, socket } = runtime;
-    const held = await store.record(room.locator);
-    if (held === undefined || (held.name === room.name && held.handle === room.handle))
-        return;
-    await store.exclusive(async () => {
+    return store.exclusive(async () => {
         if (!socket.continuing())
             return;
-        const current = await store.record(room.locator);
-        if (current === undefined)
+        const current = await store.record(locator);
+        if (current === undefined) {
+            unheld(runtime, locator, model);
             return;
-        const record = { ...current, name: room.name, handle: room.handle };
-        await local.commit({
-            rooms: [
-                {
-                    locator: room.locator,
-                    key: record.key,
-                    record: storedRecord(record),
-                    composed: composedOf(store.composed(record)),
-                },
-            ],
-        });
-        emitRooms(runtime);
+        }
+        const answer = await (await store.open()).commit({ rooms: [recordAlone(store, { ...current, declaration, model })] });
+        void store.changed(changeSet(locator, {
+            documents: answer.changed[locator] ?? [],
+            room: true,
+            unindexed: answer.indexed[locator] === false,
+        }));
     });
 }
-async function modelNow(runtime, locator) {
-    return (await runtime.store.record(locator))?.model ?? unheldModelOf(runtime, locator);
-}
-export async function retainModel(runtime, local, room, given) {
+export async function retainModel(runtime, locator, declaration, given, refused) {
     const { store, socket } = runtime;
-    const held = await store.record(room.locator);
-    const previous = held?.model ?? unheldModelOf(runtime, room.locator);
+    const held = await store.record(locator);
+    const previous = held?.model ?? unheldModelOf(runtime, locator);
     const next = given ?? previous;
-    if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(held, room))
+    if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(held, declaration))
+        return;
+    if (held !== undefined && !restands(held, next, declaration)) {
+        await recorded(runtime, locator, declaration, next);
         return;
-    await store.exclusive(async () => {
+    }
+    await settle(runtime, [locator], async (works) => {
         if (!socket.continuing())
-            return;
-        const work = await store.work(room.locator);
-        const current = work.replica;
-        let changed = null;
-        if (current !== undefined) {
-            const record = {
-                ...current.record,
-                name: room.name,
-                handle: room.handle,
-                operations: room.operations,
-                replica: room.replica,
-                providerOwnedPaths: room.providerOwnedPaths,
-                typedSelection: room.typedSelection ?? null,
-                model: next,
-            };
-            const confirmedLayer = await sliceAt(store, record, 'confirmed', current.queue, current.overlaid);
-            const replayedLayer = await replayed(store, record, confirmedLayer, current.queue);
-            const diff = await overlayDiff(record, current, replayedLayer.visible, replayedLayer.touched);
-            const answer = await local.commit({
-                rooms: [
-                    {
-                        locator: room.locator,
-                        key: record.key,
-                        record: storedRecord(record),
-                        roots: record.typedSelection?.roots ?? [],
-                        composed: composedOf(store.composed(record)),
-                        overlay: diff.overlay,
-                    },
-                ],
-            });
-            preparedAfter(runtime, room.locator, answer);
-            changed = changeSet(room.locator, {
-                documents: answer.changed[room.locator] ?? [],
-                room: true,
-            });
+            return [];
+        const current = works.get(locator)?.replica;
+        if (current === undefined) {
+            unheld(runtime, locator, next);
+            return [];
         }
-        else
-            socket.rooms.stand(room.locator, { unheldModel: next });
-        list(runtime, room, admitted(runtime, room));
-        if (changed === null)
-            emitRooms(runtime);
-        else
-            store.changed(changed);
+        return [
+            {
+                locator,
+                record: { ...current.record, declaration, model: next },
+                ...(refused === undefined ? {} : { refused }),
+            },
+        ];
     });
 }
-export async function scoped(runtime, result, room, local) {
-    const { socket, journal } = runtime;
+export async function scoped(runtime, result, locator, declaration) {
+    const { socket, presence } = runtime;
     if (result.scope === 'content' && !result.retryable) {
-        journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
-        await loseRooms(runtime, [room.locator]);
+        await loseRooms(runtime, [locator]);
         return;
     }
-    socket.rooms.stand(room.locator, {
-        refusal: { code: result.code, fields: result.fields, retryable: result.retryable },
-    });
-    let scopedAway = room;
+    presence.refused(locator, result);
     if (result.scope === 'model')
-        await retainModel(runtime, local, room, {
-            status: 'unavailable',
-            reason: 'not-readable',
-        });
-    else if (result.scope !== 'operation') {
-        socket.rooms.stand(room.locator, { unreadable: true });
-        scopedAway = { ...room, replica: { ...room.replica, admission: 'unavailable' } };
-        await retainModel(runtime, local, scopedAway, null);
-    }
+        await retainModel(runtime, locator, declaration, { status: 'unavailable', reason: 'not-readable' }, true);
     if (!socket.continuing())
         return;
-    list(runtime, scopedAway, admitted(runtime, scopedAway));
     emitRooms(runtime);
-    journal.record(`scoped refusal ${room.locator} ${result.scope} ${result.code}`);
 }
 export async function settleModels(runtime, held, status, local) {
-    const { store, socket, journal } = runtime;
+    const { store, socket, presence } = runtime;
     const owed = (model) => model.status !== 'unavailable' && model.status !== status;
     const declaredAnew = await store.exclusive(async () => {
         if (!socket.continuing())
             return [];
-        const stored = await store.rooms(held.map(({ locator }) => locator));
-        const unchanged = held.filter((room) => {
-            const record = stored.get(room.locator)?.record;
-            return (owed(record?.model ?? unheldModelOf(runtime, room.locator)) && declaredAsHeld(record, room));
+        const stored = await store.rooms([...held.keys()]);
+        const unchanged = [...held].filter(([locator, declaration]) => {
+            const record = stored.get(locator)?.record;
+            return (owed(record?.model ?? unheldModelOf(runtime, locator)) &&
+                declaredAsHeld(record, declaration));
         });
-        const records = unchanged.flatMap((room) => {
-            const record = stored.get(room.locator)?.record;
+        const records = unchanged.flatMap(([locator]) => {
+            const record = stored.get(locator)?.record;
             return record === undefined
                 ? []
                 : [{ ...record, model: { ...record.model, status } }];
         });
         if (records.length > 0) {
             try {
-                await local.commit({
-                    rooms: records.map((record) => ({
-                        locator: record.locator,
-                        key: record.key,
-                        record: storedRecord(record),
-                        composed: composedOf(store.composed(record)),
-                    })),
-                });
+                await local.commit({ rooms: records.map((record) => recordAlone(store, record)) });
             }
-            catch {
-                journal.record(`model ${status} persistence failed`);
+            catch (error) {
+                uncaught(error);
             }
         }
-        for (const room of unchanged) {
-            const { unheldModel } = socket.rooms.standing(room.locator);
-            if (!stored.has(room.locator) && unheldModel !== null) {
-                socket.rooms.stand(room.locator, {
-                    unheldModel: { ...unheldModel, status },
-                });
+        for (const [locator] of unchanged) {
+            const unheldModel = presence.unheldModel(locator);
+            if (!stored.has(locator) && unheldModel !== null) {
+                presence.modelled(locator, { ...unheldModel, status });
             }
-            list(runtime, room, admitted(runtime, room));
         }
         if (unchanged.length > 0)
             emitRooms(runtime);
-        return held.filter((room) => {
-            const record = stored.get(room.locator)?.record;
-            return (!unchanged.includes(room) && owed(record?.model ?? unheldModelOf(runtime, room.locator)));
-        });
+        const kept = new Set(unchanged.map(([locator]) => locator));
+        return [...held].filter(([locator]) => !kept.has(locator) &&
+            owed(stored.get(locator)?.record.model ?? unheldModelOf(runtime, locator)));
     });
-    for (const room of declaredAnew) {
-        const model = await modelNow(runtime, room.locator);
+    for (const [locator, declaration] of declaredAnew) {
+        const model = await modelNow(runtime, locator);
         if (owed(model))
-            await retainModel(runtime, local, room, { ...model, status });
+            await retainModel(runtime, locator, declaration, { ...model, status });
     }
 }
 export async function cachedModels(runtime, local) {
-    const { store, socket } = runtime;
+    const { store, presence } = runtime;
     const held = await store.rooms();
-    await settleModels(runtime, listedLocators(runtime, held).flatMap((locator) => {
-        const room = socket.rooms.discovered(locator) ??
-            declarationOf(runtime, locator, held.get(locator))?.room;
-        return room === undefined ? [] : [room];
-    }), 'cached', local);
+    await settleModels(runtime, new Map(listedLocators(runtime, held).flatMap((locator) => {
+        const discovered = presence.room(locator);
+        const declaration = discovered === undefined
+            ? declarationOf(runtime, locator, held.get(locator))?.room
+            : declared(discovered);
+        return declaration === undefined ? [] : [[locator, declaration]];
+    })), 'cached', local);
 }

package/dist/observation.d.ts

@@ -25,9 +25,10 @@ export type Observed = {
 };
 export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
 export declare function whole(message: QueryMessage): message is KeyedResult;
+export declare function replaces(topic: string, message: unknown): boolean;
 export declare function applied(keyed: KeyedResult, message: QueryMessage): KeyedResult;
-export declare function observed(first: unknown, stop: () => void, keyed: boolean): Observed;
-export declare function opened(watch: (deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void, keyed: boolean): Promise<Observation<unknown>>;
+export declare function observed(first: unknown, stop: () => void, topic: string): Observed;
+export declare function opened(watch: (deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void, topic: string): Promise<Observation<unknown>>;
 export declare function observing<Topic extends string>(watch: (topic: Topic, input: readonly unknown[], deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void): (topic: Topic, ...input: unknown[]) => Promise<Observation<unknown>>;
 export type Digest = {
     readonly pending: string;

package/dist/observation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"observation.d.ts","sourceRoot":"","sources":["../src/observation.ts"],"names":[],"mappings":"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"}

package/dist/observation.js

@@ -6,6 +6,12 @@ export function rowsOf(result) {
 export function whole(message) {
     return 'result' in message;
 }
+function folds(topic) {
+    return topic === 'query';
+}
+export function replaces(topic, message) {
+    return !folds(topic) || whole(message);
+}
 export function applied(keyed, message) {
     if (whole(message))
         return message;
@@ -47,8 +53,8 @@ function keyedResult(first) {
 function replaced(first) {
     return { value: first, next: (message) => message };
 }
-export function observed(first, stop, keyed) {
-    const reducer = keyed ? keyedResult(first) : replaced(first);
+export function observed(first, stop, topic) {
+    const reducer = folds(topic) ? keyedResult(first) : replaced(first);
     let value = reducer.value;
     let open = true;
     const listeners = new Set();
@@ -86,34 +92,29 @@ export function observed(first, stop, keyed) {
         end,
     };
 }
-export function opened(watch, keyed) {
+export function opened(watch, topic) {
     return new Promise((resolve, reject) => {
         let handle;
         let stop = () => { };
-        try {
-            stop = watch((message) => {
-                if (handle !== undefined) {
-                    handle.receive(message);
-                    return;
-                }
-                handle = observed(message, () => stop(), keyed);
-                resolve(handle.observation);
-            }, (error) => {
-                if (handle !== undefined)
-                    return;
-                stop();
-                reject(error);
-            });
-        }
-        catch (error) {
+        stop = watch((message) => {
+            if (handle !== undefined) {
+                handle.receive(message);
+                return;
+            }
+            handle = observed(message, () => stop(), topic);
+            resolve(handle.observation);
+        }, (error) => {
+            if (handle !== undefined)
+                return;
+            stop();
             reject(error);
-        }
+        });
     });
 }
 export function observing(watch) {
     return (topic, ...input) => opened((deliver, fail) => watch(topic, input, (message) => {
         deliver(structuredClone(message));
-    }, fail), topic === 'query');
+    }, fail), topic);
 }
 export function hashed(text) {
     let first = 0xdeadbeef;

package/dist/opened.d.ts

@@ -18,5 +18,5 @@ export type OpenedFiles = {
     find(name: OpenedName): Promise<KeptBinary | null>;
     fetch(name: OpenedName, read: () => Promise<BinaryResult>): Promise<KeptResult>;
 };
-export declare function openedFiles(database: RuntimeDatabase, fenced: (locator: string) => boolean): OpenedFiles;
+export declare function openedFiles(database: RuntimeDatabase, lost: (locator: string) => boolean): OpenedFiles;
 //# sourceMappingURL=opened.d.ts.map

package/dist/opened.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACnC,WAAW,CAsFb"}
+{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACjC,WAAW,CAsFb"}

package/dist/opened.js

@@ -20,7 +20,7 @@ function taken(chunks, size) {
     }
     return part;
 }
-export function openedFiles(database, fenced) {
+export function openedFiles(database, lost) {
     const fetching = new Map();
     async function find(name) {
         const held = await database.ask({ kind: 'opened.find', ...name });
@@ -36,14 +36,14 @@ export function openedFiles(database, fenced) {
         let part = 0;
         const write = async (bytes) => {
             if (!(await database.ask({ kind: 'opened.part', key, part, bytes }))) {
-                throw new Error('the device no longer keeps this download');
+                throw new Error();
             }
             part += 1;
         };
         try {
-            if (fenced(name.locator) ||
+            if (lost(name.locator) ||
                 !(await database.ask({ kind: 'opened.begin', key, ...name, mediaType }))) {
-                throw new Error('the device no longer reads this Room');
+                throw new Error();
             }
             for (;;) {
                 const read = await reader.read();
@@ -61,7 +61,7 @@ export function openedFiles(database, fenced) {
                 await write(taken(chunks, held));
             const received = hashed.hex();
             if (sha256 !== undefined && sha256 !== received) {
-                throw new Error('the bytes are not the file the device asked for');
+                throw new Error();
             }
             const whole = await database.ask({
                 kind: 'opened.keep',

package/dist/opening.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2CxF"}
+{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqCxF"}

package/dist/opening.js

@@ -1,10 +1,13 @@
+import { conversationsOpened } from './conversation.js';
 import { detectStorageLoss, nextGeneration, refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
 import { sweep } from './install.js';
 import { eraseFenced } from './lost.js';
 import { prepare } from './preparation.js';
+import { unpair } from './queue.js';
 import { emitRooms, emitStorageLoss, statusShown } from './shown.js';
 export async function open(runtime, opened) {
-    const { store, socket, journal, shell, conversations, build, usableWhenHeld } = runtime;
+    const { store, socket, shell, conversations, build, usableWhenHeld } = runtime;
     if (socket.closed())
         throw new Error('runtime closed');
     const interrupted = await opened.fences();
@@ -36,21 +39,15 @@ export async function open(runtime, opened) {
     }
     if (held.erasing || held.orphans.length > 0)
         queueMicrotask(() => sweep(runtime));
-    await conversations.opened(opened);
+    await conversationsOpened(conversations, opened);
     if (interrupted.length > 0) {
         queueMicrotask(() => {
-            void eraseFenced(runtime, interrupted).catch(() => {
-                journal.record('erasure failed');
-            });
+            void eraseFenced(runtime, interrupted).catch(uncaught);
         });
     }
     statusShown(runtime);
     prepare(runtime);
     emitRooms(runtime);
-    void store
-        .exclusive(() => runtime.unpair(opened))
-        .catch(() => {
-        journal.record('unpair failed');
-    });
+    void unpair(runtime).catch(uncaught);
     return opened;
 }

package/dist/outcome.d.ts

@@ -1,5 +1,6 @@
 import type { ActionResult, AdapterFailure, AttachResult, BinaryLinkResult, HistoryResult, HistoryRevision, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
 import type { ChangeBatch } from './change.js';
+import type { Attempt, Retries } from './retried.js';
 import type { KeptBinary, KeptResult } from './opened.js';
 type Refused<Kind extends string> = ProviderRefusal & {
     kind: Kind;
@@ -13,7 +14,9 @@ export type CallResult = {
     kind: 'action';
     result: unknown;
     at?: RoomVersionAt;
-} | Refused<'rejected'> | Refused<'undeclared'> | Failure;
+} | (Refused<'rejected'> & {
+    reset?: string;
+}) | Refused<'undeclared'> | Failure;
 export type HistoryAnswer = Exclude<HistoryResult, {
     kind: Failure['kind'];
 }> | Failure;
@@ -54,6 +57,10 @@ export declare const UNREADABLE: Refused<'unreadable'>;
 export declare const LOCKED_UNREADABLE: Refused<'unreadable'>;
 export declare const ABSENT_TARGET: Refused<'absent'>;
 export declare function absentBinary(path: string): Refused<'absent'>;
+export declare function declaredType(blob: Blob): string;
+export declare function blobOf(binary: Extract<BinaryAnswer, {
+    kind: 'binary';
+}>): Promise<Blob>;
 export declare function binaryAnswer(result: KeptResult): HeldBinaryAnswer;
 export declare function binaryLinkAnswer(result: BinaryLinkResult, held?: string): BinaryLinkAnswer;
 export declare function attachAnswer(result: AttachResult): AttachAnswer;
@@ -82,5 +89,7 @@ export type QueueEntry = {
 } & (Submission | {
     readonly state: 'local';
 });
+export declare const UNANSWERED: ActionResult;
+export declare function handedOutcome(retries: Retries, attempt: Attempt | undefined, result: ActionResult): CallResult;
 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":"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"}
+{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../src/outcome.ts"],"names":[],"mappings":"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"}

package/dist/outcome.js

@@ -1,3 +1,5 @@
+import { MEDIA_TYPES } from '@agentshouse/mdmodel';
+import { refusalError } from './failure.js';
 export const UNREADABLE = {
     kind: 'unreadable',
     code: 'room-not-readable',
@@ -19,17 +21,22 @@ export const ABSENT_TARGET = {
 export function absentBinary(path) {
     return { kind: 'absent', code: 'binary-file-absent', fields: { path }, retryable: false };
 }
+export function declaredType(blob) {
+    return blob.type === '' ? MEDIA_TYPES.octetStream : blob.type;
+}
+export function blobOf(binary) {
+    return new Response(binary.stream, { headers: { 'content-type': binary.mediaType } }).blob();
+}
 export function binaryAnswer(result) {
     return result.kind === 'binary' || result.kind === 'rejected' ? result : failure(result);
 }
-const OCTET_STREAM = 'application/octet-stream';
 export function binaryLinkAnswer(result, held) {
     if (result.kind === 'link') {
         return {
             kind: 'link',
             url: result.url,
             name: result.name,
-            mediaType: result.mediaType ?? held ?? OCTET_STREAM,
+            mediaType: result.mediaType ?? held ?? MEDIA_TYPES.octetStream,
         };
     }
     return result.kind === 'rejected' ? result : failure(result);
@@ -82,3 +89,17 @@ export function historyAnswer(result) {
         ? result
         : failure(result);
 }
+export const UNANSWERED = { kind: 'transport-uncertainty' };
+export function handedOutcome(retries, attempt, result) {
+    if (attempt !== undefined) {
+        const { step, instance } = attempt;
+        if (result.kind === 'action')
+            retries.succeeded(step, instance);
+        else if (result.kind === 'transport-uncertainty')
+            retries.uncertain(step, instance, result);
+        else if (result.kind === 'rejected' && result.retryable) {
+            retries.failed(step, instance, refusalError(result));
+        }
+    }
+    return calledResult(result);
+}

package/dist/overlay.d.ts

@@ -1,4 +1,6 @@
+import { type ApplyResult } from '@agentshouse/mdmodel';
 import type { BinaryFile, HeadChange } from './adapter.js';
+import { type Composition } from './collection.js';
 import type { ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
@@ -22,5 +24,7 @@ export type Layer = Heads & {
 export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Generator<readonly [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 overlaying(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Generator<number, Layer, void>;
+export declare function composed(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): ApplyResult;
+export declare function compose(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): string;
+export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], composition: Composition, unapplied?: () => void): Generator<number, Layer, void>;
 //# 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":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAIrE,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,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,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,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;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;AA6MD,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAIrE,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,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,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,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;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;AAqDD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,WAAW,CAqBb;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,MAAM,CAIR;AA8ID,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}