@agentshouse/mdruntime 0.1.0-c0ffc146f48dd → 0.1.0-c112fd663ab59

package/dist/replica.js

@@ -3,14 +3,17 @@ import { immutable, landing } from './change.js';
 import { collectionOf } from './collection.js';
 import { storedModel } from './model.js';
 import { acceptedBinaries, overlaying } from './overlay.js';
+import { writtenFacts } from './rows.js';
 import { effectiveIn, rewriting } from './save.js';
+import { guarding } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
-export function compositionOf(record, builtIn) {
+export function compositionOf(record, builtIn, typedPaths) {
     return {
         model: record.model,
         selection: record.typedSelection === null
             ? null
             : { roots: record.typedSelection.roots, model: builtIn },
+        typedPaths,
     };
 }
 export function storedRecord(record) {
@@ -35,7 +38,7 @@ function strict(values, held) {
             throw new UnreadPath(property);
         }
     };
-    return new Proxy(values, {
+    return guarding(values, {
         get(target, property, receiver) {
             guard(property);
             return Reflect.get(target, property, receiver);
@@ -58,9 +61,13 @@ export function* slicing(entries, paths) {
     const binaries = {};
     const revisions = {};
     const fileIds = {};
+    const created = {};
     const changes = {};
     const written = {};
+    const facts = {};
     for (const entry of entries) {
+        if (entry.facts !== null)
+            facts[entry.path] = entry.facts;
         if (entry.binary !== null)
             binaries[entry.path] = entry.binary;
         else if (entry.content !== null)
@@ -69,6 +76,8 @@ export function* slicing(entries, paths) {
             revisions[entry.path] = entry.revision;
         if (entry.fileId !== null)
             fileIds[entry.path] = entry.fileId;
+        if (entry.created !== null)
+            created[entry.path] = entry.created;
         if (entry.change !== null)
             changes[entry.path] = entry.change;
         if (entry.written !== null)
@@ -80,8 +89,10 @@ export function* slicing(entries, paths) {
         binaries: strict(binaries, held),
         revisions: strict(revisions, held),
         fileIds: strict(fileIds, held),
+        created: strict(created, held),
         changes: strict(changes, held),
         written: strict(written, held),
+        facts: strict(facts, held),
         held,
     };
 }
@@ -96,6 +107,7 @@ export function entryAt(layer, path) {
         binary: binary ?? null,
         revision: layer.revisions[path] ?? null,
         fileId: layer.fileIds[path] ?? null,
+        created: layer.created[path] ?? null,
         change: layer.changes[path] ?? null,
         written: layer.written?.[path] ?? null,
     };
@@ -104,8 +116,9 @@ export function* slicingWith(slice, set, removed) {
     const entries = new Map();
     for (const path of slice.held) {
         const entry = entryAt(slice, path);
-        if (entry !== null)
-            entries.set(path, { ...entry, type: null });
+        if (entry !== null) {
+            entries.set(path, { ...entry, type: null, facts: slice.facts[path] ?? null });
+        }
         yield ROW_WEIGHT;
     }
     for (const path of removed)
@@ -169,8 +182,9 @@ export function* replaying(confirmed, queue, locator, composition) {
 export function* overlayOf(visible, touched) {
     const rows = [];
     for (const path of touched) {
-        yield ROW_WEIGHT;
         const entry = entryAt(visible, path);
+        yield ROW_WEIGHT + (entry?.content?.length ?? 0);
+        const text = entry?.binary === null ? entry.content : null;
         rows.push(entry === null
             ? {
                 path,
@@ -179,10 +193,17 @@ export function* overlayOf(visible, touched) {
                 binary: null,
                 revision: null,
                 fileId: null,
+                created: null,
                 change: null,
                 written: null,
+                facts: null,
             }
-            : { ...entry, written: null, present: true });
+            : {
+                ...entry,
+                written: null,
+                present: true,
+                facts: text === null ? null : writtenFacts(path, text, visible.collection.composition),
+            });
     }
     return rows;
 }
@@ -254,7 +275,7 @@ function effects(change) {
             { kind: 'present', path: change.to },
         ];
     }
-    if (change.kind === 'binary' || change.kind === 'arrival')
+    if (change.kind === 'arrival')
         return [{ kind: 'present', path }];
     return [{ kind: 'absent', path }];
 }
@@ -347,17 +368,20 @@ export function returnedPaths(submitted, accepted) {
     }
     return paths;
 }
-export function* returning(confirmed, submitted, accepted, writtenAt) {
+export function* returning(confirmed, submitted, accepted, writtenAt, composition) {
     const documents = new Map();
     const binaries = new Map();
     const revisions = new Map();
     const fileIds = new Map();
+    const created = new Map();
     const changes = new Map();
     const written = new Map();
+    const facts = new Map();
     const read = (changed, held, path) => (changed.has(path) ? changed.get(path) : held[path]);
     for (const [path, content] of Object.entries(accepted.documents)) {
-        yield ROW_WEIGHT;
+        yield ROW_WEIGHT + content.length;
         documents.set(path, content);
+        facts.set(path, writtenFacts(path, content, composition));
         fileIds.set(path, undefined);
         written.set(path, writtenAt);
     }
@@ -380,48 +404,60 @@ export function* returning(confirmed, submitted, accepted, writtenAt) {
         written.set(path, undefined);
     }
     for (const change of submitted.changes) {
-        if (change.kind === 'arrival' && 'binary' in change) {
-            if (accepted.revisions[change.path] !== undefined) {
+        if (change.kind === 'arrival') {
+            if (accepted.revisions[change.path] === undefined)
+                continue;
+            created.set(change.path, change.created);
+            if ('binary' in change)
                 binaries.set(change.path, { state: 'accepted', ...change.binary });
-            }
             continue;
         }
-        if (change.kind !== 'move')
+        if (change.kind !== 'move' || accepted.revisions[change.to] === undefined)
             continue;
+        created.set(change.to, read(created, confirmed.created, change.path));
+        created.set(change.path, undefined);
         const moved = read(binaries, confirmed.binaries, change.path);
-        if (moved === undefined || accepted.revisions[change.to] === undefined)
+        if (moved === undefined)
             continue;
         binaries.set(change.to, moved);
         binaries.set(change.path, undefined);
     }
     for (const [path, binary] of acceptedBinaries(accepted.binaryFiles ?? {}))
         binaries.set(path, binary);
-    for (const path of accepted.removals)
+    for (const path of accepted.removals) {
         binaries.set(path, undefined);
+        created.set(path, undefined);
+    }
     const paths = new Set([
         ...documents.keys(),
         ...binaries.keys(),
         ...revisions.keys(),
         ...fileIds.keys(),
+        ...created.keys(),
         ...changes.keys(),
         ...written.keys(),
     ]);
     const set = [];
     const removed = [];
     for (const path of paths) {
-        yield ROW_WEIGHT;
         const content = read(documents, confirmed.documents, path);
         const binary = read(binaries, confirmed.binaries, path);
+        yield ROW_WEIGHT;
         if (content === undefined && binary === undefined) {
             removed.push(path);
             continue;
         }
+        const text = binary === undefined ? (content ?? null) : null;
+        const fresh = confirmed.documents[path] === undefined && confirmed.binaries[path] === undefined;
         set.push({
             path,
-            content: binary === undefined ? (content ?? null) : null,
+            content: text,
+            facts: text === null ? null : (read(facts, confirmed.facts, path) ?? null),
             binary: binary ?? null,
             revision: read(revisions, confirmed.revisions, path) ?? null,
             fileId: read(fileIds, confirmed.fileIds, path) ?? null,
+            created: read(created, confirmed.created, path) ??
+                (fresh ? (read(changes, confirmed.changes, path)?.time ?? null) : null),
             change: read(changes, confirmed.changes, path) ?? null,
             written: read(written, confirmed.written, path) ?? null,
         });

package/dist/room-draft.d.ts

@@ -90,9 +90,9 @@ type ChangedUnderneath = {
     readonly file?: string | null;
 };
 export type ReturnReason = ProviderRefusal & {
-    readonly kind: Open<'conflicted' | 'rejected' | 'expired' | 'withdrawn'>;
+    readonly kind: Open<'conflicted' | 'rejected' | 'withdrawn'>;
 };
-export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
+export declare function returnedBy(): ReturnReason;
 export type RoomDraft = {
     readonly room: string;
     readonly path: string;
@@ -106,8 +106,6 @@ export type RoomDraftWrite = {
     readonly roomDraft: RoomDraft | null;
 } | {
     readonly outcome: 'stale';
-    readonly code: string;
-    readonly retryable: boolean;
     readonly current: RoomDraft | null;
 };
 export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
@@ -134,6 +132,7 @@ export declare function underneath(parts: HeldParts, path: string, visible: Visi
 export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
 export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
 export declare function changedParts(path: string, parts: HeldParts, visible: VisibleLayer | undefined): readonly ChangedPart[];
+export declare function lineEnded(text: string): string;
 export type TextParts = {
     readonly fields?: Readonly<Record<string, {
         readonly value: unknown;

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

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

package/dist/room-draft.js

@@ -3,11 +3,11 @@ 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(at, needs) {
     throw runtimeError('room-draft-malformed', at === undefined ? 'room-draft-malformed' : `room-draft-malformed at ${at}: ${needs}`);
@@ -330,7 +330,7 @@ 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) {
@@ -354,7 +354,7 @@ export function partsAfter(markdown, parts) {
     ];
     if (pieces.length === 0)
         return markdown;
-    return `${ended(markdown)}\n${pieces.map(ended).join('')}`;
+    return `${lineEnded(markdown)}\n${pieces.map(lineEnded).join('')}`;
 }
 export function returnedInto(existing, returned) {
     if (existing === undefined)
@@ -446,11 +446,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) {

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,EAAa,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9D,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"}