@agentshouse/mdruntime 0.1.0-c0bed82db8d73 → 0.1.0-c0c1e81da9166

package/dist/memory.d.ts

@@ -1,11 +1,12 @@
 import type { ModelResult } from './model.js';
-import { type AcceptedMessage, type ActionResult, type Adapter, type BinaryFile, type Capability, type ConversationAction, type ConversationEvent, type DiscoveryScope, type DiscoveredRoom, type HeadChange, type ListedConversation, type Member, type ProviderLimit, type Retention, type ServiceMode } from './adapter.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 } from './adapter.js';
 export type MemoryRoom = DiscoveredRoom & {
     model?: ModelResult;
-    selectionModel?: ModelResult;
     documents?: Readonly<Record<string, string>>;
+    facts?: Readonly<Record<string, SavedFacts>>;
     revisions?: Readonly<Record<string, string>>;
     fileIds?: Readonly<Record<string, string>>;
+    created?: Readonly<Record<string, string>>;
     changes?: Readonly<Record<string, HeadChange>>;
     binaryFiles?: Readonly<Record<string, BinaryFile>>;
     folders?: readonly string[];
@@ -13,13 +14,14 @@ export type MemoryRoom = DiscoveredRoom & {
 };
 export type MemoryConversation = {
     conversation: string;
-    listed?: Omit<ListedConversation, 'conversation'>;
+    listed?: Omit<ListedConversation, 'conversation' | 'newest'>;
     messages?: readonly AcceptedMessage[];
-    outcomes?: Partial<Record<ConversationAction, ActionResult>>;
+    outcomes?: Partial<Record<ConversationAction | 'history', ActionResult>>;
 };
 export type MemoryAdapterOptions = {
     rooms?: readonly MemoryRoom[];
     conversations?: readonly MemoryConversation[];
+    agents?: readonly ListedAgent[];
     historyPageSize?: number;
     pageSize?: number;
     capabilities?: readonly Capability[];
@@ -27,9 +29,12 @@ export type MemoryAdapterOptions = {
     retention?: Retention;
     member?: Member;
     unopened?: boolean;
-    exhaustiveDiscovery?: true;
+    roomTypes?: string;
+    typedPaths?: readonly TypedPath[];
 };
 export type MemoryAdapter = Adapter & {
+    discover: NonNullable<Adapter['discover']>;
+    refresh: NonNullable<Adapter['refresh']>;
     setRooms(rooms: readonly MemoryRoom[]): void;
     setConversations(conversations: readonly MemoryConversation[]): void;
     script(operation: keyof Adapter, answer: unknown): void;
@@ -37,17 +42,19 @@ export type MemoryAdapter = Adapter & {
     close(closing?: {
         revoked?: boolean;
         lost?: boolean;
+        authorityChanged?: boolean;
     }): void;
     expire(locators: readonly string[]): void;
     notifyRoomVersion(notification: {
         locator: string;
         roomVersion: string;
     }): void;
-    notifyAuthorityChanged(scope?: DiscoveryScope): void;
+    notifyAuthorityChanged(locators?: readonly string[]): void;
     notifyConversation(event: ConversationEvent): void;
     notifyServiceMode(mode: ServiceMode): void;
     heldRooms(): readonly string[];
     replicatedConversations(): readonly string[];
+    heldConversationCursor(): string | null;
 };
 export declare function createMemoryAdapter(options?: MemoryAdapterOptions): MemoryAdapter;
 //# sourceMappingURL=memory.d.ts.map

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,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) {
@@ -15,12 +20,7 @@ function declaredRetention(value) {
 }
 const MODEL_ABSENT = { kind: 'model-unavailable', reason: 'not-readable' };
 function modelsOf(room) {
-    return {
-        collection: room.model ?? MODEL_ABSENT,
-        ...(room.typedSelection === undefined
-            ? {}
-            : { selection: room.selectionModel ?? MODEL_ABSENT }),
-    };
+    return { collection: room.model ?? MODEL_ABSENT };
 }
 function changedModels(room, from) {
     const now = modelsOf(room);
@@ -53,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();
@@ -87,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);
@@ -121,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 } : {}),
@@ -141,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;
@@ -168,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) : {}),
@@ -184,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;
@@ -198,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));
@@ -218,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 {
@@ -239,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 } };
-        }
-        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 } };
+            return { kind: 'action', result: { message_id: turn } };
         }
-        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 {
@@ -278,8 +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);
@@ -288,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);
         },
@@ -323,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) {
@@ -349,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);
@@ -403,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) {
@@ -490,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

@@ -1,6 +1,9 @@
 import type { AcceptedMessage } from './adapter.js';
+import type { JobMarker } from './job.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    substr(asking.text, 1, 512) 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 JOB_MARKERS = "SELECT json_extract(part.value, '$.text') AS said,\n    json_extract(message, '$.accepted_at') AS at\n  FROM conversation_messages, json_each(message, '$.parts') AS part\n  WHERE conversation = ? AND instr(message, '\"marker\":\"job\"') > 0\n    AND json_extract(part.value, '$.type') = 'marker'\n    AND json_extract(part.value, '$.marker') = 'job'\n  ORDER BY position, identity, part.key";
 export type HeldConversation = {
     readonly conversation: string;
     readonly read: string | null | undefined;
@@ -10,6 +13,25 @@ export type MessageWindow = {
     readonly messages: AcceptedMessage[];
     readonly more: boolean;
 };
+export type HeldSource = {
+    readonly source: unknown;
+    readonly sender: string | null;
+};
+export type HeldRow = {
+    readonly conversation: string;
+    readonly said: {
+        readonly text: string;
+        readonly role: string | null;
+        readonly at: string | null;
+    } | null;
+    readonly failure: string | null;
+    readonly opened: HeldSource | null;
+    readonly asking: (HeldSource & {
+        readonly identity: string;
+        readonly text: string;
+        readonly at: string | null;
+    }) | null;
+};
 export type ConversationWrite = {
     readonly conversation: string;
     readonly messages: readonly AcceptedMessage[];
@@ -18,10 +40,12 @@ 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 conversationRows(connection: Connection, conversations: readonly string[]): HeldRow[];
+export declare function jobMarkers(connection: Connection, conversation: string): JobMarker[];
 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;