@agentshouse/mdruntime 0.1.0-cc7bd7a53214e → 0.1.0-cd3486bd400ed

package/dist/react.js

@@ -0,0 +1,64 @@
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
+import { failed, runtimeError } from './failure.js';
+const LOADING = { state: 'loading' };
+export function useObserve(client, topic, ...input) {
+    const key = JSON.stringify([topic, ...input]);
+    const [held, setHeld] = useState(null);
+    const opened = useRef(input);
+    opened.current = input;
+    useLayoutEffect(() => {
+        if (client === null)
+            return;
+        let live = true;
+        let observation = null;
+        const observe = client.observe;
+        void observe(topic, ...opened.current).then((open) => {
+            if (!live) {
+                open.close();
+                return;
+            }
+            observation = open;
+            const take = (value) => {
+                if (live)
+                    setHeld({ client, key, observed: { state: 'ready', value } });
+            };
+            take(open.current());
+            open.subscribe(take);
+        });
+        return () => {
+            live = false;
+            observation?.close();
+        };
+    }, [client, key]);
+    return held !== null && held.client === client && held.key === key ? held.observed : LOADING;
+}
+const IDLE = { busy: false, outcome: null, failure: null };
+export async function saveRoomDrafts(client, room, roomDrafts) {
+    const kept = [];
+    for (const [path, parts] of roomDrafts) {
+        const prior = await client.roomDraft.read(room, path);
+        const write = await client.roomDraft.write(room, path, prior?.revision ?? null, parts);
+        if (write.outcome !== 'written' || write.roomDraft === null) {
+            throw runtimeError(write.outcome === 'stale' ? write.code : 'room-draft-unwritten', `the Room Draft at ${path} was not written`);
+        }
+        kept.push({ path, revision: write.roomDraft.revision });
+    }
+    return client.save(room, kept);
+}
+export function useSave(client) {
+    const [state, setState] = useState(IDLE);
+    const save = useCallback(async (room, roomDrafts) => {
+        setState({ busy: true, outcome: null, failure: null });
+        try {
+            const outcome = await saveRoomDrafts(client, room, roomDrafts);
+            setState({ busy: false, outcome, failure: null });
+            return outcome;
+        }
+        catch (error) {
+            const failure = failed(error);
+            setState({ busy: false, outcome: null, failure });
+            throw failure;
+        }
+    }, [client]);
+    return { ...state, save };
+}

package/dist/read-side.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-side.d.ts","sourceRoot":"","sources":["../src/read-side.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAU,KAAK,WAAW,EAAE,KAAK,WAAW,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAOV,IAAI,EAIJ,WAAW,EAIZ,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAqDpD,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,KAAK,IAAI,GACpD,MAAM,IAAI,CAAC;IACd,SAAS,IAAI,SAAS,gBAAgB,EAAE,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC9D,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AA8RF,wBAAgB,UAAU,CACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,WAAW,GAChB;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CA4BpD;AAED,wBAAgB,cAAc,IAAI,QAAQ,CA4HzC"}
+{"version":3,"file":"read-side.d.ts","sourceRoot":"","sources":["../src/read-side.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAU,KAAK,WAAW,EAAE,KAAK,WAAW,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAOV,IAAI,EAIJ,WAAW,EAIZ,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAuDpD,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5B,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,KAAK,IAAI,GACpD,MAAM,IAAI,CAAC;IACd,SAAS,IAAI,SAAS,gBAAgB,EAAE,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC9D,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AA+UF,wBAAgB,UAAU,CACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,WAAW,GAChB;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CA4BpD;AAED,wBAAgB,cAAc,IAAI,QAAQ,CA4HzC"}

package/dist/read-side.js

@@ -1,54 +1,58 @@
-import { and, BasicIndex, configureIndexDevMode, count, createCollection, createLiveQueryCollection, deepEquals, eq, gt, gte, inArray, isNull, isUndefined, lt, lte, not, or, toArray, } from '@tanstack/db';
+import { and, BasicIndex, configureIndexDevMode, count, createCollection, createLiveQueryCollection, deepEquals, eq, inArray, or, toArray, } from '@tanstack/db';
+import { ARRAY_INDEX, pointerSegments } from '@agentshouse/mdmodel';
 import { rowsOf } from './observation.js';
 import { documentKey } from './rows.js';
 function every(expressions) {
     const [first, second, ...rest] = expressions;
     return second === undefined ? first : and(first, second, ...rest);
 }
-function some(expressions) {
-    const [first, second, ...rest] = expressions;
-    return second === undefined ? first : or(first, second, ...rest);
+function same(held, value) {
+    return Array.isArray(held) ? held.includes(value) : held === value;
 }
-function equal(field, value) {
-    return or(eq(field, value), inArray(value, field));
+function ordered(held, [operator, bound]) {
+    if (typeof held !== typeof bound || held === null || typeof held === 'object')
+        return false;
+    const left = held;
+    const right = bound;
+    if (operator === 'gt')
+        return left > right;
+    if (operator === 'gte')
+        return left >= right;
+    if (operator === 'lt')
+        return left < right;
+    return left <= right;
 }
-function tested(test, field, size, written) {
+function satisfied(test, held) {
     if (test.op === 'eq')
-        return test.value === null ? isNull(field) : equal(field, test.value);
-    if (test.op === 'ne') {
-        return test.value === null
-            ? not(isNull(field))
-            : or(isUndefined(field), isNull(field), not(equal(field, test.value)));
-    }
-    if (test.op === 'in' || test.op === 'nin') {
-        const matches = test.values.length === 0
-            ? inArray(field, [])
-            : some(test.values.map((value) => (value === null ? isNull(field) : equal(field, value))));
-        if (test.op === 'in')
-            return matches;
-        return some([
-            isUndefined(field),
-            ...(test.values.includes(null) ? [] : [isNull(field)]),
-            not(matches),
-        ]);
-    }
-    if (test.op === 'range') {
-        const compare = { gt, gte, lt, lte };
-        return every(test.bounds.map(([operator, bound]) => compare[operator](field, bound)));
-    }
-    if (test.op === 'all') {
-        return every([not(isUndefined(size)), ...test.values.map((value) => inArray(value, field))]);
-    }
-    if (test.op === 'size')
-        return eq(size, test.size);
-    return test.exists ? not(isUndefined(written)) : isUndefined(written);
+        return same(held, test.value);
+    if (test.op === 'ne')
+        return !same(held, test.value);
+    if (test.op === 'in')
+        return test.values.some((value) => same(held, value));
+    if (test.op === 'nin')
+        return !test.values.some((value) => same(held, value));
+    if (test.op === 'range')
+        return test.bounds.every((bound) => ordered(held, bound));
+    if (test.op === 'all')
+        return Array.isArray(held) && test.values.every((value) => same(held, value));
+    return Array.isArray(held) && held.length === test.size;
+}
+function tested(test, reached) {
+    if (test.op === 'exists')
+        return test.exists === (reached !== undefined);
+    if (reached === undefined)
+        return test.op === 'ne' || test.op === 'nin';
+    return reached.some((held) => satisfied(test, held));
 }
 function conditioned(condition, row) {
     if ('every' in condition)
-        return every(condition.every.map((item) => conditioned(item, row)));
+        return condition.every.every((item) => conditioned(item, row));
     if ('some' in condition)
-        return some(condition.some.map((item) => conditioned(item, row)));
-    return tested(condition.test, row.values[condition.field], row.sizes[condition.field], row.fields[condition.field]);
+        return condition.some.some((item) => conditioned(item, row));
+    return tested(condition.test, row.reached[condition.field]);
+}
+function narrowed(query, where, alias) {
+    return where === null ? query : query.fn.where((row) => conditioned(where, row[alias]));
 }
 function reached(reach, room, document) {
     return reach === null
@@ -62,7 +66,6 @@ function scoped(scope, row, rooms, reach) {
         ...reached(reach, row.room, row.key),
         ...(scope.types === null ? [] : [inArray(row.type, [...scope.types])]),
         ...(scope.pathPrefix === null ? [] : [inArray(scope.pathPrefix, row.directories)]),
-        ...(scope.where === null ? [] : [conditioned(scope.where, row)]),
     ]);
 }
 function keyed(key, row) {
@@ -77,16 +80,17 @@ function live(query) {
 function related(q, rows, scope, field, kept, reach) {
     const matched = kept === 'source' ? 'target' : 'source';
     const from = q.from({ r: rows });
-    return from
-        .where(({ r }) => every([eq(r.kind, 'reference'), ...(field === null ? [] : [eq(r.field, field)])]))
+    const joined = from
+        .where(({ r }) => every([eq(r.kind, 'reference'), ...(field === null ? [] : [inArray(field, r.forms)])]))
         .innerJoin({ m: rows }, ({ r, m }) => eq(r[matched], m.key))
-        .where(({ m }) => scoped(scope, m, null, reach))
+        .where(({ m }) => scoped(scope, m, null, reach));
+    return narrowed(joined, scope.where, 'm')
         .groupBy(({ r }) => r[kept])
         .select(({ r }) => ({ key: r[kept] }));
 }
 function filtered(q, rows, plan) {
     const from = q.from({ d: rows });
-    let query = from.where(({ d }) => scoped(plan.root, d, plan.rooms, plan.reach));
+    let query = narrowed(from.where(({ d }) => scoped(plan.root, d, plan.rooms, plan.reach)), plan.root.where, 'd');
     if (plan.hop !== null) {
         const hop = related(q, rows, plan.hop, plan.hop.field, 'source', plan.reach);
         query = query.innerJoin({ h: hop }, ({ d, h }) => eq(d.key, h.key));
@@ -117,8 +121,7 @@ function documents(q, rows, plan, shape) {
         room: d.room,
         path: d.path,
         type: d.type,
-        ...(shape.fields === 'all' ? { fields: d.fields } : {}),
-        ...(Array.isArray(shape.fields) ? named('field', shape.fields, d.fields) : {}),
+        ...(shape.fields === null ? {} : { fields: d.fields }),
         ...(shape.sections === 'all' ? { sections: b.sections } : {}),
         ...(Array.isArray(shape.sections) ? named('section', shape.sections, b.sections) : {}),
         ...(shape.preamble ? { preamble: b.preamble } : {}),
@@ -176,6 +179,55 @@ function part(row, prefix, names, whole) {
         return whole;
     return present(names.map((name, index) => [name, row[`${prefix}${index}`]]));
 }
+function masked(pointers) {
+    const root = { whole: false, members: new Map() };
+    for (const pointer of pointers) {
+        let mask = root;
+        for (const token of pointerSegments(pointer)) {
+            const next = mask.members.get(token) ?? { whole: false, members: new Map() };
+            mask.members.set(token, next);
+            mask = next;
+        }
+        mask.whole = true;
+    }
+    return root;
+}
+function merged(left, right) {
+    if (left === undefined)
+        return right;
+    const members = new Map(left.members);
+    for (const [token, mask] of right.members)
+        members.set(token, merged(members.get(token), mask));
+    return { whole: left.whole || right.whole, members };
+}
+function cut(value, mask) {
+    if (mask.whole)
+        return value;
+    if (Array.isArray(value)) {
+        const each = {
+            whole: false,
+            members: new Map([...mask.members].filter(([token]) => !ARRAY_INDEX.test(token))),
+        };
+        const kept = [];
+        value.forEach((item, index) => {
+            const part = cut(item, merged(mask.members.get(String(index)), each));
+            if (part !== undefined)
+                kept[index] = part;
+        });
+        return kept.length === 0 ? undefined : kept;
+    }
+    if (typeof value !== 'object' || value === null)
+        return undefined;
+    const kept = Object.entries(value).flatMap(([key, held]) => {
+        const member = mask.members.get(key);
+        const part = member === undefined ? undefined : cut(held, member);
+        return part === undefined ? [] : [[key, part]];
+    });
+    return kept.length === 0 ? undefined : Object.fromEntries(kept);
+}
+function selected(fields, pointers) {
+    return (cut(fields, masked(pointers)) ?? {});
+}
 function documentOf(row, shape) {
     if (row.type === null)
         return { room: row.room, path: row.path };
@@ -185,7 +237,11 @@ function documentOf(row, shape) {
         type: row.type,
         ...(shape.fields === null
             ? {}
-            : { fields: part(row, 'field', shape.fields, row.fields) }),
+            : {
+                fields: shape.fields === 'all'
+                    ? row.fields
+                    : selected(row.fields, shape.fields),
+            }),
         ...(shape.sections === null
             ? {}
             : {

package/dist/refresh.d.ts

@@ -1,6 +1,16 @@
 import type { Adapter, AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
+import type { Remodel } from './bootstrap.js';
 import { type ConfirmedLayer } from './replica.js';
+import type { ReplicaRecord } from './store.js';
 import { type Refused, type Unconfirmed } from './transfer.js';
+export type Advancement = {
+    kind: 'still-current';
+} | {
+    kind: 'advanced';
+    record: ReplicaRecord;
+} | {
+    kind: 'beyond-horizon';
+} | RetryableRefusal | Unconfirmed | AdapterFailure;
 export type RefreshOutcome = {
     kind: 'still-current';
 } | {
@@ -9,5 +19,6 @@ export type RefreshOutcome = {
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
-export declare function refreshRoom(adapter: Adapter, authorization: Authorization, confirmed: ConfirmedLayer, continuing: () => boolean, minPosition: string | undefined): Promise<RefreshOutcome>;
+export declare function advancement(adapter: Adapter, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean): Promise<Advancement>;
+export declare function refreshRoom(adapter: Adapter, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
 //# sourceMappingURL=refresh.d.ts.map

package/dist/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAGb,gBAAgB,EAEjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,OAAO,EACzB,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAAC,cAAc,CAAC,CA0EzB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAGb,gBAAgB,EAEjB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CA4EtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}

package/dist/refresh.js

@@ -1,23 +1,26 @@
 import { declaredAttachments } from './attachment.js';
 import { readStaged } from './replica.js';
 import { unconfirmed } from './transfer.js';
-export async function refreshRoom(adapter, authorization, confirmed, continuing, minPosition) {
-    const locator = confirmed.record.locator;
-    const fromRoomVersion = confirmed.record.roomVersion;
+export async function advancement(adapter, authorization, held, remodel, continuing) {
+    const locator = held.locator;
+    const fromRoomVersion = held.roomVersion;
     const first = await adapter.refresh(authorization, {
         locator,
-        selection: confirmed.record.replica.selection,
+        selection: held.replica.selection,
         fromRoomVersion,
-        ...(minPosition === undefined ? {} : { minPosition }),
     });
     if (first.kind !== 'net-advancement')
         return first;
     const roomVersion = first.roomVersion;
-    const documents = { ...confirmed.record.documents };
-    const revisions = { ...confirmed.record.revisions };
-    const changes = { ...confirmed.record.changes };
-    const written = { ...confirmed.record.written };
-    const binaryTargets = new Set(confirmed.record.binaryTargets);
+    const models = remodel(first.models, {
+        collection: held.model,
+        selection: held.selectionModel,
+    });
+    const documents = { ...held.documents };
+    const revisions = { ...held.revisions };
+    const changes = { ...held.changes };
+    const written = { ...held.written };
+    const binaryTargets = new Set(held.binaryTargets);
     const attachments = [];
     const stage = (page) => {
         if (page.attachments !== undefined)
@@ -52,9 +55,8 @@ export async function refreshRoom(adapter, authorization, confirmed, continuing,
             return unconfirmed;
         const page = await adapter.refresh(authorization, {
             locator,
-            selection: confirmed.record.replica.selection,
+            selection: held.replica.selection,
             fromRoomVersion,
-            ...(minPosition === undefined ? {} : { minPosition }),
             pageToken,
         });
         if (page.kind === 'still-current' || page.kind === 'beyond-horizon')
@@ -66,15 +68,26 @@ export async function refreshRoom(adapter, authorization, confirmed, continuing,
         stage(page);
         pageToken = page.pageToken;
     }
-    const staged = readStaged({
-        ...confirmed.record,
-        roomVersion,
-        documents,
-        binaryTargets: [...binaryTargets].sort(),
-        revisions,
-        changes,
-        written,
-        attachments: attachments.length === 0 ? confirmed.record.attachments : declaredAttachments(attachments),
-    }, confirmed);
+    return {
+        kind: 'advanced',
+        record: {
+            ...held,
+            model: models.collection,
+            selectionModel: models.selection,
+            roomVersion,
+            documents,
+            binaryTargets: [...binaryTargets].sort(),
+            revisions,
+            changes,
+            written,
+            attachments: attachments.length === 0 ? held.attachments : declaredAttachments(attachments),
+        },
+    };
+}
+export async function refreshRoom(adapter, authorization, confirmed, remodel, continuing) {
+    const advanced = await advancement(adapter, authorization, confirmed.record, remodel, continuing);
+    if (advanced.kind !== 'advanced')
+        return advanced;
+    const staged = readStaged(advanced.record, confirmed);
     return staged.kind === 'staged' ? { kind: 'advanced', confirmed: staged.confirmed } : staged;
 }

package/dist/replica.d.ts

@@ -1,7 +1,7 @@
 import { type ChangeBatch } from './change.js';
 import { type Collection, type Composition } from './collection.js';
 import { type Layer } from './overlay.js';
-import { type Rewriting } from './save.js';
+import type { HeadChange, RoomAttachment } from './adapter.js';
 import type { ReplicaRecord } from './store.js';
 import type { Refused } from './transfer.js';
 export type ConfirmedLayer = {
@@ -29,15 +29,15 @@ type ReplayStep = {
     collection?: Collection;
 };
 export declare function compositionOf(record: ReplicaRecord): Composition;
-export declare function readConfirmed(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
+export declare function confirmedOf(record: ReplicaRecord, previous?: ConfirmedLayer): ConfirmedLayer;
 export declare function sameMembership(record: ReplicaRecord, other: ReplicaRecord): boolean;
 export declare function readStaged(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
 export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Staged | {
     kind: 'deferred';
 };
-export declare function applyReturned(confirmed: ConfirmedLayer, documents: Readonly<Record<string, string>>, revisions: Readonly<Record<string, string>>, removals: readonly string[], roomVersion: string): Staged;
-export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], rewriting: Rewriting, previous?: Replica): Replica;
-export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer): boolean;
-export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, rewriting: Rewriting): readonly ChangeBatch[];
+export declare function applyReturned(confirmed: ConfirmedLayer, documents: Readonly<Record<string, string>>, revisions: Readonly<Record<string, string>>, changes: Readonly<Record<string, HeadChange>>, removals: readonly string[], attachments: readonly RoomAttachment[] | undefined, roomVersion: string, writtenAt: string): Staged;
+export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Replica;
+export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer, current?: Readonly<Record<string, string>>): boolean;
+export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): readonly ChangeBatch[];
 export {};
 //# sourceMappingURL=replica.d.ts.map

package/dist/replica.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AAC1F,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA0C,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAqB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAWtF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAkBnF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAM/B;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,MAAM,GAClB,MAAM,CA+BR;AAsDD,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CA4CT;AAkFD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAa7E;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,EAC7C,SAAS,EAAE,SAAS,GACnB,SAAS,WAAW,EAAE,CAoBxB"}
+{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"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"}

package/dist/replica.js

@@ -1,9 +1,9 @@
-import { parse } from '@agentshouse/mdmodel';
+import { equalValue, parse } from '@agentshouse/mdmodel';
 import { immutable } from './change.js';
-import { parseCollection, readCollection, validateCollection, } from './collection.js';
+import { collectionOf, unreadable, validateCollection, } from './collection.js';
 import { overlay, overlayChanged, sameLayerText } from './overlay.js';
 import { providerRewritten } from './save.js';
-import { equalValue } from './room-draft.js';
+import { declaredAttachments } from './attachment.js';
 export function compositionOf(record) {
     return {
         model: record.model,
@@ -12,52 +12,62 @@ export function compositionOf(record) {
             : { roots: record.typedSelection.roots, model: record.selectionModel },
     };
 }
-export function readConfirmed(record, previous) {
-    const read = readCollection(record.documents, compositionOf(record), previous === undefined
-        ? undefined
-        : { text: previous.record.documents, collection: previous.collection });
-    return read.kind === 'read'
-        ? { kind: 'staged', confirmed: { record, collection: read.collection } }
-        : read;
+export function confirmedOf(record, previous) {
+    return {
+        record,
+        collection: collectionOf(record.documents, compositionOf(record), previous?.collection),
+    };
 }
 export function sameMembership(record, other) {
     return (JSON.stringify(record.typedSelection?.roots ?? null) ===
         JSON.stringify(other.typedSelection?.roots ?? null));
 }
 export function readStaged(record, previous) {
-    if ((record.model.status === 'current' || record.selectionModel.status === 'current') &&
-        (previous === undefined ||
-            !sameLayerText(record, previous.record) ||
-            record.model !== previous.record.model ||
-            record.selectionModel !== previous.record.selectionModel)) {
+    const textChanged = previous === undefined || !sameLayerText(record, previous.record);
+    const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+    if (modeled &&
+        (textChanged ||
+            record.model !== previous?.record.model ||
+            record.selectionModel !== previous?.record.selectionModel)) {
         const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
         if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') {
             return { kind: 'refused', refusal: verdict };
         }
+        if (verdict.verdict === 'refuse') {
+            const refused = unreadable(record.documents, previous?.record.documents);
+            if (refused !== null)
+                return refused;
+        }
+    }
+    else if (textChanged) {
+        const refused = unreadable(record.documents, previous?.record.documents);
+        if (refused !== null)
+            return refused;
     }
-    return readConfirmed(record, previous);
+    return { kind: 'staged', confirmed: confirmedOf(record, previous) };
 }
 export function readReclassified(record, previous) {
     const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
     if (verdict.verdict !== 'refuse')
-        return readConfirmed(record, previous);
+        return { kind: 'staged', confirmed: confirmedOf(record, previous) };
     return verdict.rule === 'model-unavailable'
         ? { kind: 'deferred' }
         : { kind: 'refused', refusal: verdict };
 }
-export function applyReturned(confirmed, documents, revisions, removals, roomVersion) {
+export function applyReturned(confirmed, documents, revisions, changes, removals, attachments, roomVersion, writtenAt) {
     const nextDocuments = { ...confirmed.record.documents, ...documents };
     const nextRevisions = { ...confirmed.record.revisions, ...revisions };
     const nextChanges = { ...confirmed.record.changes };
     const nextWritten = {
         ...confirmed.record.written,
-        ...Object.fromEntries(Object.keys(documents).map((path) => [path, roomVersion])),
+        ...Object.fromEntries(Object.keys(documents).map((path) => [path, writtenAt])),
     };
     const binaryTargets = new Set(confirmed.record.binaryTargets);
     for (const [path, revision] of Object.entries(revisions)) {
         if (confirmed.record.revisions[path] !== revision)
             delete nextChanges[path];
     }
+    Object.assign(nextChanges, changes);
     for (const path of removals) {
         delete nextDocuments[path];
         delete nextRevisions[path];
@@ -73,6 +83,9 @@ export function applyReturned(confirmed, documents, revisions, removals, roomVer
         changes: nextChanges,
         written: nextWritten,
         binaryTargets: [...binaryTargets].sort(),
+        attachments: attachments === undefined
+            ? confirmed.record.attachments
+            : declaredAttachments([attachments]),
     }, confirmed);
 }
 function predicted(confirmed, batches, previous) {
@@ -93,9 +106,7 @@ function predicted(confirmed, batches, previous) {
         const collection = hasMove
             ? reuseRewrite
                 ? old.collection
-                : parseCollection(before.documents, composition, old?.collection === undefined
-                    ? { text: confirmed.record.documents, collection: confirmed.collection }
-                    : { text: old.before.documents, collection: old.collection })
+                : collectionOf(before.documents, composition, old?.collection ?? confirmed.collection)
             : undefined;
         const effective = collection === undefined
             ? batch
@@ -116,7 +127,7 @@ function predicted(confirmed, batches, previous) {
     }
     return { layer, replay };
 }
-export function replicaOf(confirmed, queue, rewriting, previous) {
+export function replicaOf(confirmed, queue, previous) {
     const batches = Object.freeze(queue.map(immutable));
     if (batches.length === 0) {
         return {
@@ -132,21 +143,14 @@ export function replicaOf(confirmed, queue, rewriting, previous) {
             replay: [],
         };
     }
-    const predictedState = rewriting === 'provider' ? predicted(confirmed, batches, previous) : null;
-    const layer = rewriting === 'provider'
-        ? predictedState.layer
-        : previous === undefined
-            ? overlay(confirmed.record, batches)
-            : overlayChanged(confirmed.record, batches, previous.confirmed.record, previous.queue, previous.visible);
+    const { layer, replay } = predicted(confirmed, batches, previous);
     return {
         confirmed,
         queue: batches,
-        replay: predictedState?.replay ?? [],
+        replay,
         visible: {
             ...layer,
-            collection: parseCollection(layer.documents, compositionOf(confirmed.record), previous === undefined
-                ? undefined
-                : { text: previous.visible.documents, collection: previous.visible.collection }),
+            collection: collectionOf(layer.documents, compositionOf(confirmed.record), previous?.visible.collection ?? confirmed.collection),
         },
     };
 }
@@ -172,6 +176,8 @@ function holds(layer, preconditions) {
         if (precondition.kind === 'revision') {
             return present(layer, path) && layer.revisions[path] === precondition.revision;
         }
+        if (precondition.kind === 'content')
+            return layer.documents[path] === precondition.content;
         const document = documentAt(path);
         if (document === null)
             return false;
@@ -230,8 +236,8 @@ function after(changes, index, path) {
     }
     return at;
 }
-export function landed(batch, confirmed) {
-    const layer = confirmed.record;
+export function landed(batch, confirmed, current = {}) {
+    const layer = { ...confirmed.record, documents: { ...confirmed.record.documents, ...current } };
     return batch.changes.every((change, index) => {
         if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
             const at = after(batch.changes, index, change.path);
@@ -245,7 +251,7 @@ export function landed(batch, confirmed) {
         });
     });
 }
-export function withdrawals(confirmed, queue, withdrawable, rewriting) {
+export function withdrawals(confirmed, queue, withdrawable, local) {
     if (!queue.some(withdrawable))
         return [];
     const composition = compositionOf(confirmed.record);
@@ -256,13 +262,21 @@ export function withdrawals(confirmed, queue, withdrawable, rewriting) {
             withdrawn.push(batch);
             continue;
         }
-        const effective = rewriting === 'provider' && batch.changes.some((change) => change.kind === 'move')
+        const effective = batch.changes.some((change) => change.kind === 'move')
             ? providerRewritten(batch, {
                 ...layer,
-                collection: parseCollection(layer.documents, composition),
+                collection: collectionOf(layer.documents, composition),
             })
             : batch;
-        layer = overlay(layer, [effective]);
+        let unapplied = false;
+        const next = overlay(layer, [effective], () => {
+            unapplied = true;
+        });
+        if (local && unapplied) {
+            withdrawn.push(batch);
+            continue;
+        }
+        layer = next;
     }
     return withdrawn;
 }