@agentshouse/mdruntime 0.1.0-c967d1ca66fee → 0.1.0-c96e80d38e5f0

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;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

@@ -0,0 +1,224 @@
+// 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;
+}
+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();
+    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,24 +1,27 @@
-import type { Adapter, AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
+import type { AdapterFailure, Authorization, RefreshPage, RefreshRequest, RefreshResult, RetryableRefusal } from './adapter.js';
 import type { Remodel } from './bootstrap.js';
-import { type ConfirmedLayer } from './replica.js';
-import type { ReplicaRecord } from './store.js';
-import { type Refused, type Unconfirmed } from './transfer.js';
+import type { ReplicaRecord } from './replica.js';
+import type { RefreshedPage } from './store.js';
+import type { HeldEntry, StoredEntry } from './tables.js';
+import { type Unconfirmed } from './transfer.js';
 export type Advancement = {
     kind: 'still-current';
 } | {
     kind: 'advanced';
     record: ReplicaRecord;
+    changed: ReadonlySet<string>;
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | AdapterFailure;
-export type RefreshOutcome = {
-    kind: 'still-current';
-} | {
-    kind: 'advanced';
-    confirmed: ConfirmedLayer;
-} | {
-    kind: 'beyond-horizon';
-} | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
-export declare function advancement(adapter: Adapter, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean): Promise<Advancement>;
-export declare function refreshRoom(adapter: Adapter, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
+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>;
+};
+type PageContent = Pick<RefreshPage, 'documents' | 'outlines' | '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,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,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAe,KAAK,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5E,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,aAAa,CAAA;CAAE,GAC3C;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B,gBAAgB,GAChB,WAAW,GACX,cAAc,CAAC;AAEnB,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,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CA4EtB;AAED,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,CAKzB"}
+{"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;AAUF,KAAK,WAAW,GAAG,IAAI,CACrB,WAAW,EACX,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,aAAa,CAC/E,CAAC;AAoGF,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"}

package/dist/refresh.js

@@ -1,10 +1,145 @@
-import { declaredAttachments } from './attachment.js';
-import { readStaged } from './replica.js';
 import { unconfirmed } from './transfer.js';
-export async function advancement(adapter, authorization, held, remodel, continuing) {
+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 outlined = [];
+    const binaries = [];
+    const asked = [];
+    const written = new Set();
+    for (const [kept, named] of [
+        [documents, page.documents],
+        [outlined, page.outlines ?? {}],
+        [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, outlined, binaries, others, asked: [...asked, ...others] };
+}
+function* entering(page, roomVersion, listed, prior) {
+    const entries = [];
+    for (const path of listed.documents) {
+        yield ROW_WEIGHT;
+        entries.push({
+            path,
+            content: page.documents[path],
+            outline: null,
+            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 listed.outlined) {
+        yield ROW_WEIGHT;
+        entries.push({
+            path,
+            content: null,
+            outline: page.outlines[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 listed.binaries) {
+        yield ROW_WEIGHT;
+        entries.push({
+            path,
+            content: null,
+            outline: 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 listed.others) {
+        yield ROW_WEIGHT;
+        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;
+}
+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));
+}
+function without(named, kept) {
+    return Object.fromEntries(Object.entries(named).filter(([path]) => !kept.has(path)));
+}
+function unwritten(page, kept) {
+    if (kept.size === 0)
+        return page;
+    return {
+        ...page,
+        documents: without(page.documents, kept),
+        ...(page.outlines === undefined ? {} : { outlines: without(page.outlines, kept) }),
+        revisions: without(page.revisions, kept),
+        ...(page.fileIds === undefined ? {} : { fileIds: without(page.fileIds, kept) }),
+        changes: without(page.changes, kept),
+        binaryFiles: without(page.binaryFiles, kept),
+        removals: page.removals.filter((path) => !kept.has(path)),
+    };
+}
+async function pageOf(answered, roomVersion, staging) {
+    const page = unwritten(answered, await staging.later([
+        ...Object.keys(answered.documents),
+        ...Object.keys(answered.outlines ?? {}),
+        ...Object.keys(answered.binaryFiles),
+        ...answered.removals,
+    ], roomVersion));
+    return {
+        entries: await pageEntries(page, page.removals, roomVersion, (paths) => staging.prior(paths)),
+        removals: page.removals,
+        folders: page.folders ?? [],
+        folderRemovals: page.folderRemovals ?? [],
+    };
+}
+export async function advancement(refresh, authorization, held, remodel, continuing, staging) {
     const locator = held.locator;
     const fromRoomVersion = held.roomVersion;
-    const first = await adapter.refresh(authorization, {
+    staging.turn();
+    if (!continuing())
+        return unconfirmed;
+    const first = await refresh(authorization, {
         locator,
         selection: held.replica.selection,
         fromRoomVersion,
@@ -12,48 +147,24 @@ 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 documents = { ...held.documents };
-    const revisions = { ...held.revisions };
-    const changes = { ...held.changes };
-    const written = { ...held.written };
-    const binaryTargets = new Set(held.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 models = remodel(first.models, { collection: held.model });
+    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, {
+        const page = await refresh(authorization, {
             locator,
             selection: held.replica.selection,
             fromRoomVersion,
@@ -65,7 +176,8 @@ export async function advancement(adapter, authorization, held, remodel, continu
             return page;
         if (page.roomVersion !== roomVersion)
             return unconfirmed;
-        stage(page);
+        if (!(await staged(page)))
+            return unconfirmed;
         pageToken = page.pageToken;
     }
     return {
@@ -73,21 +185,8 @@ export async function advancement(adapter, authorization, held, remodel, continu
         record: {
             ...held,
             model: models.collection,
-            selectionModel: models.selection,
             roomVersion,
-            documents,
-            binaryTargets: [...binaryTargets].sort(),
-            revisions,
-            changes,
-            written,
-            attachments: attachments.length === 0 ? held.attachments : declaredAttachments(attachments),
         },
+        changed,
     };
 }
-export async function refreshRoom(adapter, authorization, confirmed, remodel, continuing) {
-    const advanced = await advancement(adapter, authorization, confirmed.record, remodel, continuing);
-    if (advanced.kind !== 'advanced')
-        return advanced;
-    const staged = readStaged(advanced.record, confirmed);
-    return staged.kind === 'staged' ? { kind: 'advanced', confirmed: staged.confirmed } : staged;
-}

package/dist/replica.d.ts

@@ -1,43 +1,68 @@
-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 { HeadChange, 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 providerOwnedPaths: readonly string[];
+    readonly roomVersion: string;
+    readonly transfer: string;
+    readonly inventory: BootstrapInventory;
+    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'>, builtIn: ModelState): Composition;
+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 confirmedOf(record: ReplicaRecord, previous?: ConfirmedLayer): ConfirmedLayer;
-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>>, changes: Readonly<Record<string, HeadChange>>, 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, current?: Readonly<Record<string, string>>): boolean;
-export declare function withdrawals(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: 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

package/dist/replica.d.ts.map

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