@agentshouse/mdruntime 0.1.0-cbbae1fff01c6 → 0.1.0-cc00e9289ddf4

package/dist/queries.js

@@ -1,14 +1,15 @@
 import { identityOf } from '@agentshouse/mdmodel';
 import { ROOM_TOTALS } from './figures.js';
 import { roomInFlight } from './install.js';
-import { roomFacts } from './listing.js';
+import { readerOf } from './live.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';
+import { connectionNow, prepare } from './preparation.js';
 import { planWithin, } from './query.js';
 import { planReach } from './reach.js';
 import { refuse } from './refusal.js';
-import { documentKey } from './rows.js';
+import { documentKey, roomsOfReach } from './rows.js';
 import { searchPlanOf } from './search.js';
 import { seedApplies, seededResult, watchSeeded } from './seed.js';
 import { capped, MAXIMUM_WINDOW } from './windows.js';
@@ -22,16 +23,30 @@ function everyRoom({ presence }, held) {
         ]),
     ];
 }
+function anyHeld({ presence }, held, locator) {
+    return (presence.room(locator) !== undefined || held.rooms.has(locator) || held.queues.has(locator));
+}
+function anyRoom(plan) {
+    return plan.rooms === null && plan.reach === null;
+}
+function reaching(runtime, plan, reads, held) {
+    if (!anyRoom(plan))
+        return reads;
+    return (locator) => reads(locator) && anyHeld(runtime, held, locator);
+}
 function reachedRooms(runtime, plan, held) {
-    const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
-    const named = plan.rooms ?? (reached === null ? everyRoom(runtime, held) : [...reached]);
-    return [...new Set(named)]
-        .filter((locator) => (reached === null || reached.has(locator)) && !plan.locked.includes(locator))
-        .sort();
+    const named = plan.rooms ?? (plan.reach === null ? everyRoom(runtime, held) : roomsOfReach(plan.reach));
+    return [...new Set(named)].filter(reaching(runtime, plan, readerOf(plan), held)).sort();
 }
 function awaited({ socket, presence }, locator) {
     return (!socket.session.now().roomsListed || presence.room(locator)?.replica.admission === 'admitted');
 }
+function awaitsOf(runtime, locator, held) {
+    const replica = held.rooms.get(locator);
+    if (replica === undefined)
+        return awaited(runtime, locator) ? 'acquisition' : null;
+    return replica.indexed ? null : 'preparation';
+}
 function coveredRooms(runtime, locators, whole, held) {
     const { store, socket } = runtime;
     if (locators.length === 0 && whole && !socket.session.now().roomsListed)
@@ -41,16 +56,12 @@ function coveredRooms(runtime, locators, whole, held) {
     const overlay = [];
     const read = [];
     for (const locator of locators) {
+        const awaits = awaitsOf(runtime, locator, held);
+        if (awaits !== null)
+            pending.push({ room: locator, awaits });
         const replica = held.rooms.get(locator);
-        if (replica === undefined) {
-            if (awaited(runtime, locator))
-                pending.push({ room: locator, awaits: 'acquisition' });
+        if (awaits !== null || replica === undefined)
             continue;
-        }
-        if (!replica.indexed) {
-            pending.push({ room: locator, awaits: 'preparation' });
-            continue;
-        }
         coverage.push({
             room: locator,
             generation: replica.transfer,
@@ -65,7 +76,19 @@ function coveredRooms(runtime, locators, whole, held) {
     return { coverage: { rooms: coverage, overlay }, rooms: read };
 }
 function covered(runtime, plan, held) {
-    return coveredRooms(runtime, reachedRooms(runtime, plan, held), plan.rooms === null && plan.reach === null, held);
+    return coveredRooms(runtime, reachedRooms(runtime, plan, held), anyRoom(plan), held);
+}
+function pendingAt(runtime, plan, reads, held, rooms) {
+    const reached = reaching(runtime, plan, reads, held);
+    const at = new Map();
+    for (const room of rooms) {
+        const awaits = reached(room) ? awaitsOf(runtime, room, held) : null;
+        at.set(room, awaits === null ? null : { room, awaits });
+    }
+    awaitPreparation(runtime, {
+        pending: [...at.values()].filter((room) => room !== null),
+    });
+    return at;
 }
 function awaitPreparation(runtime, cover) {
     if (!('pending' in cover))
@@ -117,7 +140,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)
@@ -126,7 +164,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 };
@@ -189,11 +227,14 @@ export async function roomTallies(runtime, rooms, since) {
     });
 }
 export function watchPlan(runtime, plan, deliver, fail) {
+    const reads = readerOf(plan);
     return watchSeeded(runtime, plan, deliver, (behind, answered) => runtime.liveQueries.watch(plan, identityOf(plan), (held) => {
         const cover = covered(runtime, plan, held);
         awaitPreparation(runtime, cover);
         return behind(cover, held);
-    }, answered, fail));
+    }, (held, rooms) => runtime.store.seeds.of(plan.key) === undefined
+        ? pendingAt(runtime, plan, reads, held, rooms)
+        : null, answered, fail));
 }
 export function watchPlanned(runtime, planning, deliver, fail) {
     let stop = null;
@@ -211,7 +252,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;
@@ -247,12 +288,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')
@@ -264,7 +303,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,9 +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'>;
+    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,

package/dist/reach.d.ts

@@ -1,8 +1,7 @@
 import type { AppRoom } from './listing.js';
-import type { ReadinessPort } from './preparation.js';
+import type { ReadinessMessage, ReadinessPort } from './preparation.js';
 import type { MdRuntime, RuntimeTopic } from './surface.js';
 import type { Plan, PlanReach, QueryResult } from './query.js';
-import type { Readiness } from './readiness.js';
 import type { SearchResult } from './search.js';
 export type ReachedDocument = {
     readonly room: string;
@@ -34,7 +33,7 @@ export type Reachable = RuntimeView & {
     query(plan: Plan): Promise<QueryResult>;
     watchPlan(plan: Plan, deliver: Deliver, fail: Fail): () => void;
     search(input: unknown, reach: PortReach | null): Promise<SearchResult>;
-    watchReadiness(port: ReadinessPort, reach: PortReach | null, deliver: (readiness: Readiness) => void): () => void;
+    watchReadiness(port: ReadinessPort, reach: PortReach | null, deliver: (readiness: ReadinessMessage) => void): () => void;
     locked(room: string): Promise<boolean>;
     lockedRooms(): Promise<readonly string[]>;
     watchLocks(notify: () => void): () => void;

package/dist/reach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAe,YAAY,EAAE,MAAM,cAAc,CAAC;AA4BzE,OAAO,KAAK,EAAiB,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAS9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAEjD,MAAM,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;AAE5C,MAAM,MAAM,KAAK,GAAG,CAClB,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,SAAS,OAAO,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,KACP,MAAM,IAAI,CAAC;AAEhB,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,KAAK,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,IAAI,CAAC;IAChE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACvE,cAAc,CACZ,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACtC,MAAM,IAAI,CAAC;IACd,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,WAAW,IAAI,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IAC1C,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAC3C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAC1F,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CACrD,CAAC;AAsCF,wBAAgB,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMpE;AAMD,wBAAgB,OAAO,CACrB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,IAAI,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,cAAc,EAAE;QAAE,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,GAC/F;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAS/D;AAeD,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAcnE;AA2GD,wBAAgB,QAAQ,CACtB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,IAAI,EAAE,aAAa,GAClB,YAAY,CA8Xd"}
+{"version":3,"file":"reach.d.ts","sourceRoot":"","sources":["../src/reach.ts"],"names":[],"mappings":"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"}

package/dist/reach.js

@@ -1,7 +1,8 @@
+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 { 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';
@@ -20,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) {
@@ -61,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
@@ -77,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);
@@ -106,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)) }),
@@ -231,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));
@@ -250,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) {
@@ -281,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) => {
@@ -315,7 +359,7 @@ export function narrowed(runtime, given, port) {
                 return () => { };
             });
         }
-        if (topic === 'figures' || topic === 'holdings') {
+        if (topic === 'figures' || topic === 'holdings' || topic === 'listed-agents') {
             if (reach === null)
                 return watch(topic, input, deliver, fail);
             fail(deviceUnreached());
@@ -340,7 +384,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 });
         }),
@@ -432,7 +478,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())),
@@ -471,14 +516,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, 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,12 @@ 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: '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;