@agentshouse/mdruntime 0.1.0-cee9c8aa4cd86 → 0.1.0-cef76ea952695

package/dist/readiness.d.ts

@@ -1,35 +1,32 @@
 import type { Open } from './open.js';
 export type CodeAvailability = Open<'stored' | 'absent'>;
-export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | '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' | 'undeclared'>;
-export type SearchObligation = Open<'required' | 'unused'>;
 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 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 +37,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/reads.d.ts

@@ -1,11 +1,37 @@
-import type { Adapter } from './adapter.js';
-import type { Reads } from './bootstrap.js';
-export type DoorReads = Reads & {
-    carried(locator: string): number;
-    finished(locator: string, turn: number): void;
-    opened(): void;
-    applied(): void;
-    lost(): void;
-};
-export declare function doorReads(adapter: Adapter, declaration: (locator: string) => unknown, generation: () => number): DoorReads;
+import { type CallResult } from './outcome.js';
+import type { Recovery } from './recovery.js';
+import type { Connection, RuntimeDatabase } from './tables.js';
+export declare const READ_TABLES: readonly string[];
+export type ReadAt = {
+    readonly name: string;
+    readonly input: string;
+    readonly build: string;
+};
+export type ObservedRead = {
+    readonly answer: unknown;
+    readonly failure: CallResult | null;
+    readonly kept: boolean;
+};
+export type ReadAnswers = {
+    watch(name: string, input: unknown, deliver: (read: ObservedRead) => void): () => void;
+    again(): void;
+    reopened(): void;
+};
+export type ReadAnswersOptions = {
+    readonly database: RuntimeDatabase;
+    readonly build: string;
+    readonly unkept: readonly string[];
+    readonly leading: readonly string[];
+    readonly recovery: Recovery;
+    call(name: string, input: unknown): Promise<CallResult>;
+    online(): boolean;
+    streaming(): boolean;
+    closed(): boolean;
+    full(): boolean;
+    filled(): void;
+};
+export declare function storedRead(connection: Connection, { name, input, build }: ReadAt): string | null;
+export declare function keptRead(connection: Connection, { name, input, build }: ReadAt, answer: string): null;
+export declare function readsOfOtherBuildsForgotten(connection: Connection, build: string): null;
+export declare function readAnswers(options: ReadAnswersOptions): ReadAnswers;
 //# sourceMappingURL=reads.d.ts.map

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":"AAEA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE/D,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAExC,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvF,KAAK,IAAI,IAAI,CAAC;IACd,QAAQ,IAAI,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,IAAI,OAAO,CAAC;IAClB,SAAS,IAAI,OAAO,CAAC;IACrB,MAAM,IAAI,OAAO,CAAC;IAClB,IAAI,IAAI,OAAO,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAeF,wBAAgB,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhG;AAED,wBAAgB,QAAQ,CACtB,UAAU,EAAE,UAAU,EACtB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAC9B,MAAM,EAAE,MAAM,GACb,IAAI,CAMN;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAGvF;AAMD,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAoJpE"}

package/dist/reads.js

@@ -1,98 +1,174 @@
-function declaredAs(declaration) {
-    if (declaration === null || typeof declaration !== 'object')
-        return declaration;
-    const { roomVersion: _version, ...declared } = declaration;
-    return declared;
+import { refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
+import { answeredResult, UNCERTAIN } from './outcome.js';
+export const READ_TABLES = [
+    'CREATE TABLE read_answers (name TEXT NOT NULL, input TEXT NOT NULL, build TEXT NOT NULL, answer TEXT NOT NULL, PRIMARY KEY (name, input)) WITHOUT ROWID',
+];
+export function storedRead(connection, { name, input, build }) {
+    const [held] = connection.rows('SELECT answer FROM read_answers WHERE name = ? AND input = ? AND build = ?', [name, input, build]);
+    return held === undefined ? null : String(held.answer);
 }
-function sameHeld(one, other) {
-    return one === other;
+export function keptRead(connection, { name, input, build }, answer) {
+    connection.run('INSERT OR REPLACE INTO read_answers (name, input, build, answer) VALUES (?, ?, ?, ?)', [name, input, build, answer]);
+    return null;
 }
-function failed(answer) {
-    return answer?.kind === 'transport-uncertainty';
+export function readsOfOtherBuildsForgotten(connection, build) {
+    connection.run('DELETE FROM read_answers WHERE build <> ?', [build]);
+    return null;
 }
-function continues(answer) {
-    const page = answer;
-    return page?.kind === 'net-advancement' && page.pageToken !== undefined;
+function answered(result) {
+    return result.kind === 'action' && answeredResult(result.result);
 }
-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]);
-        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);
+export function readAnswers(options) {
+    const { database, build, recovery } = options;
+    const unkept = new Set(options.unkept);
+    const leading = new Set(options.leading);
+    const reads = new Map();
+    function leads(read) {
+        return leading.has(read.at.name);
+    }
+    function show(read, shown) {
+        read.shown = shown;
+        for (const deliver of read.observers)
+            deliver(shown);
+    }
+    async function kept(read, answer) {
+        if (!read.shown.kept || options.full())
+            return;
+        await database.ask({ kind: 'read.keep', ...read.at, answer }).catch((error) => {
+            if (refusedForSpace(error))
+                options.filled();
             else
-                current.holder = Math.max(current.holder, asking);
-            if (current.from === asking)
-                return current.answer;
-            const again = () => joined(read, authorization, request, ask);
-            return current.answer.then((answer) => {
-                if (failed(answer))
-                    return again();
-                taken.set(request.locator, (taken.get(request.locator) ?? 0) + 1);
-                return answer;
-            }, again);
+                uncaught(error);
+        });
+    }
+    async function asked(read, led) {
+        if (!options.online()) {
+            read.owed = true;
+            return;
         }
-        const answer = ask();
-        const sent = {
-            locator: request.locator,
-            authorization,
-            asked,
-            held,
-            answer,
-            from: asking,
-            holder: asking,
-            settled: false,
-            continued: false,
-        };
-        reading.set(key, sent);
-        const settled = (result, kept) => {
-            sent.settled = true;
-            sent.continued = kept && read === 'refresh' && continues(result);
-            if (reading.get(key) !== sent)
-                return;
-            const live = sent.holder === generation();
-            if (!kept || (live ? !sent.continued : !carrying))
-                reading.delete(key);
+        const result = await options.call(read.at.name, read.asked).catch(() => UNCERTAIN);
+        if (options.closed())
+            return;
+        read.owed = !answered(result);
+        if (read.owed) {
+            show(read, { ...read.shown, failure: result });
+            return;
+        }
+        const answer = result.result;
+        const text = JSON.stringify(answer);
+        if (text === read.text && read.shown.failure === null)
+            return;
+        read.text = text;
+        await kept(read, text);
+        await led;
+        if (!options.closed())
+            show(read, { ...read.shown, answer, failure: null });
+    }
+    function lost(read) {
+        return read.owed && read.shown.failure?.kind === 'transport-uncertainty' && options.streaming();
+    }
+    function retrying(read) {
+        return `${read.key} again`;
+    }
+    function askedLater(read) {
+        void recovery.attempt(retrying(read), async () => {
+            if (options.closed() || read.observers.size === 0 || !lost(read))
+                return 'done';
+            await attempted(read);
+            return lost(read) ? 'again' : 'done';
+        }, { again: true });
+    }
+    function forgotten(read) {
+        read.text = null;
+        read.shown = { ...read.shown, answer: null, failure: null };
+    }
+    function attempted(read, led) {
+        read.asking = true;
+        return recovery
+            .attempt(read.key, async () => {
+            await asked(read, led);
+            return 'done';
+        })
+            .finally(() => {
+            const unanswered = read.joined && read.owed;
+            read.asking = false;
+            read.joined = false;
+            if (unanswered)
+                void ask(read);
+        });
+    }
+    function ask(read, led) {
+        return attempted(read, led).finally(() => {
+            if (lost(read))
+                askedLater(read);
+        });
+    }
+    function opened(name, input, key) {
+        const held = !unkept.has(name);
+        const read = {
+            key,
+            at: { name, input: JSON.stringify(input ?? null), build },
+            asked: input,
+            observers: new Set(),
+            stored: Promise.resolve(),
+            text: null,
+            shown: { answer: null, failure: null, kept: held },
+            owed: false,
+            asking: false,
+            joined: false,
         };
-        answer.then((result) => settled(result, !failed(result)), () => settled(null, false));
-        return answer;
+        if (held) {
+            read.stored = database.ask({ kind: 'read.stored', ...read.at }).then((text) => {
+                if (text === null || read.text !== null)
+                    return;
+                read.text = text;
+                read.shown = { ...read.shown, answer: JSON.parse(text) };
+            }, uncaught);
+        }
+        reads.set(key, read);
+        return read;
     }
     return {
-        bootstrap: (authorization, request) => joined('bootstrap', authorization, request, () => adapter.bootstrap(authorization, request)),
-        refresh: (authorization, request) => joined('refresh', authorization, request, () => adapter.refresh(authorization, request)),
-        reached: (locator, roomVersion, target) => adapter.reached(locator, roomVersion, target),
-        carried: (locator) => taken.get(locator) ?? 0,
-        finished(locator, turn) {
-            for (const [key, held] of reading) {
-                if (held.locator !== locator || !held.settled || held.holder !== turn)
-                    continue;
-                if (turn === generation() || !carrying)
-                    reading.delete(key);
-            }
+        watch(name, input, deliver) {
+            const key = JSON.stringify([name, input ?? null]);
+            const read = reads.get(key) ?? opened(name, input, key);
+            read.observers.add(deliver);
+            void read.stored.then(() => {
+                if (!read.observers.has(deliver))
+                    return;
+                if (!read.shown.kept)
+                    forgotten(read);
+                deliver(read.shown);
+                if (read.asking)
+                    read.joined = true;
+                else
+                    void ask(read);
+            });
+            return () => {
+                read.observers.delete(deliver);
+                if (read.observers.size === 0 && reads.get(key) === read)
+                    reads.delete(key);
+            };
         },
-        opened() {
-            carrying = true;
+        again() {
+            const all = [...reads.values()];
+            const led = Promise.all(all.filter(leads).map((read) => ask(read)));
+            for (const read of all)
+                if (!leads(read))
+                    void ask(read, led);
         },
-        applied() {
-            carrying = false;
-            for (const [key, held] of reading) {
-                if (held.settled && held.holder !== generation())
-                    reading.delete(key);
+        reopened() {
+            for (const read of reads.values()) {
+                recovery.cancel(retrying(read));
+                if (read.text === null) {
+                    if (read.owed)
+                        void ask(read);
+                }
+                else if (read.shown.failure?.kind === 'transport-uncertainty') {
+                    show(read, { ...read.shown, failure: null });
+                }
             }
         },
-        lost() {
-            reading.clear();
-        },
     };
 }

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;AA8KD,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();
@@ -80,7 +106,15 @@ function owner(backoff, inFlight, release = () => { }) {
         }
         intent.tries += 1;
         if (intent.tries >= backoff.attempts) {
-            finish(key, intent, false);
+            if (again === null) {
+                finish(key, intent, false);
+                return;
+            }
+            intent.tries = 0;
+            if (again === 'now')
+                launch(key, intent);
+            else
+                wait(key, intent, again, true);
             return;
         }
         if (result === 'again') {

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' | 'created' | '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,SAAS,GAAG,aAAa,CACxF,CAAC;AAwFF,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;AAgDD,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"}