@agentshouse/mdruntime 0.1.0-cbb8d8acc9d19 → 0.1.0-cc56db96f86ae

package/dist/reach.js

@@ -1,28 +1,33 @@
 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, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } 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';
+import { undeclaredSearch } from './search.js';
+import { after, stepped } from './turn.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'),
+    attach: unconversed('conversation.attach'),
+    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(),
+    prepend: () => Promise.resolve(),
     discard: () => Promise.resolve(),
 };
 export function holds(reach, room) {
@@ -51,6 +56,18 @@ 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;
+    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
@@ -74,7 +91,7 @@ function typesWithin(reach, room, types) {
     };
 }
 function moves(reach, room, move) {
-    return move === undefined || covers(reach, room, moveTarget(move));
+    return move === undefined || covers(reach, move.room ?? room, moveTarget(move));
 }
 function draftWithin(reach, draft) {
     return covers(reach, draft.room, draft.path) && moves(reach, draft.room, draft.parts.move);
@@ -88,7 +105,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')
@@ -107,58 +124,100 @@ function savedWithin(reach, room, result) {
 function statusWithin(reach, status) {
     return {
         ...status,
-        attentionRequired: status.attentionRequired.filter((entry) => covers(reach, entry.room, entry.path)),
+        attentionRequired: status.attentionRequired.filter((entry) => 'refusal' in entry ? wholly(reach, entry.room) : covers(reach, entry.room, entry.path)),
     };
 }
 function queueWithin(reach, room, entries) {
-    return entries.filter(({ batch }) => batch.changes.every((change) => covers(reach, room, change.path) &&
-        (change.kind !== 'move' || covers(reach, room, change.to))));
+    return entries
+        .filter(({ batch }) => batch.changes.every((change) => covers(reach, room, change.path) &&
+        (change.kind !== 'move' || covers(reach, room, change.to))))
+        .map((entry) => {
+        const { between, ...batch } = entry.batch;
+        if (between === undefined)
+            return entry;
+        return wholly(reach, between.source.room) && wholly(reach, between.destination.room)
+            ? entry
+            : { ...entry, batch };
+    });
 }
 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) {
+function lockedError(room) {
+    return runtimeError(ROOM_LOCKED, `${room} is locked until House confirms its access`, true);
+}
+export function narrowed(runtime, given, told) {
     const { md, watch } = runtime;
     let reach = given;
+    let port = told;
     const open = new Set();
-    function following(begin) {
+    function following(begin, locking = false) {
         let stop = begin();
         const restart = () => {
             stop();
             stop = begin();
         };
         open.add(restart);
+        const unwatch = locking ? runtime.watchLocks(restart) : () => { };
         return () => {
             open.delete(restart);
+            unwatch();
             stop();
         };
     }
+    const unlocking = (rooms) => {
+        const locked = (rooms ?? []).filter((room) => runtime.locked(room));
+        return locked.length === 0
+            ? null
+            : { pending: locked.map((room) => ({ room, awaits: 'unlock' })) };
+    };
+    const unlocked = (entries) => entries.filter((entry) => !runtime.locked(entry.room));
+    const intoLocked = (held) => held.some((move) => move?.room !== undefined && runtime.locked(move.room));
     const within = (topic, input, deliver) => {
         if (topic === 'rooms') {
             return following(() => watch(topic, input, (rooms) => deliver(roomsWithin(reach, rooms))));
         }
+        if (topic === 'readiness') {
+            return following(() => runtime.watchReadiness(port, reach, deliver));
+        }
         if (topic === 'sync-status') {
-            return following(() => watch(topic, input, (status) => deliver(statusWithin(reach, status))));
+            return following(() => watch(topic, input, (status) => {
+                const within = statusWithin(reach, status);
+                deliver({ ...within, attentionRequired: unlocked(within.attentionRequired) });
+            }), true);
         }
         if (topic === 'room-drafts') {
-            return following(() => watch(topic, input, (drafts) => deliver(draftsWithin(reach, drafts))));
+            return following(() => watch(topic, input, (drafts) => deliver(unlocked(draftsWithin(reach, drafts)))), true);
         }
         if (topic === 'queue') {
             const room = input[0];
             return following(() => {
-                if (!holds(reach, room)) {
+                if (!holds(reach, room) || runtime.locked(room)) {
                     deliver([]);
                     return () => { };
                 }
                 return watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)));
-            });
+            }, true);
         }
         if (topic === 'query') {
             const plan = runtime.plan(input[0], reach);
             let held = null;
             return following(() => {
+                const locked = unlocking(plan.rooms);
+                if (locked !== null) {
+                    const answer = { result: locked, keys: [] };
+                    const same = held !== null &&
+                        'pending' in held.result &&
+                        JSON.stringify(held.result) === JSON.stringify(locked);
+                    if (!same)
+                        deliver(answer);
+                    held = answer;
+                    return () => { };
+                }
                 let first = true;
-                return runtime.watchPlan({ ...plan, reach: planReach(reach) }, (message) => {
+                let open = true;
+                let order = undefined;
+                const heard = (message) => {
                     if (!first) {
                         held = applied(held, message);
                         deliver(message);
@@ -170,13 +229,30 @@ export function narrowed(runtime, given) {
                         deliver(message);
                         return;
                     }
-                    const next = reconciled(held, message);
-                    if (next === null)
-                        return;
-                    held = next.keyed;
-                    deliver(next.change);
+                    return after(stepped(reconciled(held, message)), (next) => {
+                        if (!open || next === null)
+                            return;
+                        held = next.keyed;
+                        deliver(next.message);
+                    });
+                };
+                const current = { ...plan, reach: planReach(reach), locked: runtime.lockedRooms() };
+                const stop = runtime.watchPlan(current, (message) => {
+                    const queued = after(order, () => (open ? heard(message) : undefined));
+                    if (queued instanceof Promise) {
+                        const ended = queued.catch(() => { });
+                        order = ended;
+                        void ended.then(() => {
+                            if (order === ended)
+                                order = undefined;
+                        });
+                    }
                 });
-            });
+                return () => {
+                    open = false;
+                    stop();
+                };
+            }, true);
         }
         if (topic === 'conversation') {
             return following(() => {
@@ -186,7 +262,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);
@@ -201,9 +277,16 @@ export function narrowed(runtime, given) {
     const view = {
         ...md,
         rooms: () => roomsWithin(reach, md.rooms()),
-        query: ((input) => runtime.query(runtime.plan(input, reach))),
-        search: (input) => runtime.search(input, reach),
+        query: ((input) => {
+            const plan = runtime.plan(input, reach);
+            return Promise.resolve(unlocking(plan.rooms) ?? runtime.query({ ...plan, locked: runtime.lockedRooms() }));
+        }),
+        search: (input) => port.search === 'required'
+            ? runtime.search(input, reach, runtime.lockedRooms())
+            : Promise.resolve(undeclaredSearch()),
         types(room) {
+            if (holds(reach, room) && runtime.locked(room))
+                throw lockedError(room);
             if (wholly(reach, room))
                 return md.types(room);
             if (!holds(reach, room))
@@ -214,30 +297,90 @@ export function narrowed(runtime, given) {
         async save(room, roomDrafts, writtenBy) {
             if (!holds(reach, room))
                 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 (runtime.locked(room))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
+            const held = roomDrafts.map(({ path }) => md.roomDraft.read(room, path)?.parts.move);
+            const outside = roomDrafts.find(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]));
+            if (outside !== undefined) {
+                return { outcome: 'refused', code: 'stale', retryable: false, file: outside.path };
+            }
+            if (intoLocked(held))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
             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 }),
+        async saveParts(room, parts, writtenBy) {
+            if (!holds(reach, room))
+                throw unreached(room);
+            if (runtime.locked(room))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
+            const held = parts.map(({ parts: one }) => readParts(one).move);
+            if (parts.some(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]))) {
+                throw unreached(room);
+            }
+            if (intoLocked(held))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
+            return savedWithin(reach, room, await md.saveParts(room, parts, writtenBy));
+        },
+        resolve(room, path, destination) {
+            const at = runtime.located(room, path, destination);
+            return at !== null && !covers(reach, at.room, at.path)
+                ? Promise.resolve(UNREADABLE)
+                : md.resolve(room, path, destination);
+        },
+        history: (room, path, query) => !covers(reach, room, path)
+            ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+            : runtime.locked(room)
+                ? Promise.resolve(lockedRoom(room))
+                : md.history(room, path, query),
+        binaryFile: {
+            read: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : md.binaryFile.read(room, path, revision),
+            link: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : md.binaryFile.link(room, path, revision),
+            readReference(reference) {
+                const scope = runtime.referrerScope(reference.referrer);
+                if (!refers(reach, scope))
+                    return Promise.resolve(unreachedReference(reference.fileRef));
+                if (scope !== null && runtime.locked(scope.locator)) {
+                    return Promise.resolve(lockedRoom(scope.locator));
+                }
+                return md.binaryFile.readReference(reference);
+            },
+        },
         reached: (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
+            !runtime.locked(room) &&
             md.reached(room, roomVersion, path),
         log: () => (reach === null ? md.log() : ''),
         roomDraft: {
-            list: () => md.roomDraft.list().then((drafts) => draftsWithin(reach, drafts)),
-            read: (room, path) => covers(reach, room, path) ? shownDraft(reach, md.roomDraft.read(room, path)) : null,
+            list: () => md.roomDraft.list().then((drafts) => unlocked(draftsWithin(reach, drafts))),
+            read(room, path) {
+                if (!covers(reach, room, path))
+                    return null;
+                if (runtime.locked(room))
+                    throw lockedError(room);
+                return shownDraft(reach, md.roomDraft.read(room, path));
+            },
             async write(room, path, revision, parts) {
-                if (!covers(reach, room, path) || !moves(reach, room, readParts(parts).move)) {
+                const move = readParts(parts).move;
+                if (!covers(reach, room, path) || !moves(reach, room, move))
                     throw unreached(room);
-                }
+                if (runtime.locked(room))
+                    throw lockedError(room);
+                if (intoLocked([move]))
+                    throw lockedError(move.room);
                 return writeWithin(reach, await md.roomDraft.write(room, path, revision, parts));
             },
             async discard(room, path, revision) {
                 if (!covers(reach, room, path))
-                    return { outcome: 'stale', current: null };
+                    return staleWrite(null);
+                if (runtime.locked(room))
+                    throw lockedError(room);
                 return writeWithin(reach, await md.roomDraft.discard(room, path, revision));
             },
         },
@@ -245,7 +388,12 @@ export function narrowed(runtime, given) {
             list: () => conversation().list(),
             read: (id, options) => conversation().read(id, options),
             create: (input) => conversation().create(input),
-            send: (id) => conversation().send(id),
+            send: (id, operation, draft) => conversation().send(id, operation, draft),
+            attach: (room, file) => !wholly(reach, room)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : conversation().attach(room, file),
             answer: (id, answer) => conversation().answer(id, answer),
             interrupt: (id) => conversation().interrupt(id),
             kill: (id) => conversation().kill(id),
@@ -253,7 +401,8 @@ 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),
+            prepend: (id, draft) => chatDraft().prepend(id, draft),
             discard: (id) => chatDraft().discard(id),
         },
         observe: observing(within),
@@ -266,5 +415,10 @@ export function narrowed(runtime, given) {
             for (const restart of [...open])
                 restart();
         },
+        facts(next) {
+            port = next;
+            for (const restart of [...open])
+                restart();
+        },
     };
 }

package/dist/react.d.ts

@@ -1,32 +1,43 @@
 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 { AppRoom, ConnectionRefusal, SavedRoomDraft, SaveResult } from './connection.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 { DocumentQuery, DocumentResult, GroupQuery, GroupResult, PendingResult } from './query.js';
+import type { Readiness } from './readiness.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: 'readiness'): Observed<Readiness>;
+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 | PendingResult>;
+export declare function useObserve(client: Client, topic: 'query', query: GroupQuery): Observed<GroupResult | PendingResult>;
+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;
-    save(room: string, roomDrafts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;
+    readonly failure: RuntimeError | null;
+    save(room: string, parts: ReadonlyMap<string, RoomDraftParts>): Promise<SaveResult>;
+    saveWritten(room: string, roomDrafts: readonly SavedRoomDraft[]): 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":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAkB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAElG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,KAAK,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAIrC,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC;AAC/E,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,GAAG,SAAS,CAAC;AAC3F,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,oBAAoB,GAC1B,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;AACxC,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAC7F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AACzF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,WAAW,GAAG,SAAS,CAAC;AAC3F,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,aAAa,GACnB,cAAc,GAAG,SAAS,CAAC;AAC9B,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,UAAU,GAChB,WAAW,GAAG,SAAS,CAAC;AAC3B,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,GACd,SAAS,UAAU,EAAE,GAAG,SAAS,CAAC;AACrC,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,SAAS,SAAS,EAAE,GAAG,SAAS,CAAC;AACnG,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC;AAC3E,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,cAAc,EACrB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAC3B,gBAAgB,GAAG,SAAS,CAAC;AAChC,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,GACrB,SAAS,iBAAiB,EAAE,GAAG,SAAS,CAAC;AAkC5C,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1F,CAAC;AAMF,wBAAsB,cAAc,CAClC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,GAC9C,OAAO,CAAC,UAAU,CAAC,CAWrB;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CAkBvD"}
+{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../src/react.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,UAAU,EACV,WAAW,EACX,aAAa,EACd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,KAAK,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAErC,MAAM,MAAM,QAAQ,CAAC,CAAC,IAClB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC;AAUnD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC;AACzF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;AACpF,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,oBAAoB,GAC1B,QAAQ,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;AACtC,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAC3F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;AACvF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;AACzF,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AACrF,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,aAAa,GACnB,QAAQ,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;AAC5C,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,UAAU,GAChB,QAAQ,CAAC,WAAW,GAAG,aAAa,CAAC,CAAC;AACzC,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,MAAM,GACd,QAAQ,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;AACnC,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;AACjG,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AACrF,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,cAAc,EACrB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,GAC3B,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAC9B,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,GACrB,QAAQ,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAAC;AAC1C,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,QAAQ,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAAC;AAsCpG,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACpF,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,cAAc,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACvF,CAAC;AAMF,wBAAgB,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,CA8BvD"}

package/dist/react.js

@@ -1,10 +1,12 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
+import { failed } 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,35 +30,25 @@ 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 };
-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`);
-        }
-        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) => {
+    const settled = useCallback(async (saving) => {
         setState({ busy: true, outcome: null, failure: null });
         try {
-            const outcome = await saveRoomDrafts(client, room, roomDrafts);
+            const outcome = await saving();
             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;
         }
-    }, [client]);
-    return { ...state, save };
+    }, []);
+    const save = useCallback((room, parts) => settled(() => client.saveParts(room, [...parts].map(([path, one]) => ({ path, parts: one })))), [client, settled]);
+    const saveWritten = useCallback((room, roomDrafts) => settled(() => client.save(room, roomDrafts)), [client, settled]);
+    return { ...state, save, saveWritten };
 }

package/dist/read-side.d.ts

@@ -1,18 +1,27 @@
 import type { ChangeSet } from './change-set.js';
-import { type KeyedResult, type QueryChange } from './observation.js';
-import type { Plan, QueryResult } from './query.js';
+import { type KeyedResult, type QueryMessage } from './observation.js';
+import type { PendingResult, Plan, QueryCoverage, QueryRows } from './query.js';
+import { type Later } from './turn.js';
 import type { SearchedDocument } from './search.js';
+export type Cover = {
+    coverage: QueryCoverage;
+} | PendingResult;
 export type ReadSide = {
-    apply(set: ChangeSet): void;
-    query(plan: Plan): Promise<QueryResult>;
-    watch(plan: Plan, identity: string, deliver: (message: KeyedResult | QueryChange) => void): () => void;
-    documents(): readonly SearchedDocument[];
+    apply(set: Later<ChangeSet>, next?: (set: ChangeSet) => void): Later<void>;
+    recover(): void;
+    settled(): Promise<void>;
+    query<T>(plan: Plan, at: () => T): Promise<{
+        rows: QueryRows;
+        at: T;
+    }>;
+    watch(plan: Plan, identity: string, cover: () => Cover, deliver: (message: QueryMessage) => void): () => void;
+    room(room: string): Iterable<string>;
     document(room: string, path: string): SearchedDocument | null;
     close(): void;
 };
-export declare function reconciled(previous: KeyedResult, next: KeyedResult): {
+export declare function reconciled(previous: KeyedResult, next: KeyedResult): Generator<number, {
     keyed: KeyedResult;
-    change: QueryChange;
-} | null;
+    message: QueryMessage;
+} | null, void>;
 export declare function createReadSide(): ReadSide;
 //# sourceMappingURL=read-side.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"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,EAEL,KAAK,WAAW,EAEhB,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAOV,aAAa,EACb,IAAI,EAEJ,aAAa,EAIb,SAAS,EAIV,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAuC,KAAK,KAAK,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAwDpD,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,GAAG,aAAa,CAAC;AA6ChE,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3E,OAAO,IAAI,IAAI,CAAC;IAChB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,EAAE,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IACvE,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,KAAK,EAClB,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,GACvC,MAAM,IAAI,CAAC;IACd,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC9D,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAomBF,wBAAiB,UAAU,CACzB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,WAAW,GAChB,SAAS,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,EAAE,IAAI,CAAC,CAqC/E;AAmDD,wBAAgB,cAAc,IAAI,QAAQ,CA+mBzC"}