@agentshouse/mdruntime 0.1.0-cee9c8aa4cd86 → 0.1.0-cefbc8bb8a1c0

package/dist/reach.js

@@ -2,7 +2,7 @@ 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';
@@ -16,7 +16,6 @@ const NO_CONVERSATION = {
     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'),
@@ -28,10 +27,20 @@ const NO_CHAT_DRAFT = {
     prepend: () => Promise.resolve(),
     discard: () => Promise.resolve(),
 };
+function areasOf(reach) {
+    return reach.areas ?? [];
+}
+function typedAreas(reach, room) {
+    return areasOf(reach).filter((area) => area.room === room && area.types.length > 0);
+}
+function fenced(reach, room, path) {
+    return areasOf(reach).some((area) => area.room === room && beneath(area.path, path));
+}
 export function holds(reach, room) {
     return (reach === null ||
         reach.rooms.includes(room) ||
-        reach.documents.some((document) => document.room === room));
+        reach.documents.some((document) => document.room === room) ||
+        typedAreas(reach, room).length > 0);
 }
 function wholly(reach, room) {
     return reach === null || reach.rooms.includes(room);
@@ -41,28 +50,23 @@ export function governs(reach, room) {
         return { collection: true, selection: room.typedSelection !== null };
     }
     const selected = (path) => room.typedSelection?.roots.some((root) => beneath(root, path)) ?? false;
-    const paths = reach.documents
-        .filter((document) => document.room === room.locator)
-        .map(({ path }) => path);
+    const paths = [
+        ...reach.documents
+            .filter((document) => document.room === room.locator)
+            .map(({ path }) => path),
+        ...typedAreas(reach, room.locator).map(({ path }) => path),
+    ];
     return { collection: paths.some((path) => !selected(path)), selection: paths.some(selected) };
 }
 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 +75,9 @@ export function planReach(reach) {
             documents: [
                 ...new Set(reach.documents.map(({ room, path }) => documentKey(room, path))),
             ].sort(),
+            areas: areasOf(reach)
+                .map(({ room, path, types }) => ({ room, path, types: [...new Set(types)].sort() }))
+                .sort((left, right) => documentKey(left.room, left.path) < documentKey(right.room, right.path) ? -1 : 1),
         };
 }
 function roomsWithin(reach, rooms) {
@@ -120,6 +127,7 @@ function statusWithin(reach, status) {
     return {
         ...status,
         attentionRequired: status.attentionRequired.filter((entry) => 'refusal' in entry ? wholly(reach, entry.room) : covers(reach, entry.room, entry.path)),
+        unsent: status.unsent.filter((change) => covers(reach, change.room, change.path)),
     };
 }
 function queueWithin(reach, room, entries) {
@@ -144,6 +152,13 @@ function lockedError(room) {
 function deviceUnreached() {
     return runtimeError('device-unreached', 'Only the panel cleans up this device');
 }
+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, told) {
     const { md, watch } = runtime;
     let reach = given;
@@ -254,7 +269,7 @@ export function narrowed(runtime, given, told) {
     };
     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,12 +277,12 @@ 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() }));
@@ -282,8 +297,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,6 +316,10 @@ 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);
@@ -334,15 +352,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)
@@ -367,15 +386,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).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,11 +418,6 @@ 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),

package/dist/readiness.d.ts

@@ -18,17 +18,27 @@ 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 RefusedRoom = {
     readonly room: string;
+    readonly name: string;
     readonly file: string;
     readonly rule: string;
     readonly location: string | null;
 };
+export type InstallationStep = Open<'downloading' | 'writing' | 'replaying'>;
+export type InstallationPause = Open<'hidden'>;
+export type InstallationAmount = {
+    readonly done: number;
+    readonly total: number;
+};
+export type Installation = {
+    readonly step: InstallationStep | null;
+    readonly paused: InstallationPause | null;
+    readonly rooms: InstallationAmount;
+    readonly parts: InstallationAmount;
+    readonly bytes: InstallationAmount;
+};
 export type ReadinessStatus = Open<'preparing' | 'paused' | 'refused' | 'ready' | 'lost'>;
 export type Readiness = {
     readonly status: ReadinessStatus;
@@ -40,7 +50,8 @@ export type Readiness = {
     readonly persistence: Persistence;
     readonly connection: ConnectionAvailability;
     readonly house: HouseOutcome;
-    readonly capacity: CapacityCause | null;
+    readonly space: Space | null;
+    readonly installation: Installation;
     readonly refused: readonly RefusedRoom[];
     readonly lost: boolean;
 };
@@ -48,6 +59,5 @@ export type ReadinessFacts = Omit<Readiness, 'status' | 'ready' | 'usable' | 'du
     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,5 +1,5 @@
 const COMPLETE_ROOMS = new Set(['complete', 'unadmitted']);
-export const SETTLED_ROOMS = new Set([...COMPLETE_ROOMS, 'refused']);
+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';
@@ -15,12 +15,12 @@ export function readinessOf(facts) {
     const usable = stored && (ready || established);
     const status = ready
         ? 'ready'
-        : facts.capacity !== null
+        : facts.space !== null || facts.installation.paused !== null
             ? 'paused'
-            : facts.lost && !established
-                ? 'lost'
-                : settled && !complete
-                    ? 'refused'
+            : settled && !complete
+                ? 'refused'
+                : facts.lost && !established
+                    ? 'lost'
                     : 'preparing';
     return {
         ...reported,

package/dist/reads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reads.d.ts","sourceRoot":"","sources":["../src/reads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAOR,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,IAAI,IAAI,IAAI,CAAC;CACd,CAAC;AAiCF,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,UAAU,EAAE,MAAM,MAAM,GACvB,SAAS,CA0FX"}
+{"version":3,"file":"reads.d.ts","sourceRoot":"","sources":["../src/reads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAgD,MAAM,cAAc,CAAC;AAC1F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC9B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9C,MAAM,IAAI,IAAI,CAAC;IACf,OAAO,IAAI,IAAI,CAAC;IAChB,IAAI,IAAI,IAAI,CAAC;CACd,CAAC;AA2BF,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,UAAU,EAAE,MAAM,MAAM,GACvB,SAAS,CA4EX"}

package/dist/reads.js

@@ -4,30 +4,24 @@ function declaredAs(declaration) {
     const { roomVersion: _version, ...declared } = declaration;
     return declared;
 }
-function sameHeld(one, other) {
-    return one === other;
-}
 function failed(answer) {
-    return answer?.kind === 'transport-uncertainty';
+    return answer.kind === 'transport-uncertainty';
 }
 function continues(answer) {
-    const page = answer;
-    return page?.kind === 'net-advancement' && page.pageToken !== undefined;
+    return answer?.kind === 'net-advancement' && answer.pageToken !== undefined;
 }
 export function doorReads(adapter, declaration, generation) {
     const reading = new Map();
     const taken = new Map();
     let carrying = false;
-    function joined(read, authorization, request, ask) {
-        const key = `${read} ${request.locator} ${request.pageToken ?? ''}`;
-        const { held, ...named } = request;
-        const asked = JSON.stringify([declaredAs(declaration(request.locator)), named]);
+    function joined(authorization, request) {
+        const key = `${request.locator} ${request.pageToken ?? ''}`;
+        const asked = JSON.stringify([declaredAs(declaration(request.locator)), request]);
         const asking = generation();
         const current = reading.get(key);
         if (current !== undefined &&
             current.authorization === authorization &&
             current.asked === asked &&
-            sameHeld(current.held, held) &&
             (!current.settled || current.holder < asking)) {
             if (current.settled && !current.continued)
                 reading.delete(key);
@@ -35,7 +29,7 @@ export function doorReads(adapter, declaration, generation) {
                 current.holder = Math.max(current.holder, asking);
             if (current.from === asking)
                 return current.answer;
-            const again = () => joined(read, authorization, request, ask);
+            const again = () => joined(authorization, request);
             return current.answer.then((answer) => {
                 if (failed(answer))
                     return again();
@@ -43,12 +37,11 @@ export function doorReads(adapter, declaration, generation) {
                 return answer;
             }, again);
         }
-        const answer = ask();
+        const answer = adapter.refresh(authorization, request);
         const sent = {
             locator: request.locator,
             authorization,
             asked,
-            held,
             answer,
             from: asking,
             holder: asking,
@@ -58,7 +51,7 @@ export function doorReads(adapter, declaration, generation) {
         reading.set(key, sent);
         const settled = (result, kept) => {
             sent.settled = true;
-            sent.continued = kept && read === 'refresh' && continues(result);
+            sent.continued = kept && continues(result);
             if (reading.get(key) !== sent)
                 return;
             const live = sent.holder === generation();
@@ -69,8 +62,8 @@ export function doorReads(adapter, declaration, generation) {
         return answer;
     }
     return {
-        bootstrap: (authorization, request) => joined('bootstrap', authorization, request, () => adapter.bootstrap(authorization, request)),
-        refresh: (authorization, request) => joined('refresh', authorization, request, () => adapter.refresh(authorization, request)),
+        bootstrap: (authorization, request) => adapter.bootstrap(authorization, request),
+        refresh: joined,
         reached: (locator, roomVersion, target) => adapter.reached(locator, roomVersion, target),
         carried: (locator) => taken.get(locator) ?? 0,
         finished(locator, turn) {

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 { AdapterFailure, Authorization, RefreshPage, RetryableRefusal } from './adapter.js';
 import type { Reads, 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';
@@ -14,8 +14,12 @@ export type Advancement = {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | AdapterFailure;
 export type Refreshing = {
+    turn(): Promise<void>;
     prior(paths: readonly string[]): Promise<ReadonlyMap<string, HeldEntry>>;
     stage(page: RefreshedPage): Promise<boolean>;
 };
+type PageContent = Pick<RefreshPage, 'documents' | '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(adapter: Reads, 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,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,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,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,UAAU,GAAG;IACvB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,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;AASF,KAAK,WAAW,GAAG,IAAI,CACrB,WAAW,EACX,WAAW,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,CAClE,CAAC;AAmFF,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;AAeD,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,CA8CtB"}

package/dist/refresh.js

@@ -1,24 +1,47 @@
 import { unconfirmed } from './transfer.js';
-async function pageOf(page, roomVersion, staging) {
-    const removed = new Set(page.removals);
-    const documents = Object.keys(page.documents).filter((path) => !removed.has(path));
-    const binaries = Object.keys(page.binaryFiles).filter((path) => !removed.has(path));
-    const written = new Set([...documents, ...binaries]);
-    const others = [
-        ...new Set([
-            ...Object.keys(page.revisions),
-            ...Object.keys(page.fileIds ?? {}),
-            ...Object.keys(page.changes),
-        ]),
-    ].filter((path) => !written.has(path) && !removed.has(path));
-    const asked = [
-        ...documents.filter((path) => page.revisions[path] === undefined),
-        ...binaries.filter((path) => page.revisions[path] === undefined),
-        ...others,
-    ];
-    const prior = asked.length === 0 ? new Map() : await staging.prior(asked);
+import { ROW_WEIGHT, stepped, yielded } from './turn.js';
+function* listing(page, removals) {
+    const removed = new Set();
+    for (const path of removals) {
+        removed.add(path);
+        yield ROW_WEIGHT;
+    }
+    const documents = [];
+    const binaries = [];
+    const asked = [];
+    const written = new Set();
+    for (const [kept, named] of [
+        [documents, page.documents],
+        [binaries, page.binaryFiles],
+    ]) {
+        for (const path of Object.keys(named)) {
+            yield ROW_WEIGHT;
+            if (removed.has(path))
+                continue;
+            kept.push(path);
+            written.add(path);
+            if (page.revisions[path] === undefined)
+                asked.push(path);
+        }
+    }
+    const others = [];
+    const seen = new Set();
+    for (const named of [page.revisions, page.fileIds ?? {}, page.changes]) {
+        for (const path of Object.keys(named)) {
+            yield ROW_WEIGHT;
+            if (seen.has(path))
+                continue;
+            seen.add(path);
+            if (!written.has(path) && !removed.has(path))
+                others.push(path);
+        }
+    }
+    return { documents, binaries, others, asked: [...asked, ...others] };
+}
+function* entering(page, roomVersion, listed, prior) {
     const entries = [];
-    for (const path of documents) {
+    for (const path of listed.documents) {
+        yield ROW_WEIGHT;
         entries.push({
             path,
             content: page.documents[path],
@@ -29,7 +52,8 @@ async function pageOf(page, roomVersion, staging) {
             written: roomVersion,
         });
     }
-    for (const path of binaries) {
+    for (const path of listed.binaries) {
+        yield ROW_WEIGHT;
         entries.push({
             path,
             content: null,
@@ -40,7 +64,8 @@ async function pageOf(page, roomVersion, staging) {
             written: null,
         });
     }
-    for (const path of others) {
+    for (const path of listed.others) {
+        yield ROW_WEIGHT;
         const held = prior.get(path);
         if (held === undefined)
             continue;
@@ -52,8 +77,17 @@ async function pageOf(page, roomVersion, staging) {
             change: page.changes[path] ?? held.change,
         });
     }
+    return entries;
+}
+export async function pageEntries(page, removals, roomVersion, prior) {
+    await yielded();
+    const listed = await stepped(listing(page, removals));
+    const held = listed.asked.length === 0 ? new Map() : await prior(listed.asked);
+    return stepped(entering(page, roomVersion, listed, held));
+}
+async function pageOf(page, roomVersion, staging) {
     return {
-        entries,
+        entries: await pageEntries(page, page.removals, roomVersion, (paths) => staging.prior(paths)),
         removals: page.removals,
         folders: page.folders ?? [],
         folderRemovals: page.folderRemovals ?? [],
@@ -62,6 +96,9 @@ async function pageOf(page, roomVersion, staging) {
 export async function advancement(adapter, authorization, held, remodel, continuing, staging) {
     const locator = held.locator;
     const fromRoomVersion = held.roomVersion;
+    await staging.turn();
+    if (!continuing())
+        return unconfirmed;
     const first = await adapter.refresh(authorization, {
         locator,
         selection: held.replica.selection,
@@ -70,10 +107,7 @@ export async function advancement(adapter, authorization, held, remodel, continu
     if (first.kind !== 'net-advancement')
         return first;
     const roomVersion = first.roomVersion;
-    const models = remodel(first.models, {
-        collection: held.model,
-        selection: held.selectionModel,
-    });
+    const models = remodel(first.models, { collection: held.model });
     const changed = new Set();
     const staged = async (page) => {
         const read = await pageOf(page, roomVersion, staging);
@@ -87,6 +121,7 @@ export async function advancement(adapter, authorization, held, remodel, continu
         return unconfirmed;
     let pageToken = first.pageToken;
     while (pageToken !== undefined) {
+        await staging.turn();
         if (!continuing())
             return unconfirmed;
         const page = await adapter.refresh(authorization, {
@@ -110,7 +145,6 @@ export async function advancement(adapter, authorization, held, remodel, continu
         record: {
             ...held,
             model: models.collection,
-            selectionModel: models.selection,
             roomVersion,
         },
         changed,