@agentshouse/mdruntime 0.1.0-ca9a5a0b81b98 → 0.1.0-ca9afacd5aebd

package/dist/reach.js

@@ -1,25 +1,26 @@
 import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
 import { applied, observing } from './observation.js';
+import { runtimeError } from './failure.js';
+import { failure, undeclared, } from './outcome.js';
 import { beneath } from './paths.js';
 import { reconciled } from './read-side.js';
-import { moveTarget, readParts } from './room-draft.js';
+import { moveTarget, readParts, staleWrite, } from './room-draft.js';
 import { documentKey } from './rows.js';
 const UNHELD_TYPES = { collection: modelTypes(NO_MODEL), typedSelection: null };
-const UNDECLARED = { kind: 'undeclared' };
-function undeclared() {
-    return Promise.resolve(UNDECLARED);
+function unconversed(name) {
+    return () => Promise.resolve(undeclared(name));
 }
 const NO_CONVERSATION = {
     list: () => Promise.resolve([]),
     read: (conversation) => Promise.resolve(unheldView(conversation)),
-    create: undeclared,
-    send: undeclared,
-    answer: undeclared,
-    interrupt: undeclared,
-    kill: undeclared,
-    cancel: undeclared,
-    delete: undeclared,
+    create: unconversed('conversation.create'),
+    send: unconversed('conversation.send'),
+    answer: unconversed('conversation.answer'),
+    interrupt: unconversed('conversation.interrupt'),
+    kill: unconversed('conversation.kill'),
+    cancel: unconversed('conversation.cancel'),
+    delete: unconversed('conversation.delete'),
 };
 const NO_CHAT_DRAFT = {
     write: () => Promise.resolve(),
@@ -51,6 +52,20 @@ function covers(reach, room, path) {
 function conversing(reach) {
     return reach === null || reach.conversations;
 }
+function refers(reach, scope) {
+    if (reach === null)
+        return true;
+    if (scope === null)
+        return false;
+    if (scope.kind === 'conversations')
+        return reach.conversations;
+    return scope.path === undefined
+        ? wholly(reach, scope.locator)
+        : covers(reach, scope.locator, scope.path);
+}
+function unreachedReference(fileRef) {
+    return { kind: 'absent', code: 'binary-file-absent', fields: { fileRef }, retryable: false };
+}
 export function planReach(reach) {
     return reach === null
         ? null
@@ -62,22 +77,7 @@ export function planReach(reach) {
         };
 }
 function roomsWithin(reach, rooms) {
-    if (reach === null)
-        return rooms;
-    return rooms
-        .filter((room) => holds(reach, room.locator))
-        .map((room) => {
-        if (wholly(reach, room.locator))
-            return room;
-        const governed = governs(reach, room);
-        return {
-            ...room,
-            model: governed.collection ? room.model : modelTypes(NO_MODEL),
-            typedSelection: governed.selection ? room.typedSelection : null,
-            roomVersion: null,
-            attachments: [],
-        };
-    });
+    return rooms.filter((room) => wholly(reach, room.locator));
 }
 function typesWithin(reach, room, types) {
     if (room === undefined)
@@ -103,7 +103,7 @@ function shownDraft(reach, draft) {
 function writeWithin(reach, write) {
     return write.outcome === 'written'
         ? { outcome: 'written', roomDraft: shownDraft(reach, write.roomDraft) }
-        : { outcome: 'stale', current: shownDraft(reach, write.current) };
+        : staleWrite(shownDraft(reach, write.current));
 }
 function savedWithin(reach, room, result) {
     if (reach === null || result.outcome === 'saved')
@@ -130,7 +130,7 @@ function queueWithin(reach, room, entries) {
         (change.kind !== 'move' || covers(reach, room, change.to))));
 }
 function unreached(room) {
-    return new Error(`No Local Replica for ${room}`);
+    return runtimeError('room-not-held', `No Local Replica for ${room}`);
 }
 export function narrowed(runtime, given) {
     const { md, watch } = runtime;
@@ -201,7 +201,7 @@ export function narrowed(runtime, given) {
                 return () => { };
             });
         }
-        if (topic === 'conversations') {
+        if (topic === 'conversations' || topic === 'agents') {
             return following(() => {
                 if (conversing(reach))
                     return watch(topic, input, deliver);
@@ -231,13 +231,22 @@ export function narrowed(runtime, given) {
                 throw unreached(room);
             const outside = roomDrafts.find(({ path }) => !covers(reach, room, path) ||
                 !moves(reach, room, md.roomDraft.read(room, path)?.parts.move));
-            if (outside !== undefined)
-                return { outcome: 'refused', rule: 'stale', file: outside.path };
+            if (outside !== undefined) {
+                return { outcome: 'refused', code: 'stale', retryable: false, file: outside.path };
+            }
             return savedWithin(reach, room, await md.save(room, roomDrafts, writtenBy));
         },
         history: (room, path, query) => covers(reach, room, path)
             ? md.history(room, path, query)
-            : Promise.resolve({ kind: 'room-not-readable', locator: room }),
+            : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
+        binaryFile: {
+            read: (room, path, revision) => covers(reach, room, path)
+                ? md.binaryFile.read(room, path, revision)
+                : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
+            readReference: (reference) => refers(reach, runtime.referrerScope(reference.referrer))
+                ? md.binaryFile.readReference(reference)
+                : Promise.resolve(unreachedReference(reference.fileRef)),
+        },
         reached: (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
             md.reached(room, roomVersion, path),
         log: () => (reach === null ? md.log() : ''),
@@ -252,7 +261,7 @@ export function narrowed(runtime, given) {
             },
             async discard(room, path, revision) {
                 if (!covers(reach, room, path))
-                    return { outcome: 'stale', current: null };
+                    return staleWrite(null);
                 return writeWithin(reach, await md.roomDraft.discard(room, path, revision));
             },
         },
@@ -268,7 +277,7 @@ export function narrowed(runtime, given) {
             delete: (id) => conversation().delete(id),
         },
         chatDraft: {
-            write: (id, draft) => chatDraft().write(id, draft),
+            write: (id, draft, revision) => chatDraft().write(id, draft, revision),
             discard: (id) => chatDraft().discard(id),
         },
         observe: observing(within),

package/dist/react.d.ts

@@ -1,31 +1,41 @@
 import type { MdRuntimeClient } from './client.js';
 import type { AppRoom, ConnectionRefusal, SaveResult } from './connection.js';
-import type { ServiceMode } from './adapter.js';
-import type { ConversationEntry, ConversationOptions, ConversationView } from './conversation.js';
+import type { Member, ServiceMode } from './adapter.js';
+import type { ConversationAgent, ConversationEntry, ConversationOptions, ConversationView } from './conversation.js';
+import { type RuntimeError } from './failure.js';
 import type { QueueEntry } from './outcome.js';
 import type { DocumentQuery, DocumentResult, GroupQuery, GroupResult } from './query.js';
 import type { RoomDraft, RoomDraftParts } from './room-draft.js';
 import type { SyncStatus } from './status.js';
 type Client = MdRuntimeClient | null;
-export declare function useObserve(client: Client, topic: 'deployment-facts'): unknown;
-export declare function useObserve(client: Client, topic: 'rooms'): readonly AppRoom[] | undefined;
-export declare function useObserve(client: Client, topic: 'connection-refusal'): ConnectionRefusal | null | undefined;
-export declare function useObserve(client: Client, topic: 'storage-loss'): string | null | undefined;
-export declare function useObserve(client: Client, topic: 'sync-status'): SyncStatus | undefined;
-export declare function useObserve(client: Client, topic: 'service-mode'): ServiceMode | undefined;
-export declare function useObserve(client: Client, topic: 'query', query: DocumentQuery): DocumentResult | undefined;
-export declare function useObserve(client: Client, topic: 'query', query: GroupQuery): GroupResult | undefined;
-export declare function useObserve(client: Client, topic: 'queue', locator: string): readonly QueueEntry[] | undefined;
-export declare function useObserve(client: Client, topic: 'room-drafts'): readonly RoomDraft[] | undefined;
-export declare function useObserve(client: Client, topic: 'presentation'): unknown;
-export declare function useObserve(client: Client, topic: 'conversation', conversation: string, options: ConversationOptions): ConversationView | undefined;
-export declare function useObserve(client: Client, topic: 'conversations'): readonly ConversationEntry[] | undefined;
+export type Observed<T> = {
+    readonly state: 'loading';
+} | {
+    readonly state: 'ready';
+    readonly value: T;
+};
+export declare function useObserve(client: Client, topic: 'deployment-facts'): Observed<unknown>;
+export declare function useObserve(client: Client, topic: 'rooms'): Observed<readonly AppRoom[]>;
+export declare function useObserve(client: Client, topic: 'connection-refusal'): Observed<ConnectionRefusal | null>;
+export declare function useObserve(client: Client, topic: 'storage-loss'): Observed<string | null>;
+export declare function useObserve(client: Client, topic: 'sync-status'): Observed<SyncStatus>;
+export declare function useObserve(client: Client, topic: 'service-mode'): Observed<ServiceMode>;
+export declare function useObserve(client: Client, topic: 'member'): Observed<Member | null>;
+export declare function useObserve(client: Client, topic: 'query', query: DocumentQuery): Observed<DocumentResult>;
+export declare function useObserve(client: Client, topic: 'query', query: GroupQuery): Observed<GroupResult>;
+export declare function useObserve(client: Client, topic: 'queue', locator: string): Observed<readonly QueueEntry[]>;
+export declare function useObserve(client: Client, topic: 'room-drafts'): Observed<readonly RoomDraft[]>;
+export declare function useObserve(client: Client, topic: 'presentation'): Observed<unknown>;
+export declare function useObserve(client: Client, topic: 'conversation', conversation: string, options: ConversationOptions): Observed<ConversationView>;
+export declare function useObserve(client: Client, topic: 'conversations'): Observed<readonly ConversationEntry[]>;
+export declare function useObserve(client: Client, topic: 'agents'): Observed<readonly ConversationAgent[]>;
 export type Saving = {
     readonly busy: boolean;
     readonly outcome: SaveResult | null;
-    readonly failure: Error | null;
+    readonly failure: RuntimeError | null;
     save(room: string, roomDrafts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;
 };
+export declare function saveRoomDrafts(client: MdRuntimeClient, room: string, roomDrafts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;
 export declare function useSave(client: MdRuntimeClient): Saving;
 export {};
 //# sourceMappingURL=react.d.ts.map

package/dist/react.d.ts.map

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

package/dist/react.js

@@ -1,10 +1,12 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+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;
-    useEffect(() => {
+    useLayoutEffect(() => {
         if (client === null)
             return;
         let live = true;
@@ -18,7 +20,7 @@ export function useObserve(client, topic, ...input) {
             observation = open;
             const take = (value) => {
                 if (live)
-                    setHeld({ client, key, value });
+                    setHeld({ client, key, observed: { state: 'ready', value } });
             };
             take(open.current());
             open.subscribe(take);
@@ -28,16 +30,16 @@ export function useObserve(client, topic, ...input) {
             observation?.close();
         };
     }, [client, key]);
-    return held !== null && held.client === client && held.key === key ? held.value : undefined;
+    return held !== null && held.client === client && held.key === key ? held.observed : LOADING;
 }
 const IDLE = { busy: false, outcome: null, failure: null };
-async function written(client, room, roomDrafts) {
+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 new Error(`the Room Draft at ${path} was not written`);
+            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 });
     }
@@ -48,12 +50,12 @@ export function useSave(client) {
     const save = useCallback(async (room, roomDrafts) => {
         setState({ busy: true, outcome: null, failure: null });
         try {
-            const outcome = await written(client, room, roomDrafts);
+            const outcome = await saveRoomDrafts(client, room, roomDrafts);
             setState({ busy: false, outcome, failure: null });
             return outcome;
         }
         catch (error) {
-            const failure = error instanceof Error ? error : new Error(String(error));
+            const failure = failed(error);
             setState({ busy: false, outcome: null, failure });
             throw failure;
         }

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":"AAsBA,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;AAuVF,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,8 @@ 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) : {}),
+        binary: d.binary,
+        ...(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,16 +180,75 @@ 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 };
+    if (row.type === null) {
+        const binary = row.binary;
+        return {
+            room: row.room,
+            path: row.path,
+            ...(binary === null ? {} : { binaryFile: binary }),
+        };
+    }
     return {
         room: row.room,
         path: row.path,
         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,7 +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';
 } | {
@@ -10,5 +19,6 @@ export type RefreshOutcome = {
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
+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,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CA8EzB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAGb,gBAAgB,EACjB,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,CAwEtB;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"}