@agentshouse/mdruntime 0.1.0-cebcd51f70ed1 → 0.1.0-cedb03eaa48b6

package/dist/readiness.d.ts

@@ -0,0 +1,53 @@
+import type { Open } from './open.js';
+export type CodeAvailability = Open<'stored' | 'absent'>;
+export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | 'indexing' | 'refused' | 'unadmitted'>;
+export type RoomCoverage = {
+    readonly room: string;
+    readonly state: RoomPreparation;
+};
+export type ConversationCoverage = Open<'complete' | 'acquiring' | 'indexing' | 'undeclared'>;
+export type SearchObligation = Open<'required' | 'unused'>;
+export type 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' | 'quota-exceeded'>;
+    readonly needed: number | null;
+    readonly available: number | null;
+};
+export type RefusedRoom = {
+    readonly room: string;
+    readonly file: string;
+    readonly rule: string;
+    readonly location: string | null;
+};
+export type ReadinessStatus = Open<'preparing' | 'paused' | 'refused' | 'ready' | 'lost'>;
+export type Readiness = {
+    readonly status: ReadinessStatus;
+    readonly ready: boolean;
+    readonly usable: boolean;
+    readonly code: CodeAvailability;
+    readonly coverage: TargetCoverage;
+    readonly durability: Durability;
+    readonly persistence: Persistence;
+    readonly connection: ConnectionAvailability;
+    readonly house: HouseOutcome;
+    readonly capacity: CapacityCause | null;
+    readonly refused: readonly RefusedRoom[];
+    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

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

package/dist/readiness.js

@@ -0,0 +1,33 @@
+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
+            ? 'paused'
+            : facts.lost && !established
+                ? 'lost'
+                : settled && !complete
+                    ? 'refused'
+                    : 'preparing';
+    return {
+        ...reported,
+        coverage,
+        status,
+        ready,
+        usable,
+        durability: facts.persistence === 'granted' ? 'persistent' : 'best-effort',
+    };
+}

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;AAiCF,wBAAgB,SAAS,CACvB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,EACzC,UAAU,EAAE,MAAM,MAAM,GACvB,SAAS,CA0FX"}

package/dist/reads.js

@@ -0,0 +1,98 @@
+function declaredAs(declaration) {
+    if (declaration === null || typeof declaration !== 'object')
+        return declaration;
+    const { roomVersion: _version, ...declared } = declaration;
+    return declared;
+}
+function sameHeld(one, other) {
+    return one?.documents === other?.documents && one?.revisions === other?.revisions;
+}
+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, ...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);
+            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,
+            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 ceilingMs?: 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, ceilingMs?: 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,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,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,SAAS,SAAa,GAAG,MAAM,CAG5F;AAuKD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}

package/dist/recovery.js

@@ -0,0 +1,197 @@
+// 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 CEILING_MS = 30_000;
+const ATTEMPTS = 8;
+export function retryDelay(tries, firstMs = FIRST_MS, ceilingMs = CEILING_MS) {
+    const ceiling = Math.min(ceilingMs, firstMs * 2 ** tries);
+    return ceiling / 2 + (Math.random() * ceiling) / 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') {
+            const delay = retryDelay(intent.tries - 1, backoff.firstMs, backoff.ceilingMs);
+            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.ceilingMs), 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,
+        ceilingMs: options.ceilingMs ?? CEILING_MS,
+        attempts: options.attempts ?? ATTEMPTS,
+    }, options.inFlight ?? Infinity);
+}

package/dist/refresh.d.ts

@@ -1,7 +1,16 @@
-import type { Adapter, AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
-import type { Remodel } from './bootstrap.js';
+import type { AdapterFailure, Authorization, RetryableRefusal } from './adapter.js';
+import type { Reads, Remodel } from './bootstrap.js';
 import { type ConfirmedLayer } from './replica.js';
+import type { ReplicaRecord } from './store.js';
 import { type Refused, type Unconfirmed } from './transfer.js';
+export type Advancement = {
+    kind: 'still-current';
+} | {
+    kind: 'advanced';
+    record: ReplicaRecord;
+} | {
+    kind: 'beyond-horizon';
+} | RetryableRefusal | Unconfirmed | AdapterFailure;
 export type RefreshOutcome = {
     kind: 'still-current';
 } | {
@@ -10,5 +19,6 @@ export type RefreshOutcome = {
 } | {
     kind: 'beyond-horizon';
 } | RetryableRefusal | Unconfirmed | Refused | AdapterFailure;
-export declare function refreshRoom(adapter: Adapter, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
+export declare function advancement(adapter: Reads, authorization: Authorization, held: ReplicaRecord, remodel: Remodel, continuing: () => boolean): Promise<Advancement>;
+export declare function refreshRoom(adapter: Reads, authorization: Authorization, confirmed: ConfirmedLayer, remodel: Remodel, continuing: () => boolean): Promise<RefreshOutcome>;
 //# 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;AAEjG,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAE/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,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,WAAW,CAAC,CA8EtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,KAAK,EACd,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,cAAc,CAAC,CAKzB"}

package/dist/refresh.js

@@ -1,51 +1,53 @@
-import { declaredAttachments } from './attachment.js';
+import { acceptedBinaries } from './overlay.js';
 import { readStaged } from './replica.js';
+import { drafted, settled } from './shared.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;
+export async function advancement(adapter, authorization, held, remodel, continuing) {
+    const locator = held.locator;
+    const fromRoomVersion = held.roomVersion;
     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 documents = drafted(held.documents);
+    const revisions = drafted(held.revisions);
+    const fileIds = drafted(held.fileIds);
+    const changes = drafted(held.changes);
+    const written = drafted(held.written);
+    const binaries = drafted(held.binaries);
     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 binaries[path];
+            delete fileIds[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);
+        for (const path of Object.keys(page.binaryFiles)) {
+            delete documents[path];
+            delete fileIds[path];
+            delete changes[path];
+            delete written[path];
         }
+        Object.assign(documents, page.documents);
+        Object.assign(binaries, acceptedBinaries(page.binaryFiles));
+        Object.assign(revisions, page.revisions);
+        Object.assign(fileIds, page.fileIds);
         Object.assign(changes, page.changes);
         for (const path of page.removals) {
             delete documents[path];
             delete revisions[path];
+            delete fileIds[path];
             delete changes[path];
             delete written[path];
-            binaryTargets.delete(path);
+            delete binaries[path];
         }
     };
     stage(first);
@@ -55,7 +57,7 @@ export async function refreshRoom(adapter, authorization, confirmed, remodel, co
             return unconfirmed;
         const page = await adapter.refresh(authorization, {
             locator,
-            selection: confirmed.record.replica.selection,
+            selection: held.replica.selection,
             fromRoomVersion,
             pageToken,
         });
@@ -68,17 +70,26 @@ export async function refreshRoom(adapter, authorization, confirmed, remodel, co
         stage(page);
         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 {
+        kind: 'advanced',
+        record: {
+            ...held,
+            model: models.collection,
+            selectionModel: models.selection,
+            roomVersion,
+            documents: settled(documents),
+            binaries: settled(binaries),
+            revisions: settled(revisions),
+            fileIds: settled(fileIds),
+            changes: settled(changes),
+            written: settled(written),
+        },
+    };
+}
+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,7 +1,7 @@
 import { type ChangeBatch } from './change.js';
 import { type Collection, type Composition } from './collection.js';
 import { type Layer } from './overlay.js';
-import type { RoomAttachment } from './adapter.js';
+import type { MutationResult } from './adapter.js';
 import type { ReplicaRecord } from './store.js';
 import type { Refused } from './transfer.js';
 export type ConfirmedLayer = {
@@ -29,15 +29,22 @@ type ReplayStep = {
     collection?: Collection;
 };
 export declare function compositionOf(record: ReplicaRecord): Composition;
-export declare function readConfirmed(record: ReplicaRecord, previous?: ConfirmedLayer): Staged;
+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 readStaged(staged: ReplicaRecord, previous?: ConfirmedLayer): Staged;
 export declare function readReclassified(record: ReplicaRecord, previous: ConfirmedLayer): Staged | {
     kind: 'deferred';
 };
-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;
+type Accepted = Extract<MutationResult, {
+    kind: 'accepted';
+}>;
+export declare function applyReturned(confirmed: ConfirmedLayer, submitted: ChangeBatch, accepted: Accepted, 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 landed(batch: ChangeBatch, confirmed: ConfirmedLayer, current?: Readonly<Record<string, string>>): boolean;
+export type Standing = {
+    readonly withdrawn: readonly ChangeBatch[];
+    readonly kept: readonly ChangeBatch[];
+};
+export declare function standing(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[], withdrawable: (batch: ChangeBatch) => boolean, local: boolean): Standing;
 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":"AACA,OAAO,EAA0B,KAAK,WAAW,EAAqB,MAAM,aAAa,CAAC;AAC1F,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAA0C,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG;IACjC,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,cAAc,CAAA;CAAE,GAAG,OAAO,CAAC;AAE7E,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,SAAS,WAAW,EAAE,CAAC;IAC9B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;CAC/B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,WAAW,CAQhE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAWtF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,OAAO,CAKnF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAkBnF;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,cAAc,GACvB,MAAM,GAAG;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAM/B;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC3C,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,EAClD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,MAAM,CAmCR;AAsDD,wBAAgB,SAAS,CACvB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAgCT;AAkFD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAa7E;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,cAAc,EACzB,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,YAAY,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,GAC5C,SAAS,WAAW,EAAE,CAmBxB"}
+{"version":3,"file":"replica.d.ts","sourceRoot":"","sources":["../src/replica.ts"],"names":[],"mappings":"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"}