@agentshouse/mdruntime 0.1.0-cbbae1fff01c6 → 0.1.0-cc00e9289ddf4

package/dist/live.js

@@ -1,27 +1,25 @@
-import { changeOf, digestOf, } from './observation.js';
+import { changeOf, digestOf, keyedAt, keyedInto, samePending, unchanged, } from './observation.js';
 import { uncaught } from './failure.js';
-import { roomOfKey } from './rows.js';
+import { roomsOfReach } from './rows.js';
 function narrowed(plan) {
     return (plan.paths !== null &&
         plan.hop === null &&
         plan.backlinks === null &&
         !(plan.shape.kind === 'documents' && plan.shape.backlinks));
 }
-function reads(plan, locator) {
-    if (plan.locked.includes(locator))
-        return false;
-    if (plan.rooms !== null && !plan.rooms.includes(locator))
-        return false;
-    if (plan.reach === null)
-        return true;
-    return (plan.reach.rooms.includes(locator) ||
-        plan.reach.documents.some((document) => roomOfKey(document) === locator));
+export function readerOf(plan) {
+    const locked = new Set(plan.locked);
+    const named = plan.rooms === null ? null : new Set(plan.rooms);
+    const reached = plan.reach === null ? null : roomsOfReach(plan.reach);
+    return (locator) => !locked.has(locator) &&
+        (named === null || named.has(locator)) &&
+        (reached === null || reached.has(locator));
 }
-function affected(plan, set) {
-    if (set.rooms.some((locator) => reads(plan, locator)))
+function affected({ plan, reads }, set) {
+    if (set.rooms.some(reads))
         return true;
     const paths = narrowed(plan) ? new Set(plan.paths) : null;
-    return set.documents.some(({ locator, path }) => reads(plan, locator) && (paths === null || path === null || paths.has(path)));
+    return set.documents.some(({ locator, path }) => reads(locator) && (paths === null || path === null || paths.has(path)));
 }
 function shown(entry, held) {
     const cover = entry.cover(held);
@@ -30,11 +28,13 @@ function shown(entry, held) {
 export function createLiveQueries(run, holding) {
     const entries = new Map();
     let closed = false;
-    let recovering = false;
-    let recoverAgain = false;
+    let recoveringNow = false;
+    let recoveringAll = false;
+    const recovering = new Set();
     function deliver(entry, next) {
         const previous = entry.digest;
         entry.digest = digestOf(next);
+        entry.pending = 'pending' in entry.digest ? entry.digest.pending : null;
         entry.covered = JSON.stringify('pending' in next.result ? next.result : next.result.coverage);
         const change = previous === undefined ? null : changeOf(previous, next);
         if (change !== null) {
@@ -87,58 +87,99 @@ export function createLiveQueries(run, holding) {
             }
         })();
     }
-    function recovered() {
-        if (recovering) {
-            recoverAgain = true;
-            return;
+    function pendingMoved(entry, held, rooms) {
+        const { pending } = entry;
+        if (pending === null || pending.size === 0 || entry.running || entry.fresh.size > 0) {
+            return false;
         }
-        recovering = true;
+        const at = entry.pendingAt(held, rooms);
+        const change = at === null ? null : keyedAt(pending, at, samePending);
+        if (change === null || change.removed.length === pending.size)
+            return false;
+        keyedInto(pending, change);
+        entry.covered = '';
+        if (unchanged(change))
+            return true;
+        for (const listener of entry.ready)
+            listener({ pending: change });
+        return true;
+    }
+    function recovered(locators) {
+        if (locators === undefined)
+            recoveringAll = true;
+        else
+            for (const locator of locators)
+                recovering.add(locator);
+        if (recoveringNow)
+            return;
+        recoveringNow = true;
         void (async () => {
             try {
-                do {
-                    recoverAgain = false;
-                    for (const entry of entries.values()) {
+                while ((recoveringAll || recovering.size > 0) && !closed) {
+                    const all = recoveringAll;
+                    const touched = [...recovering];
+                    recoveringAll = false;
+                    recovering.clear();
+                    const reached = [...entries.values()].filter((entry) => all || touched.some(entry.reads));
+                    for (const entry of reached) {
                         if (entry.running)
                             entry.dirty = true;
                     }
-                    const waiting = [...entries.values()].filter((entry) => !entry.running);
-                    if (waiting.length === 0 || closed)
+                    const waiting = reached.filter((entry) => !entry.running);
+                    if (waiting.length === 0)
                         continue;
                     const held = await holding();
                     for (const entry of waiting) {
                         if (entry.running)
                             continue;
+                        const read = all ? [] : touched.filter(entry.reads);
+                        if (read.length > 0 && pendingMoved(entry, held, read))
+                            continue;
                         if (entry.digest === undefined || shown(entry, held) !== entry.covered)
                             schedule(entry);
                     }
-                } while (recoverAgain && !closed);
+                }
             }
             catch (error) {
                 uncaught(error);
             }
             finally {
-                recovering = false;
+                recoveringNow = false;
             }
         })();
     }
     return {
         touched(set) {
+            const pending = new Set();
             for (const entry of entries.values()) {
-                if (affected(entry.plan, set))
+                if (!affected(entry, set))
+                    continue;
+                if (entry.pending === null || entry.running) {
                     schedule(entry);
+                    continue;
+                }
+                for (const locator of set.rooms)
+                    pending.add(locator);
+                for (const { locator } of set.documents)
+                    pending.add(locator);
             }
+            if (pending.size > 0)
+                recovered([...pending]);
         },
         recover: recovered,
-        watch(plan, identity, cover, listener, failed) {
+        watch(plan, identity, cover, pendingAt, listener, failed) {
             let entry = entries.get(identity);
             if (entry === undefined) {
                 entry = {
                     plan,
+                    reads: readerOf(plan),
                     cover,
+                    pendingAt,
                     listeners: new Set(),
                     fresh: new Map(),
                     ready: new Set(),
                     digest: undefined,
+                    pending: null,
                     covered: '',
                     dirty: false,
                     running: false,

package/dist/locks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5F;AAED,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAK1F;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAMzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAU9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}
+{"version":3,"file":"locks.d.ts","sourceRoot":"","sources":["../src/locks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,wBAAsB,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5F;AAED,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAG1F;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,iBAKzE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAU9C;AAED,wBAAgB,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE7E"}

package/dist/locks.js

@@ -4,14 +4,13 @@ export async function locked({ store, presence }, locator) {
     return presence.locked(locator, async () => (await store.open()).offline(locator));
 }
 export async function lockedRooms({ store, presence }) {
-    const held = (await store.covering()).rooms;
-    return presence.lockedAmong(new Map([...held].map(([locator, { offline }]) => [locator, offline])));
+    const { rooms, locking } = await store.covering();
+    return presence.lockedAmong(rooms, locking);
 }
 export async function relocked(runtime, before) {
     const after = await lockedRooms(runtime);
     if (JSON.stringify(after) === JSON.stringify(before))
         return;
-    runtime.journal.record(`locked ${after.length}`);
     emitRooms(runtime);
     runtime.store.tell(LOCKS_TOPIC, undefined);
 }

package/dist/lost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lost.d.ts","sourceRoot":"","sources":["../src/lost.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBAIhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,QAOtE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBA+B5E"}
+{"version":3,"file":"lost.d.ts","sourceRoot":"","sources":["../src/lost.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,wBAAsB,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBAIhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,QAMtE;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,iBA+B5E"}

package/dist/lost.js

@@ -10,12 +10,11 @@ export async function eraseFenced({ store }, locators) {
     }
 }
 export function fenceLive(runtime, locators) {
-    const { store, socket, presence, journal } = runtime;
+    const { store, socket, presence } = runtime;
     for (const locator of new Set(locators)) {
         if (!presence.lose(locator, socket.session.now().discoveries))
             continue;
         store.forget(locator);
-        journal.record(`room lost ${locator}`);
     }
 }
 export async function loseRooms(runtime, locators) {
@@ -43,7 +42,7 @@ export async function loseRooms(runtime, locators) {
             queue: true,
             drafts: held.filter((draft) => draft.locator === locator).map(({ path }) => path),
         }))));
-        recoverReads(runtime);
+        recoverReads(runtime, fresh);
     }
     await unpair(runtime);
     await eraseFenced(runtime, fresh);

package/dist/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAa,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3D,eAAO,MAAM,UAAU,eAAe,CAAC;AAwBvC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAIpF,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,GAAG,eAAe,CAG5E;AAsBD,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,GAAG,IAAI,CA0LxF"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAEnE,eAAO,MAAM,UAAU,eAAe,CAAC;AAwBvC,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAIpF,wBAAgB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,GAAG,eAAe,CAG5E;AAsBD,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,GAAG,IAAI,CAsLxF"}

package/dist/media.js

@@ -1,4 +1,5 @@
-import { UNCERTAIN } from './outcome.js';
+import { isAudioType, isImageType, isVideoType } from '@agentshouse/mdmodel';
+import { blobOf, UNCERTAIN } from './outcome.js';
 export const ROOM_MEDIA = 'room-media';
 const ATTRIBUTES = ['room', 'path', 'revision', 'width', 'height', 'alt'];
 const LOADING = new Set(['room', 'path', 'revision']);
@@ -29,11 +30,11 @@ function refusedForGood(shown) {
     return (shown.kind === 'rejected' || shown.kind === 'scoped-refusal') && !shown.retryable;
 }
 function drawnFor(mediaType) {
-    if (mediaType.startsWith('image/'))
+    if (isImageType(mediaType))
         return 'img';
-    if (mediaType.startsWith('video/'))
+    if (isVideoType(mediaType))
         return 'video';
-    if (mediaType.startsWith('audio/'))
+    if (isAudioType(mediaType))
         return 'audio';
     return null;
 }
@@ -129,11 +130,7 @@ export function defineRoomMedia(client) {
                     this.#unshown(asked);
                 return;
             }
-            const copy = await new Response(shown.stream, {
-                headers: { 'content-type': shown.mediaType },
-            })
-                .blob()
-                .catch(() => null);
+            const copy = await blobOf(shown).catch(() => null);
             if (asked !== this.#asked)
                 return;
             if (copy === null)
@@ -179,7 +176,7 @@ export function defineRoomMedia(client) {
                 if (drawn instanceof HTMLMediaElement) {
                     drawn.controls = true;
                     drawn.preload = 'metadata';
-                    if (drawn instanceof HTMLVideoElement)
+                    if (drawn instanceof HTMLVideoElement && 'playsInline' in drawn)
                         drawn.playsInline = true;
                 }
                 drawn.addEventListener(drawn instanceof HTMLImageElement ? 'load' : 'loadedmetadata', () => {

package/dist/memory.d.ts

@@ -1,3 +1,4 @@
+import { type VerifiedModel } from '@agentshouse/mdmodel';
 import type { ModelResult } from './model.js';
 import { type AcceptedMessage, type ActionResult, type Adapter, type BinaryFile, type Capability, type ConversationAction, type ConversationEvent, type DiscoveredRoom, type SavedFacts, type HeadChange, type ListedAgent, type ListedConversation, type Member, type ProviderLimit, type Retention, type ServiceMode, type TypedPath, type TypedSelection } from './adapter.js';
 export type MemoryRoom = Omit<DiscoveredRoom, 'typedSelection' | 'authoredPaths'> & {
@@ -31,7 +32,7 @@ export type MemoryAdapterOptions = {
     retention?: Retention;
     member?: Member;
     unopened?: boolean;
-    roomTypes?: string;
+    roomTypes?: VerifiedModel;
     typedPaths?: readonly TypedPath[];
 };
 export type MemoryAdapter = Adapter & {
@@ -39,6 +40,7 @@ export type MemoryAdapter = Adapter & {
     refresh: NonNullable<Adapter['refresh']>;
     setRooms(rooms: readonly MemoryRoom[]): void;
     setConversations(conversations: readonly MemoryConversation[]): void;
+    setAgents(agents: readonly ListedAgent[]): void;
     script(operation: keyof Adapter, answer: unknown): void;
     open(): void;
     close(closing?: {

package/dist/memory.d.ts.map

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

package/dist/memory.js

@@ -1,5 +1,7 @@
 import { definitionAt, documentFacts, parse } from '@agentshouse/mdmodel';
 import { NO_ROOM_TYPES, schemaTypes } from './attached-model.js';
+import { selected } from './collection.js';
+import { declaredType } from './outcome.js';
 import { sameChange } from './overlay.js';
 const ATTACHMENTS = 'attachments';
 function lastName(path) {
@@ -53,7 +55,7 @@ export function createMemoryAdapter(options = {}) {
     const listeners = new Set();
     const modeObservers = new Set();
     const scripted = new Map();
-    const sentTurns = new Map();
+    const repeats = new Map();
     const historyPageSize = options.historyPageSize;
     const attached = new Map();
     const linked = new WeakMap();
@@ -63,6 +65,7 @@ export function createMemoryAdapter(options = {}) {
     const declaredRooms = new Set();
     let replicated = [];
     let heldCursor = null;
+    let agents = structuredClone(options.agents ?? []);
     let issued = 0;
     function scriptConversations(entries) {
         scripted.clear();
@@ -104,8 +107,11 @@ export function createMemoryAdapter(options = {}) {
         }
     }
     const saved = new WeakMap();
+    const roomTypes = options.roomTypes ?? NO_ROOM_TYPES;
     function factsAt(room, path, content) {
-        const types = schemaTypes(room.model?.kind === 'model' ? room.model.snapshot.schema : null, NO_ROOM_TYPES);
+        const types = selected({ selection: room.typedSelection ?? null }, path)
+            ? roomTypes.types
+            : schemaTypes(room.model?.kind === 'model' ? room.model.snapshot.schema : null, roomTypes);
         let held = saved.get(types);
         if (held === undefined) {
             held = new Map();
@@ -261,16 +267,14 @@ export function createMemoryAdapter(options = {}) {
     }
     function pageOf(conversation, after) {
         const messages = conversation.messages ?? [];
-        const first = typeof after === 'string' ? messages.findIndex((message) => message.position > after) : 0;
+        const first = typeof after === 'string' ? messages.findIndex((message) => message.change > after) : 0;
         const from = first === -1 ? messages.length : first;
         const page = messages.slice(from, from + (historyPageSize ?? messages.length));
         const last = page.at(-1);
         return {
             conversation: conversation.conversation,
             messages: page,
-            ...(last !== undefined && from + page.length < messages.length
-                ? { next: last.position }
-                : {}),
+            ...(last !== undefined && from + page.length < messages.length ? { next: last.change } : {}),
         };
     }
     function historiesOf(request) {
@@ -290,11 +294,20 @@ export function createMemoryAdapter(options = {}) {
     function conversationAction(request) {
         const name = request.name;
         const input = (request.input ?? {});
+        const operation = typeof input.operation_id === 'string' ? `${name}\u0000${input.operation_id}` : null;
+        const first = (answer) => {
+            if (operation !== null)
+                repeats.set(operation, answer);
+            return answer;
+        };
+        const repeated = operation === null ? undefined : repeats.get(operation);
         if (name === 'conversations/create') {
+            if (repeated !== undefined)
+                return repeated;
             issued += 1;
             const conversation = `conversation-${issued}`;
             scripted.set(conversation, { conversation });
-            return { kind: 'action', result: { conversation_id: conversation } };
+            return first({ kind: 'action', result: { conversation_id: conversation } });
         }
         const named = typeof input.conversation_id === 'string' ? input.conversation_id : '';
         const conversation = scripted.get(named);
@@ -310,26 +323,39 @@ export function createMemoryAdapter(options = {}) {
         if (outcome !== undefined)
             return outcome;
         if (name === 'conversations/send') {
-            const operation = typeof input.operation_id === 'string' ? input.operation_id : null;
-            const answered = operation === null ? undefined : sentTurns.get(operation);
-            if (answered !== undefined)
-                return { kind: 'action', result: { message_id: answered } };
+            if (repeated !== undefined)
+                return repeated;
             issued += 1;
-            const turn = `turn-${issued}`;
-            if (operation !== null)
-                sentTurns.set(operation, turn);
-            return { kind: 'action', result: { message_id: turn } };
+            return first({ kind: 'action', result: { message_id: `turn-${issued}` } });
         }
         if (name === 'conversations/delete')
             scripted.delete(named);
         return { kind: 'action', result: { conversation_id: named } };
     }
+    function decided(request) {
+        const { request: asked, message, decision, } = (request.input ?? {});
+        return {
+            kind: 'action',
+            result: {
+                request: asked,
+                ...(message === undefined ? {} : { message }),
+                state: decision === 'approve' ? 'started' : 'declined',
+            },
+        };
+    }
     function announceList() {
         const entries = [...scripted.values()].flatMap(({ conversation, listed, messages = [] }) => listed === undefined
             ? []
-            : [{ conversation, ...listed, newest: messages.at(-1)?.position ?? null }]);
+            : [{ conversation, ...listed, newest: messages.at(-1)?.change ?? null }]);
         for (const listener of listeners) {
-            listener({ kind: 'list', entries, whole: true, more: false, cursor: null });
+            listener({
+                kind: 'list',
+                agents: structuredClone(agents),
+                entries,
+                whole: true,
+                more: false,
+                cursor: null,
+            });
         }
     }
     function discovery() {
@@ -385,6 +411,9 @@ export function createMemoryAdapter(options = {}) {
         setConversations(next) {
             scriptConversations(next);
         },
+        setAgents(next) {
+            agents = structuredClone(next);
+        },
         open() {
             carried.clear();
             announceList();
@@ -447,9 +476,6 @@ export function createMemoryAdapter(options = {}) {
                 };
             },
             history: (request) => Promise.resolve(historiesOf(request)),
-            ...(options.agents === undefined
-                ? {}
-                : { agents: () => Promise.resolve(structuredClone(options.agents)) }),
         },
         serviceMode: {
             observe(notify) {
@@ -602,7 +628,7 @@ export function createMemoryAdapter(options = {}) {
                 const blob = heldBlob(room, request.path);
                 return blob === undefined
                     ? { kind: 'rejected', code: 'not_found', fields: {}, retryable: false }
-                    : { kind: 'binary', body: blob.stream(), mediaType: blob.type };
+                    : { kind: 'binary', body: blob.stream(), mediaType: declaredType(blob) };
             }, request);
         },
         async link(_authorization, request) {
@@ -616,7 +642,7 @@ export function createMemoryAdapter(options = {}) {
                 }
                 const url = linked.get(blob) ?? URL.createObjectURL(blob);
                 linked.set(blob, url);
-                return { kind: 'link', url, name: lastName(request.path), mediaType: blob.type };
+                return { kind: 'link', url, name: lastName(request.path), mediaType: declaredType(blob) };
             }, request);
         },
         async attach(_authorization, request) {
@@ -633,6 +659,8 @@ export function createMemoryAdapter(options = {}) {
             return resolveScript(scripts.action, () => {
                 if (request.name.startsWith('conversations/'))
                     return conversationAction(request);
+                if (request.name === 'agent-functions/decide')
+                    return decided(request);
                 return { kind: 'rejected', code: 'unscripted-action', fields: {}, retryable: false };
             }, request).then((answer) => {
                 if (answer.kind === 'action' && answer.at !== undefined)

package/dist/messages.d.ts

@@ -1,7 +1,7 @@
 import type { AcceptedMessage } from './adapter.js';
 import type { Connection } from './tables.js';
 export declare const MESSAGE_TABLES: readonly string[];
-export declare const ROWS = "WITH chosen AS (\n    SELECT listed.value AS conversation,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'assistant' ORDER BY position DESC, identity DESC LIMIT 1) AS answer,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND text <> '' ORDER BY position DESC, identity DESC LIMIT 1) AS said,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' ORDER BY position, identity LIMIT 1) AS opened,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' AND json_extract(message, '$.waiting') = 1 ORDER BY position, identity LIMIT 1) AS asking\n    FROM json_each(?) AS listed\n  )\n  SELECT chosen.conversation AS conversation,\n    substr(said.text, 1, 512) AS said_text,\n    json_extract(said.message, '$.role') AS said_role,\n    json_extract(said.message, '$.accepted_at') AS said_at,\n    substr(json_extract(answer.message, '$.failure'), 1, 512) AS failure,\n    json_extract(opened.message, '$.source') AS opened_source,\n    json_extract(opened.message, '$.sender') AS opened_sender,\n    asking.identity AS asking_identity,\n    asking.text AS asking_text,\n    json_extract(asking.message, '$.accepted_at') AS asking_at,\n    json_extract(asking.message, '$.source') AS asking_source,\n    json_extract(asking.message, '$.sender') AS asking_sender\n  FROM chosen\n  LEFT JOIN conversation_messages said ON said.id = chosen.said\n  LEFT JOIN conversation_messages answer ON answer.id = chosen.answer\n  LEFT JOIN conversation_messages opened ON opened.id = chosen.opened\n  LEFT JOIN conversation_messages asking ON asking.id = chosen.asking";
+export declare const ROWS = "WITH chosen AS (\n    SELECT listed.value AS conversation,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'assistant' ORDER BY position DESC, identity DESC LIMIT 1) AS answer,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND text <> '' ORDER BY position DESC, identity DESC LIMIT 1) AS said,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' ORDER BY position, identity LIMIT 1) AS opened,\n      (SELECT id FROM conversation_messages WHERE conversation = listed.value AND json_extract(message, '$.role') = 'house' AND json_extract(message, '$.waiting') = 1 ORDER BY position, identity LIMIT 1) AS asking\n    FROM json_each(?) AS listed\n  )\n  SELECT chosen.conversation AS conversation,\n    substr(said.text, 1, 512) AS said_text,\n    json_extract(said.message, '$.role') AS said_role,\n    json_extract(said.message, '$.accepted_at') AS said_at,\n    answer.turn AS answered,\n    substr(json_extract(answer.message, '$.failure'), 1, 512) AS failure,\n    (SELECT value FROM conversation_facts WHERE conversation = chosen.conversation AND name = 'openedTurn') AS opened_turn,\n    json_extract(opened.message, '$.source') AS opened_source,\n    json_extract(opened.message, '$.sender') AS opened_sender,\n    asking.identity AS asking_identity,\n    asking.text AS asking_text,\n    json_extract(asking.message, '$.accepted_at') AS asking_at,\n    json_extract(asking.message, '$.source') AS asking_source,\n    json_extract(asking.message, '$.sender') AS asking_sender\n  FROM chosen\n  LEFT JOIN conversation_messages said ON said.id = chosen.said\n  LEFT JOIN conversation_messages answer ON answer.id = chosen.answer\n  LEFT JOIN conversation_messages opened ON opened.id = chosen.opened\n  LEFT JOIN conversation_messages asking ON asking.id = chosen.asking";
 export type HeldConversation = {
     readonly conversation: string;
     readonly read: string | null | undefined;
@@ -22,6 +22,8 @@ export type HeldRow = {
         readonly role: string | null;
         readonly at: string | null;
     } | null;
+    readonly answered: string | null;
+    readonly openedTurn: string | null;
     readonly failure: string | null;
     readonly opened: HeldSource | null;
     readonly asking: (HeldSource & {
@@ -30,6 +32,12 @@ export type HeldRow = {
         readonly at: string | null;
     }) | null;
 };
+export type ConversationFact = 'openedTurn' | 'dismissedSuggestion';
+export type HeldFact = {
+    readonly conversation: string;
+    readonly name: ConversationFact;
+    readonly value: string;
+};
 export type ConversationWrite = {
     readonly conversation: string;
     readonly messages: readonly AcceptedMessage[];
@@ -44,6 +52,7 @@ export declare function messageWindow(connection: Connection, conversation: stri
 export declare function messageCount(connection: Connection, conversation: string, phrase: string | null): number;
 export declare function conversationRows(connection: Connection, conversations: readonly string[]): HeldRow[];
 export declare function turnArrived(connection: Connection, conversation: string, turn: string): boolean;
-export declare function droppedMessages(connection: Connection, conversations: readonly string[]): void;
-export declare function forgottenMessages(connection: Connection): void;
+export declare function conversationFacts(connection: Connection): HeldFact[];
+export declare function keptFact(connection: Connection, { conversation, name, value }: HeldFact): null;
+export declare function forgottenConversations(connection: Connection): void;
 //# sourceMappingURL=messages.d.ts.map

package/dist/messages.d.ts.map

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

package/dist/messages.js

@@ -1,14 +1,16 @@
 import { sql } from '@agentshouse/mdmodel';
 import { EXCERPT } from './read.js';
+import { tablesOf } from './stored.js';
 const SAID_BY_HOUSE = `json_extract(message, '$.role') = 'house'`;
 const ANSWERS_THE_TURN = `json_extract(message, '$.role') = 'assistant'`;
 export const MESSAGE_TABLES = [
     'CREATE TABLE conversation_reads (conversation TEXT PRIMARY KEY, read TEXT, partial INTEGER NOT NULL) WITHOUT ROWID',
-    'CREATE TABLE conversation_messages (id INTEGER PRIMARY KEY, conversation TEXT NOT NULL, identity TEXT NOT NULL, turn TEXT NOT NULL, position TEXT NOT NULL, message TEXT NOT NULL, text TEXT NOT NULL)',
+    'CREATE TABLE conversation_messages (id INTEGER PRIMARY KEY, conversation TEXT NOT NULL, identity TEXT NOT NULL, turn TEXT NOT NULL, position TEXT NOT NULL, change TEXT NOT NULL, message TEXT NOT NULL, text TEXT NOT NULL)',
     'CREATE UNIQUE INDEX conversation_messages_identity ON conversation_messages (conversation, identity)',
     'CREATE INDEX conversation_messages_position ON conversation_messages (conversation, position, identity)',
     'CREATE INDEX conversation_messages_turn ON conversation_messages (conversation, turn)',
     `CREATE INDEX conversation_messages_house ON conversation_messages (conversation, position, identity) WHERE ${SAID_BY_HOUSE}`,
+    'CREATE TABLE conversation_facts (conversation TEXT NOT NULL, name TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (conversation, name)) WITHOUT ROWID',
 ];
 const NEWEST_FIRST = 'ORDER BY position DESC, identity DESC LIMIT 1';
 const OLDEST_FIRST = 'ORDER BY position, identity LIMIT 1';
@@ -25,7 +27,9 @@ export const ROWS = `WITH chosen AS (
     substr(said.text, 1, ${EXCERPT}) AS said_text,
     json_extract(said.message, '$.role') AS said_role,
     json_extract(said.message, '$.accepted_at') AS said_at,
+    answer.turn AS answered,
     substr(json_extract(answer.message, '$.failure'), 1, ${EXCERPT}) AS failure,
+    (SELECT value FROM conversation_facts WHERE conversation = chosen.conversation AND name = 'openedTurn') AS opened_turn,
     json_extract(opened.message, '$.source') AS opened_source,
     json_extract(opened.message, '$.sender') AS opened_sender,
     asking.identity AS asking_identity,
@@ -63,11 +67,12 @@ export function heldConversations(connection, conversations) {
 }
 export function keptMessages(connection, { conversation, messages, read }) {
     for (const message of messages) {
-        connection.run('INSERT INTO conversation_messages (conversation, identity, turn, position, message, text) VALUES (?, ?, ?, ?, ?, ?) ON CONFLICT (conversation, identity) DO UPDATE SET turn = excluded.turn, position = excluded.position, message = excluded.message, text = excluded.text', [
+        connection.run('INSERT INTO conversation_messages (conversation, identity, turn, position, change, message, text) VALUES (?, ?, ?, ?, ?, ?, ?) ON CONFLICT (conversation, identity) DO UPDATE SET turn = excluded.turn, position = excluded.position, change = excluded.change, message = excluded.message, text = excluded.text', [
             conversation,
             message.identity,
             message.turn,
             message.position,
+            message.change,
             JSON.stringify(message.message ?? null),
             message.text,
         ]);
@@ -82,6 +87,7 @@ function accepted(row) {
         identity: text(row.identity),
         turn: text(row.turn),
         position: text(row.position),
+        change: text(row.change),
         text: text(row.text),
         message: JSON.parse(text(row.message)),
     };
@@ -93,7 +99,7 @@ function holding(phrase) {
 }
 export function messageWindow(connection, conversation, limit, before, phrase) {
     const held = holding(phrase);
-    const rows = connection.rows(`SELECT identity, turn, position, message, text FROM conversation_messages WHERE conversation = ?${held.sql}${before === null ? '' : ' AND (position < ? OR (position = ? AND identity < ?))'} ORDER BY position DESC, identity DESC LIMIT ?`, before === null
+    const rows = connection.rows(`SELECT identity, turn, position, change, message, text FROM conversation_messages WHERE conversation = ?${held.sql}${before === null ? '' : ' AND (position < ? OR (position = ? AND identity < ?))'} ORDER BY position DESC, identity DESC LIMIT ?`, before === null
         ? [conversation, ...held.bind, limit + 1]
         : [conversation, ...held.bind, before[0], before[0], before[1], limit + 1]);
     return { messages: rows.slice(0, limit).map(accepted).reverse(), more: rows.length > limit };
@@ -122,6 +128,8 @@ export function conversationRows(connection, conversations) {
                 role: textOrNull(row.said_role),
                 at: textOrNull(row.said_at),
             },
+        answered: textOrNull(row.answered),
+        openedTurn: textOrNull(row.opened_turn),
         failure: textOrNull(row.failure),
         opened: row.opened_source === null ? null : heldSource(row.opened_source, row.opened_sender),
         asking: row.asking_identity === null
@@ -137,12 +145,18 @@ export function conversationRows(connection, conversations) {
 export function turnArrived(connection, conversation, turn) {
     return (connection.rows('SELECT 1 FROM conversation_messages WHERE conversation = ? AND turn = ? LIMIT 1', [conversation, turn]).length > 0);
 }
-export function droppedMessages(connection, conversations) {
-    const named = [JSON.stringify(conversations)];
-    connection.run('DELETE FROM conversation_messages WHERE conversation IN (SELECT value FROM json_each(?))', named);
-    connection.run('DELETE FROM conversation_reads WHERE conversation IN (SELECT value FROM json_each(?))', named);
+export function conversationFacts(connection) {
+    return connection.rows('SELECT conversation, name, value FROM conversation_facts').map((row) => ({
+        conversation: text(row.conversation),
+        name: text(row.name),
+        value: text(row.value),
+    }));
+}
+export function keptFact(connection, { conversation, name, value }) {
+    connection.run('INSERT OR REPLACE INTO conversation_facts (conversation, name, value) VALUES (?, ?, ?)', [conversation, name, value]);
+    return null;
 }
-export function forgottenMessages(connection) {
-    connection.run('DELETE FROM conversation_messages');
-    connection.run('DELETE FROM conversation_reads');
+export function forgottenConversations(connection) {
+    for (const table of tablesOf(MESSAGE_TABLES))
+        connection.run(`DELETE FROM ${table}`);
 }