@agentshouse/mdruntime 0.1.0-cd507e16e5fc0 → 0.1.0-cd71aba4d0215

package/dist/install.js

@@ -1,11 +1,12 @@
 import { attachedModel } from './attached-model.js';
 import { bootstrapRoom } from './bootstrap.js';
 import { refusedForSpace } from './durability.js';
-import { name, usable } from './listing.js';
+import { uncaught } from './failure.js';
+import { name } from './listing.js';
 import { NO_MODEL } from './model.js';
+import { settle } from './queue.js';
 import { advancement } from './refresh.js';
-import { recoverReads, statusShown } from './shown.js';
-import { NO_INSTALL, } from './store.js';
+import { recoverReads } from './shown.js';
 import { unconfirmed } from './transfer.js';
 import { ROW_WEIGHT, yielded } from './turn.js';
 // Bytes still arriving are reported at most this often, so readiness is not rebuilt for every chunk the network hands over while a slow link still moves the figure.
@@ -130,17 +131,15 @@ export function sweep({ store, socket, journal }) {
                 await yielded();
             }
         }
-        catch {
+        catch (error) {
             journal.record('erasure failed');
+            uncaught(error);
         }
         finally {
             store.device.set({ sweeping: false });
         }
     })();
 }
-export function forgetInstall(store, locator) {
-    store.installs.change(locator, ({ installing }) => ({ ...NO_INSTALL, installing }));
-}
 export function caughtUpTo(runtime, locator) {
     if (!runtime.store.installs.of(locator).catching)
         return;
@@ -150,12 +149,6 @@ export function caughtUpTo(runtime, locator) {
 export function catching(store, locator) {
     store.installs.change(locator, (held) => ({ ...held, catching: true }));
 }
-export function confirmedAgain(store, locator) {
-    store.installs.change(locator, (held) => ({
-        ...held,
-        confirmations: held.confirmations + 1,
-    }));
-}
 export function standingAt(store, locator, held) {
     return { key: held?.key ?? null, confirmed: store.installs.of(locator).confirmations };
 }
@@ -382,8 +375,6 @@ function staging(runtime, local, liveness, unheld) {
                 transfer: held,
                 underived: owed,
             }));
-            if (before.transfer === null)
-                recoverReads(runtime);
             installing(runtime, locator);
             recoverReads(runtime);
             if (owed < store.deriveBytes())
@@ -396,7 +387,9 @@ function staging(runtime, local, liveness, unheld) {
             if (!liveness())
                 return null;
             const prior = unheld === undefined ? await store.record(locator) : undefined;
-            const published = prior !== undefined && prior.replica.selection === record.selection ? prior.key : null;
+            const published = prior !== undefined && prior.declaration.replica.selection === record.selection
+                ? prior.key
+                : null;
             const kept = unheld?.staged ?? (await local.held()).staged.has(locator);
             if (published === null && !kept)
                 return { record: null, staged: new Set() };
@@ -452,7 +445,7 @@ export async function pullBootstrap(runtime, authorized, room, local, liveness,
     }
     try {
         const result = await bootstrapRoom(from, authorized, room, {
-            collection: prior?.model ?? runtime.socket.rooms.standing(room.locator).unheldModel ?? NO_MODEL,
+            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}`);
@@ -481,21 +474,22 @@ export async function pullBootstrap(runtime, authorized, room, local, liveness,
 }
 export function publish(runtime, local, room, reached, landing, live) {
     const { store } = runtime;
-    const landed = store.exclusive(async () => {
+    let published = true;
+    const landed = settle(runtime, [room.locator], async (held) => {
         if (!live()) {
             caughtUpTo(runtime, room.locator);
-            return true;
+            return [];
         }
-        const work = await store.work(room.locator);
-        const prior = work.replica;
+        const prior = held.get(room.locator)?.replica;
         if (!standsAt(store, room.locator, prior?.record, landing.from)) {
+            published = false;
             if (landing.kind === 'refreshed') {
                 await local.unrefresh(reached.key);
-                return false;
+                return [];
             }
             caughtUpTo(runtime, room.locator);
             await abandoned(runtime, local, room.locator);
-            return false;
+            return [];
         }
         const record = landing.kind === 'refreshed' && prior !== undefined
             ? {
@@ -504,51 +498,40 @@ export function publish(runtime, local, room, reached, landing, live) {
                 ...(landing.remodelled ? { model: reached.model } : {}),
             }
             : reached;
-        let set;
-        try {
-            set = await runtime.settle(local, room.locator, work, record, work.queue, landing.kind === 'refreshed'
-                ? {
-                    room: true,
-                    view: 'refreshed',
-                    commit: { refreshed: true },
-                }
-                : {
-                    room: true,
-                    view: landing.refreshed ? 'refreshed' : 'confirmed',
-                    commit: {
+        return [
+            {
+                locator: room.locator,
+                record,
+                installed: landing.kind === 'refreshed'
+                    ? { refreshed: true }
+                    : {
                         published: { from: prior?.record.key ?? null },
                         ...(landing.refreshed ? { refreshed: true } : {}),
                     },
-                });
-        }
-        catch (error) {
-            if (!refusedForSpace(error))
-                throw error;
-            caughtUpTo(runtime, room.locator);
-            return true;
-        }
-        if (landing.kind === 'bootstrapped') {
-            runtime.socket.rooms.readied(room.locator);
-            store.installs.change(room.locator, (held) => ({
-                ...transferGone(held),
-                highest: null,
-                beyondHorizon: false,
-                startedOver: null,
-                catching: false,
-            }));
-            runtime.socket.rooms.stand(room.locator, { unheldModel: null });
-            if (prior !== undefined && prior.record.key !== record.key)
-                sweep(runtime);
-            void name(runtime, room.locator);
-        }
-        usable(runtime, room);
-        void runtime.store.changed(set);
-        await runtime.unpair(local);
-        void statusShown(runtime);
-        if (landing.kind === 'bootstrapped' && work.queue.length > 0) {
-            runtime.submitLater(room.locator);
-        }
-        return true;
+                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) => ({
+                            ...transferGone(held),
+                            highest: null,
+                            beyondHorizon: false,
+                            startedOver: null,
+                            catching: false,
+                        }));
+                        if (prior !== undefined && prior.record.key !== record.key)
+                            sweep(runtime);
+                        void name(runtime, room.locator);
+                    }
+                },
+            },
+        ];
+    }).then(() => published, (error) => {
+        if (!refusedForSpace(error))
+            throw error;
+        caughtUpTo(runtime, room.locator);
+        return published;
     });
     return landing.kind === 'refreshed'
         ? landed

package/dist/lifecycle.d.ts

@@ -1,7 +1,7 @@
 import type { Runtime } from './runtime.js';
 export declare function scheduleCurrency(runtime: Runtime): void;
 export declare function spaceFreed(runtime: Runtime): void;
-export declare function close({ store, socket, conversations, recovery, liveQueries, figures }: Runtime): void;
+export declare function close({ store, socket, presence, conversations, recovery, liveQueries, figures, }: Runtime): void;
 export declare function stop(runtime: Runtime): Promise<void>;
 export declare function start(runtime: Runtime, signal: AbortSignal | undefined): void;
 //# sourceMappingURL=lifecycle.d.ts.map

package/dist/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AA8M5C,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,QAOhD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,QAS1C;AAED,wBAAgB,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,OAAO,QAQ9F;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBAS1C;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,QAwCtE"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAiO5C,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"}

package/dist/lifecycle.js

@@ -1,13 +1,15 @@
-import { submitAll } from './acceptance.js';
 import { catchUpConversations, receiveConversationEvent, reconcileConversations, } from './conversation.js';
+import { declared } from './declaration.js';
+import { uncaught } from './failure.js';
 import { catching, replaced } from './install.js';
 import { connectionLost } from './locks.js';
 import { fenceLive } from './lost.js';
 import { cachedModels, revoked, settleModels } from './models.js';
 import { refuse } from './refusal.js';
-import { moveTo, recoverReads, rest, SERVICE_MODE_TOPIC, show, transferring } from './shown.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) => {
@@ -20,10 +22,10 @@ function closing(runtime, opened) {
     });
 }
 function closedSocket(runtime, lapsed, lost, opened) {
-    const { socket, conversations } = runtime;
+    const { socket, presence, conversations } = runtime;
     const { session } = socket;
     socket.notifyReady();
-    socket.rooms.unreadied();
+    presence.stopAsking();
     connectionLost(runtime);
     if (lost)
         conversations.lost();
@@ -43,9 +45,9 @@ function closedSocket(runtime, lapsed, lost, opened) {
     void closing(runtime, opened);
 }
 function owedReloads(runtime, expired, held) {
-    const { store, socket } = runtime;
-    const reloading = socket.rooms
-        .discoveredRooms()
+    const { store, presence } = runtime;
+    const reloading = presence
+        .rooms()
         .filter((room) => !expired.includes(room.locator) && revoked(held.get(room.locator)?.record.model))
         .map((room) => room.locator);
     for (const locator of reloading)
@@ -54,15 +56,15 @@ function owedReloads(runtime, expired, held) {
     return reloading;
 }
 async function reloadNow(runtime, replacing, progress, held, installing) {
-    const { store, socket } = runtime;
-    const { rooms, lanes } = socket;
-    const discovered = rooms.discoveredRooms();
+    const { store, socket, presence } = runtime;
+    const { lanes } = socket;
+    const discovered = presence.rooms();
     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' &&
         replacing(room));
     for (const room of reloaded)
-        rooms.stand(room.locator, { reloadDue: true });
+        presence.reload(room.locator, true);
     try {
         const local = await store.open();
         const kept = acquired.length === 0 ? new Set() : (await local.held()).staged;
@@ -77,15 +79,17 @@ 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)
-            rooms.stand(room.locator, { reloadDue: false });
+            presence.reload(room.locator, false);
         progress.reachable = false;
     }
 }
 function caughtUpRooms(runtime, expired) {
-    const { store, socket } = runtime;
+    const { store, socket, presence } = runtime;
     const { session } = socket;
     const progress = session.now().underway;
     session.set({ underway: null });
@@ -112,14 +116,17 @@ function caughtUpRooms(runtime, expired) {
             if (progress.reachable) {
                 const stored = await held;
                 const owed = await reloading;
-                await settleModels(runtime, socket.rooms
-                    .discoveredRooms()
+                await settleModels(runtime, new Map(presence
+                    .rooms()
                     .filter((room) => stored.has(room.locator) &&
                     !expired.includes(room.locator) &&
-                    !owed.includes(room.locator)), 'current', local);
+                    !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;
         }
@@ -145,7 +152,7 @@ function signalled(runtime, mode) {
         store.tell(SERVICE_MODE_TOPIC, mode);
     }
     if (releasing)
-        submitAll(runtime);
+        void submissionDue(runtime);
 }
 async function runCurrency(runtime, live) {
     const { socket, conversations } = runtime;
@@ -166,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);
@@ -182,7 +191,7 @@ export function scheduleCurrency(runtime) {
 }
 export function spaceFreed(runtime) {
     const { store, socket, journal } = runtime;
-    socket.rooms.standAll({ unpreparable: false });
+    store.prepareAgain();
     journal.record('space freed');
     store.readiness.queue();
     const { closed, authorization } = socket.session.now();
@@ -193,10 +202,11 @@ export function spaceFreed(runtime) {
     else
         void resynchronize(runtime);
 }
-export function close({ store, socket, conversations, recovery, liveQueries, figures }) {
+export function close({ store, socket, presence, conversations, recovery, liveQueries, figures, }) {
     if (socket.closed())
         return;
     socket.close();
+    presence.close();
     conversations.close();
     void recovery.retire();
     liveQueries.close();
@@ -204,9 +214,9 @@ export function close({ store, socket, conversations, recovery, liveQueries, fig
     store.close();
 }
 export async function stop(runtime) {
-    const { store, socket, recovery } = runtime;
+    const { store, socket, presence, recovery } = runtime;
     socket.session.set({ stopping: true });
-    socket.rooms.unreadied();
+    presence.stopAsking();
     socket.stopReads();
     await recovery.retire();
     await socket.lanes.finished();
@@ -214,7 +224,7 @@ export async function stop(runtime) {
     close(runtime);
 }
 export function start(runtime, signal) {
-    const { store, socket, conversations, lastAnswers, recovery } = runtime;
+    const { store, socket, presence, conversations, lastAnswers, recovery } = runtime;
     const closeRuntime = () => close(runtime);
     socket.observeServiceMode((mode) => signalled(runtime, mode));
     socket.observeConversations((event) => {
@@ -231,7 +241,7 @@ export function start(runtime, signal) {
         closeRuntime();
     socket.observe((event) => {
         if (event.kind === 'opened') {
-            socket.rooms.connectionLive();
+            presence.connectionLive();
             conversations.reopened();
             lastAnswers.reopened();
             recovery.resume();
@@ -260,8 +270,9 @@ export function start(runtime, signal) {
         if ((await local.facts()).capabilities.length > 0)
             socket.readyFromStore();
     })
-        .catch(() => {
+        .catch((error) => {
         socket.readyFromStore();
+        uncaught(error);
     });
     if (!socket.streamed)
         void sync(runtime, 'unstreamed', null);

package/dist/listing.d.ts

@@ -1,11 +1,10 @@
 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 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 +19,7 @@ export type AppRoom = {
     model: TypesResult;
     typedSelection: AppTypedSelection | null;
     providerOwnedPaths: readonly string[];
+    authoredPaths: readonly string[];
     roomVersion: string | null;
     documents: number;
     synchronizationAvailable: boolean;
@@ -31,22 +31,17 @@ 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 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 listedLocators({ presence }: Runtime, held: ReadonlyMap<string, unknown>): string[];
 export declare function patchedListing(runtime: Runtime, changed: ReadonlySet<string>): Promise<Listing | null>;
 export declare function listingNow(runtime: Runtime): Promise<Listing>;
-export declare function shownRooms(runtime: Runtime, listing: Listing): readonly AppRoom[];
+export declare function shownRooms({ presence }: Runtime, listing: Listing): readonly AppRoom[];
 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":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EACd,QAAQ,EACR,eAAe,EACf,eAAe,EACf,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAwB,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACzC,kBAAkB,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,wBAAwB,EAAE,OAAO,CAAC;IAClC,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,KAAK,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,QAAQ,CAAC,CAAC;AAExD,KAAK,WAAW,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEvD,wBAAgB,OAAO,CACrB,EAAE,MAAM,EAAE,EAAE,OAAO,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,UAAU,CAIZ;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,WAAW,CAKnF;AAED,wBAAgB,aAAa,CAC3B,EAAE,MAAM,EAAE,EAAE,OAAO,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,CAI7E;AAED,wBAAgB,cAAc,CAC5B,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,MAAM,EAAE,CAMV;AA6CD,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAczB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnE;AAQD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,OAAO,EAAE,CAcjF;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,OAAO,EAChB,KAAK,GAAE,SAAS,GAAG,IAAW,GAC7B,OAAO,CAAC,SAAS,CAAC,CAoBpB;AAED,wBAAgB,IAAI,CAClB,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAC1B,IAAI,EAAE,eAAe,EACrB,wBAAwB,EAAE,OAAO,QAgBlC;AAED,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAGnE;AAED,wBAAgB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAE5E;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,QAG9D;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,QAO5D;AAED,wBAAsB,SAAS,CAC7B,EAAE,KAAK,EAAE,EAAE,OAAO,EAClB,MAAM,EAAE,SAAS,cAAc,EAAE,GAChC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAYrB;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAO3D"}
+{"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,19 @@ 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()])];
 }
 function selectionModel({ socket, builtIn }) {
     return socket.session.now().refusal?.code === 'revoked-authorization'
@@ -33,7 +36,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 +48,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,
     };
 }
@@ -68,9 +72,7 @@ export async function patchedListing(runtime, changed) {
     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));
+        const room = listedRoom(runtime, locator, held.get(locator));
         if (room === undefined || !listing.has(locator))
             return null;
         listing.set(locator, room);
@@ -80,11 +82,9 @@ export async function patchedListing(runtime, changed) {
 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)
+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)
         ? {
             ...room,
             model: modelTypes(NO_MODEL),
@@ -113,43 +113,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 +122,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.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,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"}

package/dist/live.js

@@ -1,4 +1,5 @@
 import { changeOf, digestOf, } from './observation.js';
+import { uncaught } from './failure.js';
 import { roomOfKey } from './rows.js';
 function narrowed(plan) {
     return (plan.paths !== 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)
@@ -113,8 +113,8 @@ export function createLiveQueries(run, holding) {
                     }
                 } while (recoverAgain && !closed);
             }
-            catch {
-                recoverAgain = false;
+            catch (error) {
+                uncaught(error);
             }
             finally {
                 recovering = false;

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