@agentshouse/mdruntime 0.1.0-c2e8a6f99866d → 0.1.0-c2ef9303a058d

package/dist/reach.js

@@ -2,11 +2,10 @@ import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
 import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
 import { runtimeError } from './failure.js';
-import { absentReference, failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
+import { failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
 import { beneath } from './paths.js';
 import { moveTarget, readParts, staleWrite, } from './room-draft.js';
 import { documentKey } from './rows.js';
-import { undeclaredSearch } from './search.js';
 const UNHELD_TYPES = { collection: modelTypes(NO_MODEL), typedSelection: null };
 function unconversed(name) {
     return () => Promise.resolve(undeclared(name));
@@ -14,20 +13,26 @@ function unconversed(name) {
 const NO_CONVERSATION = {
     list: () => Promise.resolve([]),
     read: (conversation) => Promise.resolve(unheldView(conversation)),
-    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'),
+    create: unconversed('conversations/create'),
+    send: unconversed('conversations/send'),
+    answer: unconversed('conversations/interaction/answer'),
+    interrupt: unconversed('conversations/interrupt'),
+    kill: unconversed('conversations/kill'),
+    delete: unconversed('conversations/delete'),
 };
 const NO_CHAT_DRAFT = {
     write: () => Promise.resolve(),
     prepend: () => Promise.resolve(),
     discard: () => Promise.resolve(),
 };
+function areasOf(reach) {
+    return reach.areas ?? [];
+}
+function fenced(reach, room, path) {
+    return areasOf(reach).some((area) => area.room === room &&
+        beneath(area.path, path) &&
+        !area.open.some((open) => beneath(open, path)));
+}
 export function holds(reach, room) {
     return (reach === null ||
         reach.rooms.includes(room) ||
@@ -48,21 +53,13 @@ export function governs(reach, room) {
 }
 function covers(reach, room, path) {
     return (reach === null ||
-        reach.rooms.includes(room) ||
-        reach.documents.some((document) => document.room === room && document.path === path));
+        (!fenced(reach, room, path) &&
+            (reach.rooms.includes(room) ||
+                reach.documents.some((document) => document.room === room && document.path === 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);
-}
 export function planReach(reach) {
     return reach === null
         ? null
@@ -71,6 +68,9 @@ export function planReach(reach) {
             documents: [
                 ...new Set(reach.documents.map(({ room, path }) => documentKey(room, path))),
             ].sort(),
+            areas: areasOf(reach)
+                .map(({ room, path, open }) => ({ room, path, open: [...new Set(open)].sort() }))
+                .sort((left, right) => documentKey(left.room, left.path) < documentKey(right.room, right.path) ? -1 : 1),
         };
 }
 function roomsWithin(reach, rooms) {
@@ -119,7 +119,8 @@ function savedWithin(reach, room, result) {
 function statusWithin(reach, status) {
     return {
         ...status,
-        attentionRequired: status.attentionRequired.filter((entry) => 'refusal' in entry ? wholly(reach, entry.room) : covers(reach, entry.room, entry.path)),
+        attentionRequired: status.attentionRequired.filter((entry) => covers(reach, entry.room, entry.path)),
+        unsent: status.unsent.filter((change) => covers(reach, change.room, change.path)),
     };
 }
 function queueWithin(reach, room, entries) {
@@ -136,18 +137,24 @@ function queueWithin(reach, room, entries) {
     });
 }
 function unreached(room) {
-    return runtimeError('room-not-held', `No Local Replica for ${room}`);
+    return runtimeError('unknown-room', `Unknown Room ${room}`);
 }
 function lockedError(room) {
     return runtimeError(ROOM_LOCKED, `${room} is locked until House confirms its access`, true);
 }
 function deviceUnreached() {
-    return runtimeError('device-unreached', 'Only the panel cleans up this device');
+    return runtimeError('device-unreached', 'Only the panel reaches this device');
 }
-export function narrowed(runtime, given, told) {
+const ATTACH_REQUIRED = 'attach-required';
+function attachRequired() {
+    return runtimeError(ATTACH_REQUIRED, 'App code takes a file in with binaryFile.attach');
+}
+function carriesFile(parts) {
+    return parts !== null && typeof parts === 'object' && Object.hasOwn(parts, 'file');
+}
+export function narrowed(runtime, given, port) {
     const { md, watch } = runtime;
     let reach = given;
-    let port = told;
     const open = new Set();
     function following(begin, locking = false) {
         let stop = begin();
@@ -171,9 +178,9 @@ export function narrowed(runtime, given, told) {
     };
     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) => {
+    const within = (topic, input, deliver, fail) => {
         if (topic === 'rooms') {
-            return following(() => watch(topic, input, (rooms) => deliver(roomsWithin(reach, rooms))));
+            return following(() => watch(topic, input, (rooms) => deliver(roomsWithin(reach, rooms)), fail));
         }
         if (topic === 'readiness') {
             return following(() => runtime.watchReadiness(port, reach, deliver));
@@ -182,10 +189,10 @@ export function narrowed(runtime, given, told) {
             return following(() => watch(topic, input, (status) => {
                 const within = statusWithin(reach, status);
                 deliver({ ...within, attentionRequired: unlocked(within.attentionRequired) });
-            }), true);
+            }, fail), true);
         }
         if (topic === 'room-drafts') {
-            return following(() => watch(topic, input, (drafts) => deliver(unlocked(draftsWithin(reach, drafts)))), true);
+            return following(() => watch(topic, input, (drafts) => deliver(unlocked(draftsWithin(reach, drafts))), fail), true);
         }
         if (topic === 'queue') {
             const room = input[0];
@@ -194,7 +201,7 @@ export function narrowed(runtime, given, told) {
                     deliver([]);
                     return () => { };
                 }
-                return watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)));
+                return watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)), fail);
             }, true);
         }
         if (topic === 'query') {
@@ -227,6 +234,9 @@ export function narrowed(runtime, given, told) {
                 const stop = runtime.watchPlan(current, (message) => {
                     if (open)
                         heard(message);
+                }, (error) => {
+                    if (open)
+                        fail(error);
                 });
                 return () => {
                     open = false;
@@ -237,7 +247,7 @@ export function narrowed(runtime, given, told) {
         if (topic === 'conversation') {
             return following(() => {
                 if (conversing(reach))
-                    return watch(topic, input, deliver);
+                    return watch(topic, input, deliver, fail);
                 deliver(unheldView(input[0]));
                 return () => { };
             });
@@ -245,16 +255,16 @@ export function narrowed(runtime, given, told) {
         if (topic === 'conversations' || topic === 'agents') {
             return following(() => {
                 if (conversing(reach))
-                    return watch(topic, input, deliver);
+                    return watch(topic, input, deliver, fail);
                 deliver([]);
                 return () => { };
             });
         }
-        return watch(topic, input, deliver);
+        return watch(topic, input, deliver, fail);
     };
     const files = new Map();
     let handed = 0;
-    const hand = async (reading) => {
+    async function hand(reading) {
         const answer = await reading;
         if (answer.kind !== 'binary')
             return answer;
@@ -262,19 +272,17 @@ export function narrowed(runtime, given, told) {
         const file = String(handed);
         files.set(file, answer.file);
         return { ...answer, file };
-    };
+    }
     const conversation = () => (conversing(reach) ? md.conversation : NO_CONVERSATION);
     const chatDraft = () => (conversing(reach) ? md.chatDraft : NO_CHAT_DRAFT);
     const view = {
         ...md,
-        rooms: () => roomsWithin(reach, md.rooms()),
+        rooms: () => md.rooms().then((rooms) => roomsWithin(reach, rooms)),
         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()),
+        search: (input) => runtime.search(input, reach),
         types(room) {
             if (holds(reach, room) && runtime.locked(room))
                 throw lockedError(room);
@@ -282,8 +290,7 @@ export function narrowed(runtime, given, told) {
                 return md.types(room);
             if (!holds(reach, room))
                 return structuredClone(UNHELD_TYPES);
-            const listed = md.rooms().find(({ locator }) => locator === room);
-            return typesWithin(reach, listed, md.types(room));
+            return typesWithin(reach, runtime.room(room), md.types(room));
         },
         async save(room, roomDrafts, writtenBy) {
             if (!holds(reach, room))
@@ -302,9 +309,13 @@ export function narrowed(runtime, given, told) {
         async saveParts(room, parts, writtenBy) {
             if (!holds(reach, room))
                 throw unreached(room);
+            const filed = reach === null ? undefined : parts.find(({ parts: one }) => carriesFile(one));
+            if (filed !== undefined) {
+                return { outcome: 'refused', code: ATTACH_REQUIRED, retryable: false, file: filed.path };
+            }
             if (runtime.locked(room))
                 return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
-            const held = parts.map(({ parts: one }) => readParts(one).move);
+            const held = parts.map(({ path, parts: one }) => readParts(one, path).move);
             if (parts.some(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]))) {
                 throw unreached(room);
             }
@@ -334,15 +345,16 @@ export function narrowed(runtime, given, told) {
                 : 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(absentReference(reference.fileRef));
-                if (scope !== null && runtime.locked(scope.locator)) {
-                    return Promise.resolve(lockedRoom(scope.locator));
-                }
-                return hand(md.binaryFile.readReference(reference));
-            },
+            show: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : hand(md.binaryFile.show(room, path, revision)),
+            attach: (room, file) => !wholly(reach, room)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : md.binaryFile.attach(room, file),
             async part(file, part) {
                 const key = files.get(file);
                 if (key === undefined)
@@ -358,6 +370,8 @@ export function narrowed(runtime, given, told) {
             (await md.reached(room, roomVersion, path)),
         log: () => (reach === null ? md.log() : ''),
         cleanUp: () => (reach === null ? md.cleanUp() : Promise.reject(deviceUnreached())),
+        unsent: () => (reach === null ? md.unsent() : Promise.reject(deviceUnreached())),
+        reset: () => (reach === null ? md.reset() : Promise.reject(deviceUnreached())),
         roomDraft: {
             list: () => md.roomDraft.list().then((drafts) => unlocked(draftsWithin(reach, drafts))),
             async read(room, path) {
@@ -367,15 +381,24 @@ export function narrowed(runtime, given, told) {
                     throw lockedError(room);
                 return shownDraft(reach, await md.roomDraft.read(room, path));
             },
-            async write(room, path, revision, parts) {
-                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));
+            write(room, path, revision, parts, next) {
+                try {
+                    if (reach !== null && carriesFile(parts))
+                        throw attachRequired();
+                    const move = readParts(parts, path).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);
+                }
+                catch (error) {
+                    return Promise.reject(error);
+                }
+                return md.roomDraft
+                    .write(room, path, revision, parts, next)
+                    .then((written) => writeWithin(reach, written));
             },
             async discard(room, path, revision) {
                 if (!covers(reach, room, path))
@@ -390,15 +413,9 @@ export function narrowed(runtime, given, told) {
             read: (id, options) => conversation().read(id, options),
             create: (input) => conversation().create(input),
             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),
-            cancel: (id, turn) => conversation().cancel(id, turn),
             delete: (id) => conversation().delete(id),
         },
         chatDraft: {
@@ -416,10 +433,5 @@ export function narrowed(runtime, given, told) {
             for (const restart of [...open])
                 restart();
         },
-        facts(next) {
-            port = next;
-            for (const restart of [...open])
-                restart();
-        },
     };
 }

package/dist/react.d.ts

@@ -1,10 +1,11 @@
+import type { DocumentQuery, GroupQuery } from '@agentshouse/mdmodel';
 import type { MdRuntimeClient } from './client.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, PendingResult } from './query.js';
+import type { DocumentResult, 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';
@@ -23,6 +24,7 @@ export declare function useObserve(client: Client, topic: 'storage-loss'): Obser
 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: 'authority-changes'): Observed<number>;
 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[]>;

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/readiness.d.ts

@@ -1,35 +1,33 @@
 import type { Open } from './open.js';
 export type CodeAvailability = Open<'stored' | 'absent'>;
-export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | 'indexing' | 'refused' | 'unadmitted'>;
+export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | 'unadmitted'>;
 export type RoomCoverage = {
     readonly room: string;
     readonly state: RoomPreparation;
 };
-export type ConversationCoverage = Open<'complete' | 'acquiring' | 'indexing' | 'undeclared'>;
-export type SearchObligation = Open<'required' | 'unused'>;
+export type ConversationCoverage = Open<'complete' | 'acquiring' | 'undeclared'>;
 export type TargetCoverage = {
     readonly complete: boolean;
     readonly listed: boolean;
     readonly rooms: readonly RoomCoverage[];
     readonly conversations: ConversationCoverage;
-    readonly search: SearchObligation;
 };
 export type Persistence = Open<'granted' | 'denied' | 'unavailable'>;
 export type Durability = Open<'persistent' | 'best-effort'>;
 export type ConnectionAvailability = Open<'connected' | 'connecting' | 'unreachable'>;
 export type HouseOutcome = Open<'open' | 'write-halted' | 'refused'>;
-export type CapacityCause = {
-    readonly cause: Open<'insufficient-space' | 'storage-exceeded'>;
-    readonly needed: number | null;
-    readonly available: number | null;
+export type Space = Open<'full'>;
+export type InstallationStep = Open<'downloading' | 'writing' | 'replaying'>;
+export type InstallationAmount = {
+    readonly done: number;
+    readonly total: number;
 };
-export type RefusedRoom = {
-    readonly room: string;
-    readonly file: string;
-    readonly rule: string;
-    readonly location: string | null;
+export type Installation = {
+    readonly step: InstallationStep | null;
+    readonly rooms: InstallationAmount;
+    readonly bytes: InstallationAmount;
 };
-export type ReadinessStatus = Open<'preparing' | 'paused' | 'refused' | 'ready' | 'lost'>;
+export type ReadinessStatus = Open<'preparing' | 'paused' | 'ready' | 'lost'>;
 export type Readiness = {
     readonly status: ReadinessStatus;
     readonly ready: boolean;
@@ -40,14 +38,13 @@ export type Readiness = {
     readonly persistence: Persistence;
     readonly connection: ConnectionAvailability;
     readonly house: HouseOutcome;
-    readonly capacity: CapacityCause | null;
-    readonly refused: readonly RefusedRoom[];
+    readonly space: Space | null;
+    readonly installation: Installation;
     readonly lost: boolean;
 };
 export type ReadinessFacts = Omit<Readiness, 'status' | 'ready' | 'usable' | 'durability' | 'coverage'> & {
     readonly coverage: Omit<TargetCoverage, 'complete'>;
     readonly established: boolean;
 };
-export declare const SETTLED_ROOMS: ReadonlySet<string>;
 export declare function readinessOf(facts: ReadinessFacts): Readiness;
 //# sourceMappingURL=readiness.d.ts.map

package/dist/readiness.d.ts.map

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

package/dist/readiness.js

@@ -1,27 +1,21 @@
 const COMPLETE_ROOMS = new Set(['complete', 'unadmitted']);
-export const SETTLED_ROOMS = new Set([...COMPLETE_ROOMS, 'refused']);
 export function readinessOf(facts) {
     const { established, coverage: held, ...reported } = facts;
     const settledConversations = held.conversations === 'complete' || held.conversations === 'undeclared';
     const complete = held.listed &&
         settledConversations &&
         held.rooms.every((room) => COMPLETE_ROOMS.has(room.state));
-    const settled = held.listed &&
-        settledConversations &&
-        held.rooms.every((room) => SETTLED_ROOMS.has(room.state));
     const coverage = { ...held, complete };
     const stored = facts.code === 'stored';
     const ready = stored && complete;
     const usable = stored && (ready || established);
     const status = ready
         ? 'ready'
-        : facts.capacity !== null
+        : facts.space !== null
             ? 'paused'
             : facts.lost && !established
                 ? 'lost'
-                : settled && !complete
-                    ? 'refused'
-                    : 'preparing';
+                : 'preparing';
     return {
         ...reported,
         coverage,

package/dist/recovery.d.ts

@@ -21,5 +21,6 @@ export type Recovery = {
     retire(): Promise<void>;
 };
 export declare function retryDelay(tries: number, firstMs?: number, maxMs?: number): number;
+export declare function untilAnswered<T>(ask: () => Promise<T>, signal: AbortSignal, answered?: (answer: T) => boolean): Promise<T>;
 export declare function createRecovery(options?: RecoveryOptions): Recovery;
 //# sourceMappingURL=recovery.d.ts.map

package/dist/recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,KAAK,SAAS,GAAG,MAAM,CAGpF;AAwKD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,KAAK,SAAS,GAAG,MAAM,CAGpF;AAED,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACrB,MAAM,EAAE,WAAW,EACnB,QAAQ,GAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAoB,GAC5C,OAAO,CAAC,CAAC,CAAC,CAsBZ;AAwKD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}

package/dist/recovery.js

@@ -7,6 +7,32 @@ export function retryDelay(tries, firstMs = FIRST_MS, maxMs = MAX_MS) {
     const longest = Math.min(maxMs, firstMs * 2 ** tries);
     return longest / 2 + (Math.random() * longest) / 2;
 }
+export async function untilAnswered(ask, signal, answered = () => true) {
+    for (let tries = 0;; tries += 1) {
+        try {
+            const answer = await ask();
+            if (answered(answer) || signal.aborted)
+                return answer;
+        }
+        catch (error) {
+            if (signal.aborted)
+                throw error;
+        }
+        await new Promise((resume) => {
+            const stop = () => {
+                clearTimeout(again);
+                resume();
+            };
+            // A read that failed is asked again on the doubling backoff, so its asker is answered once the failure clears.
+            const again = setTimeout(() => {
+                signal.removeEventListener('abort', stop);
+                resume();
+            }, retryDelay(tries));
+            signal.addEventListener('abort', stop, { once: true });
+        });
+        signal.throwIfAborted();
+    }
+}
 function owner(backoff, inFlight, release = () => { }) {
     const intents = new Map();
     const children = new Set();

package/dist/refresh.d.ts

@@ -1,8 +1,8 @@
-import type { AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
-import type { Reads, Remodel } from './bootstrap.js';
+import type { AdapterFailure, Authorization, RefreshPage, RefreshRequest, RefreshResult, RetryableRefusal } from './adapter.js';
+import type { Remodel } from './bootstrap.js';
 import type { ReplicaRecord } from './replica.js';
 import type { RefreshedPage } from './store.js';
-import type { HeldEntry } from './tables.js';
+import type { HeldEntry, StoredEntry } from './tables.js';
 import { type Unconfirmed } from './transfer.js';
 export type Advancement = {
     kind: 'still-current';
@@ -13,9 +13,15 @@ export type Advancement = {
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | AdapterFailure;
+export type Refresher = (authorization: Authorization, request: RefreshRequest) => Promise<RefreshResult>;
 export type Refreshing = {
+    turn(): void;
     prior(paths: readonly string[]): Promise<ReadonlyMap<string, HeldEntry>>;
+    later(paths: readonly string[], roomVersion: string): Promise<ReadonlySet<string>>;
     stage(page: RefreshedPage): Promise<boolean>;
 };
-export declare function advancement(adapter: Reads, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean, staging: Refreshing): Promise<Advancement>;
+type PageContent = Pick<RefreshPage, 'documents' | 'facts' | 'revisions' | 'fileIds' | 'changes' | 'binaryFiles'>;
+export declare function pageEntries(page: PageContent, removals: readonly string[], roomVersion: string, prior: (paths: readonly string[]) => Promise<ReadonlyMap<string, HeldEntry>>): Promise<StoredEntry[]>;
+export declare function advancement(refresh: Refresher, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean, staging: Refreshing): Promise<Advancement>;
+export {};
 //# 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,EAAE,cAAc,EAAE,aAAa,EAAe,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AAkEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,WAAW,CAAC,CA+CtB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,WAAW,EACX,cAAc,EACd,aAAa,EACb,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAG9D,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,MAAM,MAAM,SAAS,GAAG,CACtB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,IAAI,IAAI,CAAC;IACb,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnF,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C,CAAC;AASF,KAAK,WAAW,GAAG,IAAI,CACrB,WAAW,EACX,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,CAC5E,CAAC;AAqFF,wBAAsB,WAAW,CAC/B,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,GAC3E,OAAO,CAAC,WAAW,EAAE,CAAC,CAKxB;AA+CD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,WAAW,CAAC,CA8CtB"}