@agentshouse/mdruntime 0.1.0-ccbe92df1c4f6 → 0.1.0-ccd098ff75bbf

package/dist/connection.js

@@ -1,5 +1,5 @@
 import { escapePointer, parseFrontmatter, roomTarget, target } from '@agentshouse/mdmodel';
-import { attachedModel, NO_ROOM_TYPES, roomTypesOf } from './attached-model.js';
+import { attachedModel, builtInModel, roomTypesOf } from './attached-model.js';
 import { cached, modelTypes, NO_MODEL, sameModel, } from './model.js';
 import { observing, whole } from './observation.js';
 import { filterOf, identityOf, planOf, plain, queryKey, } from './query.js';
@@ -23,7 +23,7 @@ import { doorReads } from './reads.js';
 import { advancement } from './refresh.js';
 import { buildBatch, buildMove, joined, limiting, queuedDocuments, requeuing, } from './save.js';
 import { compositionOf, entryAt, landed, movedBy, overlayOf, replaying, returning, returnedPaths, sameMembership, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
-import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, moveTarget, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
+import { binaryBase, changedParts, changesOf, gatheredParts, held, heldFile, joinedDraft, moveTarget, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration, refusedForSpace, } from './durability.js';
 import { readinessOf, } from './readiness.js';
@@ -93,7 +93,7 @@ function pendingKey(locator, id) {
 }
 export function composeRuntime(options) {
     const localSaves = options.adapter.localSaves === true;
-    const roomTypes = roomTypesOf(options.adapter.roomTypes);
+    const roomTypes = roomTypesOf(options.adapter.roomTypes, options.adapter.nameableRoomTypes);
     let authorization = options.authorization;
     let opening;
     const fences = new Map();
@@ -114,9 +114,9 @@ export function composeRuntime(options) {
     const rooms = new FencedMap(isFenced);
     const counted = new Map();
     const unreadable = new Set();
-    const isModelFenced = (key) => isFenced(key.slice(key.indexOf(' ') + 1));
-    const models = new FencedMap(isModelFenced);
-    const liveModels = new FencedMap(isModelFenced);
+    const builtIn = builtInModel(roomTypes);
+    const models = new FencedMap(isFenced);
+    const liveModels = new FencedMap(isFenced);
     const invalidModels = new Set();
     const discovered = new Map();
     const reads = doorReads(options.adapter, (locator) => discovered.get(locator), () => generation);
@@ -124,23 +124,19 @@ export function composeRuntime(options) {
     const scopedRefusals = new Map();
     const sourceRefusals = new Map();
     const declarationRefusals = new Set();
-    function modelKey(locator, attached) {
-        return `${attached} ${locator}`;
+    function modelOf(locator) {
+        return models.get(locator) ?? NO_MODEL;
     }
-    function modelOf(locator, attached = 'collection') {
-        return models.get(modelKey(locator, attached)) ?? NO_MODEL;
-    }
-    function savedModel(locator, attached) {
-        return invalidModels.has(modelKey(locator, attached))
+    function savedModel(locator) {
+        return invalidModels.has(locator)
             ? { status: 'unavailable', reason: 'revoked' }
-            : modelOf(locator, attached);
+            : modelOf(locator);
+    }
+    function composed(record) {
+        return compositionOf(record, builtIn);
     }
     function compositionFor(record) {
-        return compositionOf({
-            ...record,
-            model: savedModel(record.locator, 'collection'),
-            selectionModel: savedModel(record.locator, 'typed-selection'),
-        });
+        return composed({ ...record, model: savedModel(record.locator) });
     }
     let refusal = null;
     let storageLoss = null;
@@ -172,6 +168,7 @@ export function composeRuntime(options) {
     let roomReads = { generation, free: ROOM_READS, waiting: [] };
     const working = new Set();
     let mutations = Promise.resolve();
+    let gathering = null;
     const roomListeners = new Set();
     const refusalListeners = new Set();
     const storageLossListeners = new Set();
@@ -275,7 +272,7 @@ export function composeRuntime(options) {
             return undefined;
         const local = await openLocal();
         const slice = await stepped(slicing(await local.entries(held.record.key, 'visible', paths), paths));
-        return { ...slice, collection: collectionOf(slice.documents, compositionOf(held.record)) };
+        return { ...slice, collection: collectionOf(slice.documents, composed(held.record)) };
     }
     function roomDraftOf(record, visible) {
         return structuredClone({
@@ -331,14 +328,38 @@ export function composeRuntime(options) {
         const value = presentations.get(app);
         return value === undefined ? null : structuredClone(value);
     }
-    function keepPresentation(app, next) {
-        return exclusive(async () => {
-            const local = await openLocal();
-            const stored = next(presentations.get(app));
-            await local.present({ app, value: stored });
-            presentations.set(app, stored);
-            publishChangeSet(changeSet('', { presentation: app }));
-        });
+    async function writtenRoomDraft(room, path, revision, input, next) {
+        const parts = readParts(input);
+        if (path === '' || normalize(path) !== path)
+            throw runtimeError('room-draft-malformed');
+        const local = await openLocal();
+        const current = roomDrafts.get(room)?.get(path);
+        if ((current?.revision ?? null) !== revision) {
+            return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
+        }
+        const file = parts.file === undefined
+            ? undefined
+            : await heldFile(parts.file.blob, binaryBase(await visibleOf(room, [path]), path));
+        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 }]);
+        rememberRoomDraft(record);
+        publishChangeSet(changeSet(room, { drafts: [path] }));
+        return { outcome: 'written', roomDraft: (await roomDraftsOf([record]))[0] ?? null };
+    }
+    async function keptPresentation(app, next) {
+        const local = await openLocal();
+        const stored = next(presentations.get(app));
+        await local.present({ app, value: stored });
+        presentations.set(app, stored);
+        publishChangeSet(changeSet('', { presentation: app }));
     }
     function emitPresentation(app) {
         if (closed)
@@ -458,7 +479,7 @@ export function composeRuntime(options) {
             const governed = governs(reach, room);
             const attached = [
                 ...(governed.collection ? [modelOf(room.locator)] : []),
-                ...(governed.selection ? [modelOf(room.locator, 'typed-selection')] : []),
+                ...(governed.selection ? [builtIn] : []),
             ];
             return {
                 locator: room.locator,
@@ -691,6 +712,7 @@ export function composeRuntime(options) {
             return [
                 {
                     room,
+                    name: discovered.get(room)?.name ?? room,
                     file: typeof file === 'string' ? file : '',
                     rule: held.code,
                     location: typeof location === 'string' ? location : null,
@@ -1003,7 +1025,7 @@ export function composeRuntime(options) {
                     const records = [...replicas].map(([locator, held]) => ({
                         locator,
                         held,
-                        record: { ...held.record, model: revoked, selectionModel: revoked },
+                        record: { ...held.record, model: revoked },
                     }));
                     let answer = null;
                     try {
@@ -1013,18 +1035,14 @@ export function composeRuntime(options) {
                                 locator,
                                 key: record.key,
                                 record: storedRecord(record),
-                                composition: compositionOf(record),
+                                composition: composed(record),
                             })),
                         });
                     }
                     catch {
                         journal.record('model revocation persistence failed');
                     }
-                    const keys = new Set(models.keys());
-                    for (const locator of rooms.keys()) {
-                        keys.add(modelKey(locator, 'collection'));
-                        keys.add(modelKey(locator, 'typed-selection'));
-                    }
+                    const keys = new Set([...models.keys(), ...rooms.keys()]);
                     for (const key of keys) {
                         invalidModels.add(key);
                         models.set(key, revoked);
@@ -1079,7 +1097,7 @@ export function composeRuntime(options) {
                 ? null
                 : {
                     roots: selection.roots,
-                    model: modelTypes(modelOf(room.locator, 'typed-selection')),
+                    model: modelTypes(builtIn),
                 },
             providerOwnedPaths: room.providerOwnedPaths,
             roomVersion: replicas.get(room.locator)?.record.roomVersion ?? null,
@@ -1179,12 +1197,9 @@ export function composeRuntime(options) {
             scopedRefusals.delete(locator);
             sourceRefusals.delete(locator);
             declarationRefusals.delete(locator);
-            for (const attached of ['collection', 'typed-selection']) {
-                const key = modelKey(locator, attached);
-                models.delete(key);
-                liveModels.delete(key);
-                invalidModels.delete(key);
-            }
+            models.delete(locator);
+            liveModels.delete(locator);
+            invalidModels.delete(locator);
             journal.record(`room lost ${locator}`);
         }
         if (fresh.length === 0)
@@ -1232,7 +1247,14 @@ export function composeRuntime(options) {
         });
         await eraseFenced(fresh);
     }
-    function restored(key, persisted) {
+    function retyped(persisted) {
+        if (persisted.status === 'unavailable')
+            return persisted;
+        const { state } = attachedModel({ kind: 'model', snapshot: persisted.snapshot }, NO_MODEL, roomTypes);
+        return state.status === 'unavailable' ? state : { ...persisted, types: state.types };
+    }
+    function restored(key, held) {
+        const persisted = retyped(held);
         const prior = models.get(key);
         if (prior !== undefined &&
             prior.status !== 'unavailable' &&
@@ -1290,9 +1312,7 @@ export function composeRuntime(options) {
         records.forEach((stored, index) => {
             if (fences.has(stored.locator))
                 return;
-            const model = restored(modelKey(stored.locator, 'collection'), stored.model);
-            const selectionModel = restored(modelKey(stored.locator, 'typed-selection'), stored.selectionModel);
-            const record = { ...stored, model, selectionModel };
+            const record = { ...stored, model: restored(stored.locator, stored.model) };
             replicas.set(record.locator, {
                 record,
                 queue: queuedBatches.get(record.locator) ?? [],
@@ -1310,13 +1330,10 @@ export function composeRuntime(options) {
                     roomVersion: record.roomVersion,
                     operations: record.operations,
                     replica: record.replica,
-                    model: modelTypes(model),
+                    model: modelTypes(record.model),
                     typedSelection: record.typedSelection === null
                         ? null
-                        : {
-                            roots: record.typedSelection.roots,
-                            model: modelTypes(selectionModel),
-                        },
+                        : { roots: record.typedSelection.roots, model: modelTypes(builtIn) },
                 });
             }
         });
@@ -1392,10 +1409,29 @@ export function composeRuntime(options) {
         return opening;
     }
     function exclusive(work) {
+        gathering = null;
         const next = mutations.then(work, work);
         mutations = next.then(() => undefined, () => undefined);
         return next;
     }
+    function gathered(key, input, merge, work) {
+        const tail = gathering;
+        if (tail !== null && tail.key === key) {
+            const merged = merge(tail.input, input);
+            if (merged !== null) {
+                tail.input = merged;
+                return tail.done;
+            }
+        }
+        const entry = { key, input, done: Promise.resolve() };
+        entry.done = exclusive(() => {
+            if (gathering === entry)
+                gathering = null;
+            return work(entry.input);
+        });
+        gathering = entry;
+        return entry.done;
+    }
     function withdrawable(locator) {
         return (batch) => {
             const state = pendings.get(pendingKey(locator, batch.id));
@@ -1484,7 +1520,7 @@ export function composeRuntime(options) {
         return { count: answer.counts[locator] ?? replicas.get(locator)?.count ?? 0, indexed };
     }
     function replayed(record, confirmedLayer, queue) {
-        return stepped(replaying(confirmedLayer, queue, record.locator, compositionOf(record)));
+        return stepped(replaying(confirmedLayer, queue, record.locator, composed(record)));
     }
     async function overlayDiff(record, before, visible, touched) {
         const kept = before !== undefined && before.record.key === record.key
@@ -1547,7 +1583,7 @@ export function composeRuntime(options) {
         const confirmedLayer = overrides === undefined
             ? read
             : await stepped(slicingWith(read, overrides.set, overrides.removed));
-        const composition = compositionOf(record);
+        const composition = composed(record);
         const { withdrawn, kept } = await stepped(standing(confirmedLayer, queue, withdrawable(locator), localSaves, locator, composition));
         const founded = kept.filter((batch) => !queue.includes(batch));
         const queueChanged = kept.length !== previousQueue.length || founded.length > 0;
@@ -1653,35 +1689,25 @@ export function composeRuntime(options) {
         };
     }
     function adoptModels(locator, record) {
-        for (const [attached, model] of [
-            ['collection', record.model],
-            ['typed-selection', record.selectionModel],
-        ]) {
-            const key = modelKey(locator, attached);
-            models.set(key, model);
-            invalidModels.delete(key);
-            if (model.status === 'current')
-                liveModels.set(key, JSON.stringify(model.snapshot));
-            else if (model.status === 'unavailable')
-                liveModels.delete(key);
-        }
+        const model = record.model;
+        models.set(locator, model);
+        invalidModels.delete(locator);
+        if (model.status === 'current')
+            liveModels.set(locator, JSON.stringify(model.snapshot));
+        else if (model.status === 'unavailable')
+            liveModels.delete(locator);
     }
     function remodel(locator, answers, held) {
-        const taken = (answer, previous, attached) => {
-            if (answer === undefined)
-                return previous;
-            const { state, refused } = attachedModel(answer, previous, attached === 'collection' ? roomTypes : NO_ROOM_TYPES);
-            if (refused !== null) {
-                const where = refused.location === undefined ? '' : ` ${refused.location}`;
-                journal.record(`model invalid ${locator} ${attached} ${refused.identity} ${refused.rule}${where}`);
-            }
-            models.set(modelKey(locator, attached), state);
-            return state;
-        };
-        return {
-            collection: taken(answers?.collection, held.collection, 'collection'),
-            selection: taken(answers?.selection, held.selection, 'typed-selection'),
-        };
+        const answer = answers?.collection;
+        if (answer === undefined)
+            return held;
+        const { state, refused } = attachedModel(answer, held.collection, roomTypes);
+        if (refused !== null) {
+            const where = refused.location === undefined ? '' : ` ${refused.location}`;
+            journal.record(`model invalid ${locator} collection ${refused.identity} ${refused.rule}${where}`);
+        }
+        models.set(locator, state);
+        return { collection: state };
     }
     function publish(local, room, record, landing, live) {
         const landed = exclusive(async () => {
@@ -1708,14 +1734,14 @@ export function composeRuntime(options) {
                     ? {
                         room: true,
                         view: 'refreshed',
-                        commit: { refreshed: true, composition: compositionOf(record) },
+                        commit: { refreshed: true, composition: composed(record) },
                     }
                     : {
                         room: true,
                         view: landing.refreshed ? 'refreshed' : 'confirmed',
                         commit: {
                             published: { from: prior?.record.key ?? null },
-                            composition: compositionOf(record),
+                            composition: composed(record),
                             ...(landing.refreshed ? { refreshed: true } : {}),
                         },
                     });
@@ -1825,7 +1851,7 @@ export function composeRuntime(options) {
             : (await local.referrers(record.key, 'confirmed', removed, CHECKED_LINKS)).map(({ path }) => path);
         const confirmedLayer = await sliceAt(record, 'confirmed', replica.queue, [...paths, ...referring], moved);
         const { visible } = await replayed(record, confirmedLayer, replica.queue);
-        const composition = compositionOf(record);
+        const composition = composed(record);
         return {
             record,
             confirmed: confirmedLayer,
@@ -1841,13 +1867,7 @@ export function composeRuntime(options) {
             return false;
         const local = await openLocal();
         const roots = record.typedSelection?.roots ?? [];
-        if (composition.model.status === 'unavailable' &&
-            (await local.typedWithin(record.key, 'visible', roots, false))) {
-            return true;
-        }
-        return (composition.selection !== null &&
-            composition.selection.model.status === 'unavailable' &&
-            (await local.typedWithin(record.key, 'visible', roots, true)));
+        return local.typedWithin(record.key, 'visible', roots, false);
     }
     function textDiffers(left, right) {
         return ((left?.content ?? undefined) !== (right?.content ?? undefined) ||
@@ -1952,7 +1972,7 @@ export function composeRuntime(options) {
             const lookup = overriddenLookup(lookupOf(local, record.key, 'confirmed'), overrides);
             const clean = available(composition) &&
                 changed.length <= CLEAN_CHANGES &&
-                (await changedCleanly(changed, compositionOf(record), composition, {
+                (await changedCleanly(changed, composed(record), composition, {
                     lookup,
                     texts: textsOf(local, record.key, 'confirmed'),
                     referrers: referrersOf(local, record.key, 'confirmed'),
@@ -2709,8 +2729,8 @@ export function composeRuntime(options) {
         }
     }
     async function validatedRoom(local, record, view, previous, overrides = null) {
-        const composition = compositionOf(record);
-        const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+        const composition = composed(record);
+        const modeled = record.model.status !== 'unavailable' || record.typedSelection !== null;
         const lookup = overrides === null
             ? lookupOf(local, record.key, view)
             : overriddenLookup(lookupOf(local, record.key, view), overrides);
@@ -2744,11 +2764,11 @@ export function composeRuntime(options) {
         }
         const named = changes === null ? null : changes.map(({ path }) => path);
         const textChanged = changes === null || changes.length > 0 || reshaped;
-        const modelsChanged = previous === null || !sameComposition(compositionOf(previous.record), composition);
+        const modelsChanged = previous === null || !sameComposition(composed(previous.record), composition);
         if (modeled && (textChanged || modelsChanged)) {
             const clean = previous !== null &&
                 changes !== null &&
-                (await changedCleanly(changes, compositionOf(previous.record), composition, {
+                (await changedCleanly(changes, composed(previous.record), composition, {
                     lookup,
                     texts,
                     referrers: referrersOf(local, record.key, 'confirmed'),
@@ -3061,10 +3081,7 @@ export function composeRuntime(options) {
             liveQueries.recover();
         }
         try {
-            const result = await bootstrapRoom(reads, authorized, room, {
-                collection: modelOf(room.locator),
-                selection: modelOf(room.locator, 'typed-selection'),
-            }, (models, held) => (liveness() ? remodel(room.locator, models, held) : held), liveness, staging(local, liveness), reusable(room, local));
+            const result = await bootstrapRoom(reads, authorized, room, { collection: modelOf(room.locator) }, builtIn, (models, held) => (liveness() ? remodel(room.locator, models, held) : held), liveness, staging(local, liveness), reusable(room, local));
             const detail = result.kind === 'staged' ? result.record.roomVersion : result.kind;
             journal.record(`transfer bootstrap ${room.locator} ${detail}`);
             if (result.kind !== 'staged') {
@@ -3130,7 +3147,7 @@ export function composeRuntime(options) {
                         options.adapter.reached(room.locator, now, refreshed.record.roomVersion);
                     return reached ? null : advance(room, local, authorized, live);
                 }
-                await retainModel(local, room, 'collection', modelOf(room.locator));
+                await retainModel(local, room, modelOf(room.locator));
                 return null;
             }
             if (refreshed.kind !== 'beyond-horizon')
@@ -3726,9 +3743,9 @@ export function composeRuntime(options) {
             release();
         };
     }
-    async function retainModel(local, room, attached, next) {
-        const key = modelKey(room.locator, attached);
-        const previous = modelOf(room.locator, attached);
+    async function retainModel(local, room, next) {
+        const key = room.locator;
+        const previous = modelOf(room.locator);
         const heldBefore = replicas.get(room.locator)?.record;
         if (JSON.stringify(previous) === JSON.stringify(next) &&
             (heldBefore === undefined ||
@@ -3752,11 +3769,11 @@ export function composeRuntime(options) {
                     operations: room.operations,
                     replica: room.replica,
                     typedSelection: room.typedSelection ?? null,
-                    ...(attached === 'collection' ? { model: next } : { selectionModel: next }),
+                    model: next,
                 };
                 let read = 'staged';
                 if (!sameMembership(declared, held.record)) {
-                    const verdict = await validatedCollection(walkOf(local, held.record.key, 'confirmed'), lookupOf(local, held.record.key, 'confirmed'), compositionOf(declared));
+                    const verdict = await validatedCollection(walkOf(local, held.record.key, 'confirmed'), lookupOf(local, held.record.key, 'confirmed'), composed(declared));
                     read =
                         verdict.verdict !== 'refuse'
                             ? 'staged'
@@ -3777,7 +3794,7 @@ export function composeRuntime(options) {
                             key: record.key,
                             record: storedRecord(record),
                             roots: record.typedSelection?.roots ?? [],
-                            composition: compositionOf(record),
+                            composition: composed(record),
                             overlay: diff.overlay,
                         },
                     ],
@@ -3824,14 +3841,14 @@ export function composeRuntime(options) {
         });
         let scopedAway = room;
         if (result.scope === 'model')
-            await retainModel(local, room, 'collection', {
+            await retainModel(local, room, {
                 status: 'unavailable',
                 reason: 'not-readable',
             });
         else if (result.scope !== 'operation') {
             unreadable.add(room.locator);
             scopedAway = { ...room, replica: { ...room.replica, admission: 'unavailable' } };
-            await retainModel(local, scopedAway, 'collection', modelOf(room.locator));
+            await retainModel(local, scopedAway, modelOf(room.locator));
         }
         if (!continuing())
             return;
@@ -3881,7 +3898,7 @@ export function composeRuntime(options) {
             return false;
         }
         if (prior !== undefined)
-            await retainModel(local, room, 'collection', modelOf(room.locator));
+            await retainModel(local, room, modelOf(room.locator));
         if (discoveryPaused || authorization === undefined)
             return false;
         return room.replica.admission === 'admitted';
@@ -3894,10 +3911,8 @@ export function composeRuntime(options) {
             await withhold(withheld, room, local, progress);
     }
     function revoked(locator) {
-        return ['collection', 'typed-selection'].some((attached) => {
-            const model = modelOf(locator, attached);
-            return model.status === 'unavailable' && model.reason === 'revoked';
-        });
+        const model = modelOf(locator);
+        return model.status === 'unavailable' && model.reason === 'revoked';
     }
     async function loadRoom(room, local, progress, live) {
         if (!live() || authorization === undefined)
@@ -3955,10 +3970,7 @@ export function composeRuntime(options) {
         journal.record(`connection discover ${result.kind}`);
         if (result.kind === 'transport-uncertainty') {
             for (const room of rooms.values()) {
-                await retainModel(local, room, 'collection', cached(modelOf(room.locator)));
-                if (room.typedSelection !== null) {
-                    await retainModel(local, room, 'typed-selection', cached(modelOf(room.locator, 'typed-selection')));
-                }
+                await retainModel(local, room, cached(modelOf(room.locator)));
             }
             progress.reachable = false;
             progress.complete = false;
@@ -4240,12 +4252,9 @@ export function composeRuntime(options) {
         }
     }
     async function confirmModels(room, local) {
-        for (const attached of ['collection', 'typed-selection']) {
-            const model = modelOf(room.locator, attached);
-            if (model.status === 'cached') {
-                await retainModel(local, room, attached, { ...model, status: 'current' });
-            }
-        }
+        const model = modelOf(room.locator);
+        if (model.status === 'cached')
+            await retainModel(local, room, { ...model, status: 'current' });
     }
     function submitLater(locator) {
         if (localSaves)
@@ -4827,7 +4836,7 @@ export function composeRuntime(options) {
                 typedSelection: rooms.get(locator)?.typedSelection === undefined ||
                     rooms.get(locator)?.typedSelection === null
                     ? null
-                    : modelTypes(modelOf(locator, 'typed-selection')),
+                    : modelTypes(builtIn),
             };
         },
         roomDraft: {
@@ -4844,33 +4853,17 @@ export function composeRuntime(options) {
                 const record = roomDrafts.get(room)?.get(path);
                 return record === undefined ? null : ((await roomDraftsOf([record]))[0] ?? null);
             },
-            write(room, path, revision, input) {
-                return exclusive(async () => {
-                    const parts = readParts(input);
-                    if (path === '' || normalize(path) !== path)
-                        throw runtimeError('room-draft-malformed');
-                    const local = await openLocal();
-                    const current = roomDrafts.get(room)?.get(path);
-                    if ((current?.revision ?? null) !== revision) {
-                        return staleWrite(current === undefined ? null : ((await roomDraftsOf([current]))[0] ?? null));
-                    }
-                    const file = parts.file === undefined
-                        ? undefined
-                        : await heldFile(parts.file.blob, binaryBase(await visibleOf(room, [path]), path));
-                    const record = {
-                        locator: room,
-                        path,
-                        revision: roomDraftRevision(),
-                        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 }]);
-                    rememberRoomDraft(record);
-                    publishChangeSet(changeSet(room, { drafts: [path] }));
-                    return { outcome: 'written', roomDraft: (await roomDraftsOf([record]))[0] ?? null };
-                });
+            write(room, path, revision, input, next = roomDraftRevision()) {
+                if (typeof next !== 'string' || next === '')
+                    return Promise.reject(runtimeError('room-draft-malformed'));
+                return 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(room, path, written.revision, written.input, written.next));
             },
             discard(room, path, revision) {
                 return exclusive(async () => {
@@ -4897,13 +4890,13 @@ export function composeRuntime(options) {
                 });
             },
             write(app, value) {
-                return keepPresentation(app, () => structuredClone(value));
+                return exclusive(() => keptPresentation(app, () => structuredClone(value)));
             },
             edit(app, members) {
-                return keepPresentation(app, (held) => Object.fromEntries([
-                    ...Object.entries(plain(held) ? held : {}).filter(([member]) => !Object.hasOwn(members, member)),
-                    ...Object.entries(structuredClone(members)).filter(([, value]) => value !== null),
-                ]));
+                return gathered(`presentation\u0000${app}`, structuredClone(members), (earlier, later) => ({ ...earlier, ...later }), (edited) => keptPresentation(app, (held) => Object.fromEntries([
+                    ...Object.entries(plain(held) ? held : {}).filter(([member]) => !Object.hasOwn(edited, member)),
+                    ...Object.entries(edited).filter(([, value]) => value !== null),
+                ])));
             },
         },
         save(room, named, writtenBy) {

package/dist/conversation.d.ts.map

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