@agentshouse/mdruntime 0.1.0-cf08ada271a7f → 0.1.0-cf0c43fc48aad

package/dist/conversation.js

@@ -11,6 +11,7 @@ import { runningLine } from './parts.js';
 import { record, text } from './read.js';
 import { openQuestion, questionAsked } from './questions.js';
 import { untilAnswered } from './recovery.js';
+import { retrying } from './retried.js';
 import { capped, FROM_START, messageOrder, precedes } from './windows.js';
 export function unheldView(conversation) {
     return {
@@ -25,12 +26,17 @@ export function unheldView(conversation) {
         starting: null,
         state: null,
         link: null,
+        deliveryWaiting: [],
         deliveryUnknown: [],
         chatDraft: null,
+        dismissedSuggestion: null,
     };
 }
 export const SESSION_STARTED = 'Session started';
 const NEW_CHAT = 'new:';
+const LISTING = 'listing';
+const AGENTS = 'agents';
+export const CATCHING_UP = 'catching-up';
 export const HISTORY_CONVERSATIONS = 64;
 export function newChat(agent) {
     return `${NEW_CHAT}${agent}`;
@@ -74,7 +80,7 @@ function frameOf(asked, messages, more, total) {
     };
 }
 function newestOf(arriving, from) {
-    return arriving.reduce((top, message) => (top === null || message.position > top ? message.position : top), from);
+    return arriving.reduce((top, message) => (top === null || message.change > top ? message.change : top), from);
 }
 function acceptedMessage(value) {
     if (typeof value !== 'object' || value === null)
@@ -83,6 +89,7 @@ function acceptedMessage(value) {
     if (typeof record.identity !== 'string' ||
         typeof record.turn !== 'string' ||
         typeof record.position !== 'string' ||
+        typeof record.change !== 'string' ||
         typeof record.text !== 'string') {
         return null;
     }
@@ -90,6 +97,7 @@ function acceptedMessage(value) {
         identity: record.identity,
         turn: record.turn,
         position: record.position,
+        change: record.change,
         text: record.text,
         message: structuredClone(record.message),
     };
@@ -191,17 +199,17 @@ function withSubmitted(draft, submitted) {
     const { submitted: _held, ...unsent } = draft;
     return submitted.length === 0 ? unsent : { ...unsent, submitted };
 }
-function prepended(draft, said) {
-    return { text: [said.text, draft.text].filter((one) => one !== '').join('\n') };
+export function joinedDraft(first, second) {
+    return [first, second].filter((one) => one !== '').join('\n');
 }
 function returned(draft, submission, others) {
     return withSubmitted({
         conversation: draft.conversation,
-        ...prepended(draft, submission),
+        text: joinedDraft(submission.text, draft.text),
         revision: chatDraftRevision(),
     }, others);
 }
-function viewOf(alive, conversation, held, frame, draft, ended) {
+function viewOf(alive, conversation, held, frame, draft, ended, dismissed) {
     const facts = alive.liveOf(conversation);
     return {
         conversation,
@@ -221,8 +229,10 @@ function viewOf(alive, conversation, held, frame, draft, ended) {
         starting: facts.starting,
         state: sessionOf(facts, held, ended),
         link: facts.link === null ? null : { ...facts.link },
+        deliveryWaiting: [...facts.deliveryWaiting],
         deliveryUnknown: [...facts.deliveryUnknown],
         chatDraft: draft === null || unwritten(draft) ? null : { text: draft.text, revision: draft.revision },
+        dismissedSuggestion: dismissed,
     };
 }
 function sessionOf(facts, held, ended) {
@@ -242,13 +252,14 @@ function emit(alive, conversation) {
     if (alive.deps.closed())
         return;
     for (const view of alive.views()) {
-        const { window, draft, ended } = view.held.now();
+        const { window, draft, ended, dismissed } = view.held.now();
         if (view.conversation !== conversation || window === null)
             continue;
         const ready = view.ready();
         if (ready.length === 0)
             continue;
-        const value = viewOf(alive, conversation, window, sharedFrame(view, window), draft, ended);
+        const frame = sharedFrame(view, window);
+        const value = viewOf(alive, conversation, window, frame, draft, ended, dismissed);
         for (const watcher of ready)
             watcher.notify(value);
     }
@@ -397,7 +408,7 @@ async function told(alive) {
     try {
         while (alive.held.now().listOwed && !alive.deps.closed()) {
             alive.held.set({ listOwed: false });
-            const value = await untilAnswered(() => entries(alive), alive.closing);
+            const value = await untilAnswered(retrying(alive.deps.retries, 'conversations', LISTING, () => entries(alive)), alive.closing, () => true, alive.deps.recovery);
             if (alive.deps.closed())
                 return;
             if (value === null)
@@ -440,15 +451,24 @@ export function conversationsLearned(alive) {
     shownList(alive, (list) => alive.agentListeners.welcome(agents(alive, list)));
 }
 function agents(alive, list) {
-    const named = new Map();
-    for (const agent of alive.held.now().listedAgents ?? [])
-        named.set(agent.agent, agent);
+    const read = new Map((alive.held.now().listedAgents ?? []).map((one) => [one.agent, one]));
+    const named = new Map(read);
     for (const entry of list) {
         named.set(entry.agent, { name: entry.agentName, retired: entry.agentRetired });
     }
     return [...named]
         .filter(([, agent]) => !agent.retired)
-        .map(([identity, agent]) => ({ identity, name: agent.name }))
+        .map(([identity, agent]) => {
+        const held = read.get(identity);
+        return held === undefined
+            ? { identity, name: agent.name }
+            : {
+                identity,
+                name: agent.name,
+                cli: held.cli,
+                environment: structuredClone(held.environment),
+            };
+    })
         .sort((left, right) => left.name === right.name
         ? left.identity.localeCompare(right.identity)
         : left.name.localeCompare(right.name));
@@ -465,7 +485,7 @@ function readAgents(alive) {
         if (!alive.deps.online() || (!agentListeners.waiting() && !agentListeners.told())) {
             return 'done';
         }
-        const listed = await read();
+        const listed = await retrying(alive.deps.retries, 'conversations', AGENTS, read)();
         if (listed === null)
             return 'done';
         alive.held.set({ listedAgents: listed });
@@ -524,6 +544,7 @@ function openingEnded(alive) {
             starting: facts.has('starting') ? QUIET.starting : held.starting,
             state: facts.has('state') ? QUIET.state : held.state,
             link: facts.has('link') ? QUIET.link : held.link,
+            deliveryWaiting: facts.has('deliveryWaiting') ? QUIET.deliveryWaiting : held.deliveryWaiting,
             deliveryUnknown: facts.has('deliveryUnknown') ? QUIET.deliveryUnknown : held.deliveryUnknown,
         });
         emit(alive, conversation);
@@ -555,19 +576,13 @@ function handReplicated(alive) {
 }
 async function remove(alive, leaving) {
     await alive.deps.durably(async (local) => {
-        const kept = new Set([
-            ...(await local.conversations(leaving)).map(({ conversation }) => conversation),
-            ...(await local.chatDrafts())
-                .filter(({ conversation }) => leaving.includes(conversation))
-                .map(({ conversation }) => conversation),
-        ]);
-        await local.dropConversations(leaving);
+        const kept = new Set(await local.dropConversations(leaving));
         const changed = [];
         for (const conversation of leaving) {
             if (kept.has(conversation) || alive.liveHeld(conversation) !== undefined) {
                 changed.push(conversation);
             }
-            shownDraft(alive, conversation, null);
+            heldInViews(alive, conversation, { draft: null, dismissed: null });
             alive.forget(conversation);
             setLive(alive, conversation, null);
             await slide(alive, local, conversation, null);
@@ -639,14 +654,12 @@ function keep(alive, conversation, message) {
         if (!alive.held.now().replicated.has(conversation))
             return;
         const read = (await readsOf(local, [conversation])).get(conversation)?.read;
-        const advances = read !== undefined &&
-            !alive.behind(conversation) &&
-            (read === null || message.position > read);
+        const advances = read !== undefined && !alive.behind(conversation) && (read === null || message.change > read);
         await sealed(alive, local, conversation, new Set([message.turn]));
         await local.keepMessages({
             conversation,
             messages: [message],
-            ...(advances ? { read: { at: message.position, partial: false } } : {}),
+            ...(advances ? { read: { at: message.change, partial: false } } : {}),
         });
         sealTurns(alive, conversation, new Set([message.turn]));
         await slide(alive, local, conversation, [message]);
@@ -767,13 +780,16 @@ function heard(alive, event) {
         return;
     }
     if (event.kind === 'deliveries') {
-        live(alive, conversation, { deliveryUnknown: [...event.unknown] });
+        live(alive, conversation, {
+            deliveryWaiting: [...event.waiting],
+            deliveryUnknown: [...event.unknown],
+        });
         return;
     }
     const arriving = acceptedMessage(event.message);
     if (arriving === null)
         return;
-    alive.heardAt(conversation, arriving.position);
+    alive.heardAt(conversation, arriving.change);
     if (alive.held.now().replicated.has(conversation)) {
         if (alive.deps.full()) {
             alive.gapOpened(conversation);
@@ -791,19 +807,27 @@ function heard(alive, event) {
         emit(alive, conversation);
 }
 async function kept(alive, local, conversation, following) {
-    const shown = following === null || empty(following) ? null : following;
-    if (shown === null)
+    const draft = following === null || empty(following) ? null : following;
+    if (draft === null)
         await local.dropChatDraft(conversation);
     else
-        await local.keepChatDrafts([shown]);
-    shownDraft(alive, conversation, shown);
+        await local.keepChatDrafts([draft]);
+    heldInViews(alive, conversation, { draft });
 }
-function shownDraft(alive, conversation, draft) {
+function heldInViews(alive, conversation, held) {
     for (const view of alive.views()) {
         if (view.conversation === conversation)
-            view.held.set({ draft });
+            view.held.set(held);
     }
 }
+async function factOf(local, name) {
+    return Object.fromEntries((await local.conversationFacts())
+        .filter((fact) => fact.name === name)
+        .map(({ conversation, value }) => [conversation, value]));
+}
+async function dismissedIn(local, conversation) {
+    return (await factOf(local, 'dismissedSuggestion'))[conversation] ?? null;
+}
 async function draftAt(local, conversation) {
     return (await local.chatDraft(conversation)) ?? undefined;
 }
@@ -834,9 +858,9 @@ function moved(alive, agent, operation, to) {
             : [{ ...unsent, conversation: to }];
         const left = { ...(taken.length === 0 ? unsent : blank), moves: [...earlier, operation] };
         await local.keepChatDrafts([left, ...taken]);
-        shownDraft(alive, from, left);
+        heldInViews(alive, from, { draft: left });
         for (const one of taken)
-            shownDraft(alive, to, one);
+            heldInViews(alive, to, { draft: one });
         alive.deps.publish(conversationChangeSet([from, to]));
     });
 }
@@ -867,13 +891,10 @@ async function submitted(alive, conversation, operation, draft) {
     });
     return submission;
 }
-async function dispatched(alive, conversation, submission) {
+async function dispatched(alive, conversation, submission, resent = false) {
     const dispatch = alive.sendingBegan(submission.operation);
     try {
-        const result = await invoke(alive, 'conversations/send', conversation, {
-            operation_id: submission.operation,
-            text: submission.text,
-        });
+        const result = await invoke(alive, 'conversations/send', conversation, submission.operation, { text: submission.text }, { step: 'sending', instance: `message ${submission.operation}` });
         dispatch.set({ answered: result.kind !== 'transport-uncertainty' });
         if (result.kind === 'revoked-authorization')
             return result;
@@ -881,6 +902,7 @@ async function dispatched(alive, conversation, submission) {
             alive.deps.unanswered();
             return result;
         }
+        alive.deps.heard(submission.operation, resent);
         const turn = answered(result, 'message_id');
         await withDraft(alive, conversation, async (current, local) => {
             const held = current?.submitted?.find((one) => one.operation === submission.operation);
@@ -900,8 +922,8 @@ async function dispatched(alive, conversation, submission) {
         alive.sendingEnded(submission.operation, dispatch);
     }
 }
-function invoke(alive, name, conversation, extra = { operation_id: changeBatchIdentity() }) {
-    return alive.deps.call(name, { conversation_id: conversation, ...extra });
+function invoke(alive, name, conversation, operation, extra = {}, attempt) {
+    return alive.deps.call(name, { conversation_id: conversation, operation_id: operation, ...extra }, attempt);
 }
 export function conversationSurface(alive) {
     return {
@@ -922,7 +944,7 @@ export function conversationSurface(alive) {
             return alive.deps.durably(async (local) => {
                 const { messages, more } = await local.messageWindow(conversation, asked.limit, asked.before, phrase);
                 const total = asked.total ? await local.messageCount(conversation, phrase) : null;
-                return structuredClone(viewOf(alive, conversation, messages, frameOf(asked, messages, more, total), (await local.chatDraft(conversation)) ?? null, await endedIn(alive, conversation)));
+                return structuredClone(viewOf(alive, conversation, messages, frameOf(asked, messages, more, total), (await local.chatDraft(conversation)) ?? null, await endedIn(alive, conversation), await dismissedIn(local, conversation)));
             });
         },
         async create(input) {
@@ -959,40 +981,88 @@ export function conversationSurface(alive) {
             }
             return OFFLINE;
         },
-        answer(conversation, answer) {
-            return invoke(alive, 'conversations/interaction/answer', conversation, {
-                operation_id: changeBatchIdentity(),
-                ...answer,
+        answer(conversation, answer, operation) {
+            return invoke(alive, 'conversations/interaction/answer', conversation, operation, answer);
+        },
+        interrupt(conversation, operation) {
+            return invoke(alive, 'conversations/interrupt', conversation, operation);
+        },
+        kill(conversation, operation) {
+            return invoke(alive, 'conversations/kill', conversation, operation);
+        },
+        delete(conversation, operation) {
+            return invoke(alive, 'conversations/delete', conversation, operation);
+        },
+        takeOut(conversation, message, operation) {
+            return invoke(alive, 'conversations/take-out', conversation, operation, {
+                message_id: message,
+            });
+        },
+        decide({ request, room, message }, decision, operation) {
+            return alive.deps.call('agent-functions/decide', {
+                room_ref: room,
+                request,
+                ...(message === undefined ? {} : { message }),
+                decision,
+                operation_id: operation,
+            });
+        },
+        rename(conversation, name, operation) {
+            return invoke(alive, 'conversations/rename', conversation, operation, { name });
+        },
+        option(conversation, option, value, operation) {
+            return invoke(alive, 'conversations/option/set', conversation, operation, { option, value });
+        },
+        retry(conversation, message, operation) {
+            return invoke(alive, 'conversations/retry', conversation, operation, {
+                message_id: message,
             });
         },
-        interrupt(conversation) {
-            return invoke(alive, 'conversations/interrupt', conversation);
+        async pins() {
+            return (await (await alive.deps.local()).facts()).chatPins;
         },
-        kill(conversation) {
-            return invoke(alive, 'conversations/kill', conversation);
+        pin(figures) {
+            return alive.deps.durably((local) => local.fact('chatPins', [...figures]));
         },
-        delete(conversation) {
-            return invoke(alive, 'conversations/delete', conversation);
+        async openedTurns() {
+            return factOf(await alive.deps.local(), 'openedTurn');
+        },
+        openTurn(conversation, turn) {
+            return alive.deps.durably((local) => local.keepConversationFact({ conversation, name: 'openedTurn', value: turn }));
+        },
+        dismissSuggestion(conversation, suggestion) {
+            return alive.deps.durably(async (local) => {
+                if ((await dismissedIn(local, conversation)) === suggestion)
+                    return;
+                await local.keepConversationFact({
+                    conversation,
+                    name: 'dismissedSuggestion',
+                    value: suggestion,
+                });
+                heldInViews(alive, conversation, { dismissed: suggestion });
+                alive.deps.publish(conversationChangeSet([conversation]));
+            });
         },
     };
 }
+function rewritten(alive, conversation, text, revision = chatDraftRevision()) {
+    return withDraft(alive, conversation, (current) => ({
+        conversation,
+        text: text(current?.text ?? ''),
+        revision,
+        ...(current === undefined ? {} : pending(current)),
+    }));
+}
 export function chatDraftSurface(alive) {
     return {
-        write(conversation, draft, revision = chatDraftRevision()) {
-            return withDraft(alive, conversation, (current) => ({
-                conversation,
-                text: draft.text,
-                revision,
-                ...(current === undefined ? {} : pending(current)),
-            }));
+        write(conversation, draft, revision) {
+            return rewritten(alive, conversation, () => draft.text, revision);
         },
         prepend(conversation, draft) {
-            return withDraft(alive, conversation, (current) => ({
-                conversation,
-                ...(current === undefined ? { text: draft.text } : prepended(current, draft)),
-                revision: chatDraftRevision(),
-                ...(current === undefined ? {} : pending(current)),
-            }));
+            return rewritten(alive, conversation, (held) => joinedDraft(draft.text, held));
+        },
+        append(conversation, draft) {
+            return rewritten(alive, conversation, (held) => joinedDraft(held, draft.text));
         },
         discard(conversation) {
             return withDraft(alive, conversation, (current) => current === undefined
@@ -1012,9 +1082,9 @@ export async function reconcileConversations(alive) {
     if (!alive.known())
         return;
     const local = await alive.deps.local();
-    const [held, kept, { conversationList }] = await Promise.all([
+    const [held, stored, { conversationList }] = await Promise.all([
         local.conversations(),
-        local.chatDrafts(),
+        local.storedConversations(),
         local.facts(),
     ]);
     const list = conversationList ?? [];
@@ -1022,9 +1092,7 @@ export async function reconcileConversations(alive) {
     const named = new Set(entries.keys());
     const reads = new Map(held.map((one) => [one.conversation, one]));
     const { replicated } = alive.held.now();
-    const leaving = [
-        ...new Set([...replicated, ...reads.keys(), ...kept.map(({ conversation }) => conversation)]),
-    ].filter((conversation) => !named.has(conversation) &&
+    const leaving = [...new Set([...replicated, ...stored])].filter((conversation) => !named.has(conversation) &&
         !alive.isCreating(conversation) &&
         (!conversation.startsWith(NEW_CHAT) || retiredChat(conversation, list)));
     for (const conversation of named) {
@@ -1061,6 +1129,17 @@ export async function catchUpConversations(alive, progress) {
     if (!alive.current())
         progress.complete = false;
 }
+export async function holdsSubmission(alive, operation) {
+    if (alive.sending(operation))
+        return true;
+    const local = await alive.deps.local();
+    for (const { conversation } of await local.chatDrafts()) {
+        const held = (await local.chatDraft(conversation))?.submitted;
+        if (held?.some((one) => one.operation === operation && one.turn === null) === true)
+            return true;
+    }
+    return false;
+}
 export async function resendConversations(alive, progress) {
     const local = await alive.deps.local();
     const tried = new Set();
@@ -1072,7 +1151,7 @@ export async function resendConversations(alive, progress) {
             if (alive.deps.closed())
                 return;
             tried.add(submission.operation);
-            const result = await dispatched(alive, conversation, submission);
+            const result = await dispatched(alive, conversation, submission, true);
             if (result.kind === 'revoked-authorization')
                 return;
             if (result.kind === 'transport-uncertainty') {
@@ -1092,22 +1171,24 @@ export function watchConversation(alive, conversation, options, deliver) {
     const { view, watcher } = alive.viewJoined(key, conversation, asked, deliver);
     const { held } = view;
     const reading = new AbortController();
-    void untilAnswered(() => alive.deps.durably(async (local) => {
+    void untilAnswered(retrying(alive.deps.retries, 'reading', `window ${key}`, () => alive.deps.durably(async (local) => {
         if (held.now().window !== null)
             return;
         const { messages, more } = await local.messageWindow(conversation, asked.limit, asked.before);
         held.set({ draft: (await local.chatDraft(conversation)) ?? null });
         held.set({ ended: await endedIn(alive, conversation) });
+        held.set({ dismissed: await dismissedIn(local, conversation) });
         held.set({ window: messages });
         held.set({ more });
         held.set({ total: asked.total ? await local.messageCount(conversation) : null });
-    }), reading.signal)
+    })), reading.signal)
         .then(() => {
         if (alive.deps.closed() || !view.admit(watcher))
             return;
-        const { window, draft, ended } = held.now();
+        const { window, draft, ended, dismissed } = held.now();
         const shown = window ?? [];
-        watcher.notify(viewOf(alive, conversation, shown, sharedFrame(view, shown), draft, ended));
+        const frame = sharedFrame(view, shown);
+        watcher.notify(viewOf(alive, conversation, shown, frame, draft, ended, dismissed));
     })
         .catch(() => { });
     return () => {

package/dist/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../src/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,SAAS,EACT,cAAc,EACd,MAAM,EAEP,MAAM,cAAc,CAAC;AAStB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAkB/C,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,GAAG,IAAI,CAsB1E;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,cAAc,EAAE,EAChC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GACvB,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAqEpC;AAUD,wBAAsB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,iBAI1F;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,SAAS,cAAc,EAAE,GAAG,IAAI,CAAC,CA+D3C"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../src/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,SAAS,EACT,cAAc,EACd,MAAM,EAEP,MAAM,cAAc,CAAC;AAOtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAkB/C,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,GAAG,IAAI,CAsB1E;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,cAAc,EAAE,EAChC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GACvB,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CA0CpC;AAYD,wBAAsB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,iBAI1F;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,SAAS,GAAG,IAAI,GACtB,OAAO,CAAC,SAAS,cAAc,EAAE,GAAG,IAAI,CAAC,CA+D3C"}

package/dist/discovery.js

@@ -1,7 +1,5 @@
 import { validRoot } from './collection.js';
-import { declared } from './declaration.js';
-import { admitted, list, listHeld } from './listing.js';
-import { confirmLocks, lockedRooms, relocked } from './locks.js';
+import { lockedRooms, relocked } from './locks.js';
 import { loseRooms } from './lost.js';
 import { cachedModels } from './models.js';
 import { beneath } from './paths.js';
@@ -38,61 +36,34 @@ export function malformed(listed) {
     return null;
 }
 export async function applyDiscovery(runtime, found, started, left) {
-    const { store, socket } = runtime;
-    const { rooms } = socket;
+    const { store, socket, presence } = runtime;
     const lockedBefore = await lockedRooms(runtime);
     const local = await store.open();
-    const stillFenced = new Set(await local.fences());
+    const fenced = new Set(await local.fences());
     const relisting = found
         .map(({ locator }) => locator)
-        .filter((locator) => {
-        const fence = store.fences.of(locator);
-        return stillFenced.has(locator) && (fence === undefined || fence.at < started);
-    });
-    const relisted = relisting.length === 0
+        .filter((locator) => fenced.has(locator) && presence.liftable(locator, started));
+    const unfenced = relisting.length === 0
         ? new Set()
         : await store.durably((held) => held.unfence(relisting));
-    for (const { locator } of found) {
-        const fence = store.fences.of(locator);
-        if (fence === undefined || fence.at >= started)
-            continue;
-        if (relisted.has(locator) || (!stillFenced.has(locator) && !fence.written)) {
-            store.fences.lift(locator);
-        }
-    }
+    const clear = found.filter(({ locator }) => !fenced.has(locator) || unfenced.has(locator));
+    for (const { locator } of clear)
+        presence.lift(locator, started, unfenced.has(locator));
     const kept = await local.held();
     await loseRooms(runtime, found
         .filter((room) => room.replica.admission !== 'admitted' &&
         (kept.held.has(room.locator) || store.installs.of(room.locator).transfer !== null))
         .map((room) => room.locator));
-    const listed = found.filter(({ locator }) => !store.fences.has(locator) && (!stillFenced.has(locator) || relisted.has(locator)));
-    const listedLocatorsNow = new Set(listed.map((room) => room.locator));
-    for (const locator of listedLocatorsNow)
-        rooms.stand(locator, { refusal: null });
-    if (left === undefined)
-        rooms.undiscoverAll();
-    for (const room of listed)
-        rooms.discover(room);
     const named = new Set(found.map((room) => room.locator));
     await loseRooms(runtime, left ??
         [
             ...new Set([
-                ...rooms.declarations().keys(),
+                ...presence.rooms().map(({ locator }) => locator),
                 ...kept.held,
                 ...store.installs.transferring(),
             ]),
         ].filter((locator) => !named.has(locator)));
-    const held = await store.rooms(listed.map((room) => room.locator));
-    for (const room of listed) {
-        const record = held.get(room.locator)?.record;
-        if (record !== undefined && record.declaration.replica.selection !== room.replica.selection) {
-            listHeld(runtime, room.locator);
-            continue;
-        }
-        const declaration = declared(room);
-        list(runtime, room.locator, declaration, admitted(runtime, room.locator, declaration));
-    }
-    confirmLocks(runtime, listed);
+    const listed = presence.list(clear, { whole: left === undefined, live: socket.isOpen() });
     socket.session.set({ roomsListed: true });
     emitRooms(runtime);
     await relocked(runtime, lockedBefore);
@@ -102,10 +73,11 @@ async function asked({ socket }, authorized) {
     try {
         return (await socket.discover(authorized)) ?? { kind: 'transport-uncertainty' };
     }
-    catch {
-        return { kind: 'transport-uncertainty' };
+    catch (failure) {
+        return { kind: 'transport-uncertainty', failure };
     }
 }
+const DISCOVERY = 'discovery';
 export async function signIn(runtime, local, signedIn) {
     if (JSON.stringify(signedIn) === JSON.stringify((await local.facts()).member))
         return;
@@ -113,7 +85,7 @@ export async function signIn(runtime, local, signedIn) {
     emitMember(runtime, signedIn);
 }
 export async function discoverRooms(runtime, local, progress, live, found) {
-    const { socket, journal } = runtime;
+    const { socket } = runtime;
     const { session } = socket;
     const { closed, authorization } = session.now();
     if (closed || authorization === undefined) {
@@ -131,7 +103,10 @@ export async function discoverRooms(runtime, local, progress, live, found) {
         socket.notifyReady();
         return null;
     }
-    journal.record(`connection discover ${result.kind}`);
+    if (result.kind === 'transport-uncertainty')
+        runtime.retries.uncertain('connection', DISCOVERY, result);
+    if (result.kind === 'discovery')
+        runtime.retries.succeeded('connection', DISCOVERY);
     if (result.kind === 'transport-uncertainty') {
         await cachedModels(runtime, local);
         progress.reachable = false;
@@ -140,7 +115,6 @@ export async function discoverRooms(runtime, local, progress, live, found) {
         return null;
     }
     if (result.kind === 'contract-unavailable') {
-        journal.record(`connection contract unavailable ${result.code}`);
         await refuse(runtime, 'missing-required-guarantee', {
             code: result.code,
             fields: result.fields,
@@ -156,7 +130,6 @@ export async function discoverRooms(runtime, local, progress, live, found) {
     }
     const invalid = malformed(result.rooms);
     if (invalid !== null) {
-        journal.record(invalid);
         await refuse(runtime, 'missing-required-guarantee');
         socket.notifyReady();
         return null;

package/dist/durability.d.ts

@@ -1,4 +1,5 @@
 import type { Persistence } from './readiness.js';
+import type { RetriedFailure, Step } from './retried.js';
 export type UnsentKind = 'pending-change' | 'call' | 'room-draft' | 'chat-draft';
 export type UnsentWork = {
     readonly kind: UnsentKind;
@@ -20,6 +21,8 @@ export type RuntimeShell = {
     cleanUp?(): Promise<number>;
     measure?(measured: (app: string, code: AppCode | null) => void): Promise<HeldCode>;
     reset(): Promise<void>;
+    retried?(failure: RetriedFailure): void;
+    succeeded?(step: Step): void;
 };
 export declare function refusedForSpace(error: unknown): boolean;
 export declare function detectStorageLoss(stored: string | null, reported: string | null): string | null;

package/dist/durability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["../src/durability.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAC;AAEjF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3F,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAG/F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGrF"}
+{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["../src/durability.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAIzD,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAC;AAEjF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,OAAO,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAE3F,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,CAAC,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IACxC,SAAS,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAMvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAG/F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGrF"}

package/dist/entry.js

@@ -145,7 +145,7 @@ export function entryScope(rooms, roomTypes, connection) {
             change: null,
             written: null,
         })));
-        return { locator: room.locator, key };
+        return { locator: room.locator, key, composition };
     });
     const planned = { listed: true, rooms: held };
     return {