@agentshouse/mdruntime 0.1.0-cbbae1fff01c6 → 0.1.0-cc00e9289ddf4

package/dist/install.d.ts

@@ -1,6 +1,6 @@
 import type { AdapterFailure, Authorization, DiscoveredRoom, NotReady, RetryableRefusal } from './adapter.js';
 import { type Reads } from './bootstrap.js';
-import type { Installation, RoomCoverage } from './readiness.js';
+import type { Installation, InstallationAmount, RoomCoverage } from './readiness.js';
 import { advancement, type Refresher } from './refresh.js';
 import type { ReplicaRecord } from './replica.js';
 import type { Runtime } from './runtime.js';
@@ -33,9 +33,15 @@ type Refreshed = {
     kind: 'advanced';
 }>;
 export declare const ERASE_BATCH = 512;
-export declare function installationOf(store: Store, coverage: readonly RoomCoverage[], held: ReadonlyMap<string, CoveredRoom>): Installation;
+export type InstallShare = {
+    readonly installing: boolean;
+    readonly downloading: boolean;
+    readonly bytes: InstallationAmount;
+};
+export declare function installShare(store: Store, { room, state }: RoomCoverage, held: ReadonlyMap<string, CoveredRoom>): InstallShare;
+export declare function installationOf(installing: number, downloading: number, bytes: InstallationAmount): Installation;
 export declare function roomInFlight(store: Store, locator: string): boolean;
-export declare function sweep({ store, socket, journal }: Runtime): void;
+export declare function sweep({ store, socket }: Runtime): void;
 export declare function caughtUpTo(runtime: Runtime, locator: string): void;
 export declare function catching(store: Store, locator: string): void;
 export declare function standingAt(store: Store, locator: string, held: Pick<ReplicaRecord, 'key'> | undefined): Standing;
@@ -46,7 +52,7 @@ export declare function reachedBy({ store, socket }: Runtime, locator: string, r
 export declare function behind({ store, socket }: Runtime, room: DiscoveredRoom): Promise<boolean>;
 export declare function writtenAfter({ store, socket }: Runtime, locator: string, roomVersion: string, path: string): Promise<boolean>;
 export declare function pullRefresh(runtime: Runtime, authorized: Authorization, record: ReplicaRecord, liveness: Live, hold: InstallHold, refresh: Refresher): Promise<Refreshed>;
-export declare function pullBootstrap(runtime: Runtime, authorized: Authorization, room: DiscoveredRoom, local: RuntimeStore, liveness: Live, prior: ReplicaRecord | undefined, from?: Reads, unheld?: Unheld): Promise<import("./bootstrap.js").Bootstrapped | NotReady | import("./adapter.js").RevokedAuthorization | import("./adapter.js").RoomNotReadable | Unconfirmed | {
+export declare function pullBootstrap(runtime: Runtime, authorized: Authorization, room: DiscoveredRoom, local: RuntimeStore, liveness: Live, prior: ReplicaRecord | undefined, from?: Reads, unheld?: Unheld): Promise<import("./bootstrap.js").Bootstrapped | NotReady | import("./adapter.js").RevokedAuthorization | import("./adapter.js").RoomNotReadable | import("./adapter.js").TransportUncertainty | Unconfirmed | {
     readonly kind: 'transport-uncertainty';
 } | RetryableRefusal | import("./adapter.js").ScopedRefusal>;
 export declare function publish(runtime: Runtime, local: RuntimeStore, room: DiscoveredRoom, reached: ReplicaRecord, landing: Landing, live: Live): Promise<boolean>;

package/dist/install.d.ts.map

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

package/dist/install.js

@@ -79,28 +79,32 @@ function batchEnd(entries, from, bytes) {
     }
     return end;
 }
-export function installationOf(store, coverage, held) {
-    const bytes = { done: 0, total: 0 };
-    let installing = 0;
-    let downloading = false;
-    for (const { room, state } of coverage) {
-        if (state === 'unadmitted')
-            continue;
-        const install = store.installs.of(room);
-        const underway = state === 'acquiring' || (install.installing && state !== 'complete');
-        if (underway)
-            installing += 1;
-        if (underway && (install.streaming || install.arrived === null))
-            downloading = true;
-        const kept = underway ? NOTHING_HELD.bytes : (held.get(room)?.bytes ?? NOTHING_HELD.bytes);
-        const now = amountOf(install, kept);
-        const earlier = underway ? install.startedOver : null;
-        bytes.done += Math.max(now.done, earlier?.done ?? 0);
-        bytes.total += Math.max(now.total, earlier?.total ?? 0);
-    }
+const UNSHARED = {
+    installing: false,
+    downloading: false,
+    bytes: { done: 0, total: 0 },
+};
+export function installShare(store, { room, state }, held) {
+    if (state === 'unadmitted')
+        return UNSHARED;
+    const install = store.installs.of(room);
+    const underway = state === 'acquiring' || (install.installing && state !== 'complete');
+    const kept = underway ? NOTHING_HELD.bytes : (held.get(room)?.bytes ?? NOTHING_HELD.bytes);
+    const now = amountOf(install, kept);
+    const earlier = underway ? install.startedOver : null;
+    return {
+        installing: underway,
+        downloading: underway && (install.streaming || install.arrived === null),
+        bytes: {
+            done: Math.max(now.done, earlier?.done ?? 0),
+            total: Math.max(now.total, earlier?.total ?? 0),
+        },
+    };
+}
+export function installationOf(installing, downloading, bytes) {
     const step = installing === 0
         ? null
-        : downloading
+        : downloading > 0
             ? 'downloading'
             : bytes.done < bytes.total
                 ? 'writing'
@@ -113,15 +117,15 @@ export function roomInFlight(store, locator) {
 }
 function installing(runtime, locator) {
     runtime.store.installs.change(locator, (held) => ({ ...held, installing: true }));
-    runtime.store.readiness.queue();
+    runtime.store.readiness.queue([locator]);
 }
 function installed(runtime, locator) {
     if (!runtime.store.installs.of(locator).installing)
         return;
     runtime.store.installs.change(locator, (held) => ({ ...held, installing: false }));
-    runtime.store.readiness.queue();
+    runtime.store.readiness.queue([locator]);
 }
-export function sweep({ store, socket, journal }) {
+export function sweep({ store, socket }) {
     if (store.device.now().sweeping || socket.closed())
         return;
     store.device.set({ sweeping: true });
@@ -132,7 +136,6 @@ export function sweep({ store, socket, journal }) {
             }
         }
         catch (error) {
-            journal.record('erasure failed');
             uncaught(error);
         }
         finally {
@@ -144,7 +147,7 @@ export function caughtUpTo(runtime, locator) {
     if (!runtime.store.installs.of(locator).catching)
         return;
     runtime.store.installs.change(locator, (held) => ({ ...held, catching: false }));
-    recoverReads(runtime);
+    recoverReads(runtime, [locator]);
 }
 export function catching(store, locator) {
     store.installs.change(locator, (held) => ({ ...held, catching: true }));
@@ -263,7 +266,7 @@ function refreshingOf(runtime, local, locator, key, composition, liveness, repla
 export async function pullRefresh(runtime, authorized, record, liveness, hold, refresh) {
     if (!liveness())
         return unconfirmed;
-    const { store, journal } = runtime;
+    const { store } = runtime;
     const from = standingAt(store, record.locator, record);
     const local = await store.open();
     try {
@@ -277,11 +280,8 @@ export async function pullRefresh(runtime, authorized, record, liveness, hold, r
                 hold.take();
             }
         }, authorized, record, (models, kept) => (liveness() ? remodel(runtime, models, kept) : kept), liveness, refreshingOf(runtime, local, record.locator, record.key, store.composed(record), liveness, false, record.roomVersion));
-        if (result.kind !== 'advanced') {
-            journal.record(`transfer refresh ${record.locator} ${result.kind}`);
+        if (result.kind !== 'advanced')
             return result;
-        }
-        journal.record(`transfer refresh ${record.locator} ${result.record.roomVersion}`);
         return {
             kind: 'advanced',
             record: result.record,
@@ -292,14 +292,14 @@ export async function pullRefresh(runtime, authorized, record, liveness, hold, r
     catch (error) {
         if (refusedForSpace(error))
             return unconfirmed;
-        journal.record(`transfer refresh ${record.locator} transport-uncertainty`);
         throw error;
     }
 }
 async function abandoned(runtime, local, locator) {
     await local.abandon(locator);
     runtime.store.installs.change(locator, (held) => transferGone(setBack(held)));
-    recoverReads(runtime);
+    recoverReads(runtime, [locator]);
+    runtime.store.readiness.queue([locator]);
     sweep(runtime);
 }
 function staging(runtime, local, liveness, unheld) {
@@ -313,7 +313,7 @@ function staging(runtime, local, liveness, unheld) {
             if (done === null)
                 return false;
             store.installs.change(locator, (held) => built(held, done.done, done.text));
-            runtime.store.readiness.queue();
+            runtime.store.readiness.queue([locator]);
             if (done.done)
                 return true;
         }
@@ -337,9 +337,9 @@ function staging(runtime, local, liveness, unheld) {
                         arrived: bytes,
                         streaming: true,
                     }));
-                    if (!store.installs.arrivalDue(performance.now(), ARRIVAL_REPORT_MS))
-                        return;
-                    runtime.store.readiness.queue();
+                    const due = store.installs.arrivalsDue(locator, performance.now(), ARRIVAL_REPORT_MS);
+                    if (due.length > 0)
+                        runtime.store.readiness.queue(due);
                 },
                 end() {
                     if (ended)
@@ -348,7 +348,7 @@ function staging(runtime, local, liveness, unheld) {
                     if (!store.installs.of(locator).streaming)
                         return;
                     store.installs.change(locator, (held) => ({ ...held, streaming: false }));
-                    runtime.store.readiness.queue();
+                    runtime.store.readiness.queue([locator]);
                 },
             };
         },
@@ -376,7 +376,7 @@ function staging(runtime, local, liveness, unheld) {
                 underived: owed,
             }));
             installing(runtime, locator);
-            recoverReads(runtime);
+            recoverReads(runtime, [locator]);
             if (owed < store.deriveBytes())
                 return held;
             return (await derived(locator, key, composition)) ? held : null;
@@ -411,7 +411,8 @@ function staging(runtime, local, liveness, unheld) {
                 done: { bytes },
             };
             store.installs.change(locator, (room) => ({ ...room, transfer: held }));
-            recoverReads(runtime);
+            recoverReads(runtime, [locator]);
+            store.readiness.queue([locator]);
             return { record: held, staged: parted };
         },
         derive: derived,
@@ -427,7 +428,8 @@ function staging(runtime, local, liveness, unheld) {
             if (!liveness())
                 return;
             store.installs.change(locator, (held) => transferGone(setBack(held)));
-            recoverReads(runtime);
+            recoverReads(runtime, [locator]);
+            store.readiness.queue([locator]);
         },
         release: (key) => store.exclusive(async () => {
             await local.release(key);
@@ -438,23 +440,20 @@ function staging(runtime, local, liveness, unheld) {
 export async function pullBootstrap(runtime, authorized, room, local, liveness, prior, from = runtime.socket.reads, unheld) {
     if (!liveness())
         return unconfirmed;
-    const { store, journal } = runtime;
+    const { store } = runtime;
     if (prior !== undefined) {
         catching(store, room.locator);
-        recoverReads(runtime);
+        recoverReads(runtime, [room.locator]);
     }
     try {
         const result = await bootstrapRoom(from, authorized, room, {
             collection: prior?.model ?? runtime.presence.unheldModel(room.locator) ?? NO_MODEL,
         }, runtime.builtIn, runtime.typedPaths, (models, held) => (liveness() ? remodel(runtime, models, held) : held), liveness, staging(runtime, local, liveness, unheld));
-        const detail = result.kind === 'staged' ? result.record.roomVersion : result.kind;
-        journal.record(`transfer bootstrap ${room.locator} ${detail}`);
         if (result.kind === 'staged' &&
             (await older(runtime, room.locator, result.record.roomVersion))) {
             caughtUpTo(runtime, room.locator);
             installed(runtime, room.locator);
             await abandoned(runtime, local, room.locator);
-            journal.record(`transfer bootstrap ${room.locator} older than shown`);
             return { kind: 'transport-uncertainty' };
         }
         if (result.kind !== 'staged') {
@@ -468,7 +467,6 @@ export async function pullBootstrap(runtime, authorized, room, local, liveness,
         installed(runtime, room.locator);
         if (refusedForSpace(error))
             return unconfirmed;
-        journal.record(`transfer bootstrap ${room.locator} transport-uncertainty`);
         throw error;
     }
 }
@@ -510,6 +508,7 @@ export function publish(runtime, local, room, reached, landing, live) {
                     },
                 after() {
                     runtime.presence.installed(room.locator, landing.kind === 'bootstrapped');
+                    runtime.retries.succeeded('download', room.locator);
                     store.prepareAgain(room.locator);
                     if (landing.kind === 'bootstrapped') {
                         store.installs.change(room.locator, (held) => ({

package/dist/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAyN5C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QAOhD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,QAS1C;AAED,wBAAgB,KAAK,CAAC,EACpB,KAAK,EACL,MAAM,EACN,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,OAAO,GACR,EAAE,OAAO,QAST;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBAS1C;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,QAyCtE"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAoO5C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QAOhD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,QAQ1C;AAED,wBAAgB,KAAK,CAAC,EACpB,KAAK,EACL,MAAM,EACN,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,OAAO,GACR,EAAE,OAAO,QAST;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBAS1C;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,QAyCtE"}

package/dist/lifecycle.js

@@ -9,6 +9,7 @@ import { refuse } from './refusal.js';
 import { moveTo, recoverReads, rest, SERVICE_MODE_TOPIC, show, submissionDue, transferring, } from './shown.js';
 import { applyRoom, changeAuthority, countAuthorityChange, finishOpening, loadRoom, OPENING_LANE, reload, resynchronize, sync, } from './sync.js';
 const CONVERSATION_LANE = 'conversations';
+const RELOADING = 'reloading';
 function closing(runtime, opened) {
     const { store, socket } = runtime;
     return socket.lanes.task(OPENING_LANE, async (live) => {
@@ -51,13 +52,13 @@ function owedReloads(runtime, expired, held) {
         .map((room) => room.locator);
     for (const locator of reloading)
         catching(store, locator);
-    recoverReads(runtime);
+    recoverReads(runtime, reloading);
     return reloading;
 }
-async function reloadNow(runtime, replacing, progress, held, installing) {
+async function reloadNow(runtime, among, replacing, progress, held, installing) {
     const { store, socket, presence } = runtime;
     const { lanes } = socket;
-    const discovered = presence.rooms();
+    const discovered = among === null ? presence.rooms() : among.flatMap((locator) => presence.room(locator) ?? []);
     const reloaded = discovered.filter((room) => held.has(room.locator) && !installing.has(room.locator) && replacing(room));
     const acquired = discovered.filter((room) => (!held.has(room.locator) || installing.has(room.locator)) &&
         room.replica.admission === 'admitted' &&
@@ -78,8 +79,10 @@ async function reloadNow(runtime, replacing, progress, held, installing) {
                 .roomTask(room.locator, (live) => loadRoom(runtime, room, local, progress, live, unheld))
                 .then(() => rest(runtime, progress));
         }
+        runtime.retries.succeeded('download', RELOADING);
     }
-    catch {
+    catch (error) {
+        runtime.retries.failed('download', RELOADING, error);
         for (const room of reloaded)
             presence.reload(room.locator, false);
         progress.reachable = false;
@@ -93,12 +96,13 @@ function caughtUpRooms(runtime, expired) {
     socket.named();
     const cycle = progress ?? { complete: true, reachable: true };
     replaced(store, expired);
-    const installing = store.installs.underway();
-    const held = progress === null ? store.rooms(expired) : store.rooms();
+    const among = progress === null ? expired : null;
+    const installing = store.installs.underway(among);
+    const held = among === null ? store.rooms() : store.rooms(among);
     const reloading = progress === null
         ? Promise.resolve([])
         : held.then((stored) => owedReloads(runtime, expired, stored));
-    const replacing = Promise.all([held, reloading]).then(([stored, owed]) => reloadNow(runtime, (room) => expired.includes(room.locator) || owed.includes(room.locator), cycle, stored, installing));
+    const replacing = Promise.all([held, reloading]).then(([stored, owed]) => reloadNow(runtime, among, (room) => expired.includes(room.locator) || owed.includes(room.locator), cycle, stored, installing));
     return socket.lanes.task(OPENING_LANE, async (live) => {
         if (!live())
             return;
@@ -120,8 +124,10 @@ function caughtUpRooms(runtime, expired) {
                     !owed.includes(room.locator))
                     .map((room) => [room.locator, declared(room)])), 'current', local);
             }
+            runtime.retries.succeeded('download', OPENING_LANE);
         }
-        catch {
+        catch (error) {
+            runtime.retries.failed('download', OPENING_LANE, error);
             progress.complete = false;
             progress.reachable = false;
         }
@@ -130,7 +136,7 @@ function caughtUpRooms(runtime, expired) {
     });
 }
 function signalled(runtime, mode) {
-    const { store, socket, journal } = runtime;
+    const { store, socket } = runtime;
     const { session } = socket;
     const { closed, serviceMode, haltedRefusal, openSignals } = session.now();
     if (closed)
@@ -142,8 +148,7 @@ function signalled(runtime, mode) {
         session.set({ haltedRefusal: false });
     if (mode !== serviceMode) {
         session.set({ serviceMode: mode });
-        store.readiness.queue();
-        journal.record(`service mode ${mode}`);
+        store.readiness.queue([]);
         store.tell(SERVICE_MODE_TOPIC, mode);
     }
     if (releasing)
@@ -158,7 +163,7 @@ async function runCurrency(runtime, live) {
         return;
     await reconcileConversations(conversations);
     if (conversations.current()) {
-        show(runtime);
+        await rest(runtime, null, live);
         return;
     }
     const progress = {
@@ -168,8 +173,10 @@ async function runCurrency(runtime, live) {
     moveTo(runtime, transferring(runtime));
     try {
         await catchUpConversations(conversations, progress);
+        runtime.retries.succeeded('conversations', CONVERSATION_LANE);
     }
-    catch {
+    catch (error) {
+        runtime.retries.failed('conversations', CONVERSATION_LANE, error);
         progress.reachable = false;
     }
     await rest(runtime, progress, live);
@@ -183,9 +190,8 @@ export function scheduleCurrency(runtime) {
     void socket.lanes.task(CONVERSATION_LANE, (live) => runCurrency(runtime, live));
 }
 export function spaceFreed(runtime) {
-    const { store, socket, journal } = runtime;
+    const { store, socket } = runtime;
     store.prepareAgain();
-    journal.record('space freed');
     store.readiness.queue();
     const { closed, authorization } = socket.session.now();
     if (closed || authorization === undefined)
@@ -222,7 +228,7 @@ export function start(runtime, signal) {
     socket.observeServiceMode((mode) => signalled(runtime, mode));
     socket.observeConversations((event) => {
         if (event.kind === 'list' || event.kind === 'listed' || event.kind === 'unlisted')
-            store.readiness.queue();
+            store.readiness.queue([]);
         receiveConversationEvent(conversations, event);
         if (event.kind !== 'gap' || conversations.current())
             return;

package/dist/listing.d.ts

@@ -1,6 +1,7 @@
 import type { HeldRooms } from '@agentshouse/mdmodel';
 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';
@@ -27,10 +28,11 @@ 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 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({ presence }: Runtime, locator: string, stored: Stored | undefined): {
@@ -38,9 +40,11 @@ export declare function declarationOf({ presence }: Runtime, locator: string, st
     readonly available: boolean;
 } | undefined;
 export declare function listedLocators({ presence }: Runtime, held: ReadonlyMap<string, unknown>): string[];
-export declare function patchedListing(runtime: Runtime, changed: ReadonlySet<string>): Promise<Listing | null>;
+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({ presence }: Runtime, listing: Listing): readonly AppRoom[];
+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 heldRooms({ store }: Runtime, listed: readonly DiscoveredRoom[]): Promise<HeldRoom[]>;
 export declare function name(runtime: Runtime, locator: string): Promise<void>;

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

@@ -26,6 +26,9 @@ 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'
         ? { status: 'unavailable', reason: 'revoked' }
@@ -64,27 +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) {
+    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 || !listing.has(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());
 }
-export function shownRooms({ presence }, listing) {
-    const locked = new Set(presence.lockedAmong(new Map([...listing].map(([locator, room]) => [locator, room.replica.offline]))));
-    return structuredClone([...listing.values()].map(({ documents, ...room }) => locked.has(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({ presence }, 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;

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;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,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,CA2HxF"}
+{"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"}