@agentshouse/mdruntime 0.1.0-cf08ada271a7f → 0.1.0-cf0c43fc48aad

package/dist/presence.d.ts

@@ -0,0 +1,52 @@
+import type { DiscoveredRoom, ProviderRefusal, ScopedRefusal } from './adapter.js';
+import type { ModelState } from './model.js';
+type Repairable = {
+    readonly reset: string | undefined;
+};
+type Standing = {
+    readonly stale: boolean;
+    readonly repairable: Repairable | null;
+    readonly repairing: boolean;
+    readonly reloadDue: boolean;
+};
+type Listing = {
+    readonly whole: boolean;
+    readonly live: boolean;
+};
+export type Presence = {
+    list(found: readonly DiscoveredRoom[], how: Listing): readonly DiscoveredRoom[];
+    room(locator: string): DiscoveredRoom | undefined;
+    rooms(): readonly DiscoveredRoom[];
+    available(locator: string, selection?: string): boolean;
+    refusal(locator: string): ProviderRefusal | null;
+    unheldModel(locator: string): ModelState | null;
+    refused(locator: string, refusal: ScopedRefusal | null): void;
+    readable(locator: string): boolean;
+    modelled(locator: string, model: ModelState | null): void;
+    installed(locator: string, bootstrapped: boolean): void;
+    locked(locator: string, stored: () => Promise<string | null>): Promise<boolean>;
+    lockedAmong(stored: ReadonlyMap<string, string>): readonly string[];
+    connectionLost(lapsed: () => void): void;
+    connectionLive(): void;
+    lapse(): void;
+    stood(locator: string, stale: boolean, repairable?: Repairable | null): void;
+    repairing(locator: string, running: boolean): void;
+    reload(locator: string, due: boolean): void;
+    standing(locator: string): Standing;
+    settled(): boolean;
+    repairsOwed(): readonly string[];
+    askAgain(locator: string, ask: () => void): void;
+    stopAsking(locator?: string): void;
+    lose(locator: string, during: number): boolean;
+    writing(locator: string): boolean;
+    unwritten(locator: string): void;
+    lost(locator: string): boolean;
+    losses(): number;
+    lostSince(locator: string, losses: number): boolean;
+    liftable(locator: string, discovery: number): boolean;
+    lift(locator: string, discovery: number, unfenced: boolean): void;
+    close(): void;
+};
+export declare function createPresence(): Presence;
+export {};
+//# sourceMappingURL=presence.d.ts.map

package/dist/presence.d.ts.map

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

package/dist/presence.js

@@ -0,0 +1,220 @@
+const UNANSWERED = {
+    stale: false,
+    repairable: null,
+    repairing: false,
+    reloadDue: false,
+    refusal: null,
+    unreading: false,
+    unreadable: false,
+    unheldModel: null,
+    confirmed: false,
+};
+// A Room the Provider answers not ready is asked again after these waits, the last repeating, so a chunk build that catches up within seconds installs at once and a long one is asked every 15 seconds.
+const NOT_READY_MS = [1_000, 2_000, 3_000, 5_000, 8_000, 11_000, 15_000];
+// A Room that locks offline stays readable this long after the connection drops, so a laptop waking or changing network keeps working while a disconnected device locks soon after.
+const LOCK_GRACE_MS = 120_000;
+export function createPresence() {
+    const listed = new Map();
+    const answered = new Map();
+    const marks = new Map();
+    const lastLost = new Map();
+    const unready = new Map();
+    let lossCount = 0;
+    let lockGrace = null;
+    function answer(locator) {
+        return answered.get(locator) ?? UNANSWERED;
+    }
+    function change(locator, next) {
+        answered.set(locator, { ...answer(locator), ...next });
+    }
+    function heard(locator, next) {
+        if (!marks.has(locator))
+            change(locator, next);
+    }
+    function readied(locator) {
+        const held = unready.get(locator);
+        if (held === undefined)
+            return;
+        if (held.timer !== null)
+            clearTimeout(held.timer);
+        unready.delete(locator);
+    }
+    function stopAsking(locator) {
+        for (const held of locator === undefined ? [...unready.keys()] : [locator])
+            readied(held);
+    }
+    function connectionLive() {
+        if (lockGrace !== null)
+            clearTimeout(lockGrace);
+        lockGrace = null;
+    }
+    function readable(locator) {
+        const { unreadable, unreading } = answer(locator);
+        if (!unreadable || marks.has(locator))
+            return false;
+        change(locator, {
+            unreadable: false,
+            ...(unreading ? { refusal: null, unreading: false } : {}),
+        });
+        return true;
+    }
+    function locks(locator, mode) {
+        return mode === 'locked' && !answer(locator).confirmed && !marks.has(locator);
+    }
+    function liftable(locator, discovery) {
+        const mark = marks.get(locator);
+        return mark === undefined || mark.during < discovery;
+    }
+    return {
+        list(found, { whole, live }) {
+            const kept = found.filter(({ locator }) => !marks.has(locator));
+            if (whole)
+                listed.clear();
+            for (const room of kept) {
+                listed.set(room.locator, room);
+                change(room.locator, {
+                    refusal: null,
+                    unreading: false,
+                    ...(live && room.replica.admission === 'admitted' ? { confirmed: true } : {}),
+                });
+            }
+            return kept;
+        },
+        room: (locator) => listed.get(locator),
+        rooms: () => [...listed.values()],
+        available(locator, selection) {
+            if (marks.has(locator))
+                return false;
+            const room = listed.get(locator);
+            if (room === undefined)
+                return true;
+            return ((selection === undefined || selection === room.replica.selection) &&
+                room.replica.admission === 'admitted' &&
+                !answer(locator).unreadable);
+        },
+        refusal: (locator) => answer(locator).refusal,
+        unheldModel: (locator) => answer(locator).unheldModel,
+        refused(locator, refusal) {
+            if (refusal === null) {
+                heard(locator, { unreadable: true });
+                return;
+            }
+            const unreading = refusal.scope !== 'operation' && refusal.scope !== 'model';
+            heard(locator, {
+                refusal: { code: refusal.code, fields: refusal.fields, retryable: refusal.retryable },
+                unreading,
+                ...(unreading ? { unreadable: true } : {}),
+            });
+        },
+        readable,
+        modelled(locator, model) {
+            heard(locator, { unheldModel: model });
+        },
+        installed(locator, bootstrapped) {
+            if (marks.has(locator))
+                return;
+            if (bootstrapped) {
+                readied(locator);
+                change(locator, { unheldModel: null });
+            }
+            change(locator, { stale: false });
+            readable(locator);
+        },
+        async locked(locator, stored) {
+            if (marks.has(locator) || answer(locator).confirmed)
+                return false;
+            return locks(locator, (await stored()) ?? listed.get(locator)?.replica.offline);
+        },
+        lockedAmong(stored) {
+            const modes = new Map([...listed].map(([locator, room]) => [locator, room.replica.offline]));
+            for (const [locator, mode] of stored)
+                modes.set(locator, mode);
+            return [...modes]
+                .filter(([locator, mode]) => locks(locator, mode))
+                .map(([locator]) => locator)
+                .sort();
+        },
+        connectionLost(lapsed) {
+            if (lockGrace !== null)
+                return;
+            lockGrace = setTimeout(() => {
+                lockGrace = null;
+                lapsed();
+            }, LOCK_GRACE_MS);
+        },
+        connectionLive,
+        lapse() {
+            for (const [locator, held] of answered) {
+                if (held.confirmed)
+                    answered.set(locator, { ...held, confirmed: false });
+            }
+        },
+        stood(locator, stale, repairable) {
+            heard(locator, { stale, ...(repairable === undefined ? {} : { repairable }) });
+        },
+        repairing(locator, running) {
+            change(locator, { repairing: running });
+        },
+        reload(locator, due) {
+            change(locator, { reloadDue: due });
+        },
+        standing(locator) {
+            const { stale, repairable, repairing, reloadDue } = answer(locator);
+            return { stale, repairable, repairing, reloadDue };
+        },
+        settled: () => ![...answered].some(([locator, { stale }]) => stale && !marks.has(locator)),
+        repairsOwed: () => [...answered]
+            .filter(([locator, { stale, repairable }]) => stale && repairable !== null && !marks.has(locator))
+            .map(([locator]) => locator),
+        askAgain(locator, ask) {
+            const held = unready.get(locator) ?? { tries: 0, timer: null };
+            unready.set(locator, held);
+            if (held.timer !== null)
+                return;
+            const wait = NOT_READY_MS[Math.min(held.tries, NOT_READY_MS.length - 1)];
+            held.tries += 1;
+            held.timer = setTimeout(() => {
+                held.timer = null;
+                ask();
+            }, wait);
+        },
+        stopAsking,
+        lose(locator, during) {
+            if (marks.has(locator))
+                return false;
+            marks.set(locator, { during, written: false });
+            lastLost.set(locator, ++lossCount);
+            listed.delete(locator);
+            readied(locator);
+            const { repairing, reloadDue } = answer(locator);
+            answered.set(locator, { ...UNANSWERED, repairing, reloadDue });
+            return true;
+        },
+        writing(locator) {
+            const mark = marks.get(locator);
+            if (mark === undefined || mark.written)
+                return false;
+            marks.set(locator, { ...mark, written: true });
+            return true;
+        },
+        unwritten(locator) {
+            const mark = marks.get(locator);
+            if (mark !== undefined)
+                marks.set(locator, { ...mark, written: false });
+        },
+        lost: (locator) => marks.has(locator),
+        losses: () => lossCount,
+        lostSince: (locator, losses) => marks.has(locator) || (lastLost.get(locator) ?? 0) > losses,
+        liftable,
+        lift(locator, discovery, unfenced) {
+            const mark = marks.get(locator);
+            if (mark !== undefined && liftable(locator, discovery) && (unfenced || !mark.written)) {
+                marks.delete(locator);
+            }
+        },
+        close() {
+            stopAsking();
+            connectionLive();
+        },
+    };
+}

package/dist/queries.d.ts

@@ -9,7 +9,7 @@ export declare function figuresCover(runtime: Runtime): Promise<FiguresCover>;
 export declare function answeredPlan(runtime: Runtime, plan: Plan, cover: () => Promise<Cover>): Promise<Ran>;
 export declare function rowsQuery(runtime: Runtime, plan: Plan): Promise<QueryResult>;
 export declare function planned(runtime: Runtime, input: unknown, reach: PortReach | null): Promise<Plan>;
-export declare function roomTallies(runtime: Runtime, rooms: readonly QueryRoom[], since: string): Promise<readonly import("./tallies.js").RoomTally[]>;
+export declare function roomTallies(runtime: Runtime, rooms: readonly QueryRoom[], since: string): Promise<readonly import("./tallies.ts").RoomTally[]>;
 export declare function watchPlan(runtime: Runtime, plan: Plan, deliver: Deliver, fail: Fail): () => void;
 export declare function watchPlanned(runtime: Runtime, planning: Promise<Plan>, deliver: Deliver, fail: Fail): () => void;
 export declare function searched(runtime: Runtime, input: unknown, reach: PortReach | null): Promise<SearchResult>;

package/dist/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAK5C,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,WAAW,EAEjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAa,KAAK,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAGhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAa,SAAS,EAAgB,MAAM,YAAY,CAAC;AAuFrE,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAa1E;AA2ED,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,GAC1B,OAAO,CAAC,GAAG,CAAC,CAQd;AAQD,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAWlF;AAED,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,wDAO7F;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,IAAI,CAchG;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EACvB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,GACT,MAAM,IAAI,CAeZ;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,YAAY,CAAC,CAqDvB"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAK5C,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,WAAW,EAEjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAa,KAAK,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAGhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAa,SAAS,EAAgB,MAAM,YAAY,CAAC;AAqFrE,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAa1E;AAoGD,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,GAC1B,OAAO,CAAC,GAAG,CAAC,CAQd;AAQD,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAWlF;AAED,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,wDAO7F;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,IAAI,CAchG;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EACvB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,GACT,MAAM,IAAI,CAeZ;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,YAAY,CAAC,CAkDvB"}

package/dist/queries.js

@@ -1,7 +1,7 @@
 import { identityOf } from '@agentshouse/mdmodel';
 import { ROOM_TOTALS } from './figures.js';
 import { roomInFlight } from './install.js';
-import { roomFacts } from './listing.js';
+import { compositionFor, roomFacts } from './listing.js';
 import { lockedRooms } from './locks.js';
 import { OFFLINE, UNCERTAIN, failure } from './outcome.js';
 import { connectionNow, prepare, roomsOfReach } from './preparation.js';
@@ -13,10 +13,10 @@ import { searchPlanOf } from './search.js';
 import { seedApplies, seededResult, watchSeeded } from './seed.js';
 import { capped, MAXIMUM_WINDOW } from './windows.js';
 const QUERY_BYTES = 1 << 20;
-function everyRoom({ socket }, held) {
+function everyRoom({ presence }, held) {
     return [
         ...new Set([
-            ...socket.rooms.declarations().keys(),
+            ...presence.rooms().map(({ locator }) => locator),
             ...held.rooms.keys(),
             ...held.queues.keys(),
         ]),
@@ -29,10 +29,8 @@ function reachedRooms(runtime, plan, held) {
         .filter((locator) => (reached === null || reached.has(locator)) && !plan.locked.includes(locator))
         .sort();
 }
-function awaited({ socket }, locator) {
-    return (!socket.session.now().roomsListed ||
-        (socket.rooms.declared(locator) !== undefined &&
-            socket.rooms.discovered(locator)?.replica.admission === 'admitted'));
+function awaited({ socket, presence }, locator) {
+    return (!socket.session.now().roomsListed || presence.room(locator)?.replica.admission === 'admitted');
 }
 function coveredRooms(runtime, locators, whole, held) {
     const { store, socket } = runtime;
@@ -119,7 +117,22 @@ async function windowRows(local, plan, rooms, unchanged) {
     }
     return null;
 }
-async function coveredRows({ store }, plan, cover) {
+function freeTextAsked(plan) {
+    return plan.shape.kind === 'documents' && (plan.shape.sections !== null || plan.shape.preamble);
+}
+async function composedRooms(runtime, plan, rooms) {
+    if (!freeTextAsked(plan))
+        return rooms;
+    const held = await runtime.store.rooms(rooms.map(({ locator }) => locator));
+    return rooms.map((room) => {
+        const stored = held.get(room.locator);
+        return stored === undefined
+            ? room
+            : { ...room, composition: compositionFor(runtime, stored.record) };
+    });
+}
+async function coveredRows(runtime, plan, cover) {
+    const { store } = runtime;
     for (;;) {
         const before = await cover();
         if ('pending' in before)
@@ -128,7 +141,7 @@ async function coveredRows({ store }, plan, cover) {
         const keys = before.rooms.map(({ key }) => key);
         const changes = local.changes(keys);
         const current = () => local.changes(keys) === changes;
-        const rows = await windowRows(local, plan, before.rooms, current);
+        const rows = await windowRows(local, plan, await composedRooms(runtime, plan, before.rooms), current);
         const after = await cover();
         if (rows !== null && sameCover(before, after))
             return { rows, cover: before, current };
@@ -213,7 +226,7 @@ export function watchPlanned(runtime, planning, deliver, fail) {
     };
 }
 export async function searched(runtime, input, reach) {
-    const { store, socket, journal } = runtime;
+    const { store, socket } = runtime;
     const { session } = socket;
     const asked = searchPlanOf(input);
     await socket.ready;
@@ -249,12 +262,10 @@ export async function searched(runtime, input, reach) {
     const { closed, authorization, refusal } = session.now();
     if (closed || authorization === undefined || refusal !== null)
         return UNCERTAIN;
-    journal.record('transfer search');
     try {
         const result = await search(authorization, { text: asked.text, rooms });
         if (result.kind === 'revoked-authorization')
             await refuse(runtime, 'revoked-authorization');
-        journal.record(`outcome search ${result.kind}`);
         if (result.kind === 'rejected')
             return result;
         if (result.kind !== 'found')
@@ -266,7 +277,6 @@ export async function searched(runtime, input, reach) {
         };
     }
     catch {
-        journal.record('outcome search transport-uncertainty');
         return UNCERTAIN;
     }
 }

package/dist/questions.d.ts

@@ -26,9 +26,4 @@ export declare function entered(field: ChatField): boolean;
 export declare function questionsOf(view: Pick<ConversationView, 'questions'> | null): readonly ChatQuestion[];
 export declare function openQuestion(questions: readonly unknown[]): string | null;
 export declare function questionAsked(questions: readonly unknown[]): string | null;
-export type ChatLone = {
-    readonly question: ChatQuestion;
-    readonly field: ChatField;
-};
-export declare function loneOf(questions: readonly ChatQuestion[]): ChatLone | null;
 //# sourceMappingURL=questions.d.ts.map

package/dist/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../src/questions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,CAAC;IAC5E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAuCF,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAEjD;AA2DD,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,IAAI,GAC/C,SAAS,YAAY,EAAE,CAiBzB;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CAE1E;AAED,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAEtF,wBAAgB,MAAM,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,QAAQ,GAAG,IAAI,CAM1E"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../src/questions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,cAAc,CAAC;IAC5E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,SAAS,EAAE,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,MAAM,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAuCF,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAEjD;AA2DD,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,IAAI,GAC/C,SAAS,YAAY,EAAE,CAiBzB;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,GAAG,IAAI,CAE1E"}

package/dist/questions.js

@@ -113,10 +113,3 @@ export function openQuestion(questions) {
 export function questionAsked(questions) {
     return questionsOf({ questions })[0]?.asked ?? null;
 }
-export function loneOf(questions) {
-    const asked = questions.length === 1 && !questions[0].secret ? questions[0] : undefined;
-    const only = asked?.fields.length === 1 ? asked.fields[0] : undefined;
-    return asked !== undefined && only !== undefined && entered(only)
-        ? { question: asked, field: only }
-        : null;
-}

package/dist/queue.d.ts

@@ -5,8 +5,9 @@ import type { Runtime } from './runtime.js';
 import type { SavePlan } from './save.js';
 import type { SaveResult } from './saves.js';
 import type { PendingState, RoomCommit, Store, StoredFile, View, Work } from './store.js';
-export type Queueing = Pick<Runtime, 'store' | 'journal' | 'localSaves'> & {
+export type Queueing = Pick<Runtime, 'store' | 'localSaves'> & {
     readonly socket: Pick<Runtime['socket'], 'continuing'>;
+    readonly presence: Pick<Runtime['presence'], 'lost' | 'unheldModel' | 'room'>;
 };
 export type Restand = {
     readonly locator: string;

package/dist/queue.d.ts.map

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

package/dist/queue.js

@@ -1,6 +1,7 @@
 import { changeSet, mergeChangeSets } from './change-set.js';
 import { leaving as leavingIn, partnerOf } from './change.js';
 import { composedOf, definitionsAt } from './collection.js';
+import { declared } from './declaration.js';
 import { runtimeError } from './failure.js';
 import { roomDraftRevision } from './identity.js';
 import { landed, movedBy, overlayOf, replaying, slicing, slicingWith, standing, storedRecord, touchedBy, } from './replica.js';
@@ -44,18 +45,23 @@ async function returnedDrafts(store, locator, work, leaving, composition) {
             continue;
         for (const saved of work.states.get(batch.id)?.drafts ?? []) {
             const existing = written.get(saved.path) ?? (await store.draft(locator, saved.path));
-            written.set(saved.path, {
-                locator,
-                path: saved.path,
-                revision: roomDraftRevision(),
-                parts: returnedInto(existing?.parts, saved.parts, composition === undefined ? undefined : definitionsAt(composition, saved.path)),
-                returned,
-            });
+            const parts = returnedInto(existing?.parts, saved.parts, composition === undefined ? undefined : definitionsAt(composition, saved.path));
+            written.set(saved.path, parts === null
+                ? { ...existing, returned }
+                : { locator, path: saved.path, revision: roomDraftRevision(), parts, returned });
         }
     }
     return written;
 }
-async function carriedBack(store, locator, unlanded, written) {
+function unheldComposition({ store, presence }, locator) {
+    const model = presence.unheldModel(locator);
+    const listed = presence.room(locator);
+    if (model === null || listed === undefined)
+        return undefined;
+    return store.composed({ model, declaration: declared(listed) });
+}
+async function carriedBack(runtime, locator, unlanded, written) {
+    const { store } = runtime;
     const back = new Map();
     const taken = [];
     for (const batch of unlanded) {
@@ -74,12 +80,16 @@ async function carriedBack(store, locator, unlanded, written) {
             const [into, key] = source === locator ? [written, path] : [back, documentKey(source, path)];
             const existing = into.get(key) ?? (await store.draft(source, path));
             const held = await store.record(source);
+            const composition = held === undefined ? unheldComposition(runtime, source) : store.composed(held);
+            const parts = returnedInto(existing?.parts, record.parts, composition === undefined ? undefined : definitionsAt(composition, path));
+            if (parts === null)
+                continue;
             taken.push({ locator: destination, path: to });
             into.set(key, {
                 locator: source,
                 path,
                 revision: roomDraftRevision(),
-                parts: returnedInto(existing?.parts, record.parts, held === undefined ? undefined : definitionsAt(store.composed(held), path)),
+                parts,
                 returned: existing?.returned ?? null,
             });
         }
@@ -156,7 +166,7 @@ async function together(runtime, local, settlements) {
     return mergeChangeSets(all.map((one) => one.apply(answer)));
 }
 async function settlement(runtime, local, locator, work, record, queue, settling = {}) {
-    const { store, journal, localSaves } = runtime;
+    const { store, localSaves } = runtime;
     const before = work.replica;
     const view = settling.view ?? 'confirmed';
     const previousQueue = work.queue;
@@ -191,7 +201,7 @@ async function settlement(runtime, local, locator, work, record, queue, settling
         ...(settling.leaving ?? []),
     ];
     const written = await returnedDrafts(store, locator, work, returning, composition);
-    const carried = await carriedBack(store, locator, [
+    const carried = await carriedBack(runtime, locator, [
         ...[...unqueued].reverse().flatMap(({ batch, landed: held }) => (held ? [] : [batch])),
         ...(settling.leaving ?? []).flatMap(({ batch, returned }) => returned === null ? [] : [batch]),
     ], written);
@@ -235,10 +245,6 @@ async function settlement(runtime, local, locator, work, record, queue, settling
                     store.landed.drop(locator, batch.id);
             }
             const drafts = [...written.keys(), ...carried.taken];
-            for (const { batch, landed: held } of unqueued) {
-                const outcome = localSaves ? 'dropped' : held ? 'landed' : 'withdrawn';
-                journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
-            }
             const changed = answer.changed[locator];
             if (settling.commit?.published !== undefined ||
                 settling.commit?.refreshed === true ||
@@ -260,29 +266,20 @@ async function settlement(runtime, local, locator, work, record, queue, settling
     };
 }
 async function unpairing(runtime, local, locator, batches) {
-    const { store, journal, localSaves } = runtime;
+    const { store, localSaves } = runtime;
     const ids = new Set(batches.map(({ id }) => id));
     const leaving = batches.map((batch) => ({
         batch,
         returned: !localSaves && leavingIn(batch, locator) ? returnedBy() : null,
     }));
-    const outcome = localSaves ? 'dropped' : 'unpaired';
     const work = await store.work(locator);
     const current = work.replica;
     if (current !== undefined) {
-        const settled = await settlement(runtime, local, locator, work, current.record, current.queue.filter((one) => !ids.has(one.id)), { leaving });
-        return {
-            ...settled,
-            apply(answer) {
-                for (const batch of batches)
-                    journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
-                return settled.apply(answer);
-            },
-        };
+        return settlement(runtime, local, locator, work, current.record, current.queue.filter((one) => !ids.has(one.id)), { leaving });
     }
     const queue = work.queue.filter((one) => !ids.has(one.id));
-    const written = await returnedDrafts(store, locator, work, leaving, undefined);
-    const carried = await carriedBack(store, locator, leaving.flatMap(({ batch, returned }) => (returned === null ? [] : [batch])), written);
+    const written = await returnedDrafts(store, locator, work, leaving, unheldComposition(runtime, locator));
+    const carried = await carriedBack(runtime, locator, leaving.flatMap(({ batch, returned }) => (returned === null ? [] : [batch])), written);
     return {
         locator,
         left: batches,
@@ -300,8 +297,6 @@ async function unpairing(runtime, local, locator, batches) {
             ],
         },
         apply() {
-            for (const batch of batches)
-                journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
             return mergeChangeSets([
                 changeSet(locator, {
                     queue: true,
@@ -437,7 +432,7 @@ export async function append(runtime, appending) {
     catch {
         return { outcome: 'refused', code: 'durable-write', retryable: true };
     }
-    const lost = answer.fenced ?? plan.rooms.find(({ locator }) => store.fences.has(locator))?.locator;
+    const lost = answer.fenced ?? plan.rooms.find(({ locator }) => runtime.presence.lost(locator))?.locator;
     if (lost !== undefined)
         throw runtimeError('unknown-room', `Unknown Room ${lost}`);
     const [saving] = plan.rooms;

package/dist/reach.d.ts.map

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