@agentshouse/mdruntime 0.1.0-cd507e16e5fc0 → 0.1.0-cd574a610e9c8

package/dist/listing.d.ts

@@ -1,11 +1,11 @@
 import type { HeldRooms } from '@agentshouse/mdmodel';
-import type { DiscoveredRoom, HeldRoom, OperationScopes, ProviderRefusal, ReplicaAdmission } from './adapter.js';
+import type { DiscoveredRoom, HeldRoom, OperationScopes, ProviderRefusal, ReplicaAdmission, RoomDeclaration } from './adapter.js';
 import type { Composition } from './collection.js';
+import type { KeyedChange } from './observation.js';
 import { type ModelState, type TypesResult } from './model.js';
 import { type PortReach } from './reach.js';
 import type { ReplicaRecord } from './replica.js';
 import type { Runtime } from './runtime.js';
-import type { RoomDeclaration } from './socket.js';
 import type { Stored } from './store.js';
 export type AppTypedSelection = {
     roots: readonly string[];
@@ -20,6 +20,7 @@ export type AppRoom = {
     model: TypesResult;
     typedSelection: AppTypedSelection | null;
     providerOwnedPaths: readonly string[];
+    authoredPaths: readonly string[];
     roomVersion: string | null;
     documents: number;
     synchronizationAvailable: boolean;
@@ -27,26 +28,24 @@ export type AppRoom = {
     locked: boolean;
 };
 type ListedRoom = Omit<AppRoom, 'documents' | 'locked'>;
-type ListedEntry = ListedRoom & {
+export type ListedEntry = ListedRoom & {
     readonly documents: number;
 };
 export type Listing = ReadonlyMap<string, ListedEntry>;
-export declare function modelIn({ socket }: Runtime, locator: string, stored: Stored | undefined): ModelState;
+export type RoomsChange = KeyedChange<string, AppRoom>;
+export declare function modelIn({ socket, presence }: Runtime, locator: string, stored: Stored | undefined): ModelState;
 export declare function compositionFor(runtime: Runtime, record: ReplicaRecord): Composition;
-export declare function declarationOf({ socket }: Runtime, locator: string, stored: Stored | undefined): {
+export declare function declarationOf({ presence }: Runtime, locator: string, stored: Stored | undefined): {
     readonly room: RoomDeclaration;
     readonly available: boolean;
 } | undefined;
-export declare function listedLocators({ store, socket }: Runtime, held: ReadonlyMap<string, unknown>): string[];
-export declare function patchedListing(runtime: Runtime, changed: ReadonlySet<string>): Promise<Listing | null>;
+export declare function listedLocators({ presence }: Runtime, held: ReadonlyMap<string, unknown>): string[];
+export declare function listedOrHeld({ presence }: Runtime, held: ReadonlyMap<string, unknown>, locator: string): boolean;
+export declare function listedEntries(runtime: Runtime, touched: readonly string[]): Promise<readonly ListedEntry[] | null>;
 export declare function listingNow(runtime: Runtime): Promise<Listing>;
 export declare function shownRooms(runtime: Runtime, listing: Listing): readonly AppRoom[];
+export declare function shownChange(runtime: Runtime, entries: readonly ListedEntry[]): RoomsChange;
 export declare function roomFacts(runtime: Runtime, reach?: PortReach | null): Promise<HeldRooms>;
-export declare function list({ store, socket }: Runtime, room: RoomDeclaration, synchronizationAvailable: boolean): void;
-export declare function listHeld({ store, socket }: Runtime, locator: string): void;
-export declare function admitted({ socket }: Runtime, room: RoomDeclaration): boolean;
-export declare function readable(runtime: Runtime, room: DiscoveredRoom): void;
-export declare function usable(runtime: Runtime, room: DiscoveredRoom): void;
 export declare function heldRooms({ store }: Runtime, listed: readonly DiscoveredRoom[]): Promise<HeldRoom[]>;
 export declare function name(runtime: Runtime, locator: string): Promise<void>;
 export {};

package/dist/listing.d.ts.map

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

package/dist/listing.js

@@ -1,9 +1,10 @@
+import { declared } from './declaration.js';
 import { modelTypes, NO_MODEL } from './model.js';
 import { governs, holds } from './reach.js';
-export function modelIn({ socket }, locator, stored) {
+export function modelIn({ socket, presence }, locator, stored) {
     if (socket.session.now().refusal?.code === 'revoked-authorization')
         return { status: 'unavailable', reason: 'revoked' };
-    return stored?.record.model ?? socket.rooms.standing(locator).unheldModel ?? NO_MODEL;
+    return stored?.record.model ?? presence.unheldModel(locator) ?? NO_MODEL;
 }
 export function compositionFor(runtime, record) {
     return runtime.store.composed({
@@ -11,17 +12,22 @@ export function compositionFor(runtime, record) {
         model: modelIn(runtime, record.locator, { record, indexed: true, documents: 0 }),
     });
 }
-export function declarationOf({ socket }, locator, stored) {
-    const held = socket.rooms.declared(locator);
-    const room = stored?.record ?? held?.room ?? socket.rooms.discovered(locator);
-    return room === undefined ? undefined : { room, available: held?.available ?? true };
+export function declarationOf({ presence }, locator, stored) {
+    const listed = presence.room(locator);
+    const room = stored?.record.declaration ?? (listed === undefined ? undefined : declared(listed));
+    if (room === undefined)
+        return undefined;
+    return {
+        room,
+        available: presence.available(locator, stored?.record.declaration.replica.selection),
+    };
 }
-export function listedLocators({ store, socket }, held) {
-    const declared = socket.rooms.declarations();
-    return [
-        ...declared.keys(),
-        ...[...held.keys()].filter((locator) => !declared.has(locator)),
-    ].filter((locator) => !store.fences.has(locator));
+export function listedLocators({ presence }, held) {
+    const listed = presence.rooms().map(({ locator }) => locator);
+    return [...new Set([...listed, ...held.keys()])];
+}
+export function listedOrHeld({ presence }, held, locator) {
+    return presence.room(locator) !== undefined || held.has(locator);
 }
 function selectionModel({ socket, builtIn }) {
     return socket.session.now().refusal?.code === 'revoked-authorization'
@@ -33,7 +39,7 @@ function listedRoom(runtime, locator, stored) {
     if (declaration === undefined)
         return undefined;
     const { room, available } = declaration;
-    const selection = room.typedSelection ?? null;
+    const selection = room.typedSelection;
     return {
         name: room.name,
         locator,
@@ -45,9 +51,10 @@ function listedRoom(runtime, locator, stored) {
             ? null
             : { roots: selection.roots, model: modelTypes(selectionModel(runtime)) },
         providerOwnedPaths: room.providerOwnedPaths,
+        authoredPaths: room.authoredPaths,
         roomVersion: stored?.record.roomVersion ?? null,
         synchronizationAvailable: available,
-        refusal: runtime.socket.rooms.standing(locator).refusal,
+        refusal: runtime.presence.refusal(locator),
         documents: stored?.documents ?? 0,
     };
 }
@@ -60,31 +67,27 @@ function listingOf(runtime, held) {
     }
     return listing;
 }
-export async function patchedListing(runtime, changed) {
+export async function listedEntries(runtime, touched) {
     const { store } = runtime;
-    const { roomsShown } = store.device.now();
-    if (roomsShown === null)
+    if (store.roomsShown.now() === null)
         return null;
-    const held = await store.rooms([...changed]);
-    const listing = new Map(roomsShown);
-    for (const locator of changed) {
-        const room = store.fences.has(locator)
-            ? undefined
-            : listedRoom(runtime, locator, held.get(locator));
-        if (room === undefined || !listing.has(locator))
+    if (touched.length === 0)
+        return [];
+    const held = await store.rooms(touched);
+    const entries = [];
+    for (const locator of touched) {
+        const room = listedRoom(runtime, locator, held.get(locator));
+        if (room === undefined || store.roomsShown.now()?.has(locator) !== true)
             return null;
-        listing.set(locator, room);
+        entries.push(room);
     }
-    return listing;
+    return entries;
 }
 export async function listingNow(runtime) {
     return listingOf(runtime, await runtime.store.rooms());
 }
-function lockedIn({ socket }, listing, locator) {
-    return (listing.get(locator)?.replica.offline === 'locked' && !socket.rooms.standing(locator).confirmed);
-}
-export function shownRooms(runtime, listing) {
-    return structuredClone([...listing.values()].map(({ documents, ...room }) => lockedIn(runtime, listing, room.locator)
+function shownRoom({ presence }, { documents, ...room }) {
+    return presence.lockedAs(room.locator, room.replica.offline)
         ? {
             ...room,
             model: modelTypes(NO_MODEL),
@@ -92,7 +95,17 @@ export function shownRooms(runtime, listing) {
             documents: 0,
             locked: true,
         }
-        : { ...room, documents, locked: false }));
+        : { ...room, documents, locked: false };
+}
+export function shownRooms(runtime, listing) {
+    return structuredClone([...listing.values()].map((entry) => shownRoom(runtime, entry)));
+}
+export function shownChange(runtime, entries) {
+    return {
+        changed: structuredClone(entries.map((entry) => [entry.locator, shownRoom(runtime, entry)])),
+        removed: [],
+        order: null,
+    };
 }
 export async function roomFacts(runtime, reach = null) {
     const { store, socket, builtIn } = runtime;
@@ -113,43 +126,6 @@ export async function roomFacts(runtime, reach = null) {
     });
     return { listed: socket.session.now().roomsListed, rooms };
 }
-export function list({ store, socket }, room, synchronizationAvailable) {
-    if (store.fences.has(room.locator))
-        return;
-    socket.rooms.declare(room.locator, {
-        room: {
-            name: room.name,
-            locator: room.locator,
-            handle: room.handle,
-            operations: room.operations,
-            replica: room.replica,
-            typedSelection: room.typedSelection ?? null,
-            providerOwnedPaths: room.providerOwnedPaths,
-            authoredPaths: room.authoredPaths,
-        },
-        available: synchronizationAvailable,
-    });
-}
-export function listHeld({ store, socket }, locator) {
-    if (store.fences.has(locator))
-        return;
-    socket.rooms.declare(locator, { room: null, available: false });
-}
-export function admitted({ socket }, room) {
-    return room.replica.admission === 'admitted' && !socket.rooms.standing(room.locator).unreadable;
-}
-export function readable(runtime, room) {
-    runtime.socket.rooms.stand(room.locator, { unreadable: false });
-    list(runtime, room, true);
-}
-export function usable(runtime, room) {
-    const { rooms } = runtime.socket;
-    rooms.stand(room.locator, { stale: false, unpreparable: false });
-    if (rooms.standing(room.locator).unreadable) {
-        rooms.stand(room.locator, { unreadable: false, refusal: null });
-    }
-    list(runtime, room, true);
-}
 export async function heldRooms({ store }, listed) {
     const stored = await store.rooms(listed.map((room) => room.locator));
     return listed.flatMap((room) => {
@@ -159,14 +135,14 @@ export async function heldRooms({ store }, listed) {
                 ? [{ locator: room.locator, roomVersion: null }]
                 : [];
         }
-        if (record.replica.selection !== room.replica.selection)
+        if (record.declaration.replica.selection !== room.replica.selection)
             return [];
         return [{ locator: room.locator, roomVersion: record.roomVersion }];
     });
 }
 export async function name(runtime, locator) {
-    const { socket } = runtime;
-    const room = socket.rooms.discovered(locator);
+    const { socket, presence } = runtime;
+    const room = presence.room(locator);
     if (!socket.streamed || room === undefined || !socket.isOpen() || !socket.isHanded())
         return;
     const [held] = await heldRooms(runtime, [room]);

package/dist/live.d.ts

@@ -1,6 +1,6 @@
 import type { ChangeSet } from './change-set.js';
 import { type KeyedResult, type QueryMessage } from './observation.js';
-import type { PendingResult, Plan, QueryCoverage } from './query.js';
+import type { PendingResult, PendingRoom, Plan, QueryCoverage } from './query.js';
 import type { Fail } from './reach.js';
 import type { QueryRoom } from './tables.js';
 export type Cover = {
@@ -11,13 +11,15 @@ export type Ran = KeyedResult & {
     readonly current: () => boolean;
 };
 export type Run = (plan: Plan, cover: () => Promise<Cover>) => Promise<Ran>;
+export type PendingAt<H> = (held: H, rooms: readonly string[]) => ReadonlyMap<string, PendingRoom | null> | null;
 type Listener = (message: QueryMessage) => void;
 export type LiveQueries<H> = {
     touched(set: ChangeSet): void;
-    recover(): void;
-    watch(plan: Plan, identity: string, cover: (held: H) => Cover, deliver: Listener, failed: Fail): () => void;
+    recover(locators?: readonly string[]): void;
+    watch(plan: Plan, identity: string, cover: (held: H) => Cover, pendingAt: PendingAt<H>, deliver: Listener, failed: Fail): () => void;
     close(): void;
 };
+export declare function readerOf(plan: Plan): (locator: string) => boolean;
 export declare function createLiveQueries<H>(run: Run, holding: () => Promise<H>): LiveQueries<H>;
 export {};
 //# sourceMappingURL=live.d.ts.map

package/dist/live.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GAAG,aAAa,CAAC;AAE7F,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;CAAE,CAAC;AAEpE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE5E,KAAK,QAAQ,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;AAchD,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,OAAO,IAAI,IAAI,CAAC;IAChB,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,KAAK,EACzB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,IAAI,GACX,MAAM,IAAI,CAAC;IACd,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAmCF,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CA4HxF"}
+{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../src/live.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAQL,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GAAG,aAAa,CAAC;AAE7F,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;CAAE,CAAC;AAEpE,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAE5E,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CACzB,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,SAAS,MAAM,EAAE,KACrB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;AAEpD,KAAK,QAAQ,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;AAiBhD,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CACH,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,KAAK,EACzB,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,IAAI,GACX,MAAM,IAAI,CAAC;IACd,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAWF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAQjE;AAeD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CA4JxF"}

package/dist/live.js

@@ -1,26 +1,25 @@
-import { changeOf, digestOf, } from './observation.js';
-import { roomOfKey } from './rows.js';
+import { changeOf, digestOf, keyedAt, keyedInto, samePending, unchanged, } from './observation.js';
+import { uncaught } from './failure.js';
+import { roomsOfReach } from './rows.js';
 function narrowed(plan) {
     return (plan.paths !== null &&
         plan.hop === null &&
         plan.backlinks === null &&
         !(plan.shape.kind === 'documents' && plan.shape.backlinks));
 }
-function reads(plan, locator) {
-    if (plan.locked.includes(locator))
-        return false;
-    if (plan.rooms !== null && !plan.rooms.includes(locator))
-        return false;
-    if (plan.reach === null)
-        return true;
-    return (plan.reach.rooms.includes(locator) ||
-        plan.reach.documents.some((document) => roomOfKey(document) === locator));
+export function readerOf(plan) {
+    const locked = new Set(plan.locked);
+    const named = plan.rooms === null ? null : new Set(plan.rooms);
+    const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
+    return (locator) => !locked.has(locator) &&
+        (named === null || named.has(locator)) &&
+        (reached === null || reached.has(locator));
 }
-function affected(plan, set) {
-    if (set.rooms.some((locator) => reads(plan, locator)))
+function affected({ plan, reads }, set) {
+    if (set.rooms.some(reads))
         return true;
     const paths = narrowed(plan) ? new Set(plan.paths) : null;
-    return set.documents.some(({ locator, path }) => reads(plan, locator) && (paths === null || path === null || paths.has(path)));
+    return set.documents.some(({ locator, path }) => reads(locator) && (paths === null || path === null || paths.has(path)));
 }
 function shown(entry, held) {
     const cover = entry.cover(held);
@@ -29,11 +28,13 @@ function shown(entry, held) {
 export function createLiveQueries(run, holding) {
     const entries = new Map();
     let closed = false;
-    let recovering = false;
-    let recoverAgain = false;
+    let recoveringNow = false;
+    let recoveringAll = false;
+    const recovering = new Set();
     function deliver(entry, next) {
         const previous = entry.digest;
         entry.digest = digestOf(next);
+        entry.pending = 'pending' in entry.digest ? entry.digest.pending : null;
         entry.covered = JSON.stringify('pending' in next.result ? next.result : next.result.coverage);
         const change = previous === undefined ? null : changeOf(previous, next);
         if (change !== null) {
@@ -76,7 +77,6 @@ export function createLiveQueries(run, holding) {
                 }
             }
             catch (error) {
-                entry.dirty = false;
                 const unanswered = [...entry.fresh.values()];
                 entry.fresh.clear();
                 for (const failed of unanswered)
@@ -87,58 +87,99 @@ export function createLiveQueries(run, holding) {
             }
         })();
     }
-    function recovered() {
-        if (recovering) {
-            recoverAgain = true;
-            return;
+    function pendingMoved(entry, held, rooms) {
+        const { pending } = entry;
+        if (pending === null || pending.size === 0 || entry.running || entry.fresh.size > 0) {
+            return false;
         }
-        recovering = true;
+        const at = entry.pendingAt(held, rooms);
+        const change = at === null ? null : keyedAt(pending, at, samePending);
+        if (change === null || change.removed.length === pending.size)
+            return false;
+        keyedInto(pending, change);
+        entry.covered = '';
+        if (unchanged(change))
+            return true;
+        for (const listener of entry.ready)
+            listener({ pending: change });
+        return true;
+    }
+    function recovered(locators) {
+        if (locators === undefined)
+            recoveringAll = true;
+        else
+            for (const locator of locators)
+                recovering.add(locator);
+        if (recoveringNow)
+            return;
+        recoveringNow = true;
         void (async () => {
             try {
-                do {
-                    recoverAgain = false;
-                    for (const entry of entries.values()) {
+                while ((recoveringAll || recovering.size > 0) && !closed) {
+                    const all = recoveringAll;
+                    const touched = [...recovering];
+                    recoveringAll = false;
+                    recovering.clear();
+                    const reached = [...entries.values()].filter((entry) => all || touched.some(entry.reads));
+                    for (const entry of reached) {
                         if (entry.running)
                             entry.dirty = true;
                     }
-                    const waiting = [...entries.values()].filter((entry) => !entry.running);
-                    if (waiting.length === 0 || closed)
+                    const waiting = reached.filter((entry) => !entry.running);
+                    if (waiting.length === 0)
                         continue;
                     const held = await holding();
                     for (const entry of waiting) {
                         if (entry.running)
                             continue;
+                        const read = all ? [] : touched.filter(entry.reads);
+                        if (read.length > 0 && pendingMoved(entry, held, read))
+                            continue;
                         if (entry.digest === undefined || shown(entry, held) !== entry.covered)
                             schedule(entry);
                     }
-                } while (recoverAgain && !closed);
+                }
             }
-            catch {
-                recoverAgain = false;
+            catch (error) {
+                uncaught(error);
             }
             finally {
-                recovering = false;
+                recoveringNow = false;
             }
         })();
     }
     return {
         touched(set) {
+            const pending = new Set();
             for (const entry of entries.values()) {
-                if (affected(entry.plan, set))
+                if (!affected(entry, set))
+                    continue;
+                if (entry.pending === null || entry.running) {
                     schedule(entry);
+                    continue;
+                }
+                for (const locator of set.rooms)
+                    pending.add(locator);
+                for (const { locator } of set.documents)
+                    pending.add(locator);
             }
+            if (pending.size > 0)
+                recovered([...pending]);
         },
         recover: recovered,
-        watch(plan, identity, cover, listener, failed) {
+        watch(plan, identity, cover, pendingAt, listener, failed) {
             let entry = entries.get(identity);
             if (entry === undefined) {
                 entry = {
                     plan,
+                    reads: readerOf(plan),
                     cover,
+                    pendingAt,
                     listeners: new Set(),
                     fresh: new Map(),
                     ready: new Set(),
                     digest: undefined,
+                    pending: null,
                     covered: '',
                     dirty: false,
                     running: false,

package/dist/loaded.d.ts

@@ -0,0 +1,5 @@
+import type { BuildFile } from './client.js';
+export declare function parsed(file: Blob | null): Promise<unknown>;
+export declare function perBuild<T>(buildFile: BuildFile, key: string, make: () => Promise<T>): Promise<T>;
+export declare function loaded<T>(buildFile: BuildFile, name: string, read?: (file: Blob | null) => Promise<unknown>): Promise<T | null>;
+//# sourceMappingURL=loaded.d.ts.map

package/dist/loaded.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loaded.d.ts","sourceRoot":"","sources":["../src/loaded.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAc7C,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhE;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAYjG;AAED,wBAAgB,MAAM,CAAC,CAAC,EACtB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,OAAO,CAAY,GACvD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAEnB"}

package/dist/loaded.js

@@ -0,0 +1,40 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+const holdings = new WeakMap();
+async function imported(file) {
+    if (file === null)
+        return null;
+    const address = URL.createObjectURL(file);
+    try {
+        return await import(__rewriteRelativeImportExtension(address));
+    }
+    finally {
+        URL.revokeObjectURL(address);
+    }
+}
+export async function parsed(file) {
+    return file === null ? null : JSON.parse(await file.text());
+}
+export function perBuild(buildFile, key, make) {
+    let named = holdings.get(buildFile);
+    if (named === undefined) {
+        named = new Map();
+        holdings.set(buildFile, named);
+    }
+    const holding = named.get(key);
+    if (holding !== undefined)
+        return holding;
+    const making = make();
+    named.set(key, making);
+    making.catch(() => named.delete(key));
+    return making;
+}
+export function loaded(buildFile, name, read = imported) {
+    return perBuild(buildFile, name, () => buildFile(name).then(read));
+}

package/dist/locks.d.ts

@@ -1,9 +1,7 @@
-import type { DiscoveredRoom } from './adapter.js';
 import type { Runtime } from './runtime.js';
-export declare function locked({ store, socket }: Runtime, locator: string): Promise<boolean>;
-export declare function lockedRooms(runtime: Runtime): Promise<readonly string[]>;
+export declare function locked({ store, presence }: Runtime, locator: string): Promise<boolean>;
+export declare function lockedRooms({ store, presence }: Runtime): Promise<readonly string[]>;
 export declare function relocked(runtime: Runtime, before: readonly string[]): Promise<void>;
-export declare function confirmLocks({ socket }: Runtime, listed: readonly DiscoveredRoom[]): void;
 export declare function connectionLost(runtime: Runtime): void;
 export declare function watchLocks({ store }: Runtime, notify: () => void): () => void;
 //# sourceMappingURL=locks.d.ts.map

package/dist/locks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAa5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK1F;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAW9E;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAMzE;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,cAAc,EAAE,QAOlF;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAa9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}
+{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5F;AAED,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAG1F;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAKzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAU9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}

package/dist/locks.js

@@ -1,59 +1,30 @@
+import { uncaught } from './failure.js';
 import { emitRooms, LOCKS_TOPIC } from './shown.js';
-async function offlineModes({ store, socket }) {
-    const modes = new Map();
-    for (const [locator, { room }] of socket.rooms.declarations()) {
-        const declaration = room ?? socket.rooms.discovered(locator);
-        if (declaration !== undefined)
-            modes.set(locator, declaration.replica.offline);
-    }
-    for (const [locator, { offline }] of (await store.covering()).rooms)
-        modes.set(locator, offline);
-    return modes;
+export async function locked({ store, presence }, locator) {
+    return presence.locked(locator, async () => (await store.open()).offline(locator));
 }
-export async function locked({ store, socket }, locator) {
-    if (store.fences.has(locator) || socket.rooms.standing(locator).confirmed)
-        return false;
-    const held = socket.rooms.declared(locator)?.room ?? socket.rooms.discovered(locator);
-    const mode = (await (await store.open()).offline(locator)) ?? held?.replica.offline;
-    return mode === 'locked';
-}
-export async function lockedRooms(runtime) {
-    const { store, socket } = runtime;
-    return [...(await offlineModes(runtime))]
-        .filter(([locator, mode]) => mode === 'locked' &&
-        !socket.rooms.standing(locator).confirmed &&
-        !store.fences.has(locator))
-        .map(([locator]) => locator)
-        .sort();
+export async function lockedRooms({ store, presence }) {
+    const { rooms, locking } = await store.covering();
+    return presence.lockedAmong(rooms, locking);
 }
 export async function relocked(runtime, before) {
     const after = await lockedRooms(runtime);
     if (JSON.stringify(after) === JSON.stringify(before))
         return;
-    runtime.journal.record(`locked ${after.length}`);
     emitRooms(runtime);
     runtime.store.tell(LOCKS_TOPIC, undefined);
 }
-export function confirmLocks({ socket }, listed) {
-    if (!socket.isOpen())
-        return;
-    for (const room of listed) {
-        if (room.replica.admission === 'admitted') {
-            socket.rooms.stand(room.locator, { confirmed: true });
-        }
-    }
-}
 export function connectionLost(runtime) {
-    const { socket } = runtime;
+    const { socket, presence } = runtime;
     if (socket.closed())
         return;
-    socket.rooms.connectionLost(() => {
+    presence.connectionLost(() => {
         if (socket.isOpen() || socket.closed())
             return;
         void lockedRooms(runtime).then((before) => {
-            socket.rooms.standAll({ confirmed: false });
+            presence.lapse();
             return relocked(runtime, before);
-        }, () => { });
+        }, uncaught);
     });
 }
 export function watchLocks({ store }, notify) {

package/dist/lost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lost.d.ts","sourceRoot":"","sources":["../src/lost.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAU5C,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBAIhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,QAOtE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBAqC5E"}
+{"version":3,"file":"lost.d.ts","sourceRoot":"","sources":["../src/lost.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBAIhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,QAMtE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBA+B5E"}