@agentshouse/mdruntime 0.1.0-cd26b960b7262 → 0.1.0-cd30853a1b15e

package/dist/observation.js

@@ -6,49 +6,165 @@ export function rowsOf(result) {
 export function whole(message) {
     return 'result' in message;
 }
-export function applied(keyed, message) {
-    if (whole(message))
-        return message;
-    const result = keyed.result;
-    if ('pending' in result)
-        return keyed;
-    const rows = rowsOf(result);
-    const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
-    for (const key of message.removed)
-        byKey.delete(key);
-    for (const [key, row] of message.changed)
-        byKey.set(key, row);
-    const keys = message.order ?? keyed.keys.filter((key) => byKey.has(key));
-    const kept = keys.map((key) => byKey.get(key));
-    const coverage = message.coverage ?? result.coverage;
-    const next = message.next === undefined ? result.next : (message.next ?? undefined);
-    const total = message.total ?? result.total;
-    const window = {
-        ...(next === undefined ? {} : { next }),
-        ...(total === undefined ? {} : { total }),
+export function pendingChange(message) {
+    return 'pending' in message;
+}
+export function unchanged(change) {
+    return change.changed.length === 0 && change.removed.length === 0 && change.order === null;
+}
+export function keyedChange(held, keys, rows, same) {
+    const present = new Set(keys);
+    const changed = keys.flatMap((key, at) => {
+        const was = held.get(key);
+        return was !== undefined && same(was, rows[at]) ? [] : [[key, rows[at]]];
+    });
+    const removed = [];
+    const kept = [];
+    for (const key of held.keys())
+        (present.has(key) ? kept : removed).push(key);
+    const moved = kept.length !== keys.length || kept.some((key, at) => keys[at] !== key);
+    return { changed, removed, order: moved ? keys : null };
+}
+export function keyedAt(held, at, same) {
+    const changed = [];
+    const removed = [];
+    for (const [key, now] of at) {
+        const was = held.get(key);
+        if (was === undefined) {
+            if (now !== null)
+                return null;
+        }
+        else if (now === null)
+            removed.push(key);
+        else if (!same(was, now))
+            changed.push([key, now]);
+    }
+    return { changed, removed, order: null };
+}
+export function keyedInto(held, change) {
+    for (const key of change.removed)
+        held.delete(key);
+    for (const [key, row] of change.changed)
+        held.set(key, row);
+    if (change.order === null)
+        return;
+    const placed = change.order.map((key) => [key, held.get(key)]);
+    held.clear();
+    for (const [key, row] of placed)
+        held.set(key, row);
+}
+export function samePending(was, now) {
+    return was.awaits === now.awaits;
+}
+function keyedRows(keys, rows) {
+    const held = new Map(keys.map((key, at) => [key, rows[at]]));
+    let shown = rows;
+    return {
+        rows: () => shown,
+        apply(change) {
+            if (unchanged(change))
+                return shown;
+            keyedInto(held, change);
+            shown = [...held.values()];
+            return shown;
+        },
     };
+}
+function located(rooms) {
+    return keyedRows(rooms.map(({ locator }) => locator), rooms);
+}
+function keyedRooms(first) {
+    let held = located(first);
     return {
-        result: 'groups' in result
-            ? { groups: kept, coverage, ...window }
-            : { documents: kept, coverage, ...window },
-        keys,
+        value: first,
+        next(message) {
+            if (!Array.isArray(message))
+                return held.apply(message);
+            held = located(message);
+            return held.rows();
+        },
     };
 }
+function covered(readiness) {
+    return keyedRows(readiness.coverage.rooms.map(({ room }) => room), readiness.coverage.rooms);
+}
+function keyedReadiness(first) {
+    let held = covered(first);
+    return {
+        value: first,
+        next(message) {
+            if (!('shown' in message)) {
+                held = covered(message);
+                return message;
+            }
+            const { shown, rooms } = message;
+            return { ...shown, coverage: { ...shown.coverage, rooms: held.apply(rooms) } };
+        },
+    };
+}
+function awaiting(pending) {
+    return keyedRows(pending.map(({ room }) => room), pending);
+}
 function keyedResult(first) {
-    let keyed = first;
+    let result = first.result;
+    let rows = keyedRows([], []);
+    let pending = awaiting([]);
+    const take = ({ result: next, keys }) => {
+        result = next;
+        if ('pending' in next)
+            pending = awaiting(next.pending);
+        else
+            rows = keyedRows(keys, rowsOf(next));
+        return result;
+    };
+    take(first);
     return {
         value: first.result,
         next(message) {
-            keyed = applied(keyed, message);
-            return keyed.result;
+            const asked = message;
+            if (whole(asked))
+                return take(asked);
+            if (pendingChange(asked)) {
+                if ('pending' in result)
+                    result = { pending: pending.apply(asked.pending) };
+                return result;
+            }
+            if ('pending' in result)
+                return result;
+            const kept = rows.apply(asked);
+            const coverage = asked.coverage ?? result.coverage;
+            const next = asked.next === undefined ? result.next : (asked.next ?? undefined);
+            const total = asked.total ?? result.total;
+            const window = {
+                ...(next === undefined ? {} : { next }),
+                ...(total === undefined ? {} : { total }),
+            };
+            result =
+                'groups' in result
+                    ? { groups: kept, coverage, ...window }
+                    : { documents: kept, coverage, ...window };
+            return result;
         },
     };
 }
+const FOLDS = {
+    query: (first) => keyedResult(first),
+    rooms: (first) => keyedRooms(first),
+    readiness: (first) => keyedReadiness(first),
+};
+const WHOLE = {
+    query: (message) => whole(message),
+    rooms: (message) => Array.isArray(message),
+    readiness: (message) => !('shown' in message),
+};
+export function replaces(topic, message) {
+    return WHOLE[topic]?.(message) ?? true;
+}
 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] ?? replaced)(first);
     let value = reducer.value;
     let open = true;
     const listeners = new Set();
@@ -86,7 +202,7 @@ 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 = () => { };
@@ -95,7 +211,7 @@ export function opened(watch, keyed) {
                 handle.receive(message);
                 return;
             }
-            handle = observed(message, () => stop(), keyed);
+            handle = observed(message, () => stop(), topic);
             resolve(handle.observation);
         }, (error) => {
             if (handle !== undefined)
@@ -108,7 +224,7 @@ export function opened(watch, keyed) {
 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;
@@ -129,10 +245,9 @@ function rowDigest(row) {
 }
 export function digestOf({ result, keys }) {
     if ('pending' in result)
-        return { pending: JSON.stringify(result) };
+        return { pending: new Map(result.pending.map((room) => [room.room, room])) };
     const rows = rowsOf(result);
     return {
-        keys,
         rows: new Map(keys.map((key, index) => [key, rowDigest(rows[index])])),
         coverage: JSON.stringify(result.coverage),
         next: result.next,
@@ -140,16 +255,22 @@ export function digestOf({ result, keys }) {
     };
 }
 export function digestApplied(digest, message) {
-    if (whole(message) || 'pending' in digest)
-        return whole(message) ? digestOf(message) : digest;
-    const rows = new Map(digest.rows);
-    for (const key of message.removed)
-        rows.delete(key);
-    for (const [key, row] of message.changed)
-        rows.set(key, rowDigest(row));
+    if (whole(message))
+        return digestOf(message);
+    if (pendingChange(message)) {
+        if ('pending' in digest)
+            keyedInto(digest.pending, message.pending);
+        return digest;
+    }
+    if ('pending' in digest)
+        return digest;
+    keyedInto(digest.rows, {
+        changed: message.changed.map(([key, row]) => [key, rowDigest(row)]),
+        removed: message.removed,
+        order: message.order,
+    });
     return {
-        keys: message.order ?? digest.keys.filter((key) => rows.has(key)),
-        rows,
+        rows: digest.rows,
         coverage: message.coverage === undefined ? digest.coverage : JSON.stringify(message.coverage),
         next: message.next === undefined ? digest.next : (message.next ?? undefined),
         total: message.total ?? digest.total,
@@ -157,35 +278,18 @@ export function digestApplied(digest, message) {
 }
 export function changeOf(previous, next) {
     const after = next.result;
-    if ('pending' in previous || 'pending' in after) {
-        return 'pending' in previous && 'pending' in after && previous.pending === JSON.stringify(after)
-            ? null
-            : next;
+    if ('pending' in previous && 'pending' in after) {
+        const pending = keyedChange(previous.pending, after.pending.map(({ room }) => room), after.pending, samePending);
+        return unchanged(pending) ? null : { pending };
     }
-    const later = rowsOf(after);
-    const present = new Set(next.keys);
-    const changed = [];
-    next.keys.forEach((key, index) => {
-        const row = later[index];
-        if (previous.rows.get(key) !== rowDigest(row))
-            changed.push([key, row]);
-    });
-    const removed = previous.keys.filter((key) => !present.has(key));
-    const kept = previous.keys.filter((key) => present.has(key));
-    const moved = kept.length !== next.keys.length || kept.some((key, index) => next.keys[index] !== key);
-    const coverage = JSON.stringify(after.coverage);
-    const covered = previous.coverage !== coverage;
+    if ('pending' in previous || 'pending' in after)
+        return next;
+    const rows = keyedChange(previous.rows, next.keys, rowsOf(after), (was, row) => was === rowDigest(row));
+    const covered = previous.coverage !== JSON.stringify(after.coverage);
     const framing = reframed(previous, after);
-    if (changed.length === 0 && removed.length === 0 && !moved && !covered && framing === null) {
+    if (unchanged(rows) && !covered && framing === null)
         return null;
-    }
-    return {
-        changed,
-        removed,
-        order: moved ? next.keys : null,
-        ...(covered ? { coverage: after.coverage } : {}),
-        ...framing,
-    };
+    return { ...rows, ...(covered ? { coverage: after.coverage } : {}), ...framing };
 }
 function reframed(before, after) {
     const next = before.next === after.next ? {} : { next: after.next ?? null };

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 });
@@ -41,7 +41,7 @@ export function openedFiles(database, fenced) {
             part += 1;
         };
         try {
-            if (fenced(name.locator) ||
+            if (lost(name.locator) ||
                 !(await database.ask({ kind: 'opened.begin', key, ...name, mediaType }))) {
                 throw new Error();
             }

package/dist/opening.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAKA,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,11 +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();
@@ -40,18 +42,12 @@ export async function open(runtime, 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;
@@ -56,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;
@@ -84,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,5 +1,7 @@
+import { type ApplyResult } from '@agentshouse/mdmodel';
 import type { BinaryFile, HeadChange } from './adapter.js';
-import type { ChangeBatch } from './change.js';
+import { type Composition } from './collection.js';
+import { type ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
     fileIds: 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,EAGL,KAAK,WAAW,EAGjB,MAAM,aAAa,CAAC;AAIrB,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;AA+CD,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"}

package/dist/overlay.js

@@ -1,4 +1,6 @@
-import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, documentValue, parse, serialize, TYPE_FIELD, } from '@agentshouse/mdmodel';
+import { definitionsAt } from './collection.js';
+import { isPart, } from './change.js';
 import { drafted, entriesIn, settling } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
 export function* acceptedBinaries(files) {
@@ -24,10 +26,6 @@ export function sameChange(left, right) {
         left.author?.id === right.author?.id &&
         left.author?.name === right.author?.name);
 }
-const EMPTY_FRONTMATTER = '---\n---\n';
-function isPart(change) {
-    return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
-}
 function at(path, name) {
     return `${path} ${name}`;
 }
@@ -53,16 +51,27 @@ function* priorsOf(preconditions) {
         preamble: (path) => preambles.get(path) ?? '',
     };
 }
-function compose(fields, sections) {
-    const body = Object.entries(sections)
-        .map(([name, value]) => `\n## ${name}\n${value}`)
-        .join('');
-    const skeleton = `${EMPTY_FRONTMATTER}${body}`;
-    const opened = parse(skeleton);
-    if (!opened.ok)
-        return skeleton;
-    const next = apply(opened.document, Object.entries(fields).flatMap(([name, value]) => frontmatterValue(value) ? [{ kind: 'field', name, value, prior: undefined }] : []));
-    return serialize(next.outcome === 'applied' ? next.document : opened.document);
+export function composed(path, fields, sections, composition) {
+    const declared = fields[TYPE_FIELD];
+    const type = typeof declared === 'string' && declared !== '' ? declared : undefined;
+    const definition = definitionsAt(composition, path)(type);
+    return apply(create(type, definition), [
+        ...Object.entries(fields).flatMap(([name, value]) => (name !== TYPE_FIELD || type === undefined) && documentValue(value)
+            ? [{ kind: 'field', name, value, prior: undefined }]
+            : []),
+        ...Object.entries(sections).map(([name, value]) => ({
+            kind: 'section',
+            name,
+            value,
+            prior: undefined,
+        })),
+    ], definition);
+}
+export function compose(path, fields, sections, composition) {
+    const next = composed(path, fields, sections, composition);
+    if (next.outcome !== 'applied')
+        throw new Error(`the creation of ${path} writes no document`);
+    return serialize(next.document);
 }
 function edited(change, priors) {
     if (change.kind === 'field')
@@ -81,17 +90,19 @@ function edited(change, priors) {
         prior: priors.section(change.path, change.name),
     };
 }
-function edit(staged, changes, priors) {
+function edit(staged, changes, priors, composition) {
     const path = changes[0].path;
     delete staged.revisions[path];
     const text = staged.documents[path];
     if (text === undefined)
         return changes.length;
-    const parsed = parse(text, path);
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(text, path, definitions);
     if (!parsed.ok)
         return changes.length;
+    const definition = definitions(parsed.document.type);
     const wanted = changes.map((change) => edited(change, priors));
-    const first = apply(parsed.document, wanted);
+    const first = apply(parsed.document, wanted, definition);
     if (first.outcome === 'refuse')
         return changes.length;
     if (first.outcome === 'applied') {
@@ -100,7 +111,7 @@ function edit(staged, changes, priors) {
     }
     const stale = new Set(first.stale);
     const kept = wanted.filter((_, at) => !stale.has(at));
-    const rest = apply(parsed.document, kept);
+    const rest = apply(parsed.document, kept, definition);
     if (rest.outcome !== 'applied')
         return changes.length;
     staged.documents[path] = serialize(rest.document);
@@ -151,10 +162,12 @@ function erase(staged, path) {
     delete staged.changes[path];
     delete staged.binaries[path];
 }
-function stage(staged, change) {
+function stage(staged, change, composition) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
-            'content' in change ? change.content : compose(change.fields, change.sections);
+            'content' in change
+                ? change.content
+                : compose(change.path, change.fields, change.sections, composition);
         delete staged.fileIds[change.path];
         delete staged.created[change.path];
         delete staged.changes[change.path];
@@ -206,7 +219,7 @@ function arrive(heads, change) {
     if (change.change !== undefined)
         heads.changes[change.path] = change.change;
 }
-export function* overlaying(base, queue, unapplied) {
+export function* overlaying(base, queue, composition, unapplied) {
     const staged = {
         documents: drafted(base.documents),
         binaries: drafted(base.binaries),
@@ -220,7 +233,7 @@ export function* overlaying(base, queue, unapplied) {
         for (let index = 0; index < batch.changes.length; index += 1) {
             const change = batch.changes[index];
             if (!isPart(change)) {
-                if (!stage(staged, change))
+                if (!stage(staged, change, composition))
                     unapplied?.();
                 yield ROW_WEIGHT;
                 continue;
@@ -234,7 +247,7 @@ export function* overlaying(base, queue, unapplied) {
                 index += 1;
             }
             const text = staged.documents[change.path] ?? '';
-            for (let left = edit(staged, run, priors); left > 0; left -= 1)
+            for (let left = edit(staged, run, priors, composition); left > 0; left -= 1)
                 unapplied?.();
             yield ROW_WEIGHT + text.length;
         }

package/dist/page-metadata.d.ts

@@ -0,0 +1,8 @@
+export declare const PAGE_METADATA_WORDS: {
+    readonly heading: 'Page metadata';
+    readonly app: 'App';
+    readonly address: 'Address';
+    readonly queries: 'Local Queries';
+};
+export declare function pageMetadataBlock(app: string, address: string, queries: readonly unknown[]): string;
+//# sourceMappingURL=page-metadata.d.ts.map

package/dist/page-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-metadata.d.ts","sourceRoot":"","sources":["../src/page-metadata.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB;aAC9B,OAAO,EAAE,eAAe;aACxB,GAAG,EAAE,KAAK;aACV,OAAO,EAAE,SAAS;aAClB,OAAO,EAAE,eAAe;CAChB,CAAC;AAIX,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,SAAS,OAAO,EAAE,GAC1B,MAAM,CAUR"}