@agentshouse/mdruntime 0.1.0-cefbc8bb8a1c0 → 0.1.0-cf08ada271a7f

package/dist/room-draft.js

@@ -1,60 +1,68 @@
-import { apply, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, equalValue, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
 import { runtimeError } from './failure.js';
 import { sha256 } from './digest.js';
 import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
-export function returnedBy(kind) {
-    return { kind, code: kind, fields: {}, retryable: false };
+export function returnedBy() {
+    return { kind: 'withdrawn', code: 'withdrawn', fields: {}, retryable: false };
 }
 export function staleWrite(current) {
-    return { outcome: 'stale', code: 'stale', retryable: false, current };
+    return { outcome: 'stale', current };
 }
-function malformed() {
-    throw runtimeError('room-draft-malformed');
+function malformed(at, needs) {
+    throw runtimeError('room-draft-malformed', at === undefined ? 'room-draft-malformed' : `room-draft-malformed at ${at}: ${needs}`);
 }
 function plain(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function text(value) {
-    return typeof value === 'string' ? value : malformed();
+function text(value, at) {
+    return typeof value === 'string' ? value : malformed(at, 'text');
 }
-function optionalText(value) {
-    return value === undefined ? undefined : text(value);
+function optionalText(value, at) {
+    return value === undefined ? undefined : text(value, at);
 }
-function markdownBase(value) {
-    return value === null ? null : optionalText(value);
+function markdownBase(value, at) {
+    return value === null ? null : optionalText(value, at);
 }
-function entries(value, each) {
+function entries(value, at, each) {
     if (!plain(value))
-        malformed();
+        malformed(at, 'an object of named values');
     const read = {};
     for (const [name, item] of Object.entries(value))
-        read[name] = each(item);
+        read[name] = each(item, `${at}.${name}`);
     return read;
 }
-function fieldValue(value) {
+function frontmatter(item, at) {
+    return frontmatterValue(item) ? item : malformed(at, 'a frontmatter value');
+}
+function fieldValue(value, at) {
     if (value === null)
         return null;
     if (!plain(value) || !Object.hasOwn(value, 'value') || !frontmatterValue(value.value)) {
-        malformed();
+        malformed(at, '{ value } with a frontmatter value, or null where the document lacks it');
     }
     return { value: value.value };
 }
-function textPart(value) {
+function textPart(value, at) {
     if (!plain(value))
-        malformed();
-    const base = optionalText(value.base);
-    return { value: text(value.value), ...(base === undefined ? {} : { base }) };
+        malformed(at, '{ value, base }');
+    const base = optionalText(value.base, `${at}.base`);
+    return { value: text(value.value, `${at}.value`), ...(base === undefined ? {} : { base }) };
 }
-function creationOf(value) {
+function creationOf(value, at) {
     if (!plain(value))
-        malformed();
+        malformed(at, '{ type, fields, sections }, or { markdown }');
     if (Object.hasOwn(value, 'markdown'))
-        return { markdown: text(value.markdown) };
-    const fields = entries(value.fields, (item) => (frontmatterValue(item) ? item : malformed()));
-    return { type: text(value.type), fields, sections: entries(value.sections, text) };
+        return { markdown: text(value.markdown, `${at}.markdown`) };
+    if (typeof value.type !== 'string')
+        malformed(`${at}.type`, 'a type name, or markdown in place of type, fields and sections');
+    return {
+        type: value.type,
+        fields: entries(value.fields, `${at}.fields`, frontmatter),
+        sections: entries(value.sections, `${at}.sections`, text),
+    };
 }
-const PART_NAMES = new Set([
+const PART_NAMES = [
     'fields',
     'sections',
     'preamble',
@@ -63,52 +71,56 @@ const PART_NAMES = new Set([
     'move',
     'removal',
     'file',
-]);
-export function readParts(value) {
-    if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
-        malformed();
+];
+const NAMED_PARTS = `a part named ${PART_NAMES.slice(0, -1).join(', ')} or ${PART_NAMES.at(-1)}`;
+export function readParts(value, path) {
+    if (!plain(value))
+        malformed(path, 'an object of parts');
+    const unknown = Object.keys(value).find((name) => !PART_NAMES.includes(name));
+    if (unknown !== undefined)
+        malformed(`${path} ${unknown}`, NAMED_PARTS);
     const parts = {};
     if (value.fields !== undefined) {
-        parts.fields = entries(value.fields, (item) => {
+        parts.fields = entries(value.fields, `${path} fields`, (item, at) => {
             if (!plain(item) || !Object.hasOwn(item, 'value') || !frontmatterValue(item.value)) {
-                malformed();
+                malformed(at, '{ value, base } with a frontmatter value');
             }
             return item.base === undefined
                 ? { value: item.value }
-                : { value: item.value, base: fieldValue(item.base) };
+                : { value: item.value, base: fieldValue(item.base, `${at}.base`) };
         });
     }
     if (value.sections !== undefined)
-        parts.sections = entries(value.sections, textPart);
+        parts.sections = entries(value.sections, `${path} sections`, textPart);
     if (value.preamble !== undefined)
-        parts.preamble = textPart(value.preamble);
+        parts.preamble = textPart(value.preamble, `${path} preamble`);
     if (value.markdown !== undefined)
-        parts.markdown = textPart(value.markdown);
+        parts.markdown = textPart(value.markdown, `${path} markdown`);
     if (value.creation !== undefined)
-        parts.creation = creationOf(value.creation);
+        parts.creation = creationOf(value.creation, `${path} creation`);
     if (value.move !== undefined) {
         if (!plain(value.move))
-            malformed();
-        const base = markdownBase(value.move.base);
-        const room = optionalText(value.move.room);
+            malformed(`${path} move`, '{ to, room, base }');
+        const base = markdownBase(value.move.base, `${path} move.base`);
+        const room = optionalText(value.move.room, `${path} move.room`);
         parts.move = {
-            to: text(value.move.to),
+            to: text(value.move.to, `${path} move.to`),
             ...(room === undefined ? {} : { room }),
             ...(base === undefined ? {} : { base }),
         };
     }
     if (value.removal !== undefined) {
         if (!plain(value.removal))
-            malformed();
-        const base = markdownBase(value.removal.base);
+            malformed(`${path} removal`, '{ base }');
+        const base = markdownBase(value.removal.base, `${path} removal.base`);
         parts.removal = base === undefined ? {} : { base };
     }
     if (value.file !== undefined) {
         if (!plain(value.file) || !(value.file.blob instanceof Blob))
-            malformed();
+            malformed(`${path} file`, '{ blob, base } with a Blob');
         if (Object.keys(value).length > 1)
             throw runtimeError('room-draft-file-exclusive');
-        const base = markdownBase(value.file.base);
+        const base = markdownBase(value.file.base, `${path} file.base`);
         parts.file = base === undefined ? { blob: value.file.blob } : { blob: value.file.blob, base };
     }
     return parts;
@@ -318,33 +330,46 @@ function joined(existing, returned) {
             merged[name] = part;
     return Object.keys(merged).length === 0 ? undefined : merged;
 }
-function ended(text) {
+export function lineEnded(text) {
     return text === '' || text.endsWith('\n') ? text : `${text}\n`;
 }
-function frontmatterOf(fields) {
-    const opened = parse('---\n---\n');
-    if (!opened.ok)
-        return malformed();
-    const next = apply(opened.document, fields.map(([name, part]) => ({
-        kind: 'field',
-        name,
-        value: part.value,
-        prior: undefined,
-    })));
+function written(start, changes, definition) {
+    const next = apply(start, changes, definition);
     return next.outcome === 'applied' ? serialize(next.document) : malformed();
 }
-export function partsAfter(markdown, parts) {
+function empty(definition) {
+    const parsed = parse('', '', definition);
+    return parsed.ok ? parsed.document : malformed();
+}
+export function partsAfter(markdown, parts, definitions) {
     const fields = named(parts.fields);
+    const sections = named(parts.sections);
+    if (fields.length === 0 && sections.length === 0 && parts.preamble === undefined)
+        return markdown;
+    const whole = parse(markdown, '', definitions);
+    const definition = whole.ok ? definitions?.(whole.document.type) : undefined;
+    const head = [
+        ...fields.map(([name, part]) => ({
+            kind: 'field',
+            name,
+            value: part.value,
+            prior: undefined,
+        })),
+        ...(parts.preamble === undefined
+            ? []
+            : [{ kind: 'preamble', value: lineEnded(parts.preamble.value), prior: '' }]),
+    ];
     const pieces = [
-        ...(fields.length === 0 ? [] : [frontmatterOf(fields)]),
-        ...(parts.preamble === undefined ? [] : [parts.preamble.value]),
-        ...named(parts.sections).map(([name, part]) => `## ${name}\n${part.value}`),
+        ...(head.length === 0
+            ? []
+            : [
+                written(fields.length === 0 ? empty(definition) : create(undefined, definition), head, definition),
+            ]),
+        ...sections.map(([name, part]) => written(empty(definition), [{ kind: 'section', name, value: lineEnded(part.value), prior: undefined }], definition)),
     ];
-    if (pieces.length === 0)
-        return markdown;
-    return `${ended(markdown)}\n${pieces.map(ended).join('')}`;
+    return `${lineEnded(markdown)}\n${pieces.join('')}`;
 }
-export function returnedInto(existing, returned) {
+export function returnedInto(existing, returned, definitions) {
     if (existing === undefined)
         return returned;
     const next = { ...existing };
@@ -364,7 +389,7 @@ export function returnedInto(existing, returned) {
         delete next.fields;
         delete next.sections;
         delete next.preamble;
-        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned);
+        const value = partsAfter(whole.value, existing.markdown === undefined ? existing : returned, definitions);
         next.markdown = { value, base: whole.base };
     }
     const creation = existing.creation ?? returned.creation;
@@ -386,12 +411,13 @@ export function moveTarget(move) {
     return to === null || to === '' ? move.to : to;
 }
 export function readSavedParts(named) {
-    const read = named.map(({ path, parts }) => ({ path, parts: readParts(parts) }));
-    if (read.some(({ path }, at) => path === '' ||
-        normalize(path) !== path ||
-        read.findIndex((one) => one.path === path) !== at)) {
-        throw runtimeError('room-draft-malformed');
-    }
+    const read = named.map(({ path, parts }) => ({ path, parts: readParts(parts, path) }));
+    read.forEach(({ path }, at) => {
+        if (path === '' || normalize(path) !== path)
+            malformed(path, 'a path inside the Room, such as notes/a.md');
+        if (read.findIndex((one) => one.path === path) !== at)
+            malformed(path, 'each path once in one save');
+    });
     return read;
 }
 export function partsChanges(named) {
@@ -433,11 +459,11 @@ export function changesOf(path, parts) {
         bases.push({ kind: 'field', path, name, value: part.base?.value });
     }
     for (const [name, part] of named(parts.sections)) {
-        changes.push({ kind: 'section', path, name, value: part.value });
+        changes.push({ kind: 'section', path, name, value: lineEnded(part.value) });
         bases.push({ kind: 'section', path, name, value: part.base });
     }
     if (parts.preamble !== undefined) {
-        changes.push({ kind: 'preamble', path, value: parts.preamble.value });
+        changes.push({ kind: 'preamble', path, value: lineEnded(parts.preamble.value) });
         bases.push({ kind: 'preamble', path, value: parts.preamble.base });
     }
     if (parts.markdown !== undefined) {
@@ -461,35 +487,6 @@ export function changesOf(path, parts) {
         changes.push({ kind: 'remove', path });
     return { changes, bases };
 }
-function rebased(before, after) {
-    return before === undefined ? after : { ...after, base: before.base };
-}
-function rebasedAll(before, after) {
-    return {
-        ...before,
-        ...Object.fromEntries(Object.entries(after).map(([name, part]) => [name, rebased(before?.[name], part)])),
-    };
-}
-export function joinedDraft(carried, saved) {
-    const draft = saved.find((item) => item.path === carried.path);
-    if (draft === undefined)
-        return carried;
-    const held = carried.parts;
-    const next = draft.parts;
-    return {
-        path: carried.path,
-        parts: {
-            ...held,
-            ...next,
-            ...(next.fields === undefined ? {} : { fields: rebasedAll(held.fields, next.fields) }),
-            ...(next.sections === undefined
-                ? {}
-                : { sections: rebasedAll(held.sections, next.sections) }),
-            ...(next.preamble === undefined ? {} : { preamble: rebased(held.preamble, next.preamble) }),
-            ...(next.markdown === undefined ? {} : { markdown: rebased(held.markdown, next.markdown) }),
-        },
-    };
-}
 export function withdrawnDrafts(drafts, changes) {
     return drafts.flatMap((draft) => {
         const file = draft.parts.file;

package/dist/room-drafts.d.ts

@@ -0,0 +1,24 @@
+import { type ChangeSet } from './change-set.js';
+import { type VisibleLayer } from './replica.js';
+import { type RoomDraft, type RoomDraftWrite } from './room-draft.js';
+import type { Runtime } from './runtime.js';
+import type { Store } from './store.js';
+export type RoomDraftSurface = {
+    list(): Promise<readonly RoomDraft[]>;
+    read(room: string, path: string): Promise<RoomDraft | null>;
+    write(room: string, path: string, revision: string | null, parts: unknown, next?: string): Promise<RoomDraftWrite>;
+    discard(room: string, path: string, revision: string): Promise<RoomDraftWrite>;
+};
+export type PresentationSurface = {
+    read(app: string): Promise<unknown>;
+    write(app: string, value: unknown): Promise<void>;
+    edit(app: string, members: Readonly<Record<string, unknown>>): Promise<void>;
+};
+export declare function visibleOf(store: Store, locator: string, paths: readonly string[]): Promise<VisibleLayer | undefined>;
+export declare function publishRoomDrafts({ store, socket }: Runtime, waitingOnly: boolean, touched?: ChangeSet['documents'] | null): Promise<void>;
+export declare function emitPresentation({ store, socket }: Runtime, app: string): Promise<void>;
+export declare function roomDraftSurface(runtime: Runtime): RoomDraftSurface;
+export declare function presentationSurface(runtime: Runtime): PresentationSurface;
+export declare function watchRoomDrafts({ store, socket }: Runtime, deliver: (value: unknown) => void): () => void;
+export declare function watchPresentation({ store, socket }: Runtime, app: string, deliver: (value: unknown) => void): () => void;
+//# sourceMappingURL=room-drafts.d.ts.map

package/dist/room-drafts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"room-drafts.d.ts","sourceRoot":"","sources":["../src/room-drafts.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5D,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAQL,KAAK,SAAS,EAEd,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,IAAI,OAAO,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC5D,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,cAAc,CAAC,CAAC;IAC3B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAChF,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E,CAAC;AAMF,wBAAsB,SAAS,CAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,MAAM,EAAE,GACvB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AA0CD,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,WAAW,EAAE,OAAO,EACpB,OAAO,GAAE,SAAS,CAAC,WAAW,CAAC,GAAG,IAAW,GAC5C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAOD,wBAAgB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUvF;AAoDD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAkDnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,CA8BzE;AAED,wBAAgB,eAAe,CAC7B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CAiBZ;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAChC,MAAM,IAAI,CASZ"}

package/dist/room-drafts.js

@@ -0,0 +1,217 @@
+import { plain } from '@agentshouse/mdmodel';
+import { changeSet } from './change-set.js';
+import { collectionOf } from './collection.js';
+import { runtimeError, uncaught } from './failure.js';
+import { roomDraftRevision } from './identity.js';
+import { normalize } from './paths.js';
+import { slicing } from './replica.js';
+import { binaryBase, gatheredParts, held, heldFile, readParts, staleWrite, underneath, } from './room-draft.js';
+import { stepped } from './turn.js';
+const ROOM_DRAFTS = 'room-drafts';
+const presentationTopic = (app) => `presentation\u0000${app}`;
+export async function visibleOf(store, locator, paths) {
+    const kept = await store.record(locator);
+    if (kept === undefined)
+        return undefined;
+    const local = await store.open();
+    const slice = await stepped(slicing(await local.entries(kept.key, 'visible', paths), paths));
+    return { ...slice, collection: collectionOf(slice.documents, store.composed(kept)) };
+}
+function roomDraftOf(record, visible) {
+    return structuredClone({
+        room: record.locator,
+        path: record.path,
+        revision: record.revision,
+        parts: record.parts,
+        changedUnderneath: underneath(record.parts, record.path, visible),
+        returned: record.returned,
+    });
+}
+async function roomDraftsOf(store, records) {
+    const rooms = new Map();
+    for (const record of records) {
+        const paths = rooms.get(record.locator) ?? [];
+        paths.push(record.path);
+        rooms.set(record.locator, paths);
+    }
+    const layers = new Map();
+    for (const [locator, paths] of rooms) {
+        layers.set(locator, await visibleOf(store, locator, paths));
+    }
+    return records.map((record) => roomDraftOf(record, layers.get(record.locator)));
+}
+function inOrder(records) {
+    return [...records].sort((left, right) => {
+        if (left.locator !== right.locator)
+            return left.locator < right.locator ? -1 : 1;
+        if (left.path !== right.path)
+            return left.path < right.path ? -1 : 1;
+        return 0;
+    });
+}
+async function snapshotRoomDrafts(store) {
+    return roomDraftsOf(store, inOrder(await store.drafts()));
+}
+export function publishRoomDrafts({ store, socket }, waitingOnly, touched = null) {
+    const unwatched = () => socket.closed() || store.watching(ROOM_DRAFTS).length === 0;
+    if (unwatched())
+        return Promise.resolve();
+    return store.publication(async () => {
+        if (unwatched())
+            return;
+        const records = await store.drafts();
+        if (socket.closed())
+            return;
+        if (touched !== null &&
+            !records.some((record) => touched.some(({ locator, path }) => locator === record.locator && (path === null || path === record.path)))) {
+            return;
+        }
+        const value = await roomDraftsOf(store, inOrder(records));
+        if (socket.closed())
+            return;
+        const answered = store.watching(ROOM_DRAFTS, waitingOnly ? 'waiting' : 'all');
+        for (const watcher of answered)
+            watcher.answer(value);
+    });
+}
+async function presentationOf(store, app) {
+    const value = await (await store.open()).presentation(app);
+    return value === undefined ? null : structuredClone(value);
+}
+export function emitPresentation({ store, socket }, app) {
+    const topic = presentationTopic(app);
+    const listening = () => store.watching(topic, 'ready');
+    if (socket.closed() || listening().length === 0)
+        return Promise.resolve();
+    return store.publication(async () => {
+        if (socket.closed() || listening().length === 0)
+            return;
+        const value = await presentationOf(store, app);
+        if (socket.closed())
+            return;
+        for (const watcher of listening())
+            watcher.answer(value);
+    });
+}
+async function writtenRoomDraft({ store }, room, path, revision, input, next) {
+    const parts = readParts(input, path);
+    if (path === '' || normalize(path) !== path)
+        throw runtimeError('room-draft-malformed', `room-draft-malformed at ${path}: a path inside the Room, such as notes/a.md`);
+    const local = await store.open();
+    const current = await store.draft(room, path);
+    if ((current?.revision ?? null) !== revision) {
+        return staleWrite(current === undefined ? null : (await roomDraftsOf(store, [current]))[0]);
+    }
+    const file = parts.file === undefined
+        ? undefined
+        : await heldFile(parts.file.blob, parts.file.base === undefined
+            ? binaryBase(await visibleOf(store, room, [path]), path)
+            : parts.file.base);
+    const record = {
+        locator: room,
+        path,
+        revision: next,
+        parts: held(current?.parts, parts, file),
+        returned: current?.returned ?? null,
+    };
+    await local.keepRoomDraft(record, parts.file === undefined || file === undefined
+        ? []
+        : [{ key: file.localId, blob: parts.file.blob }]);
+    await store.changed(changeSet(room, { drafts: [path] }));
+    return { outcome: 'written', roomDraft: (await roomDraftsOf(store, [record]))[0] };
+}
+async function keptPresentation({ store }, app, value) {
+    await (await store.open()).present({ app, value });
+    await store.changed(changeSet('', { presentation: app }));
+}
+export function roomDraftSurface(runtime) {
+    const { store } = runtime;
+    return {
+        list() {
+            return store
+                .exclusive(async () => {
+                await store.open();
+                return snapshotRoomDrafts(store);
+            })
+                .then((listed) => {
+                publishRoomDrafts(runtime, true);
+                return listed;
+            });
+        },
+        async read(room, path) {
+            const record = await store.draft(room, path);
+            return record === undefined ? null : (await roomDraftsOf(store, [record]))[0];
+        },
+        write(room, path, revision, input, next = roomDraftRevision()) {
+            if (typeof next !== 'string' || next === '')
+                return Promise.reject(runtimeError('room-draft-malformed'));
+            return store.gathered(`room-draft\u0000${room}\u0000${path}`, { revision, input, next }, (earlier, later) => {
+                if (later.revision !== earlier.next)
+                    return null;
+                const parts = gatheredParts(earlier.input, later.input);
+                return parts === null
+                    ? null
+                    : { revision: earlier.revision, input: parts, next: later.next };
+            }, (written) => writtenRoomDraft(runtime, room, path, written.revision, written.input, written.next));
+        },
+        discard(room, path, revision) {
+            return store.exclusive(async () => {
+                const local = await store.open();
+                const current = await store.draft(room, path);
+                if (current === undefined || current.revision !== revision) {
+                    return staleWrite(current === undefined ? null : (await roomDraftsOf(store, [current]))[0]);
+                }
+                await local.discardRoomDraft(room, path);
+                await store.changed(changeSet(room, { drafts: [path] }));
+                return { outcome: 'written', roomDraft: null };
+            });
+        },
+    };
+}
+export function presentationSurface(runtime) {
+    const { store } = runtime;
+    return {
+        read(app) {
+            return store.exclusive(() => presentationOf(store, app));
+        },
+        write(app, value) {
+            return store.exclusive(() => keptPresentation(runtime, app, structuredClone(value)));
+        },
+        edit(app, members) {
+            return store.gathered(`presentation\u0000${app}`, structuredClone(members), (earlier, later) => ({ ...earlier, ...later }), async (edited) => {
+                const kept = await (await store.open()).presentation(app);
+                await keptPresentation(runtime, app, Object.fromEntries([
+                    ...Object.entries(plain(kept) ? kept : {}).filter(([member]) => !Object.hasOwn(edited, member)),
+                    ...Object.entries(edited).filter(([, value]) => value !== null),
+                ]));
+            });
+        },
+    };
+}
+export function watchRoomDrafts({ store, socket }, deliver) {
+    const watcher = store.watch(ROOM_DRAFTS, deliver);
+    const unwatched = () => socket.closed() || !watcher.held();
+    void store
+        .exclusive(async () => {
+        await store.open();
+    })
+        .then(() => store.publication(async () => {
+        if (unwatched())
+            return;
+        const value = await snapshotRoomDrafts(store);
+        if (!unwatched())
+            watcher.answer(value);
+    }), uncaught);
+    return watcher.stop;
+}
+export function watchPresentation({ store, socket }, app, deliver) {
+    const watcher = store.watch(presentationTopic(app), deliver);
+    void store
+        .exclusive(async () => {
+        const value = await presentationOf(store, app);
+        if (!socket.closed() && watcher.held())
+            watcher.answer(value);
+    })
+        .catch(uncaught);
+    return watcher.stop;
+}

package/dist/rows.d.ts

@@ -1,14 +1,7 @@
+import { type HeldValue } from '@agentshouse/mdmodel';
+import type { SavedFacts } from './adapter.js';
 import { type Composition } from './collection.js';
-export type ValueKind = 'string' | 'number' | 'boolean' | 'null' | 'array' | 'object' | 'undefined';
-type HeldValue = {
-    readonly keys: string;
-    readonly places: string;
-    readonly item: number;
-    readonly kind: ValueKind;
-    readonly value: string | number | null;
-    readonly size: number | null;
-};
-type LinkKind = 'field' | 'section' | 'body';
+type LinkKind = 'field' | 'link';
 type HeldLink = {
     readonly kind: LinkKind;
     readonly keys: string;
@@ -22,8 +15,14 @@ export type Described = {
     readonly queried: boolean;
     readonly folder: string;
     readonly fields: string | null;
+    readonly links: string | null;
+};
+export type Held = {
+    readonly type: string | null;
+    readonly fields: Readonly<Record<string, unknown>> | null;
+    readonly links: readonly string[];
 };
-export type Derived = Described & {
+export type Derived = {
     readonly values: readonly HeldValue[];
     readonly links: readonly HeldLink[];
 };
@@ -32,15 +31,9 @@ export declare function roomOfKey(key: string): string;
 export declare function pathOfKey(key: string): string;
 export declare function markdownPath(path: string): boolean;
 export declare function folderOf(path: string): string;
-export type Reach = 'exact' | 'value' | 'link';
-export type Placed = {
-    readonly keys: string;
-    readonly places: string;
-    readonly glob: boolean;
-};
-export declare function placedOf(pointer: string, reach: Reach): Placed;
-export declare function kindOf(value: unknown): ValueKind;
-export declare function described(path: string, content: string | null): Described;
-export declare function derived(path: string, content: string | null, composition: Composition): Derived;
+export declare function writtenFacts(path: string, content: string, composition: Composition): SavedFacts | null;
+export declare function described(path: string, content: string | null, facts: SavedFacts | null): Described;
+export declare function heldOf(path: string, content: string | null, facts: SavedFacts | null): Held;
+export declare function derived(path: string, held: Held, composition: Composition): Derived;
 export {};
 //# sourceMappingURL=rows.d.ts.map

package/dist/rows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAWA,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpG,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,KAAK,QAAQ,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7C,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CACrC,CAAC;AAMF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAWD,MAAM,MAAM,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/C,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhG,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,CAuB9D;AAwBD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAMhD;AAiJD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAEzE;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAO/F"}
+{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../src/rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAClG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAA4B,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE7E,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAEjC,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;CACrC,CAAC;AAMF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAaD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,GACvB,UAAU,GAAG,IAAI,CAQnB;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,KAAK,EAAE,UAAU,GAAG,IAAI,GACvB,SAAS,CAeX;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI,CAK3F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAYnF"}