@agentshouse/mdruntime 0.1.0-cd26b960b7262 → 0.1.0-cd30853a1b15e

package/dist/reach.js

@@ -1,7 +1,9 @@
+import { QueryError } from '@agentshouse/mdmodel';
+import { selected } from './collection.js';
 import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
-import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
-import { runtimeError } from './failure.js';
+import { changeOf, digestApplied, digestOf, observing, unchanged, } from './observation.js';
+import { runtimeError, uncaught } from './failure.js';
 import { failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
 import { beneath } from './paths.js';
 import { moveTarget, readParts, staleWrite, } from './room-draft.js';
@@ -19,10 +21,19 @@ const NO_CONVERSATION = {
     interrupt: unconversed('conversations/interrupt'),
     kill: unconversed('conversations/kill'),
     delete: unconversed('conversations/delete'),
+    takeOut: unconversed('conversations/take-out'),
+    decide: unconversed('agent-functions/decide'),
+    rename: unconversed('conversations/rename'),
+    option: unconversed('conversations/option/set'),
+    retry: unconversed('conversations/retry'),
+    pin: () => Promise.resolve(),
+    openTurn: () => Promise.resolve(),
+    dismissSuggestion: () => Promise.resolve(),
 };
 const NO_CHAT_DRAFT = {
     write: () => Promise.resolve(),
     prepend: () => Promise.resolve(),
+    append: () => Promise.resolve(),
     discard: () => Promise.resolve(),
 };
 function areasOf(reach) {
@@ -45,11 +56,11 @@ export function governs(reach, room) {
     if (wholly(reach, room.locator)) {
         return { collection: true, selection: room.typedSelection !== null };
     }
-    const selected = (path) => room.typedSelection?.roots.some((root) => beneath(root, path)) ?? false;
+    const within = (path) => selected({ selection: room.typedSelection }, path);
     const paths = reach.documents
         .filter((document) => document.room === room.locator)
         .map(({ path }) => path);
-    return { collection: paths.some((path) => !selected(path)), selection: paths.some(selected) };
+    return { collection: paths.some((path) => !within(path)), selection: paths.some(within) };
 }
 function covers(reach, room, path) {
     return (reach === null ||
@@ -60,6 +71,19 @@ function covers(reach, room, path) {
 function conversing(reach) {
     return reach === null || reach.conversations;
 }
+function roomsAwaited(error, reach) {
+    return error.code === 'unknown-type' && reach !== null && reach.rooms.length === 0;
+}
+async function planInReach(runtime, input, reach, answered) {
+    try {
+        return await runtime.plan(input, reach);
+    }
+    catch (error) {
+        if (error instanceof QueryError && (answered || roomsAwaited(error, reach)))
+            return null;
+        throw error;
+    }
+}
 export function planReach(reach) {
     return reach === null
         ? null
@@ -76,6 +100,14 @@ export function planReach(reach) {
 function roomsWithin(reach, rooms) {
     return rooms.filter((room) => wholly(reach, room.locator));
 }
+function roomsChangeWithin(reach, { changed, removed, order }) {
+    const within = {
+        changed: changed.filter(([locator]) => wholly(reach, locator)),
+        removed,
+        order: order === null ? null : order.filter((locator) => wholly(reach, locator)),
+    };
+    return unchanged(within) ? null : within;
+}
 function typesWithin(reach, room, types) {
     if (room === undefined)
         return structuredClone(UNHELD_TYPES);
@@ -105,12 +137,13 @@ function writeWithin(reach, write) {
 function savedWithin(reach, room, result) {
     if (reach === null || result.outcome === 'saved')
         return result;
-    const { file, location, referrers, ...refusal } = result;
+    const { file, location, line, referrers, ...refusal } = result;
     const hidden = file !== undefined && !covers(reach, room, file);
     return {
         ...refusal,
         ...(file === undefined || hidden ? {} : { file }),
         ...(location === undefined || hidden ? {} : { location }),
+        ...(line === undefined || hidden ? {} : { line }),
         ...(referrers === undefined
             ? {}
             : { referrers: referrers.filter((path) => covers(reach, room, path)) }),
@@ -190,7 +223,7 @@ export function narrowed(runtime, given, port) {
                 shown = shown.then(() => making.then((value) => {
                     if (open)
                         deliver(value);
-                }, () => { }), () => { });
+                }, uncaught), uncaught);
             },
             stop() {
                 open = false;
@@ -230,7 +263,13 @@ export function narrowed(runtime, given, port) {
             return () => { };
         }
         if (topic === 'rooms') {
-            return following(() => watch(topic, input, (rooms) => deliver(roomsWithin(reach, rooms)), fail));
+            return following(() => watch(topic, input, (rooms) => {
+                const shown = Array.isArray(rooms)
+                    ? roomsWithin(reach, rooms)
+                    : roomsChangeWithin(reach, rooms);
+                if (shown !== null)
+                    deliver(shown);
+            }, fail));
         }
         if (topic === 'readiness') {
             return following(() => runtime.watchReadiness(port, reach, deliver));
@@ -249,24 +288,31 @@ export function narrowed(runtime, given, port) {
             return following(() => lockedFirst(room, () => watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)), fail), () => deliver([])), true);
         }
         if (topic === 'query') {
-            const planning = runtime.plan(input[0], reach);
             let held = null;
+            let planning = null;
+            const waiting = (result) => {
+                const answer = { result, keys: [] };
+                if (held === null || changeOf(held, answer) !== null)
+                    deliver(answer);
+                held = digestOf(answer);
+            };
             return following(() => {
                 let open = true;
                 let stop = () => { };
+                if (planning?.reach !== reach) {
+                    planning = { reach, plan: planInReach(runtime, input[0], reach, held !== null) };
+                }
+                const planned = planning.plan;
                 void (async () => {
-                    const plan = await planning;
+                    const plan = await planned;
                     const locked = await runtime.lockedRooms();
                     if (!open)
                         return;
+                    if (plan === null)
+                        return waiting({ pending: [] });
                     const pending = unlocking(plan.rooms, locked);
-                    if (pending !== null) {
-                        const answer = { result: pending, keys: [] };
-                        if (held === null || changeOf(held, answer) !== null)
-                            deliver(answer);
-                        held = digestOf(answer);
-                        return;
-                    }
+                    if (pending !== null)
+                        return waiting(pending);
                     let first = true;
                     const heard = (message) => {
                         if (!first) {
@@ -280,8 +326,7 @@ export function narrowed(runtime, given, port) {
                         if (change !== null)
                             deliver(change);
                     };
-                    const current = { ...plan, reach: planReach(reach), locked };
-                    stop = runtime.watchPlan(current, (message) => {
+                    stop = runtime.watchPlan({ ...plan, locked }, (message) => {
                         if (open)
                             heard(message);
                     }, (error) => {
@@ -314,7 +359,10 @@ export function narrowed(runtime, given, port) {
                 return () => { };
             });
         }
-        if (topic === 'figures' || topic === 'holdings') {
+        if (topic === 'figures' ||
+            topic === 'holdings' ||
+            topic === 'listed-agents' ||
+            topic === 'room-list') {
             if (reach === null)
                 return watch(topic, input, deliver, fail);
             fail(deviceUnreached());
@@ -339,7 +387,9 @@ export function narrowed(runtime, given, port) {
         ...md,
         rooms: () => md.rooms().then((rooms) => roomsWithin(reach, rooms)),
         query: (async (input) => {
-            const plan = await runtime.plan(input, reach);
+            const plan = await planInReach(runtime, input, reach, false);
+            if (plan === null)
+                return { pending: [] };
             const locked = await runtime.lockedRooms();
             return unlocking(plan.rooms, locked) ?? runtime.query({ ...plan, locked });
         }),
@@ -431,7 +481,6 @@ export function narrowed(runtime, given, port) {
         reached: async (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
             !(await runtime.locked(room)) &&
             (await md.reached(room, roomVersion, path)),
-        log: () => (reach === null ? md.log() : ''),
         cleanUp: () => (reach === null ? md.cleanUp() : Promise.reject(deviceUnreached())),
         unsent: () => (reach === null ? md.unsent() : Promise.reject(deviceUnreached())),
         reset: () => (reach === null ? md.reset() : Promise.reject(deviceUnreached())),
@@ -470,14 +519,23 @@ export function narrowed(runtime, given, port) {
             read: (id, options) => conversation().read(id, options),
             create: (input) => conversation().create(input),
             send: (id, operation, draft) => conversation().send(id, operation, draft),
-            answer: (id, answer) => conversation().answer(id, answer),
-            interrupt: (id) => conversation().interrupt(id),
-            kill: (id) => conversation().kill(id),
-            delete: (id) => conversation().delete(id),
+            answer: (id, answer, operation) => conversation().answer(id, answer, operation),
+            interrupt: (id, operation) => conversation().interrupt(id, operation),
+            kill: (id, operation) => conversation().kill(id, operation),
+            delete: (id, operation) => conversation().delete(id, operation),
+            takeOut: (id, message, operation) => conversation().takeOut(id, message, operation),
+            decide: (request, decision, operation) => conversation().decide(request, decision, operation),
+            rename: (id, name, operation) => conversation().rename(id, name, operation),
+            option: (id, option, value, operation) => conversation().option(id, option, value, operation),
+            retry: (id, message, operation) => conversation().retry(id, message, operation),
+            pin: (figures) => conversation().pin(figures),
+            openTurn: (id, turn) => conversation().openTurn(id, turn),
+            dismissSuggestion: (id, suggestion) => conversation().dismissSuggestion(id, suggestion),
         },
         chatDraft: {
             write: (id, draft, revision) => chatDraft().write(id, draft, revision),
             prepend: (id, draft) => chatDraft().prepend(id, draft),
+            append: (id, draft) => chatDraft().append(id, draft),
             discard: (id) => chatDraft().discard(id),
         },
         observe: observing(within),

package/dist/react.d.ts

@@ -1,14 +1,15 @@
 import type { DocumentQuery, GroupQuery } from '@agentshouse/mdmodel';
+import type { Acting, Lane, LaneShown } from './act-lanes.js';
 import type { MdRuntimeClient } from './client.js';
 import type { AppRoom } from './listing.js';
 import type { ConnectionRefusal } from './socket.js';
 import type { SavedRoomDraft, SaveResult } from './saves.js';
-import type { Member, ServiceMode } from './adapter.js';
+import type { ListedAgent, Member, RoomList, ServiceMode } from './adapter.js';
 import type { ConversationAgent, ConversationEntry, ConversationOptions, ConversationView } from './conversation.js';
 import { type RuntimeError } from './failure.js';
 import type { FiguresResult } from './figures.js';
 import type { Holdings } from './holdings.js';
-import type { Expecting } from './expectation.js';
+import type { Descriptor, Expecting } from './expectation.js';
 import type { QueueEntry } from './outcome.js';
 import type { DocumentResult, GroupResult, PendingResult } from './query.js';
 import type { Readiness } from './readiness.js';
@@ -38,11 +39,13 @@ export declare function useObserve(client: Client, topic: 'presentation'): Obser
 export declare function useObserve(client: Client, topic: 'conversation', conversation: string, options: ConversationOptions): Observed<ConversationView>;
 export declare function useObserve(client: Client, topic: 'conversations'): Observed<readonly ConversationEntry[]>;
 export declare function useObserve(client: Client, topic: 'agents'): Observed<readonly ConversationAgent[]>;
+export declare function useObserve(client: Client, topic: 'listed-agents'): Observed<readonly ListedAgent[]>;
+export declare function useObserve(client: Client, topic: 'room-list'): Observed<RoomList | null>;
 export declare function useObserve(client: Client, topic: 'figures'): Observed<FiguresResult>;
 export declare function useObserve(client: Client, topic: 'holdings'): Observed<Holdings>;
-export declare function useReading<E extends {
-    readonly key: string;
-}>(store: Pick<Expecting<E>, 'reads' | 'heard' | 'left'>, asks: (one: E) => boolean, shown: ((one: E) => boolean) | null): void;
+export declare function useExpected<A, T>(store: Expecting, descriptor: Descriptor<A, T>, places: readonly A[], held: ReadonlyMap<A, T> | null): (place: A, held: T) => T;
+export type LaneHeld<O> = LaneShown<O> & Pick<Lane<O>, 'run' | 'forget'>;
+export declare function useLane<O>(lanes: Acting<O>): LaneHeld<O>;
 export type Saving = {
     readonly busy: boolean;
     readonly outcome: SaveResult | null;

package/dist/react.d.ts.map

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

package/dist/react.js

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useId, useLayoutEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore, } from 'react';
 import { failed } from './failure.js';
 const LOADING = { state: 'loading' };
 export function useObserve(client, topic, ...input) {
@@ -32,14 +32,37 @@ export function useObserve(client, topic, ...input) {
     }, [client, key]);
     return held !== null && held.client === client && held.key === key ? held.observed : LOADING;
 }
-export function useReading(store, asks, shown) {
+function sameHeld(descriptor, was, now) {
+    if (was === now)
+        return true;
+    if (was === null || now === null || was.size !== now.size)
+        return false;
+    const before = new Map([...was].map(([place, value]) => [descriptor.place(place), value]));
+    return [...now].every(([place, value]) => {
+        const at = descriptor.place(place);
+        return before.has(at) && Object.is(before.get(at), value);
+    });
+}
+export function useExpected(store, descriptor, places, held) {
     const reader = useId();
-    useLayoutEffect(() => store.reads(reader, asks), [store, reader, asks]);
+    const version = useSyncExternalStore(store.subscribe, store.version);
+    const asked = JSON.stringify(places.map((one) => descriptor.place(one)));
+    const kept = useRef(held);
+    if (!sameHeld(descriptor, kept.current, held))
+        kept.current = held;
+    const shown = kept.current;
+    useLayoutEffect(() => store.reads(reader, descriptor, places), [store, reader, descriptor, asked]);
     useLayoutEffect(() => () => store.left(reader), [store, reader]);
     useEffect(() => {
         if (shown !== null)
-            store.heard(reader, shown);
-    }, [store, reader, shown]);
+            store.heard(reader, descriptor, shown);
+    }, [store, reader, descriptor, shown]);
+    return useCallback((place, value) => store.draw(descriptor, place, value), [store, descriptor, version]);
+}
+export function useLane(lanes) {
+    const lane = useMemo(() => lanes.open(), [lanes]);
+    const shown = useSyncExternalStore(lane.subscribe, lane.shown);
+    return useMemo(() => ({ ...shown, run: lane.run, forget: lane.forget }), [shown, lane]);
 }
 const IDLE = { busy: false, outcome: null, failure: null };
 export function useSave(client) {

package/dist/readiness.d.ts

@@ -12,7 +12,7 @@ export type TargetCoverage = {
     readonly rooms: readonly RoomCoverage[];
     readonly conversations: ConversationCoverage;
 };
-export type Persistence = Open<'granted' | 'denied' | 'unavailable'>;
+export type Persistence = Open<'granted' | 'denied' | 'unavailable' | 'memory'>;
 export type Durability = Open<'persistent' | 'best-effort'>;
 export type ConnectionAvailability = Open<'connected' | 'connecting' | 'unreachable'>;
 export type HouseOutcome = Open<'open' | 'write-halted' | 'refused'>;
@@ -41,9 +41,15 @@ export type Readiness = {
     readonly installation: Installation;
     readonly lost: boolean;
 };
+export type ReadinessShown = Omit<Readiness, 'coverage'> & {
+    readonly coverage: Omit<TargetCoverage, 'rooms'>;
+};
 export type ReadinessFacts = Omit<Readiness, 'status' | 'ready' | 'usable' | 'durability' | 'coverage'> & {
-    readonly coverage: Omit<TargetCoverage, 'complete'>;
+    readonly coverage: Omit<TargetCoverage, 'complete' | 'rooms'> & {
+        readonly unsettled: number;
+    };
     readonly established: boolean;
 };
-export declare function readinessOf(facts: ReadinessFacts): Readiness;
+export declare const COMPLETE_ROOMS: ReadonlySet<string>;
+export declare function readinessOf(facts: ReadinessFacts): ReadinessShown;
 //# sourceMappingURL=readiness.d.ts.map

package/dist/readiness.d.ts.map

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

package/dist/readiness.js

@@ -1,10 +1,8 @@
-const COMPLETE_ROOMS = new Set(['complete', 'unadmitted']);
+export const COMPLETE_ROOMS = new Set(['complete', 'unadmitted']);
 export function readinessOf(facts) {
-    const { established, coverage: held, ...reported } = facts;
+    const { established, coverage: { unsettled, ...held }, ...reported } = facts;
     const settledConversations = held.conversations === 'complete' || held.conversations === 'undeclared';
-    const complete = held.listed &&
-        settledConversations &&
-        held.rooms.every((room) => COMPLETE_ROOMS.has(room.state));
+    const complete = held.listed && settledConversations && unsettled === 0;
     const coverage = { ...held, complete };
     const stored = facts.code === 'stored';
     const ready = stored && complete;

package/dist/reads.d.ts

@@ -1,5 +1,6 @@
 import { type CallResult } from './outcome.js';
 import type { Recovery } from './recovery.js';
+import type { Attempt, Retries } from './retried.js';
 import type { Connection, RuntimeDatabase } from './tables.js';
 export declare const READ_TABLES: readonly string[];
 export type ReadAt = {
@@ -14,7 +15,7 @@ export type ObservedRead = {
 };
 export type ReadAnswers = {
     watch(name: string, input: unknown, deliver: (read: ObservedRead) => void): () => void;
-    again(): void;
+    again(led?: Promise<unknown>): void;
     reopened(): void;
 };
 export type ReadAnswersOptions = {
@@ -23,7 +24,8 @@ export type ReadAnswersOptions = {
     readonly unkept: readonly string[];
     readonly leading: readonly string[];
     readonly recovery: Recovery;
-    call(name: string, input: unknown): Promise<CallResult>;
+    readonly retries: Retries;
+    call(name: string, input: unknown, attempt: Attempt): Promise<CallResult>;
     online(): boolean;
     streaming(): boolean;
     closed(): boolean;

package/dist/reads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reads.d.ts","sourceRoot":"","sources":["../src/reads.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE/D,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAExC,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvF,KAAK,IAAI,IAAI,CAAC;IACd,QAAQ,IAAI,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,IAAI,OAAO,CAAC;IAClB,SAAS,IAAI,OAAO,CAAC;IACrB,MAAM,IAAI,OAAO,CAAC;IAClB,IAAI,IAAI,OAAO,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAeF,wBAAgB,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhG;AAED,wBAAgB,QAAQ,CACtB,UAAU,EAAE,UAAU,EACtB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAC9B,MAAM,EAAE,MAAM,GACb,IAAI,CAMN;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAGvF;AAMD,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAsJpE"}
+{"version":3,"file":"reads.d.ts","sourceRoot":"","sources":["../src/reads.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE/D,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAExC,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACvF,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IACpC,QAAQ,IAAI,IAAI,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1E,MAAM,IAAI,OAAO,CAAC;IAClB,SAAS,IAAI,OAAO,CAAC;IACrB,MAAM,IAAI,OAAO,CAAC;IAClB,IAAI,IAAI,OAAO,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAeF,wBAAgB,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhG;AAED,wBAAgB,QAAQ,CACtB,UAAU,EAAE,UAAU,EACtB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAC9B,MAAM,EAAE,MAAM,GACb,IAAI,CAMN;AAED,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAGvF;AAMD,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAwJpE"}

package/dist/reads.js

@@ -1,4 +1,5 @@
 import { refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
 import { answeredResult, UNCERTAIN } from './outcome.js';
 export const READ_TABLES = [
     'CREATE TABLE read_answers (name TEXT NOT NULL, input TEXT NOT NULL, build TEXT NOT NULL, answer TEXT NOT NULL, PRIMARY KEY (name, input)) WITHOUT ROWID',
@@ -37,6 +38,8 @@ export function readAnswers(options) {
         await database.ask({ kind: 'read.keep', ...read.at, answer }).catch((error) => {
             if (refusedForSpace(error))
                 options.filled();
+            else
+                uncaught(error);
         });
     }
     async function asked(read, led) {
@@ -44,7 +47,11 @@ export function readAnswers(options) {
             read.owed = true;
             return;
         }
-        const result = await options.call(read.at.name, read.asked).catch(() => UNCERTAIN);
+        const attempt = { step: 'reading', instance: read.key };
+        const result = await options.call(read.at.name, read.asked, attempt).catch((error) => {
+            options.retries.failed(attempt.step, attempt.instance, error);
+            return UNCERTAIN;
+        });
         if (options.closed())
             return;
         read.owed = !answered(result);
@@ -121,7 +128,7 @@ export function readAnswers(options) {
                     return;
                 read.text = text;
                 read.shown = { ...read.shown, answer: JSON.parse(text) };
-            }, () => { });
+            }, uncaught);
         }
         reads.set(key, read);
         return read;
@@ -148,9 +155,9 @@ export function readAnswers(options) {
                     reads.delete(key);
             };
         },
-        again() {
+        again(first = Promise.resolve()) {
             const all = [...reads.values()];
-            const led = Promise.all(all.filter(leads).map((read) => ask(read)));
+            const led = Promise.all([first, ...all.filter(leads).map((read) => ask(read, first))]);
             for (const read of all)
                 if (!leads(read))
                     void ask(read, led);

package/dist/recovery.d.ts

@@ -16,11 +16,13 @@ export type Recovery = {
     attempt(intent: string, run: Attempt, options?: AttemptOptions): Promise<boolean>;
     pending(intent: string): boolean;
     resume(): void;
+    again(): void;
+    waits(wake: () => void): () => void;
     cancel(intent: string): void;
     scope(inFlight?: number): Recovery;
     retire(): Promise<void>;
 };
 export declare function retryDelay(tries: number, firstMs?: number, maxMs?: number): number;
-export declare function untilAnswered<T>(ask: () => Promise<T>, signal: AbortSignal, answered?: (answer: T) => boolean): Promise<T>;
+export declare function untilAnswered<T>(ask: () => Promise<T>, signal: AbortSignal, answered?: (answer: T) => boolean, owner?: Recovery): Promise<T>;
 export declare function createRecovery(options?: RecoveryOptions): Recovery;
 //# sourceMappingURL=recovery.d.ts.map

package/dist/recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,KAAK,SAAS,GAAG,MAAM,CAGpF;AAED,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACrB,MAAM,EAAE,WAAW,EACnB,QAAQ,GAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAoB,GAC5C,OAAO,CAAC,CAAC,CAAC,CAsBZ;AA8KD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,KAAK,IAAI,IAAI,CAAC;IACd,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IACpC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,KAAK,SAAS,GAAG,MAAM,CAGpF;AAED,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACrB,MAAM,EAAE,WAAW,EACnB,QAAQ,GAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAoB,EAC7C,KAAK,CAAC,EAAE,QAAQ,GACf,OAAO,CAAC,CAAC,CAAC,CAsBZ;AAgMD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}

package/dist/recovery.js

@@ -7,7 +7,7 @@ export function retryDelay(tries, firstMs = FIRST_MS, maxMs = MAX_MS) {
     const longest = Math.min(maxMs, firstMs * 2 ** tries);
     return longest / 2 + (Math.random() * longest) / 2;
 }
-export async function untilAnswered(ask, signal, answered = () => true) {
+export async function untilAnswered(ask, signal, answered = () => true, owner) {
     for (let tries = 0;; tries += 1) {
         try {
             const answer = await ask();
@@ -19,16 +19,16 @@ export async function untilAnswered(ask, signal, answered = () => true) {
                 throw error;
         }
         await new Promise((resume) => {
-            const stop = () => {
+            const done = () => {
                 clearTimeout(again);
+                signal.removeEventListener('abort', done);
+                unheld();
                 resume();
             };
             // A read that failed is asked again on the doubling backoff, so its asker is answered once the failure clears.
-            const again = setTimeout(() => {
-                signal.removeEventListener('abort', stop);
-                resume();
-            }, retryDelay(tries));
-            signal.addEventListener('abort', stop, { once: true });
+            const again = setTimeout(done, retryDelay(tries));
+            signal.addEventListener('abort', done, { once: true });
+            const unheld = owner?.waits(done) ?? (() => { });
         });
         signal.throwIfAborted();
     }
@@ -38,6 +38,7 @@ function owner(backoff, inFlight, release = () => { }) {
     const children = new Set();
     const running = new Set();
     const queued = [];
+    const waiting = new Set();
     let free = inFlight;
     let retired = false;
     function finish(key, intent, done) {
@@ -195,6 +196,27 @@ function owner(backoff, inFlight, release = () => { }) {
                 launch(key, intent);
             }
         },
+        again() {
+            if (retired)
+                return;
+            for (const [key, intent] of [...intents]) {
+                if (intent.timer === null || intent.guided)
+                    continue;
+                clearTimeout(intent.timer);
+                intent.timer = null;
+                launch(key, intent);
+            }
+            for (const wake of [...waiting])
+                wake();
+            for (const child of [...children])
+                child.again();
+        },
+        waits(wake) {
+            waiting.add(wake);
+            return () => {
+                waiting.delete(wake);
+            };
+        },
         cancel(key) {
             const intent = intents.get(key);
             if (intent === undefined)

package/dist/refresh.js

@@ -129,7 +129,7 @@ export async function advancement(refresh, authorization, held, remodel, continu
         return unconfirmed;
     const first = await refresh(authorization, {
         locator,
-        selection: held.replica.selection,
+        selection: held.declaration.replica.selection,
         fromRoomVersion,
     });
     if (first.kind !== 'net-advancement')
@@ -154,7 +154,7 @@ export async function advancement(refresh, authorization, held, remodel, continu
             return unconfirmed;
         const page = await refresh(authorization, {
             locator,
-            selection: held.replica.selection,
+            selection: held.declaration.replica.selection,
             fromRoomVersion,
             pageToken,
         });

package/dist/refusal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refusal.d.ts","sourceRoot":"","sources":["../src/refusal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAOpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,eAAe,GAAG,IAAW,iBAkDxC"}
+{"version":3,"file":"refusal.d.ts","sourceRoot":"","sources":["../src/refusal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAQpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,eAAe,GAAG,IAAW,iBAiDxC"}

package/dist/refusal.js

@@ -1,11 +1,12 @@
 import { changeSet, mergeChangeSets } from './change-set.js';
 import { composedOf } from './collection.js';
+import { uncaught } from './failure.js';
 import { listedLocators } from './listing.js';
 import { prepare } from './preparation.js';
 import { storedRecord } from './replica.js';
 import { emitRefusal } from './shown.js';
 export async function refuse(runtime, reason, provider = null) {
-    const { store, socket, journal } = runtime;
+    const { store, socket, presence } = runtime;
     socket.session.set({ paused: true });
     socket.abortReads();
     try {
@@ -28,13 +29,13 @@ export async function refuse(runtime, reason, provider = null) {
                         }),
                     });
                 }
-                catch {
-                    journal.record('model revocation persistence failed');
+                catch (error) {
+                    uncaught(error);
                 }
                 const listedNow = listedLocators(runtime, held);
                 for (const locator of listedNow) {
                     if (!held.has(locator))
-                        socket.rooms.stand(locator, { unheldModel: revoked });
+                        presence.modelled(locator, revoked);
                 }
                 store.changed(mergeChangeSets(listedNow.map((locator) => changeSet(locator, { documents: null, room: true }))));
                 prepare(runtime);
@@ -49,7 +50,6 @@ export async function refuse(runtime, reason, provider = null) {
                 refusal: provider,
             },
         });
-        journal.record(`connection refused ${reason}`);
         emitRefusal(runtime);
     }
 }