@agentshouse/mdruntime 0.1.0-c014edb0e9d9b → 0.1.0-c01d4615bfe46

package/README.md

@@ -12,14 +12,14 @@ npm install @agentshouse/mdruntime
 
 ## Entries
 
-| Entry                           | For                                                                                                                                |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
-| `@agentshouse/mdruntime/client` | The host's client: `connectMdRuntime(port)`                                                                                        |
-| `@agentshouse/mdruntime/host`   | The host that serves a Runtime: `serveMdRuntime`                                                                                   |
-| `@agentshouse/mdruntime`        | Shared types                                                                                                                       |
-| `@agentshouse/mdruntime/memory` | Tests: `createMemoryAdapter`, an in-memory Adapter                                                                                 |
-| `@agentshouse/mdruntime/tables` | The host's database: the Authored store's and opened files' tables, `answerRuntime`                                                |
-| `@agentshouse/mdruntime/react`  | React over the client: `useObserve`, `useSave`; `useReading`, a reader of an expectation store; `useLane`, a reader of an act lane |
+| Entry                           | For                                                                                                                                 |
+| ------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `@agentshouse/mdruntime/client` | The host's client: `connectMdRuntime(port)`                                                                                         |
+| `@agentshouse/mdruntime/host`   | The host that serves a Runtime: `serveMdRuntime`                                                                                    |
+| `@agentshouse/mdruntime`        | Shared types                                                                                                                        |
+| `@agentshouse/mdruntime/memory` | Tests: `createMemoryAdapter`, an in-memory Adapter                                                                                  |
+| `@agentshouse/mdruntime/tables` | The host's database: the Authored store's and opened files' tables, `answerRuntime`                                                 |
+| `@agentshouse/mdruntime/react`  | React over the client: `useObserve`, `useSave`; `useExpected`, a reader of an expectation store; `useLane`, a reader of an act lane |
 
 ## Usage
 
@@ -33,18 +33,19 @@ const rooms = await runtime.rooms();
 const notes = await runtime.query({ types: ['note'], select: 'all', limit: 20 });
 ```
 
-`observe('storage-loss')` reports `null` or the stable code
-`storage-loss` when unsynchronized Room Drafts and Pending Changes were lost.
-The host supplies the user-facing wording.
+`observe('storage-loss')` reports `null`, the stable code `storage-loss` when
+unsynchronized Room Drafts and Pending Changes were lost, or `visit` while the host holds
+the database in memory, which ends with the visit; the readiness `persistence` answer is then
+`memory`. The host supplies the user-facing wording.
 
 In House the bridge object the page holds as `window.houseBridge` places the Chat, which
-House serves with the page: install and bundle nothing for it. Mount it in an element,
-themed by CSS custom properties on that element, docked at a third of the window:
+House serves with the page: install and bundle nothing for it. Mount it in an element it
+fills, on one chat, themed by CSS custom properties on that element:
 
 ```ts
-const chat = await window.houseBridge.chat.mount(element, { width: '1/3', showChats: true });
+const chat = await window.houseBridge.chat.mount(element, { conversation });
 element.style.setProperty('--chat-accent', '#2a6cf0');
-chat.update({ width: 'full', showChats: true });
+chat.update({ conversation: null, agent });
 chat.unmount();
 ```
 

package/dist/acceptance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acceptance.d.ts","sourceRoot":"","sources":["../src/acceptance.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAyX5C,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAK5D"}
+{"version":3,"file":"acceptance.d.ts","sourceRoot":"","sources":["../src/acceptance.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AA0V5C,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,QAK5D"}

package/dist/acceptance.js

@@ -39,11 +39,6 @@ async function keepUpload({ socket, presence }, local, locator, identifier, uplo
     if (!socket.continuing())
         throw new Error();
 }
-function logAccepted({ journal }, locator, submitted, accepted) {
-    journal.record(`outcome ${locator} ${submitted.id} accepted ${accepted.roomVersion}` +
-        (accepted.author === undefined ? '' : ` author ${accepted.author}`) +
-        (accepted.time === undefined ? '' : ` time ${accepted.time}`));
-}
 function restands(adoptions) {
     return adoptions.flatMap((one) => (one === null || !('record' in one) ? [] : [one]));
 }
@@ -55,7 +50,6 @@ async function adoption(runtime, room, current, local, submitted, accepted) {
         return null;
     }
     const held = current.record.roomVersion;
-    logAccepted(runtime, room.locator, submitted, accepted);
     let record = current.record;
     let adopted;
     if (!socket.reads.reached(room.locator, held, accepted.roomVersion) &&
@@ -119,7 +113,7 @@ async function behindIn({ store }, locator, batch) {
     return room ? order.indexOf(batch.id) > 0 : order.length > 0;
 }
 async function submitRoom(runtime, room, local, authorized, progress, signal) {
-    const { store, socket, presence, journal } = runtime;
+    const { store, socket, presence } = runtime;
     while (socket.continuing() &&
         socket.session.now().authorization !== undefined &&
         !signal.aborted) {
@@ -152,12 +146,10 @@ async function submitRoom(runtime, room, local, authorized, progress, signal) {
         }
         if (socket.writesHeld()) {
             progress.complete = false;
-            journal.record(`submission ${room.locator} ${head.id} held`);
             return 'done';
         }
         const lost = earlier || submission.state === 'submitted';
         let result;
-        journal.record(`submission ${room.locator} ${head.id}`);
         await store.exclusive(() => mark(runtime, local, room.locator, head, { state: 'submitted' }, lost));
         if (socket.session.now().paused || presence.lost(room.locator))
             return 'done';
@@ -166,7 +158,6 @@ async function submitRoom(runtime, room, local, authorized, progress, signal) {
             if (signal.aborted)
                 return 'done';
             progress.complete = false;
-            journal.record(`submission ${room.locator} ${head.id} held`);
             return 'done';
         }
         const opensBefore = socket.session.now().openSignals;
@@ -223,7 +214,6 @@ async function submitRoom(runtime, room, local, authorized, progress, signal) {
             return 'done';
         }
         if (result.kind === 'write-halted') {
-            journal.record(`outcome ${room.locator} ${head.id} write-halted`);
             await store.exclusive(() => mark(runtime, local, room.locator, head, { state: 'waiting' }, lost));
             if (!socket.haltedSince(opensBefore))
                 continue;
@@ -231,15 +221,6 @@ async function submitRoom(runtime, room, local, authorized, progress, signal) {
             return 'done';
         }
         const other = partner === null ? undefined : presence.room(partner);
-        if (result.kind === 'conflicted' ||
-            result.kind === 'rejected' ||
-            result.kind === 'retryable-refusal') {
-            journal.record(`outcome ${room.locator} ${head.id} ${result.kind}` +
-                (result.kind === 'conflicted' && result.roomVersion !== undefined
-                    ? ` ${result.roomVersion}`
-                    : ''));
-            journal.record(`refusal ${result.kind} ${result.code}`);
-        }
         if (result.kind === 'retryable-refusal') {
             runtime.retries.failed('sending', submitting(room.locator), refusalError(result));
             const reset = result.reset;

package/dist/act-lanes.d.ts

@@ -1,33 +1,30 @@
-import { type ExpectedOf, type Expecting } from './expectation.js';
+import { type Expected, type Expecting } from './expectation.js';
 export type Ended = 'accepted' | 'refused' | 'unanswered' | 'unsent';
-type Keyed = {
-    readonly key: string;
-};
-export type Send<O, E extends Keyed> = {
+export type Send<O> = {
     (name: string, input: unknown, sending: (operation: string) => Promise<O>): Promise<O>;
-    expect(expected: ExpectedOf<E>): void;
+    expect(expected: Expected): void;
 };
 export type LaneShown<O> = {
     readonly busy: boolean;
     readonly drawn: boolean;
     readonly ended: O | null;
 };
-export type Lane<O, E extends Keyed> = {
-    run(steps: (send: Send<O, E>) => Promise<O>, expected?: ExpectedOf<E>): Promise<O>;
+export type Lane<O> = {
+    run(steps: (send: Send<O>) => Promise<O>, expected?: Expected): Promise<O>;
     shown(): LaneShown<O>;
     subscribe(listener: () => void): () => void;
     forget(): void;
 };
-export type Acting<O, E extends Keyed> = {
-    open(): Lane<O, E>;
+export type Acting<O> = {
+    open(): Lane<O>;
 };
-export type ActingRules<O, E extends Keyed> = {
-    readonly store: Pick<Expecting<E>, 'begin' | 'expect' | 'drop'>;
+export type ActingRules<O> = {
+    readonly store: Pick<Expecting, 'begin' | 'expect' | 'drop'>;
     readonly uncertain: O;
     ending(outcome: O): Ended;
     acted?(): void;
     mint?(): string;
+    settles?(operation: string): Promise<boolean>;
 };
-export declare function acting<O, E extends Keyed>(rules: ActingRules<O, E>): Acting<O, E>;
-export {};
+export declare function acting<O>(rules: ActingRules<O>): Acting<O>;
 //# sourceMappingURL=act-lanes.d.ts.map

package/dist/act-lanes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"act-lanes.d.ts","sourceRoot":"","sources":["../src/act-lanes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,UAAU,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGjF,MAAM,MAAM,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC;AAErE,KAAK,KAAK,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtC,MAAM,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,IAAI;IACrC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,IAAI;IACrC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACnF,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IACtB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAC5C,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,IAAI;IACvC,IAAI,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,IAAI;IAC5C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;IAChE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACtB,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC;IAC1B,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,IAAI,CAAC,IAAI,MAAM,CAAC;CACjB,CAAC;AAQF,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,SAAS,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAmKjF"}
+{"version":3,"file":"act-lanes.d.ts","sourceRoot":"","sources":["../src/act-lanes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG/E,MAAM,MAAM,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC;AAErE,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI;IACpB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACvF,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI;IACpB,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3E,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IACtB,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IAC5C,MAAM,IAAI,IAAI,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI;IACtB,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;IAC7D,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACtB,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC;IAC1B,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,IAAI,CAAC,IAAI,MAAM,CAAC;IAChB,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC/C,CAAC;AAUF,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CA6N1D"}

package/dist/act-lanes.js

@@ -2,10 +2,11 @@ import { expectedList } from './expectation.js';
 import { changeBatchIdentity } from './identity.js';
 const IDLE = { busy: false, drawn: false, ended: null };
 export function acting(rules) {
-    const { store, uncertain, ending } = rules;
+    const { store, uncertain, ending, settles } = rules;
     const mint = rules.mint ?? (() => changeBatchIdentity());
     const identities = new Map();
     const waiting = new Map();
+    const settling = new Map();
     const blobs = new WeakMap();
     let counted = 0;
     let touches = 0;
@@ -78,6 +79,8 @@ export function acting(rules) {
             let pressed = 0;
             let drawing = 0;
             let ended = null;
+            let held = null;
+            let presses = 0;
             let shown = IDLE;
             const show = () => {
                 const busy = pressed > 0;
@@ -88,7 +91,38 @@ export function acting(rules) {
                 for (const listener of listeners)
                     listener();
             };
-            const run = (steps, expected = null) => {
+            const awaiting = (outcome, operations, heard, again) => new Promise((resolve) => {
+                const forgotten = () => {
+                    for (const operation of operations)
+                        if (settling.get(operation) === record)
+                            settling.delete(operation);
+                };
+                const record = {
+                    supersede() {
+                        if (held !== record)
+                            return;
+                        held = null;
+                        forgotten();
+                        resolve(outcome);
+                    },
+                };
+                held = record;
+                for (const operation of operations)
+                    settling.set(operation, record);
+                const answers = operations.map((operation) => heard(operation).then((answered) => {
+                    if (!answered)
+                        record.supersede();
+                    return answered;
+                }));
+                void Promise.all(answers).then(() => {
+                    if (held !== record)
+                        return;
+                    held = null;
+                    forgotten();
+                    resolve(again());
+                }, () => record.supersede());
+            });
+            const attempt = (steps, expected, press) => {
                 const act = store.begin();
                 let drew = false;
                 const expect = (more) => {
@@ -108,6 +142,7 @@ export function acting(rules) {
                 const send = Object.assign(async (name, input, sending) => {
                     const request = requestOf(name, input);
                     const identity = identityOf(request);
+                    settling.get(identity.operation)?.supersede();
                     const called = { request, identity, ended: null };
                     calls.push(called);
                     touches += 1;
@@ -150,11 +185,24 @@ export function acting(rules) {
                         end(uncertain, 'unanswered');
                         throw error;
                     }
-                    end(outcome, ending(outcome));
-                    return outcome;
+                    const how = ending(outcome);
+                    end(outcome, how);
+                    return { outcome, how };
                 });
                 tail = turn.catch(() => undefined);
-                return turn;
+                return turn.then(({ outcome, how }) => {
+                    const lost = calls.flatMap(({ identity, ended: answered }) => answered === 'unanswered' ? [identity.operation] : []);
+                    if (how !== 'unanswered' || lost.length === 0 || settles === undefined)
+                        return outcome;
+                    if (press !== presses)
+                        return outcome;
+                    return awaiting(outcome, lost, settles, () => attempt(steps, expected, press));
+                });
+            };
+            const run = (steps, expected = null) => {
+                held?.supersede();
+                presses += 1;
+                return attempt(steps, expected, presses);
             };
             return {
                 run,

package/dist/actions.d.ts

@@ -20,6 +20,7 @@ export type Invoked = {
 export declare function invokeAction(runtime: Runtime, name: string, input: unknown, { dispatching, attempt }?: Invoked): Promise<CallResult>;
 export declare function readConversationHistory(runtime: Runtime, request: ConversationHistoryRequest): Promise<CallResult>;
 export declare function called(runtime: Runtime, name: string, input: unknown, attempt?: Attempt): Promise<CallResult>;
+export declare function answeredCall(runtime: Runtime, operation: string): Promise<boolean>;
 export declare function resendCalls(runtime: Runtime, signal: AbortSignal): Promise<Attempted>;
 export declare function resendLater(runtime: Runtime): void;
 //# sourceMappingURL=actions.d.ts.map

package/dist/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAK/D,OAAO,EAWL,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAOF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,YAAiB,GACvB,OAAO,CAAC,aAAa,CAAC,CAqCxB;AAED,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAShD;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAuBrB;AAwBD,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,EAAE,WAAW,EAAE,OAAO,EAAE,GAAE,OAAY,GACrC,OAAO,CAAC,UAAU,CAAC,CAiCrB;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,UAAU,CAAC,CAkBrB;AAqDD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,UAAU,CAAC,CAKrB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAmB3F;AAiBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAG3C"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAM/D,OAAO,EAWL,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAOF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,YAAiB,GACvB,OAAO,CAAC,aAAa,CAAC,CA+BxB;AAED,wBAAsB,OAAO,CAC3B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAShD;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAuBrB;AAwBD,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,EAAE,WAAW,EAAE,OAAO,EAAE,GAAE,OAAY,GACrC,OAAO,CAAC,UAAU,CAAC,CA6BrB;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,UAAU,CAAC,CAerB;AA4GD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,UAAU,CAAC,CAKrB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAaxF;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAe3F;AAiBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAG3C"}

package/dist/actions.js

@@ -1,5 +1,5 @@
 import { roomTarget, target } from '@agentshouse/mdmodel';
-import { CATCHING_UP, resendConversations } from './conversation.js';
+import { CATCHING_UP, holdsSubmission, resendConversations } from './conversation.js';
 import { listingNow } from './listing.js';
 import { locked, lockedRooms } from './locks.js';
 import { scoped } from './models.js';
@@ -10,7 +10,7 @@ function operationOf(input) {
     return typeof operation === 'string' ? operation : null;
 }
 export async function readHistory(runtime, locator, path, query = {}) {
-    const { store, socket, presence, journal } = runtime;
+    const { store, socket, presence } = runtime;
     const { session } = socket;
     if (socket.closed() || session.now().refusal !== null)
         return UNCERTAIN;
@@ -27,12 +27,6 @@ export async function readHistory(runtime, locator, path, query = {}) {
     if (closed || authorization === undefined || refusal !== null)
         return UNCERTAIN;
     const since = presence.losses();
-    const transfer = ['transfer', 'history', locator, path];
-    if (query.revision !== undefined)
-        transfer.push(query.revision);
-    if (query.pageToken !== undefined)
-        transfer.push(query.pageToken);
-    journal.record(transfer.join(' '));
     try {
         const result = await socket.history(authorization, {
             locator,
@@ -40,7 +34,6 @@ export async function readHistory(runtime, locator, path, query = {}) {
             ...(query.revision === undefined ? {} : { revision: query.revision }),
             ...(query.pageToken === undefined ? {} : { pageToken: query.pageToken }),
         });
-        journal.record(`outcome history ${result.kind}`);
         if (presence.lostSince(locator, since))
             return failure({ kind: 'room-not-readable', locator });
         if (result.kind === 'scoped-refusal') {
@@ -53,7 +46,6 @@ export async function readHistory(runtime, locator, path, query = {}) {
         return historyAnswer(result);
     }
     catch {
-        journal.record('outcome history transport-uncertainty');
         return UNCERTAIN;
     }
 }
@@ -111,7 +103,7 @@ async function calledRooms(runtime, name, input) {
     return (Array.isArray(named) ? named : [named]).filter((room) => typeof room === 'string');
 }
 export async function invokeAction(runtime, name, input, { dispatching, attempt } = {}) {
-    const { store, socket, journal, retries } = runtime;
+    const { store, socket, retries } = runtime;
     const { session } = socket;
     await socket.ready;
     if (socket.closed() || session.now().refusal !== null) {
@@ -130,7 +122,6 @@ export async function invokeAction(runtime, name, input, { dispatching, attempt
         return handedOutcome(retries, attempt, UNANSWERED);
     }
     await dispatching?.();
-    journal.record(`transfer action ${name}`);
     try {
         const result = await socket.action(authorization, { name, input });
         if (result.kind === 'scoped-refusal') {
@@ -140,34 +131,27 @@ export async function invokeAction(runtime, name, input, { dispatching, attempt
         }
         if (result.kind === 'revoked-authorization')
             await refuse(runtime, 'revoked-authorization');
-        journal.record(`outcome action ${result.kind}`);
-        if (result.kind === 'rejected')
-            journal.record(`refusal rejected ${result.code}`);
         return handedOutcome(retries, attempt, result);
     }
     catch (error) {
-        journal.record('outcome action transport-uncertainty');
         return handedOutcome(retries, attempt, { kind: 'transport-uncertainty', failure: error });
     }
 }
 export async function readConversationHistory(runtime, request) {
-    const { socket, journal, retries } = runtime;
+    const { socket, retries } = runtime;
     const caught = { step: 'conversations', instance: CATCHING_UP };
     await socket.ready;
     const stream = socket.conversations();
     if (socket.closed() || socket.session.now().refusal !== null || stream?.history === undefined) {
         return handedOutcome(retries, caught, UNANSWERED);
     }
-    journal.record('transfer conversation history');
     try {
         const result = await stream.history(request);
         if (result.kind === 'revoked-authorization')
             await refuse(runtime, 'revoked-authorization');
-        journal.record(`outcome conversation history ${result.kind}`);
         return handedOutcome(retries, caught, result);
     }
     catch (error) {
-        journal.record('outcome conversation history transport-uncertainty');
         return handedOutcome(retries, caught, { kind: 'transport-uncertainty', failure: error });
     }
 }
@@ -182,33 +166,79 @@ function numberedCall(runtime, name, input, operation, dispatching) {
         attempt: { step: 'sending', instance: `action ${operation}` },
     });
 }
-async function recoveredAction(runtime, name, input, attempt) {
-    const { store, socket, recovery } = runtime;
+function keptSender(runtime, name, input, operation, resent = false) {
+    const { store, socket } = runtime;
     const { lanes } = socket;
+    const dispatching = async () => (await store.open()).keepCall({ operation, name, input });
+    let waiting = [];
+    let last = UNCERTAIN;
+    let lost = resent;
+    const tell = (result) => {
+        last = result;
+        const told = waiting;
+        waiting = [];
+        for (const answer of told)
+            answer(result);
+    };
+    const sender = {
+        next: () => new Promise((answer) => waiting.push(answer)),
+        async send() {
+            let result;
+            try {
+                result = await numberedCall(runtime, name, input, operation, dispatching);
+            }
+            catch (error) {
+                tell(last);
+                throw error;
+            }
+            if (unsettled(result))
+                lost = true;
+            else {
+                await (await store.open()).dropCall(operation);
+                lanes.settle(operation, lost);
+            }
+            tell(result);
+            return result;
+        },
+        release() {
+            lanes.sent(operation, sender);
+            tell(last);
+        },
+    };
+    lanes.sending(operation, sender);
+    return sender;
+}
+async function recoveredAction(runtime, name, input, attempt) {
+    const { socket, recovery } = runtime;
     const operation = operationOf(input);
     if (operation === null)
         return invokeAction(runtime, name, input, { attempt });
-    const dispatching = async () => (await store.open()).keepCall({ operation, name, input });
-    lanes.call(operation);
+    const held = socket.lanes.sender(operation);
+    if (held !== undefined)
+        return held.next();
+    const sender = keptSender(runtime, name, input, operation);
+    let first;
     try {
-        let result = await numberedCall(runtime, name, input, operation, dispatching);
-        if (unsettled(result)) {
-            await recovery.attempt(`action ${operation}`, async () => {
-                if (socket.closed() || socket.session.now().refusal !== null)
-                    return 'done';
-                if (!socket.isOpen())
-                    return 'again';
-                result = await numberedCall(runtime, name, input, operation, dispatching);
-                return unsettled(result) ? 'again' : 'done';
-            }, { again: true });
-        }
-        if (!unsettled(result))
-            await (await store.open()).dropCall(operation);
-        return result;
+        first = await sender.send();
+    }
+    catch (error) {
+        sender.release();
+        throw error;
     }
-    finally {
-        lanes.called(operation);
+    if (!unsettled(first)) {
+        sender.release();
+        return first;
     }
+    void recovery
+        .attempt(`action ${operation}`, async () => {
+        if (socket.closed() || socket.session.now().refusal !== null)
+            return 'done';
+        if (!socket.isOpen())
+            return 'again';
+        return unsettled(await sender.send()) ? 'again' : 'done';
+    }, { again: true })
+        .finally(() => sender.release());
+    return first;
 }
 export async function called(runtime, name, input, attempt) {
     await runtime.socket.ready;
@@ -216,26 +246,37 @@ export async function called(runtime, name, input, attempt) {
     const room = (await calledRooms(runtime, name, input)).find((one) => lockedNow.includes(one));
     return room === undefined ? recoveredAction(runtime, name, input, attempt) : lockedRoom(room);
 }
-export async function resendCalls(runtime, signal) {
+export async function answeredCall(runtime, operation) {
     const { store, socket } = runtime;
     const { lanes } = socket;
+    const held = () => lanes.sender(operation) !== undefined || lanes.unclaimed(operation);
+    if (!held()) {
+        const calls = await (await store.open()).calls();
+        const kept = calls.some((one) => one.operation === operation) ||
+            (await holdsSubmission(runtime.conversations, operation));
+        if (!held() && !kept)
+            return false;
+    }
+    await lanes.settled(operation);
+    return true;
+}
+export async function resendCalls(runtime, signal) {
+    const { store, socket } = runtime;
     if (!socket.isOpen() || socket.closed() || socket.stopping())
         return 'done';
     const local = await store.open();
     for (const held of await local.calls()) {
-        if (lanes.calling(held.operation))
+        if (socket.lanes.sender(held.operation) !== undefined)
             continue;
         if (socket.closed() || signal.aborted)
             return 'done';
-        lanes.call(held.operation);
+        const sender = keptSender(runtime, held.name, held.input, held.operation, true);
         try {
-            if (unsettled(await numberedCall(runtime, held.name, held.input, held.operation))) {
+            if (unsettled(await sender.send()))
                 return 'again';
-            }
-            await local.dropCall(held.operation);
         }
         finally {
-            lanes.called(held.operation);
+            sender.release();
         }
     }
     return 'done';

package/dist/adapter.d.ts

@@ -1,4 +1,4 @@
-import type { SavedFacts, TypedPath } from '@agentshouse/mdmodel';
+import type { SavedFacts, TypedPath, VerifiedModel } from '@agentshouse/mdmodel';
 import type { Operation, SessionState } from '@agentshouse/session-content';
 import type { ModelResult } from './model.js';
 export type { SavedFacts, TypedPath };
@@ -42,8 +42,6 @@ export type Capability = {
 export type ListedConversation = {
     conversation: string;
     agent: string;
-    agentName: string;
-    agentRetired: boolean;
     name: string;
     created: string;
     finished: string | null;
@@ -51,6 +49,7 @@ export type ListedConversation = {
     waiting: boolean;
     newest: string | null;
     processEnded: string | null;
+    subject: string | null;
 };
 export type ConversationAction = 'conversations/create' | 'conversations/send' | 'conversations/interaction/answer' | 'conversations/interrupt' | 'conversations/kill' | 'conversations/delete' | 'conversations/take-out' | 'conversations/rename' | 'conversations/option/set' | 'conversations/retry' | 'agent-functions/decide';
 export type ConversationMessage = {
@@ -164,6 +163,7 @@ export type ConversationEvent = {
     conversation: string;
 } | {
     kind: 'list';
+    agents: readonly ListedAgent[];
     entries: readonly ListedConversation[];
     whole: boolean;
     more: boolean;
@@ -171,6 +171,9 @@ export type ConversationEvent = {
 } | {
     kind: 'listed';
     entry: ListedConversation;
+} | {
+    kind: 'agent';
+    agent: ListedAgent;
 } | {
     kind: 'unlisted';
     conversation: string;
@@ -181,17 +184,26 @@ export type AgentEnvironment = {
     state: 'online' | 'offline';
 };
 export type ListedAgent = {
-    agent: string;
+    id: string;
     name: string;
-    retired: boolean;
+    revision: number;
+    environment: string;
+    environment_name: string;
+    environment_connected: boolean;
+    launch_directory: string;
     cli: string;
-    environment: AgentEnvironment;
+    model: string | null;
+    effort: string | null;
+    mode: string | null;
+    base_instructions: string;
+    in_telegram: boolean;
+    created: string;
+    retired_at: string | null;
 };
 export type ConversationStream = {
     replicate(conversations: readonly string[]): void;
     hold(cursor: string | null): void;
     observe(notify: (event: ConversationEvent) => void): () => void;
-    agents?(): Promise<readonly ListedAgent[] | null>;
     history?(request: ConversationHistoryRequest): Promise<ActionResult>;
 };
 export type ActionDeclaration = {
@@ -359,12 +371,9 @@ export type AcceptedRoom = {
 };
 export type MutationResult = (AcceptedRoom & {
     kind: 'accepted';
-    author?: string;
-    time?: string;
     destination?: AcceptedRoom;
 }) | (ProviderRefusal & {
     kind: 'conflicted';
-    roomVersion?: string;
     affected: Readonly<Record<string, string>>;
 }) | (ProviderRefusal & {
     kind: 'rejected';
@@ -507,8 +516,7 @@ export type RoomStream = {
 export type PathRule = (path: string) => boolean;
 export type Adapter = {
     readonly localSaves?: true;
-    readonly roomTypes?: string;
-    readonly nameableRoomTypes?: readonly string[];
+    readonly roomTypes?: VerifiedModel;
     readonly typedPaths?: readonly TypedPath[];
     readonly pathRule?: PathRule;
     readonly unkeptReads?: readonly string[];