@agentshouse/mdruntime 0.1.0-ca6edc1abd618 → 0.1.0-ca92b54804c33

package/dist/memory.js

@@ -1,7 +1,12 @@
+import { documentFacts, parse } from '@agentshouse/mdmodel';
+import { NO_ROOM_TYPES, schemaTypes } from './attached-model.js';
 import { sameChange } from './overlay.js';
+const ATTACHMENTS = 'attachments';
+function lastName(path) {
+    return path.slice(path.lastIndexOf('/') + 1);
+}
 const FIXTURE_RETENTION = {
     history: { kind: 'duration', seconds: 1 },
-    outcome: 604_800,
     refreshHorizon: 1,
 };
 function declaredRetention(value) {
@@ -48,13 +53,16 @@ export function createMemoryAdapter(options = {}) {
     const listeners = new Set();
     const modeObservers = new Set();
     const scripted = new Map();
-    const unsealed = new Map();
-    const sealed = new Set();
     const sentTurns = new Map();
     const historyPageSize = options.historyPageSize;
-    let held = [];
+    const attached = new Map();
+    const linked = new WeakMap();
+    const carried = new Map();
     let expiring = [];
+    let openings = 0;
+    const declaredRooms = new Set();
     let replicated = [];
+    let heldCursor = null;
     let issued = 0;
     function scriptConversations(entries) {
         scripted.clear();
@@ -82,8 +90,48 @@ export function createMemoryAdapter(options = {}) {
         const wanted = ordinals.get(`${locator}\u0000${target}`);
         return held !== undefined && wanted !== undefined && held >= wanted;
     }
+    function heldBlob(room, path) {
+        return attached.get(`${room.locator}\u0000${path}`) ?? room.blobs?.[path];
+    }
+    function freePath(room, name) {
+        const dot = name.lastIndexOf('.');
+        const stem = dot > 0 ? name.slice(0, dot) : name;
+        const extension = dot > 0 ? name.slice(dot) : '';
+        for (let count = 1;; count += 1) {
+            const path = `${ATTACHMENTS}/${count === 1 ? stem : `${stem}-${count}`}${extension}`;
+            if (heldBlob(room, path) === undefined && room.documents?.[path] === undefined)
+                return path;
+        }
+    }
+    const saved = new WeakMap();
+    function factsAt(room, path, content) {
+        const types = schemaTypes(room.model?.kind === 'model' ? room.model.snapshot.schema : null, NO_ROOM_TYPES);
+        let held = saved.get(types);
+        if (held === undefined) {
+            held = new Map();
+            saved.set(types, held);
+        }
+        const key = `${path}\u0000${content}`;
+        if (!held.has(key)) {
+            const facts = documentFacts(path, parse(content, path), { types });
+            held.set(key, facts === null ? null : JSON.parse(JSON.stringify(facts)));
+        }
+        return held.get(key);
+    }
+    function factsIn(room, paths) {
+        const facts = {};
+        for (const path of paths) {
+            const content = room.documents?.[path];
+            const held = room.facts?.[path] ?? (content === undefined ? null : factsAt(room, path, content));
+            if (held !== null)
+                facts[path] = held;
+        }
+        return facts;
+    }
     function retain(entries) {
         for (const room of entries) {
+            for (const [path, content] of Object.entries(room.documents ?? {}))
+                factsAt(room, path, content);
             note(room.locator, room);
             const versions = served.get(room.locator) ?? new Map();
             versions.set(room.roomVersion, room);
@@ -116,10 +164,14 @@ export function createMemoryAdapter(options = {}) {
             roomVersion: room.roomVersion,
             ...(opening ? { models: modelsOf(room) } : {}),
             documents: named(room.documents ?? {}, taken),
+            facts: factsIn(room, taken),
             revisions: named(room.revisions ?? {}, [...taken, ...targets]),
             ...(room.fileIds === undefined
                 ? {}
                 : { fileIds: named(room.fileIds, [...taken, ...targets]) }),
+            ...(room.created === undefined
+                ? {}
+                : { created: named(room.created, [...taken, ...targets]) }),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
             binaryFiles: named(room.binaryFiles ?? {}, targets),
             ...(opening && room.folders !== undefined ? { folders: room.folders } : {}),
@@ -136,18 +188,19 @@ export function createMemoryAdapter(options = {}) {
             ...(folderRemovals.length === 0 ? {} : { folderRemovals }),
         };
     }
-    function advancement(room, from, at) {
+    function advancement(room, from, at, whole = false) {
         const current = room.documents ?? {};
         const previous = from.documents ?? {};
         const currentTargets = new Set(Object.keys(room.binaryFiles ?? {}));
         const previousTargets = new Set(Object.keys(from.binaryFiles ?? {}));
         const headMoved = (path) => room.revisions?.[path] !== from.revisions?.[path] ||
             room.fileIds?.[path] !== from.fileIds?.[path] ||
+            room.created?.[path] !== from.created?.[path] ||
             !sameChange(room.changes?.[path], from.changes?.[path]);
         const changed = Object.keys(current)
             .filter((path) => current[path] !== previous[path] || headMoved(path))
             .sort();
-        const size = pageSize ?? changed.length;
+        const size = whole ? changed.length : (pageSize ?? changed.length);
         const taken = changed.slice(at, at + size);
         const next = at + taken.length;
         const opening = at === 0;
@@ -163,10 +216,14 @@ export function createMemoryAdapter(options = {}) {
             roomVersion: room.roomVersion,
             ...(models === undefined ? {} : { models }),
             documents: named(current, taken),
+            facts: factsIn(room, taken),
             revisions: named(room.revisions ?? {}, [...taken, ...targets]),
             ...(room.fileIds === undefined
                 ? {}
                 : { fileIds: named(room.fileIds, [...taken, ...targets]) }),
+            ...(room.created === undefined
+                ? {}
+                : { created: named(room.created, [...taken, ...targets]) }),
             changes: named(room.changes ?? {}, [...taken, ...targets]),
             binaryFiles: named(room.binaryFiles ?? {}, targets),
             ...(opening ? foldersMoved(room, from) : {}),
@@ -179,6 +236,26 @@ export function createMemoryAdapter(options = {}) {
             ...(pageToken === undefined ? {} : { pageToken }),
         };
     }
+    function carry(locator) {
+        const at = carried.get(locator);
+        const current = rooms.find((entry) => entry.locator === locator);
+        if (at === undefined || current === undefined || current.roomVersion === at)
+            return;
+        const from = served.get(locator)?.get(at);
+        carried.set(locator, current.roomVersion);
+        if (from === undefined)
+            return;
+        const page = advancement(current, from, 0, true);
+        for (const observer of observers) {
+            observer({
+                kind: 'room-change',
+                locator,
+                from: at,
+                roomVersion: current.roomVersion,
+                read: async () => page,
+            });
+        }
+    }
     function pageOf(conversation, after) {
         const messages = conversation.messages ?? [];
         const first = typeof after === 'string' ? messages.findIndex((message) => message.position > after) : 0;
@@ -193,16 +270,13 @@ export function createMemoryAdapter(options = {}) {
                 : {}),
         };
     }
-    function historiesOf(input) {
-        const asked = input?.conversations;
-        if (!Array.isArray(asked))
-            return { kind: 'rejected', code: 'invalid_request', fields: {}, retryable: false };
+    function historiesOf(request) {
         const histories = [];
-        for (const entry of asked) {
-            const conversation = typeof entry.conversation === 'string' ? scripted.get(entry.conversation) : undefined;
+        for (const entry of request.conversations) {
+            const conversation = scripted.get(entry.conversation);
             if (conversation === undefined)
                 continue;
-            const outcome = conversation.outcomes?.['conversation.history'];
+            const outcome = conversation.outcomes?.history;
             if (outcome !== undefined)
                 return outcome;
             histories.push(pageOf(conversation, entry.after));
@@ -213,15 +287,13 @@ export function createMemoryAdapter(options = {}) {
     function conversationAction(request) {
         const name = request.name;
         const input = (request.input ?? {});
-        if (name === 'conversation.history')
-            return historiesOf(request.input);
-        if (name === 'conversation.create') {
+        if (name === 'conversations/create') {
             issued += 1;
             const conversation = `conversation-${issued}`;
             scripted.set(conversation, { conversation });
-            return { kind: 'action', result: { conversation } };
+            return { kind: 'action', result: { conversation_id: conversation } };
         }
-        const named = typeof input.conversation === 'string' ? input.conversation : '';
+        const named = typeof input.conversation_id === 'string' ? input.conversation_id : '';
         const conversation = scripted.get(named);
         if (conversation === undefined) {
             return {
@@ -234,34 +306,28 @@ export function createMemoryAdapter(options = {}) {
         const outcome = conversation.outcomes?.[name];
         if (outcome !== undefined)
             return outcome;
-        if (name === 'conversation.send') {
+        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: { turn: answered } };
+                return { kind: 'action', result: { message_id: answered } };
             issued += 1;
             const turn = `turn-${issued}`;
-            unsealed.set(turn, named);
             if (operation !== null)
                 sentTurns.set(operation, turn);
-            return { kind: 'action', result: { turn } };
+            return { kind: 'action', result: { message_id: turn } };
         }
-        if (name === 'conversation.cancel') {
-            const turn = typeof input.turn === 'string' ? input.turn : '';
-            if (sealed.has(turn) || !unsealed.has(turn)) {
-                return { kind: 'rejected', code: 'turn-sealed', fields: { turn }, retryable: false };
-            }
-            unsealed.delete(turn);
-            return { kind: 'action', result: { turn, cancelled: true } };
-        }
-        if (name === 'conversation.delete')
+        if (name === 'conversations/delete')
             scripted.delete(named);
-        return { kind: 'action', result: { conversation: named } };
+        return { kind: 'action', result: { conversation_id: named } };
     }
     function announceList() {
-        const entries = [...scripted.values()].flatMap(({ conversation, listed }) => listed === undefined ? [] : [{ conversation, ...listed }]);
-        for (const listener of listeners)
-            listener({ kind: 'list', entries });
+        const entries = [...scripted.values()].flatMap(({ conversation, listed, messages = [] }) => listed === undefined
+            ? []
+            : [{ conversation, ...listed, newest: messages.at(-1)?.position ?? null }]);
+        for (const listener of listeners) {
+            listener({ kind: 'list', entries, whole: true, more: false, cursor: null });
+        }
     }
     function discovery() {
         return {
@@ -273,9 +339,42 @@ export function createMemoryAdapter(options = {}) {
             ...(options.member === undefined ? {} : { member: options.member }),
         };
     }
+    function discovered() {
+        return resolveScript(scripts.discover, discovery, undefined).then((answer) => {
+            if (answer.kind === 'discovery')
+                for (const room of answer.rooms)
+                    note(room.locator, room);
+            return answer;
+        });
+    }
+    function opened(notify) {
+        const opening = ++openings;
+        notify({ kind: 'opened' });
+        void discovered()
+            .catch(() => ({ kind: 'transport-uncertainty' }))
+            .then((answer) => {
+            if (opening !== openings)
+                return;
+            if (answer.kind !== 'discovery') {
+                openings += 1;
+                carried.clear();
+                const revoked = answer.kind === 'revoked-authorization';
+                notify({ kind: 'closed', revoked, lost: !revoked, authorityChanged: false });
+                return;
+            }
+            declaredRooms.clear();
+            for (const room of answer.rooms)
+                declaredRooms.add(room.locator);
+            notify({ kind: 'discovered', discovery: answer });
+        });
+    }
+    function emitAll(event) {
+        for (const observer of observers)
+            observer(event);
+    }
     return {
-        ...(options.exhaustiveDiscovery === undefined ? {} : { exhaustiveDiscovery: true }),
         ...(options.roomTypes === undefined ? {} : { roomTypes: options.roomTypes }),
+        ...(options.typedPaths === undefined ? {} : { typedPaths: options.typedPaths }),
         setRooms(next) {
             rooms = [...next];
             retain(rooms);
@@ -284,33 +383,37 @@ export function createMemoryAdapter(options = {}) {
             scriptConversations(next);
         },
         open() {
+            carried.clear();
             announceList();
-            for (const observer of observers)
-                observer({ kind: 'opened' });
+            opened(emitAll);
         },
-        close({ revoked = false, lost = !revoked } = {}) {
-            for (const observer of observers)
-                observer({ kind: 'closed', revoked, lost });
+        close({ revoked = false, lost = !revoked, authorityChanged = false } = {}) {
+            openings += 1;
+            carried.clear();
+            emitAll({ kind: 'closed', revoked, lost, authorityChanged });
         },
         expire(locators) {
             expiring = [...locators];
         },
-        notifyRoomVersion({ locator, roomVersion }) {
-            for (const observer of observers)
-                observer({ kind: 'room-version', locator, roomVersion });
+        notifyRoomVersion({ locator }) {
+            carry(locator);
         },
-        notifyAuthorityChanged(scope) {
-            for (const observer of observers) {
-                observer(scope === undefined
-                    ? { kind: 'authority-changed' }
-                    : { kind: 'authority-changed', scope });
-            }
+        notifyAuthorityChanged(locators) {
+            const named = new Set(locators ?? [...declaredRooms, ...rooms.map((room) => room.locator)]);
+            const listed = rooms.filter((room) => named.has(room.locator));
+            const left = [...named].filter((locator) => !listed.some((room) => room.locator === locator));
+            for (const room of listed)
+                declaredRooms.add(room.locator);
+            for (const locator of left)
+                declaredRooms.delete(locator);
+            emitAll({
+                kind: 'authority-changed',
+                rooms: listed.map(declared),
+                left,
+                ...(options.member === undefined ? {} : { member: options.member }),
+            });
         },
         notifyConversation(event) {
-            if (event.kind === 'accepted-message') {
-                sealed.add(event.message.turn);
-                unsealed.delete(event.message.turn);
-            }
             for (const listener of listeners)
                 listener(event);
         },
@@ -319,21 +422,31 @@ export function createMemoryAdapter(options = {}) {
                 observer(mode);
         },
         heldRooms() {
-            return held;
+            return [...carried.keys()].sort();
         },
         replicatedConversations() {
             return replicated;
         },
+        heldConversationCursor() {
+            return heldCursor;
+        },
         conversations: {
             replicate(next) {
                 replicated = [...next];
             },
+            hold(cursor) {
+                heldCursor = cursor;
+            },
             observe(notify) {
                 listeners.add(notify);
                 return () => {
                     listeners.delete(notify);
                 };
             },
+            history: (request) => Promise.resolve(historiesOf(request)),
+            ...(options.agents === undefined
+                ? {}
+                : { agents: () => Promise.resolve(structuredClone(options.agents)) }),
         },
         serviceMode: {
             observe(notify) {
@@ -345,44 +458,46 @@ export function createMemoryAdapter(options = {}) {
         },
         roomStream: {
             hold(asked) {
-                held = asked.map((room) => room.locator);
-                const expired = expiring.filter((locator) => held.includes(locator));
-                expiring = [];
-                const moved = asked.flatMap((room) => {
+                const named = asked.map((room) => room.locator);
+                const unknown = asked.flatMap((room) => {
                     const current = rooms.find((entry) => entry.locator === room.locator);
+                    const version = room.roomVersion;
                     return current === undefined ||
-                        expired.includes(room.locator) ||
-                        current.roomVersion === room.roomVersion
+                        (version !== null &&
+                            (current.roomVersion === version || served.get(room.locator)?.has(version) === true))
                         ? []
-                        : [{ locator: room.locator, roomVersion: current.roomVersion }];
+                        : [room.locator];
                 });
+                const expired = [
+                    ...new Set([...expiring.filter((locator) => named.includes(locator)), ...unknown]),
+                ];
+                expiring = expiring.filter((locator) => !named.includes(locator));
                 queueMicrotask(() => {
-                    for (const observer of observers) {
-                        for (const room of moved)
-                            observer({ kind: 'room-version', ...room });
-                        observer({ kind: 'opening', expired });
+                    for (const room of asked) {
+                        if (expired.includes(room.locator) || room.roomVersion === null)
+                            carried.delete(room.locator);
+                        else {
+                            carried.set(room.locator, room.roomVersion);
+                            carry(room.locator);
+                        }
                     }
+                    emitAll({ kind: 'caught-up', expired });
                 });
             },
-            reopen() {
-                queueMicrotask(() => {
-                    for (const observer of observers) {
-                        observer({ kind: 'closed', revoked: false, lost: false });
-                    }
-                });
-            },
-            published() { },
             observe(notify) {
                 observers.add(notify);
                 queueMicrotask(() => {
                     if (!observers.has(notify))
                         return;
                     if (options.unopened === true) {
-                        notify({ kind: 'closed', revoked: false, lost: true });
+                        notify({ kind: 'closed', revoked: false, lost: true, authorityChanged: false });
                         return;
                     }
                     announceList();
-                    notify({ kind: 'opened' });
+                    opened((event) => {
+                        if (observers.has(notify))
+                            notify(event);
+                    });
                 });
                 return () => {
                     observers.delete(notify);
@@ -399,12 +514,7 @@ export function createMemoryAdapter(options = {}) {
             return resolveScript(scripts.authorize, () => ({}), undefined);
         },
         async discover(_authorization) {
-            return resolveScript(scripts.discover, discovery, undefined).then((answer) => {
-                if (answer.kind === 'discovery')
-                    for (const room of answer.rooms)
-                        note(room.locator, room);
-                return answer;
-            });
+            return discovered();
         },
         reached,
         follows(locator, roomVersion, next) {
@@ -486,18 +596,39 @@ export function createMemoryAdapter(options = {}) {
                 const room = rooms.find((entry) => entry.locator === request.locator);
                 if (room === undefined)
                     return { kind: 'room-not-readable', locator: request.locator };
-                const blob = room.blobs?.[request.path];
+                const blob = heldBlob(room, request.path);
                 return blob === undefined
                     ? { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false }
                     : { kind: 'binary', body: blob.stream(), mediaType: blob.type };
             }, request);
         },
         async link(_authorization, request) {
-            return resolveScript(scripts.link, () => ({ kind: 'rejected', code: 'unscripted-link', fields: {}, retryable: false }), request);
+            return resolveScript(scripts.link, () => {
+                const room = rooms.find((entry) => entry.locator === request.locator);
+                if (room === undefined)
+                    return { kind: 'room-not-readable', locator: request.locator };
+                const blob = heldBlob(room, request.path);
+                if (blob === undefined) {
+                    return { kind: 'rejected', code: 'file_not_found', fields: {}, retryable: false };
+                }
+                const url = linked.get(blob) ?? URL.createObjectURL(blob);
+                linked.set(blob, url);
+                return { kind: 'link', url, name: lastName(request.path), mediaType: blob.type };
+            }, request);
+        },
+        async attach(_authorization, request) {
+            return resolveScript(scripts.attach, () => {
+                const room = rooms.find((entry) => entry.locator === request.locator);
+                if (room === undefined)
+                    return { kind: 'room-not-readable', locator: request.locator };
+                const path = freePath(room, request.name);
+                attached.set(`${room.locator}\u0000${path}`, request.blob);
+                return { kind: 'attached', path, revision: `attached-${attached.size}` };
+            }, request);
         },
         async action(_authorization, request) {
             return resolveScript(scripts.action, () => {
-                if (request.name.startsWith('conversation.'))
+                if (request.name.startsWith('conversations/'))
                     return conversationAction(request);
                 return { kind: 'rejected', code: 'unscripted-action', fields: {}, retryable: false };
             }, request).then((answer) => {

package/dist/messages.d.ts

@@ -18,10 +18,10 @@ export type ConversationWrite = {
         readonly partial: boolean;
     };
 };
-export declare function heldConversations(connection: Connection): HeldConversation[];
+export declare function heldConversations(connection: Connection, conversations: readonly string[] | null): HeldConversation[];
 export declare function keptMessages(connection: Connection, { conversation, messages, read }: ConversationWrite): null;
-export declare function messageWindow(connection: Connection, conversation: string, limit: number, before: readonly [string, string] | null): MessageWindow;
-export declare function messageCount(connection: Connection, conversation: string): number;
+export declare function messageWindow(connection: Connection, conversation: string, limit: number, before: readonly [string, string] | null, phrase: string | null): MessageWindow;
+export declare function messageCount(connection: Connection, conversation: string, phrase: string | null): number;
 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;

package/dist/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAE1D,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAM3C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE7F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,CAAC;IAC9C,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3E,CAAC;AAMF,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,gBAAgB,EAAE,CAmB5E;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,iBAAiB,GAClD,IAAI,CAoCN;AAYD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GACvC,aAAa,CAUf;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAMjF;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/F;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAW9F;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAG9D"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAE1D,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAM3C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE7F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,CAAC;IAC9C,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3E,CAAC;AAMF,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,GACtC,gBAAgB,EAAE,CA0BpB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,iBAAiB,GAClD,IAAI,CA+BN;AAkBD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,EACxC,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,aAAa,CAWf;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CAOR;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAO/F;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAK9F;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAG9D"}

package/dist/messages.js

@@ -1,4 +1,4 @@
-import { indexMessage, unindexMessages } from './fulltext.js';
+import { sql } from '@agentshouse/mdmodel';
 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)',
@@ -9,16 +9,18 @@ export const MESSAGE_TABLES = [
 function text(value) {
     return typeof value === 'string' ? value : String(value);
 }
-export function heldConversations(connection) {
+export function heldConversations(connection, conversations) {
+    const named = conversations === null ? '' : ' AND conversation IN (SELECT value FROM json_each(?))';
+    const bound = conversations === null ? [] : [JSON.stringify(conversations)];
     const held = new Map();
-    for (const row of connection.rows('SELECT conversation, read, partial FROM conversation_reads')) {
+    for (const row of connection.rows(`SELECT conversation, read, partial FROM conversation_reads WHERE 1 = 1${named}`, bound)) {
         held.set(text(row.conversation), {
             conversation: text(row.conversation),
             read: row.read === null ? null : text(row.read),
             partial: Number(row.partial) === 1,
         });
     }
-    for (const row of connection.rows('SELECT DISTINCT conversation FROM conversation_messages WHERE conversation NOT IN (SELECT conversation FROM conversation_reads)')) {
+    for (const row of connection.rows(`SELECT DISTINCT conversation FROM conversation_messages WHERE conversation NOT IN (SELECT conversation FROM conversation_reads)${named}`, bound)) {
         held.set(text(row.conversation), {
             conversation: text(row.conversation),
             read: undefined,
@@ -36,17 +38,12 @@ export function keptMessages(connection, { conversation, messages, read }) {
             JSON.stringify(message.message ?? null),
             message.text,
         ];
-        let id;
         if (held === undefined) {
             connection.run('INSERT INTO conversation_messages (conversation, identity, turn, position, message, text) VALUES (?, ?, ?, ?, ?, ?)', [conversation, message.identity, ...record]);
-            id = Number(connection.rows('SELECT last_insert_rowid() AS id')[0].id);
         }
         else {
-            id = Number(held.id);
-            unindexMessages(connection, [id]);
-            connection.run('UPDATE conversation_messages SET turn = ?, position = ?, message = ?, text = ? WHERE id = ?', [...record, id]);
+            connection.run('UPDATE conversation_messages SET turn = ?, position = ?, message = ?, text = ? WHERE id = ?', [...record, held.id]);
         }
-        indexMessage(connection, id, message.text);
     }
     if (read !== undefined) {
         connection.run('INSERT OR REPLACE INTO conversation_reads (conversation, read, partial) VALUES (?, ?, ?)', [conversation, read.at, read.partial ? 1 : 0]);
@@ -62,14 +59,21 @@ function accepted(row) {
         message: JSON.parse(text(row.message)),
     };
 }
-export function messageWindow(connection, conversation, limit, before) {
-    const rows = connection.rows(`SELECT identity, turn, position, message, text FROM conversation_messages WHERE conversation = ?${before === null ? '' : ' AND (position < ? OR (position = ? AND identity < ?))'} ORDER BY position DESC, identity DESC LIMIT ?`, before === null
-        ? [conversation, limit + 1]
-        : [conversation, before[0], before[0], before[1], limit + 1]);
+function holding(phrase) {
+    return phrase === null
+        ? { sql: '', bind: [] }
+        : { sql: ` AND ${sql.HOLDS_PHRASE}(text, ?)`, bind: [phrase.toLowerCase()] };
+}
+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
+        ? [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 };
 }
-export function messageCount(connection, conversation) {
-    const [counted] = connection.rows('SELECT count(*) AS held FROM conversation_messages WHERE conversation = ?', [conversation]);
+export function messageCount(connection, conversation, phrase) {
+    const held = holding(phrase);
+    const [counted] = connection.rows(`SELECT count(*) AS held FROM conversation_messages WHERE conversation = ?${held.sql}`, [conversation, ...held.bind]);
     return Number(counted?.held ?? 0);
 }
 export function turnArrived(connection, conversation, turn) {
@@ -77,9 +81,6 @@ export function turnArrived(connection, conversation, turn) {
 }
 export function droppedMessages(connection, conversations) {
     for (const conversation of conversations) {
-        unindexMessages(connection, connection
-            .rows('SELECT id FROM conversation_messages WHERE conversation = ?', [conversation])
-            .map((row) => Number(row.id)));
         connection.run('DELETE FROM conversation_messages WHERE conversation = ?', [conversation]);
         connection.run('DELETE FROM conversation_reads WHERE conversation = ?', [conversation]);
     }

package/dist/model.d.ts

@@ -1,4 +1,4 @@
-import type { Definition, ValueFacts, VerifiedModel } from '@agentshouse/mdmodel';
+import type { Definition, VerifiedModel } from '@agentshouse/mdmodel';
 import type { Open } from './open.js';
 export type ModelIdentity = {
     identity: string;
@@ -8,7 +8,7 @@ export type ModelSnapshot = ModelIdentity & {
     schema: string | null;
     revision: string | null;
 };
-export type ModelUnavailableReason = Open<'not-readable' | 'revoked' | 'not-acquired' | 'invalid'>;
+export type ModelUnavailableReason = Open<'not-readable' | 'revoked' | 'not-acquired'>;
 export type ModelResult = {
     kind: 'model';
     snapshot: ModelSnapshot;
@@ -20,20 +20,21 @@ export type MdType = Definition;
 export type ModelState = {
     status: 'unavailable';
     reason: ModelUnavailableReason;
-    schema?: string | null;
-    revision?: string | null;
 } | {
     status: 'current' | 'cached';
     snapshot: ModelSnapshot;
     verifiedWith: ModelIdentity;
     types: VerifiedModel['types'];
 };
+export type StoredModel = Extract<ModelState, {
+    status: 'unavailable';
+}> | Omit<Extract<ModelState, {
+    status: 'current' | 'cached';
+}>, 'types'>;
 export type TypesResult = {
     status: Open<'unavailable'>;
     reason: ModelUnavailableReason;
     types: null;
-    schema?: string | null;
-    revision?: string | null;
 } | {
     status: Open<'current' | 'cached'>;
     identity: string;
@@ -51,8 +52,5 @@ export type ValidationReceipt = {
 export declare const NO_MODEL: ModelState;
 export declare function definitionOf(state: ModelState, type: string | undefined): Definition | undefined;
 export declare function modelTypes(state: ModelState): TypesResult;
-export declare function cached(state: ModelState): ModelState;
-export declare function sameModel(left: ModelIdentity, right: ModelIdentity): boolean;
-export declare function sameTyping(left: ModelState, right: ModelState): boolean;
-export declare function referenceField(facts: ValueFacts | undefined): boolean;
+export declare function storedModel(state: ModelState): StoredModel;
 //# sourceMappingURL=model.d.ts.map