@agentshouse/mdruntime 0.1.0-cfbf80d8d4644 → 0.1.0-cfe148b32e3d8

package/dist/reads.d.ts

@@ -0,0 +1,11 @@
+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;
+//# sourceMappingURL=reads.d.ts.map

package/dist/reads.d.ts.map

@@ -0,0 +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;AAkCF,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,UAAU,EAAE,MAAM,MAAM,GACvB,SAAS,CA4FX"}

package/dist/reads.js

@@ -0,0 +1,100 @@
+function declaredAs(declaration) {
+    if (declaration === null || typeof declaration !== 'object')
+        return declaration;
+    const { roomVersion: _version, ...declared } = declaration;
+    return declared;
+}
+function sameHeld(one, other) {
+    return one === other;
+}
+function failed(answer) {
+    return answer?.kind === 'transport-uncertainty';
+}
+function continues(answer) {
+    const page = answer;
+    return page?.kind === 'net-advancement' && page.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, received, ...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.received === received &&
+            (!current.settled || current.holder < asking)) {
+            if (current.settled && !current.continued)
+                reading.delete(key);
+            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);
+        }
+        const answer = ask();
+        const sent = {
+            locator: request.locator,
+            authorization,
+            asked,
+            held,
+            received,
+            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);
+        };
+        answer.then((result) => settled(result, !failed(result)), () => settled(null, false));
+        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)),
+        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);
+            }
+        },
+        opened() {
+            carrying = true;
+        },
+        applied() {
+            carrying = false;
+            for (const [key, held] of reading) {
+                if (held.settled && held.holder !== generation())
+                    reading.delete(key);
+            }
+        },
+        lost() {
+            reading.clear();
+        },
+    };
+}

package/dist/recovery.d.ts

@@ -0,0 +1,25 @@
+export type Attempted = 'done' | 'again' | {
+    readonly at: number;
+};
+export type Attempt = (signal: AbortSignal) => Promise<Attempted>;
+export type AttemptOptions = {
+    readonly at?: number;
+    readonly again?: boolean;
+};
+export type RecoveryOptions = {
+    readonly firstMs?: number;
+    readonly maxMs?: number;
+    readonly attempts?: number;
+    readonly inFlight?: number;
+};
+export type Recovery = {
+    attempt(intent: string, run: Attempt, options?: AttemptOptions): Promise<boolean>;
+    pending(intent: string): boolean;
+    resume(): void;
+    cancel(intent: string): void;
+    scope(inFlight?: number): Recovery;
+    retire(): Promise<void>;
+};
+export declare function retryDelay(tries: number, firstMs?: number, maxMs?: number): number;
+export declare function createRecovery(options?: RecoveryOptions): Recovery;
+//# sourceMappingURL=recovery.d.ts.map

package/dist/recovery.d.ts.map

@@ -0,0 +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"}

package/dist/recovery.js

@@ -0,0 +1,198 @@
+// A first retry waits about a second, so a passing failure clears before the next attempt.
+const FIRST_MS = 1_000;
+// Waits stop doubling at half a minute, so work resumes soon after a long failure ends.
+const MAX_MS = 30_000;
+const ATTEMPTS = 8;
+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;
+}
+function owner(backoff, inFlight, release = () => { }) {
+    const intents = new Map();
+    const children = new Set();
+    const running = new Set();
+    const queued = [];
+    let free = inFlight;
+    let retired = false;
+    function finish(key, intent, done) {
+        if (intents.get(key) === intent)
+            intents.delete(key);
+        if (intent.timer !== null)
+            clearTimeout(intent.timer);
+        intent.timer = null;
+        intent.end(done);
+    }
+    function wait(key, intent, at, guided) {
+        if (intent.timer !== null)
+            clearTimeout(intent.timer);
+        intent.due = at;
+        intent.guided = guided;
+        intent.timer = setTimeout(() => {
+            intent.timer = null;
+            launch(key, intent);
+        }, Math.max(0, at - Date.now()));
+    }
+    function launch(key, intent) {
+        intent.due = null;
+        intent.guided = false;
+        const controller = new AbortController();
+        intent.controller = controller;
+        const run = start(key, intent, controller);
+        running.add(run);
+        void run.finally(() => running.delete(run));
+    }
+    async function start(key, intent, controller) {
+        while (free === 0)
+            await new Promise((admit) => queued.push(admit));
+        if (controller.signal.aborted) {
+            queued.shift()?.();
+            return;
+        }
+        free -= 1;
+        const abandoned = new Promise((resolve) => {
+            controller.signal.addEventListener('abort', () => resolve(null), { once: true });
+        });
+        let result;
+        try {
+            result = await Promise.race([intent.run(controller.signal), abandoned]);
+        }
+        catch {
+            result = 'again';
+        }
+        finally {
+            free += 1;
+            queued.shift()?.();
+        }
+        if (result === null || controller.signal.aborted || intents.get(key) !== intent)
+            return;
+        intent.controller = null;
+        const again = intent.again;
+        intent.again = null;
+        if (result === 'done') {
+            intent.tries = 0;
+            if (again === null)
+                finish(key, intent, true);
+            else if (again === 'now')
+                launch(key, intent);
+            else
+                wait(key, intent, again, true);
+            return;
+        }
+        intent.tries += 1;
+        if (intent.tries >= backoff.attempts) {
+            finish(key, intent, false);
+            return;
+        }
+        if (result === 'again') {
+            // The next attempt waits the doubling backoff, up to its maximum.
+            const delay = retryDelay(intent.tries - 1, backoff.firstMs, backoff.maxMs);
+            wait(key, intent, Date.now() + delay, false);
+        }
+        else
+            wait(key, intent, result.at, true);
+    }
+    const recovery = {
+        attempt(key, run, options = {}) {
+            if (retired)
+                return Promise.resolve(false);
+            const held = intents.get(key);
+            if (held !== undefined) {
+                held.run = run;
+                if (held.controller !== null) {
+                    const at = options.at;
+                    held.again =
+                        at === undefined || held.again === 'now'
+                            ? 'now'
+                            : Math.min(at, held.again ?? Number.POSITIVE_INFINITY);
+                }
+                else if (held.due !== null && held.due <= Date.now()) {
+                    if (held.timer !== null)
+                        clearTimeout(held.timer);
+                    held.timer = null;
+                    launch(key, held);
+                }
+                else if (options.at !== undefined && (held.due === null || options.at < held.due)) {
+                    wait(key, held, options.at, true);
+                }
+                return held.ended;
+            }
+            let end = () => { };
+            const ended = new Promise((resolve) => {
+                end = resolve;
+            });
+            const intent = {
+                run,
+                tries: 0,
+                timer: null,
+                due: null,
+                guided: false,
+                controller: null,
+                again: null,
+                ended,
+                end,
+            };
+            intents.set(key, intent);
+            if (options.at !== undefined)
+                wait(key, intent, options.at, true);
+            else if (options.again === true) {
+                intent.tries = 1;
+                wait(key, intent, Date.now() + retryDelay(0, backoff.firstMs, backoff.maxMs), false);
+            }
+            else
+                launch(key, intent);
+            return ended;
+        },
+        pending(key) {
+            const intent = intents.get(key);
+            return intent !== undefined && intent.controller === null;
+        },
+        resume() {
+            if (retired)
+                return;
+            for (const [key, intent] of [...intents]) {
+                if (intent.guided && intent.due !== null && intent.due > Date.now())
+                    continue;
+                if (intent.timer !== null)
+                    clearTimeout(intent.timer);
+                intent.timer = null;
+                intent.controller?.abort();
+                intent.again = null;
+                intent.tries = 0;
+                launch(key, intent);
+            }
+        },
+        cancel(key) {
+            const intent = intents.get(key);
+            if (intent === undefined)
+                return;
+            intent.controller?.abort();
+            finish(key, intent, false);
+        },
+        scope(bound = Infinity) {
+            const child = owner(backoff, bound, () => children.delete(child));
+            if (retired)
+                void child.retire();
+            else
+                children.add(child);
+            return child;
+        },
+        async retire() {
+            retired = true;
+            release();
+            for (const [key, intent] of [...intents]) {
+                intent.controller?.abort();
+                finish(key, intent, false);
+            }
+            await Promise.all([...children].map((child) => child.retire()));
+            await Promise.all(running);
+        },
+    };
+    return recovery;
+}
+export function createRecovery(options = {}) {
+    return owner({
+        firstMs: options.firstMs ?? FIRST_MS,
+        maxMs: options.maxMs ?? MAX_MS,
+        attempts: options.attempts ?? ATTEMPTS,
+    }, options.inFlight ?? Infinity);
+}

package/dist/refresh.d.ts

@@ -1,14 +1,22 @@
-import type { Adapter, AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
-import type { Remodel } from './bootstrap.js';
-import { type ConfirmedLayer } from './replica.js';
-import { type Refused, type Unconfirmed } from './transfer.js';
-export type RefreshOutcome = {
+import type { AdapterFailure, Authorization, 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 Unconfirmed } from './transfer.js';
+export type Advancement = {
     kind: 'still-current';
 } | {
     kind: 'advanced';
-    confirmed: ConfirmedLayer;
+    record: ReplicaRecord;
+    changed: ReadonlySet<string>;
 } | {
     kind: 'beyond-horizon';
-} | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
-export declare function refreshRoom(adapter: Adapter, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
+} | RetryableRefusal | Unconfirmed | AdapterFailure;
+export type Refreshing = {
+    turn(): Promise<void>;
+    prior(paths: readonly string[]): Promise<ReadonlyMap<string, HeldEntry>>;
+    stage(page: RefreshedPage): Promise<boolean>;
+};
+export declare function advancement(adapter: Reads, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean, staging: Refreshing): Promise<Advancement>;
 //# sourceMappingURL=refresh.d.ts.map

package/dist/refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,aAAa,EAGb,gBAAgB,EAEjB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,OAAO,GACP,cAAc,CAAC;AAEnB,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CA8EzB"}
+{"version":3,"file":"refresh.d.ts","sourceRoot":"","sources":["../src/refresh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,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,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;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,CAkDtB"}

package/dist/refresh.js

@@ -1,61 +1,101 @@
-import { declaredAttachments } from './attachment.js';
-import { readStaged } from './replica.js';
 import { unconfirmed } from './transfer.js';
-export async function refreshRoom(adapter, authorization, confirmed, remodel, continuing) {
-    const locator = confirmed.record.locator;
-    const fromRoomVersion = confirmed.record.roomVersion;
+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);
+    const entries = [];
+    for (const path of documents) {
+        entries.push({
+            path,
+            content: page.documents[path],
+            binary: null,
+            revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
+            fileId: page.fileIds?.[path] ?? null,
+            change: page.changes[path] ?? null,
+            written: roomVersion,
+        });
+    }
+    for (const path of binaries) {
+        entries.push({
+            path,
+            content: null,
+            binary: { state: 'accepted', ...page.binaryFiles[path] },
+            revision: page.revisions[path] ?? prior.get(path)?.revision ?? null,
+            fileId: page.fileIds?.[path] ?? null,
+            change: page.changes[path] ?? null,
+            written: null,
+        });
+    }
+    for (const path of others) {
+        const held = prior.get(path);
+        if (held === undefined)
+            continue;
+        const { type: _type, ...kept } = held;
+        entries.push({
+            ...kept,
+            revision: page.revisions[path] ?? held.revision,
+            fileId: page.fileIds?.[path] ?? held.fileId,
+            change: page.changes[path] ?? held.change,
+        });
+    }
+    return {
+        entries,
+        removals: page.removals,
+        folders: page.folders ?? [],
+        folderRemovals: page.folderRemovals ?? [],
+    };
+}
+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: confirmed.record.replica.selection,
+        selection: held.replica.selection,
         fromRoomVersion,
     });
     if (first.kind !== 'net-advancement')
         return first;
     const roomVersion = first.roomVersion;
     const models = remodel(first.models, {
-        collection: confirmed.record.model,
-        selection: confirmed.record.selectionModel,
+        collection: held.model,
+        selection: held.selectionModel,
     });
-    const documents = { ...confirmed.record.documents };
-    const revisions = { ...confirmed.record.revisions };
-    const changes = { ...confirmed.record.changes };
-    const written = { ...confirmed.record.written };
-    const binaryTargets = new Set(confirmed.record.binaryTargets);
-    const attachments = [];
-    const stage = (page) => {
-        if (page.attachments !== undefined)
-            attachments.push(page.attachments);
-        Object.assign(documents, page.documents);
-        Object.assign(revisions, page.revisions);
-        for (const path of Object.keys(page.documents)) {
-            binaryTargets.delete(path);
-            delete changes[path];
-            written[path] = roomVersion;
-        }
-        for (const target of page.binaryTargets) {
-            delete documents[target];
-            delete revisions[target];
-            delete changes[target];
-            delete written[target];
-            binaryTargets.add(target);
-        }
-        Object.assign(changes, page.changes);
-        for (const path of page.removals) {
-            delete documents[path];
-            delete revisions[path];
-            delete changes[path];
-            delete written[path];
-            binaryTargets.delete(path);
-        }
+    const changed = new Set();
+    const staged = async (page) => {
+        const read = await pageOf(page, roomVersion, staging);
+        for (const { path } of read.entries)
+            changed.add(path);
+        for (const path of read.removals)
+            changed.add(path);
+        return staging.stage(read);
     };
-    stage(first);
+    if (!(await staged(first)))
+        return unconfirmed;
     let pageToken = first.pageToken;
     while (pageToken !== undefined) {
+        await staging.turn();
         if (!continuing())
             return unconfirmed;
         const page = await adapter.refresh(authorization, {
             locator,
-            selection: confirmed.record.replica.selection,
+            selection: held.replica.selection,
             fromRoomVersion,
             pageToken,
         });
@@ -65,20 +105,18 @@ export async function refreshRoom(adapter, authorization, confirmed, remodel, co
             return page;
         if (page.roomVersion !== roomVersion)
             return unconfirmed;
-        stage(page);
+        if (!(await staged(page)))
+            return unconfirmed;
         pageToken = page.pageToken;
     }
-    const staged = readStaged({
-        ...confirmed.record,
-        model: models.collection,
-        selectionModel: models.selection,
-        roomVersion,
-        documents,
-        binaryTargets: [...binaryTargets].sort(),
-        revisions,
-        changes,
-        written,
-        attachments: attachments.length === 0 ? confirmed.record.attachments : declaredAttachments(attachments),
-    }, confirmed);
-    return staged.kind === 'staged' ? { kind: 'advanced', confirmed: staged.confirmed } : staged;
+    return {
+        kind: 'advanced',
+        record: {
+            ...held,
+            model: models.collection,
+            selectionModel: models.selection,
+            roomVersion,
+        },
+        changed,
+    };
 }

package/dist/replica.d.ts

@@ -1,43 +1,70 @@
-import { type ChangeBatch } from './change.js';
+import type { BootstrapInventory, MutationResult, OperationScopes, ReplicaAdmission, TypedSelection } from './adapter.js';
+import { type ChangeBatch, type Precondition } from './change.js';
 import { type Collection, type Composition } from './collection.js';
+import type { ModelState } from './model.js';
 import { type Layer } from './overlay.js';
-import type { RoomAttachment } from './adapter.js';
-import type { ReplicaRecord } from './store.js';
-import type { Refused } from './transfer.js';
-export type ConfirmedLayer = {
-    record: ReplicaRecord;
-    collection: Collection;
+import type { HeldEntry, OverlayEntry, StoredEntry } from './tables.js';
+export type ReplicaRecord = {
+    readonly locator: string;
+    readonly name: string;
+    readonly handle: string;
+    readonly operations: OperationScopes;
+    readonly replica: ReplicaAdmission;
+    readonly model: ModelState;
+    readonly typedSelection: TypedSelection | null;
+    readonly selectionModel: ModelState;
+    readonly providerOwnedPaths: readonly string[];
+    readonly roomVersion: string;
+    readonly transfer: string;
+    readonly inventory: BootstrapInventory | null;
+    readonly key: number;
+};
+export type HeldReplica = {
+    readonly record: ReplicaRecord;
+    readonly queue: readonly ChangeBatch[];
+    readonly overlaid: ReadonlySet<string>;
+    readonly count: number;
+    readonly confirmed: number;
+    readonly indexed: boolean;
 };
 export type VisibleLayer = Layer & {
-    collection: Collection;
+    readonly collection: Collection;
+};
+export type Slice = Layer & {
+    readonly written: Readonly<Record<string, string>>;
+    readonly held: ReadonlySet<string>;
 };
-export type Staged = {
-    kind: 'staged';
-    confirmed: ConfirmedLayer;
-} | Refused;
-export type Replica = {
-    confirmed: ConfirmedLayer;
-    queue: readonly ChangeBatch[];
-    visible: VisibleLayer;
-    replay: readonly ReplayStep[];
+export declare function compositionOf(record: Pick<ReplicaRecord, 'model' | 'typedSelection' | 'selectionModel'>): Composition;
+export declare function sameMembership(record: Pick<ReplicaRecord, 'typedSelection'>, other: Pick<ReplicaRecord, 'typedSelection'>): boolean;
+export declare function storedRecord(record: ReplicaRecord): string;
+export declare function slicing(entries: readonly HeldEntry[], paths: Iterable<string>): Generator<number, Slice, void>;
+export declare function entryAt(layer: Layer & {
+    readonly written?: Readonly<Record<string, string>>;
+}, path: string): StoredEntry | null;
+export declare function slicingWith(slice: Slice, set: readonly StoredEntry[], removed: readonly string[]): Generator<number, Slice, void>;
+export declare function touchedBy(queue: readonly ChangeBatch[]): Set<string>;
+export declare function movedBy(queue: readonly ChangeBatch[], locator: string): Set<string>;
+export type Replayed = {
+    readonly visible: VisibleLayer;
+    readonly touched: ReadonlySet<string>;
 };
-type ReplayStep = {
-    id: string;
-    before: Layer;
-    after: Layer;
-    effective: ChangeBatch;
-    collection?: Collection;
+export declare function replaying(confirmed: Slice, queue: readonly ChangeBatch[], locator: string, composition: Composition): Generator<number, Replayed, void>;
+export declare function overlayOf(visible: Layer, touched: Iterable<string>): Generator<number, OverlayEntry[], void>;
+export declare function holds(layer: Layer, preconditions: readonly Precondition[]): boolean;
+export declare function landed(batch: ChangeBatch, confirmed: Layer, current?: Readonly<Record<string, string>>): boolean;
+export type Standing = {
+    readonly withdrawn: readonly ChangeBatch[];
+    readonly kept: readonly ChangeBatch[];
 };
-export declare function compositionOf(record: ReplicaRecord): Composition;
-export declare function readConfirmed(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
-export declare function sameMembership(record: ReplicaRecord, other: ReplicaRecord): boolean;
-export declare function readStaged(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
-export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Staged | {
-    kind: 'deferred';
+export declare function standing(confirmed: Slice, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean, locator: string, composition: Composition): Generator<number, Standing, void>;
+type Accepted = Extract<MutationResult, {
+    kind: 'accepted';
+}>;
+export type Returned = {
+    readonly set: readonly StoredEntry[];
+    readonly removed: readonly string[];
 };
-export declare function applyReturned(confirmed: ConfirmedLayer, documents: Readonly<Record<string, string>>, revisions: Readonly<Record<string, string>>, removals: readonly string[], attachments: readonly RoomAttachment[] | undefined, roomVersion: string, writtenAt: string): Staged;
-export declare function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], previous?: Replica): Replica;
-export declare function landed(batch: ChangeBatch, confirmed: ConfirmedLayer): boolean;
-export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean): readonly ChangeBatch[];
+export declare function returnedPaths(submitted: ChangeBatch, accepted: Accepted): Set<string>;
+export declare function returning(confirmed: Slice, submitted: ChangeBatch, accepted: Accepted, writtenAt: string): Generator<number, Returned, void>;
 export {};
 //# sourceMappingURL=replica.d.ts.map