@agentshouse/mdruntime 0.1.0-cd26b960b7262 → 0.1.0-cd30853a1b15e

package/dist/tables.js

@@ -1,9 +1,12 @@
 import { sql } from '@agentshouse/mdmodel';
 import { answerQuery } from './compile.js';
-import { conversationRows, droppedMessages, forgottenMessages, heldConversations, jobMarkers, keptMessages, messageCount, messageWindow, MESSAGE_TABLES, turnArrived, } from './messages.js';
+import { amended, authoredLocators, authoredPart, call, callRecords, chatDraft, chatDraftConversations, chatDraftRecord, chatDraftRecords, chatDraftsDropped, claim, fact, fenced, fencedWork, fences, FILE_PART_BYTES, authoredEmptied, heldOrder, kept, moving, pendingBatch, pendingState, queuedLocators, queueOf, queues, remember, roomDraft, roomDraftRecords, spooled, unfenced, unsent, unsentStatus, } from './authored.js';
+import { count, text, texts } from './column.js';
+import { conversationFacts, conversationRows, forgottenConversations, heldConversations, keptFact, keptMessages, messageCount, messageWindow, MESSAGE_TABLES, turnArrived, } from './messages.js';
 import { keptRead, READ_TABLES, readsOfOtherBuildsForgotten, storedRead, } from './reads.js';
 import { conversationTallies, roomTallies, } from './tallies.js';
-import { abandon, release, commit, covering, demoted, ended, entries, erase, facts, fenceRooms, folders, heldLocators, heldRoom, heldRooms, offlineMode, opened, overlaid, presentation, rederive, referrers, refreshing, REPLICA_TABLES, resume, stage, typed, stagedLocators, typedWithin, unrefresh, } from './stored.js';
+import { abandon, release, commit, covering, demoted, ended, entries, erase, facts, fenceRooms, folders, heldLocators, heldRoom, heldRooms, offlineMode, opened, overlaid, presentation, rederive, referrers, refreshing, REPLICA_TABLES, resume, stage, typed, stagedLocators, tablesOf, typedWithin, unrefresh, } from './stored.js';
+export { authoredEmptied, authoredTable, FILE_PART_BYTES, formatted, heldTables, } from './authored.js';
 const STATEMENTS_HELD = 256;
 export function sqliteConnection(engine, database) {
     const decoder = new TextDecoder();
@@ -71,36 +74,16 @@ export function sqliteConnection(engine, database) {
         },
     };
 }
-export const FILE_PART_BYTES = 1_048_576;
 const PROBE_BYTES = 4 * FILE_PART_BYTES;
-const TABLES = [
-    ['authored_facts', 'name TEXT PRIMARY KEY, value TEXT NOT NULL'],
-    ['authored_queues', 'locator TEXT PRIMARY KEY, ids TEXT NOT NULL'],
-    [
-        'authored_pending',
-        'locator TEXT NOT NULL, id TEXT NOT NULL, batch TEXT NOT NULL, state TEXT NOT NULL, files TEXT NOT NULL, paths TEXT NOT NULL, moving INTEGER NOT NULL, PRIMARY KEY (locator, id)',
-    ],
-    [
-        'authored_room_drafts',
-        'locator TEXT NOT NULL, path TEXT NOT NULL, record TEXT NOT NULL, files TEXT NOT NULL, PRIMARY KEY (locator, path)',
-    ],
-    ['authored_chat_drafts', 'conversation TEXT PRIMARY KEY, record TEXT NOT NULL'],
-    ['authored_calls', 'operation TEXT PRIMARY KEY, record TEXT NOT NULL, files TEXT NOT NULL'],
-    ['authored_fences', 'locator TEXT PRIMARY KEY'],
-];
 export const RUNTIME_TABLES = [
-    ...TABLES.map(([name, columns]) => `CREATE TABLE ${name} (${columns}) WITHOUT ROWID`),
-    'CREATE TABLE file_parts (key TEXT NOT NULL, part INTEGER NOT NULL, bytes BLOB NOT NULL, PRIMARY KEY (key, part))',
     'CREATE TABLE opened_files (key TEXT PRIMARY KEY, locator TEXT NOT NULL, path TEXT NOT NULL, revision TEXT NOT NULL, media_type TEXT NOT NULL, sha256 TEXT, byte_length INTEGER) WITHOUT ROWID',
     'CREATE INDEX opened_files_name ON opened_files (locator, path, revision)',
+    'CREATE TABLE opened_parts (key TEXT NOT NULL, part INTEGER NOT NULL, bytes BLOB NOT NULL, PRIMARY KEY (key, part))',
     ...REPLICA_TABLES,
     ...MESSAGE_TABLES,
     ...READ_TABLES,
 ];
-const OWNERS = ['authored_pending', 'authored_room_drafts', 'authored_calls'];
-const AUTHORED_KEYS = OWNERS.map((table) => `SELECT value FROM ${table}, json_each(${table}.files)`).join(' UNION ');
-const UNOWNED_PARTS = `DELETE FROM file_parts WHERE key NOT IN (${AUTHORED_KEYS} UNION SELECT key FROM opened_files)`;
-const CLEANABLE_BYTES = `SELECT coalesce(sum(length(bytes)), 0) AS bytes FROM file_parts WHERE key NOT IN (${AUTHORED_KEYS})`;
+const UNOPENED_PARTS = 'DELETE FROM opened_parts WHERE key NOT IN (SELECT key FROM opened_files)';
 const READS = new Set([
     'authored.status',
     'authored.moving',
@@ -139,8 +122,9 @@ const READS = new Set([
     'conversation.count',
     'conversation.turn',
     'conversation.rows',
-    'conversation.jobs',
     'conversation.tallies',
+    'conversation.facts',
+    'conversation.stored',
     'read.stored',
 ]);
 const KINDS = new Set([
@@ -172,6 +156,7 @@ const KINDS = new Set([
     'opened.drop',
     'opened.clean',
     'conversation.keep',
+    'conversation.fact',
     'conversation.drop',
     'space.probe',
     'read.keep',
@@ -183,290 +168,75 @@ export function isRuntime(request) {
 export function readsRuntime(request) {
     return READS.has(request.kind);
 }
-function text(value) {
-    return typeof value === 'string' ? value : String(value);
-}
-function texts(rows, column) {
-    return rows.map((row) => text(row[column]));
-}
-function owned(files) {
-    return JSON.stringify([...new Set(files)]);
-}
-function fact(connection, name) {
-    const [held] = connection.rows('SELECT value FROM authored_facts WHERE name = ?', [name]);
-    return held === undefined ? null : text(held.value);
-}
-function remember(connection, name, value) {
-    connection.run('INSERT OR REPLACE INTO authored_facts (name, value) VALUES (?, ?)', [
-        name,
-        value,
-    ]);
-    return null;
-}
-function fenced(connection, locator) {
-    return connection.rows('SELECT 1 FROM authored_fences WHERE locator = ?', [locator]).length > 0;
-}
-function stored(connection, key) {
-    return connection.rows('SELECT 1 FROM file_parts WHERE key = ? LIMIT 1', [key]).length > 0;
-}
-function storedPart(connection, key, part, bytes) {
-    connection.run('INSERT INTO file_parts (key, part, bytes) VALUES (?, ?, ?)', [key, part, bytes]);
-}
-async function storedFiles(connection, files) {
-    for (const { key, blob } of files) {
-        if (stored(connection, key))
-            continue;
-        for (let at = 0, part = 0; at < blob.size; at += FILE_PART_BYTES, part += 1) {
-            const bytes = new Uint8Array(await blob.slice(at, at + FILE_PART_BYTES).arrayBuffer());
-            storedPart(connection, key, part, bytes);
-        }
-    }
-}
-function filePart(connection, key, part) {
-    const [held] = connection.rows('SELECT bytes FROM file_parts WHERE key = ? AND part = ?', [
-        key,
-        part,
-    ]);
-    return held?.bytes instanceof Uint8Array ? held.bytes : null;
-}
-function* fileParts(connection, key) {
-    for (let part = 0;; part += 1) {
-        const bytes = filePart(connection, key, part);
-        if (bytes === null)
-            return;
-        yield bytes;
-    }
-}
-async function spooled(connection, spool, { key, type }) {
-    for (const held of [...spool.held()]) {
-        if (held !== key && !stored(connection, held))
-            await spool.drop(held);
-    }
-    return spool.spool(key, type, fileParts(connection, key));
-}
-function unowned(connection) {
-    connection.run(UNOWNED_PARTS);
-}
-function queued(connection) {
-    return connection.rows('SELECT locator, ids FROM authored_queues').map((row) => ({
-        locator: text(row.locator),
-        ids: JSON.parse(text(row.ids)),
-    }));
-}
 function heldWork(connection, locator) {
     const room = heldRoom(connection, locator);
-    const pending = new Map(connection
-        .rows('SELECT id, batch, state FROM authored_pending WHERE locator = ?', [locator])
-        .map((row) => [
-        text(row.id),
-        { id: text(row.id), batch: text(row.batch), state: text(row.state) },
-    ]));
     return {
         room: room === null ? null : { ...room, overlaid: overlaid(connection, room.key) },
-        queue: heldOrder(connection, locator).map((id) => {
-            const held = pending.get(id);
-            if (held === undefined)
-                throw new Error(`Missing Pending Change ${locator}/${id}`);
-            return held;
-        }),
+        queue: queueOf(connection, locator),
     };
 }
 function status(connection) {
-    const [completed] = connection.rows("SELECT value FROM replica_facts WHERE name = 'lastCompleted'");
     return {
-        queued: texts(connection.rows('SELECT locator FROM authored_queues'), 'locator'),
-        lastCompleted: completed === undefined ? null : text(completed.value),
-        changes: connection
-            .rows('SELECT p.locator, c.value AS path FROM authored_pending p, json_each(p.paths) c')
-            .map((row) => ({ locator: text(row.locator), path: text(row.path) })),
-        resets: connection
-            .rows(`SELECT locator, json_extract(state, '$.submission.reset') AS reset FROM authored_pending
-         WHERE json_extract(state, '$.submission.state') = 'reset'`)
-            .map((row) => ({ locator: text(row.locator), reset: text(row.reset) })),
-        returned: texts(connection.rows(`SELECT record FROM authored_room_drafts WHERE json_type(record, '$.returned') = 'object'`), 'record'),
+        ...unsentStatus(connection),
+        lastCompleted: facts(connection, ['lastCompleted']).lastCompleted ?? null,
     };
 }
 function pendingOf(connection, locator, id) {
-    const [held] = connection.rows('SELECT state FROM authored_pending WHERE locator = ? AND id = ?', [locator, id]);
     return {
-        state: held === undefined ? null : text(held.state),
+        state: pendingState(connection, locator, id),
         room: connection.rows('SELECT 1 FROM replica_rooms WHERE locator = ?', [locator]).length > 0,
     };
 }
-function roomDraftRecords(connection, locator, paths) {
-    if (locator === null) {
-        return texts(connection.rows('SELECT record FROM authored_room_drafts'), 'record');
-    }
-    if (paths === null) {
-        return texts(connection.rows('SELECT record FROM authored_room_drafts WHERE locator = ?', [locator]), 'record');
-    }
-    return texts(connection.rows('SELECT record FROM authored_room_drafts WHERE locator = ? AND path IN (SELECT value FROM json_each(?))', [locator, JSON.stringify(paths)]), 'record');
-}
-function chatDraftRecord(connection, conversation) {
-    const [held] = connection.rows('SELECT record FROM authored_chat_drafts WHERE conversation = ?', [
-        conversation,
-    ]);
-    return held === undefined ? null : text(held.record);
-}
-function heldOrder(connection, locator) {
-    const [held] = connection.rows('SELECT ids FROM authored_queues WHERE locator = ?', [locator]);
-    return held === undefined ? [] : JSON.parse(text(held.ids));
-}
-function keptRows(connection, { locator, order, added, founded, roomDrafts, consumedRoomDrafts }) {
-    for (const path of consumedRoomDrafts ?? []) {
-        connection.run('DELETE FROM authored_room_drafts WHERE locator = ? AND path = ?', [
-            locator,
-            path,
-        ]);
-    }
-    for (const { path, record, files } of roomDrafts ?? []) {
-        connection.run('INSERT OR REPLACE INTO authored_room_drafts (locator, path, record, files) VALUES (?, ?, ?, ?)', [locator, path, record, owned(files)]);
-    }
-    if (order === undefined)
-        return;
-    const before = new Set(heldOrder(connection, locator));
-    const after = new Set(order);
-    if (after.size === 0)
-        connection.run('DELETE FROM authored_queues WHERE locator = ?', [locator]);
-    else {
-        connection.run('INSERT OR REPLACE INTO authored_queues (locator, ids) VALUES (?, ?)', [
-            locator,
-            JSON.stringify([...after]),
-        ]);
-    }
-    for (const id of before) {
-        if (!after.has(id)) {
-            connection.run('DELETE FROM authored_pending WHERE locator = ? AND id = ?', [locator, id]);
-        }
-    }
-    for (const { id, batch, state, files, paths, moving } of added ?? []) {
-        if (before.has(id))
-            continue;
-        connection.run('INSERT OR REPLACE INTO authored_pending (locator, id, batch, state, files, paths, moving) VALUES (?, ?, ?, ?, ?, ?, ?)', [locator, id, batch, state, owned(files), JSON.stringify(paths), moving ? 1 : 0]);
-    }
-    for (const { id, batch, files, paths, moving } of founded ?? []) {
-        const [held] = connection.rows('SELECT files FROM authored_pending WHERE locator = ? AND id = ?', [locator, id]);
-        if (held === undefined || !before.has(id))
-            continue;
-        connection.run('UPDATE authored_pending SET batch = ?, files = ?, paths = ?, moving = ? WHERE locator = ? AND id = ?', [
-            batch,
-            owned([...JSON.parse(text(held.files)), ...files]),
-            JSON.stringify(paths),
-            moving ? 1 : 0,
-            locator,
-            id,
-        ]);
-    }
-}
-async function kept(connection, { writes, files, whole }) {
-    const refused = writes.find(({ locator }) => fenced(connection, locator));
-    if (refused !== undefined && whole)
-        return refused.locator;
-    await storedFiles(connection, files);
-    for (const write of writes) {
-        if (!fenced(connection, write.locator))
-            keptRows(connection, write);
-    }
-    unowned(connection);
-    return refused?.locator ?? null;
-}
-function amended(connection, { locator, id, amendment }) {
-    if (fenced(connection, locator))
-        return null;
-    const [held] = connection.rows('SELECT state FROM authored_pending WHERE locator = ? AND id = ?', [locator, id]);
-    if (held === undefined)
-        return null;
-    connection.run('UPDATE authored_pending SET state = ? WHERE locator = ? AND id = ?', [
-        JSON.stringify({
-            ...JSON.parse(text(held.state)),
-            ...JSON.parse(amendment),
-        }),
-        locator,
-        id,
-    ]);
-    return null;
-}
-async function roomDraft(connection, { locator, path, kept: draft, files }) {
-    if (fenced(connection, locator))
-        return locator;
-    await storedFiles(connection, files);
-    if (draft === null) {
-        connection.run('DELETE FROM authored_room_drafts WHERE locator = ? AND path = ?', [
-            locator,
-            path,
+function storedConversations(connection, conversations) {
+    const named = conversations === null ? '' : ' WHERE conversation IN (SELECT value FROM json_each(?))';
+    const bound = conversations === null ? [] : [JSON.stringify(conversations)];
+    return [
+        ...new Set([
+            ...tablesOf(MESSAGE_TABLES).flatMap((table) => texts(connection.rows(`SELECT DISTINCT conversation FROM ${table}${named}`, bound), 'conversation')),
+            ...chatDraftConversations(connection, conversations),
+        ]),
+    ];
+}
+function droppedConversations(connection, conversations) {
+    const held = storedConversations(connection, conversations);
+    for (const table of tablesOf(MESSAGE_TABLES)) {
+        connection.run(`DELETE FROM ${table} WHERE conversation IN (SELECT value FROM json_each(?))`, [
+            JSON.stringify(conversations),
         ]);
     }
-    else {
-        connection.run('INSERT OR REPLACE INTO authored_room_drafts (locator, path, record, files) VALUES (?, ?, ?, ?)', [locator, path, draft.record, owned(draft.files)]);
-    }
-    unowned(connection);
-    return null;
-}
-function chatDraft(connection, { kept: drafts, dropped }) {
-    for (const conversation of dropped) {
-        connection.run('DELETE FROM authored_chat_drafts WHERE conversation = ?', [conversation]);
-    }
-    for (const { conversation, record } of drafts) {
-        connection.run('INSERT OR REPLACE INTO authored_chat_drafts (conversation, record) VALUES (?, ?)', [conversation, record]);
-    }
-    return null;
+    chatDraftsDropped(connection, conversations);
+    return held;
 }
-async function call(connection, { operation, kept: held, files }) {
-    await storedFiles(connection, files);
-    if (held === null)
-        connection.run('DELETE FROM authored_calls WHERE operation = ?', [operation]);
-    else {
-        connection.run('INSERT OR REPLACE INTO authored_calls (operation, record, files) VALUES (?, ?, ?)', [operation, held.record, owned(held.files)]);
-    }
-    unowned(connection);
-    return null;
-}
-function roomWork(connection, locator) {
-    connection.run('DELETE FROM authored_queues WHERE locator = ?', [locator]);
-    connection.run('DELETE FROM authored_pending WHERE locator = ?', [locator]);
+function unopened(connection) {
+    connection.run(UNOPENED_PARTS);
 }
 function fence(connection, locators) {
+    fencedWork(connection, locators);
     for (const locator of locators) {
-        connection.run('INSERT OR REPLACE INTO authored_fences (locator) VALUES (?)', [locator]);
-        roomWork(connection, locator);
-        connection.run('DELETE FROM authored_room_drafts WHERE locator = ?', [locator]);
         connection.run('DELETE FROM opened_files WHERE locator = ?', [locator]);
     }
-    unowned(connection);
+    unopened(connection);
     return fenceRooms(connection, locators);
 }
 function erased(connection, { locator, limit }) {
     return erase(connection, locator, limit);
 }
-function unfenced(connection, locators) {
+function unfencedRooms(connection, locators) {
     const erased = locators.filter((locator) => connection.rows('SELECT 1 FROM replica_erasing WHERE locator = ? LIMIT 1', [locator])
         .length === 0);
-    for (const locator of erased) {
-        connection.run('DELETE FROM authored_fences WHERE locator = ?', [locator]);
-    }
+    unfenced(connection, erased);
     return erased;
 }
-function claim(connection, holder) {
-    const held = fact(connection, 'holder');
-    if (held !== null)
-        return held === holder;
-    remember(connection, 'holder', holder);
-    return true;
-}
 function end(connection, holder) {
     ended(connection);
-    forgottenMessages(connection);
+    forgottenConversations(connection);
     if (holder !== null && claim(connection, holder))
         return true;
-    for (const [table] of TABLES)
-        connection.run(`DELETE FROM ${table}`);
+    authoredEmptied(connection);
     connection.run('DELETE FROM opened_files');
-    connection.run('DELETE FROM file_parts');
+    connection.run('DELETE FROM opened_parts');
     return false;
 }
-function count(value) {
-    return typeof value === 'bigint' ? Number(value) : typeof value === 'number' ? value : 0;
-}
 function openedFile(connection, { locator, path, revision }) {
     const [held] = connection.rows('SELECT key, media_type, byte_length FROM opened_files WHERE locator = ? AND path = ? AND revision = ? AND byte_length IS NOT NULL', [locator, path, revision]);
     return held === undefined
@@ -481,7 +251,7 @@ function opening(connection, { key, locator, path, revision, mediaType }) {
     if (fenced(connection, locator))
         return false;
     connection.run('DELETE FROM opened_files WHERE locator = ? AND path = ? AND revision = ? AND byte_length IS NULL', [locator, path, revision]);
-    unowned(connection);
+    unopened(connection);
     connection.run('INSERT INTO opened_files (key, locator, path, revision, media_type) VALUES (?, ?, ?, ?, ?)', [key, locator, path, revision, mediaType]);
     return true;
 }
@@ -494,19 +264,23 @@ function fetching(connection, key) {
 function openedPart(connection, { key, part, bytes }) {
     if (fetching(connection, key) === null)
         return false;
-    storedPart(connection, key, part, bytes);
+    connection.run('INSERT INTO opened_parts (key, part, bytes) VALUES (?, ?, ?)', [
+        key,
+        part,
+        bytes,
+    ]);
     return true;
 }
 function dropped(connection, key) {
     connection.run('DELETE FROM opened_files WHERE key = ?', [key]);
-    connection.run('DELETE FROM file_parts WHERE key = ?', [key]);
+    connection.run('DELETE FROM opened_parts WHERE key = ?', [key]);
     return null;
 }
 function keptOpened(connection, { key, sha256, byteLength, parts }) {
     const fetched = fetching(connection, key);
     if (fetched === null)
         return false;
-    const [held] = connection.rows('SELECT count(*) AS parts, min(part) AS first, max(part) AS last, coalesce(sum(length(bytes)), 0) AS bytes FROM file_parts WHERE key = ?', [key]);
+    const [held] = connection.rows('SELECT count(*) AS parts, min(part) AS first, max(part) AS last, coalesce(sum(length(bytes)), 0) AS bytes FROM opened_parts WHERE key = ?', [key]);
     const whole = count(held.parts) === parts &&
         count(held.bytes) === byteLength &&
         (parts === 0 || (count(held.first) === 0 && count(held.last) === parts - 1));
@@ -520,27 +294,24 @@ function keptOpened(connection, { key, sha256, byteLength, parts }) {
         key,
     ]);
     connection.run('DELETE FROM opened_files WHERE locator = ? AND path = ? AND revision = ? AND key <> ?', [fetched.locator, fetched.path, fetched.revision, key]);
-    unowned(connection);
+    unopened(connection);
     return true;
 }
-const UNSENT = [
-    ['pending-change', 'authored_pending'],
-    ['call', 'authored_calls'],
-    ['room-draft', 'authored_room_drafts'],
-    ['chat-draft', 'authored_chat_drafts'],
-];
-function unsent(connection) {
-    const [held] = connection.rows(`SELECT ${UNSENT.map(([kind, table]) => `(SELECT count(*) FROM ${table}) AS "${kind}"`).join(', ')}`);
-    return UNSENT.map(([kind]) => ({ kind, count: count(held[kind]) })).filter((work) => work.count > 0);
+function heldPart(connection, key, part) {
+    const [held] = connection.rows('SELECT bytes FROM opened_parts WHERE key = ? AND part = ?', [
+        key,
+        part,
+    ]);
+    return held?.bytes instanceof Uint8Array ? held.bytes : authoredPart(connection, key, part);
 }
 function cleanable(connection) {
-    const [held] = connection.rows(CLEANABLE_BYTES);
+    const [held] = connection.rows('SELECT coalesce(sum(length(bytes)), 0) AS bytes FROM opened_parts');
     return count(held.bytes);
 }
 function cleaned(connection) {
     connection.run('DELETE FROM opened_files');
     const freed = cleanable(connection);
-    unowned(connection);
+    unopened(connection);
     return freed;
 }
 function openedHeld(connection) {
@@ -566,51 +337,39 @@ export function answerRuntime(connection, request, spool) {
         case 'authored.status':
             return status(connection);
         case 'authored.moving':
-            return {
-                queues: queued(connection),
-                pending: connection
-                    .rows('SELECT locator, id, batch, state FROM authored_pending WHERE moving = 1 ORDER BY locator')
-                    .map((row) => ({
-                    locator: text(row.locator),
-                    id: text(row.id),
-                    batch: text(row.batch),
-                    state: text(row.state),
-                })),
-            };
+            return moving(connection);
         case 'authored.pending':
             return pendingOf(connection, request.locator, request.id);
-        case 'authored.batch': {
-            const [held] = connection.rows('SELECT batch FROM authored_pending WHERE locator = ? AND id = ?', [request.locator, request.id]);
-            return held === undefined ? null : text(held.batch);
-        }
+        case 'authored.batch':
+            return pendingBatch(connection, request.locator, request.id);
         case 'authored.order':
             return heldOrder(connection, request.locator);
         case 'authored.queued':
-            return texts(connection.rows('SELECT locator FROM authored_queues'), 'locator');
+            return queuedLocators(connection);
         case 'authored.roomDrafts':
             return roomDraftRecords(connection, request.locator, request.paths);
         case 'authored.chatDraft.read':
             return chatDraftRecord(connection, request.conversation);
         case 'authored.chatDrafts':
-            return texts(connection.rows('SELECT record FROM authored_chat_drafts'), 'record');
+            return chatDraftRecords(connection);
         case 'authored.calls':
-            return texts(connection.rows('SELECT record FROM authored_calls'), 'record');
+            return callRecords(connection);
         case 'authored.fences':
-            return texts(connection.rows('SELECT locator FROM authored_fences'), 'locator');
+            return fences(connection);
         case 'authored.unsent':
             return unsent(connection);
         case 'authored.fact':
             return fact(connection, request.name);
         case 'authored.file':
-            return spooled(connection, spool, request);
+            return spooled(connection, spool, request.key, request.type);
         case 'authored.amend':
-            return amended(connection, request);
+            return amended(connection, request.locator, request.id, request.amendment);
         case 'authored.roomDraft':
-            return roomDraft(connection, request);
+            return roomDraft(connection, request.locator, request.path, request.kept, request.files);
         case 'authored.chatDraft':
-            return chatDraft(connection, request);
+            return chatDraft(connection, request.kept, request.dropped);
         case 'authored.call':
-            return call(connection, request);
+            return call(connection, request.operation, request.kept, request.files);
         case 'authored.remember':
             return remember(connection, request.name, request.value);
         case 'authored.claim':
@@ -624,18 +383,18 @@ export function answerRuntime(connection, request, spool) {
         case 'replica.room':
             return heldWork(connection, request.locator);
         case 'replica.covering':
-            return {
-                rooms: covering(connection),
-                queues: queued(connection),
-            };
+            return { ...covering(connection, request.since), queues: queues(connection) };
         case 'replica.offline':
             return offlineMode(connection, request.locator);
         case 'replica.held':
-            return { held: heldLocators(connection), staged: stagedLocators(connection) };
+            return {
+                held: [...new Set([...heldLocators(connection), ...authoredLocators(connection)])],
+                staged: stagedLocators(connection),
+            };
         case 'replica.demote':
             return demoted(connection);
         case 'replica.facts':
-            return facts(connection);
+            return facts(connection, request.names);
         case 'replica.presentation':
             return presentation(connection, request.app);
         case 'replica.query':
@@ -669,7 +428,7 @@ export function answerRuntime(connection, request, spool) {
         case 'replica.abandon':
             return abandon(connection, request.locator);
         case 'replica.unfence':
-            return unfenced(connection, request.locators);
+            return unfencedRooms(connection, request.locators);
         case 'replica.release':
             return release(connection, request.key);
         case 'replica.rederive':
@@ -701,7 +460,7 @@ export function answerRuntime(connection, request, spool) {
         case 'opened.held':
             return openedHeld(connection);
         case 'file.part':
-            return filePart(connection, request.key, request.part);
+            return heldPart(connection, request.key, request.part);
         case 'conversation.held':
             return heldConversations(connection, request.conversations);
         case 'conversation.keep': {
@@ -716,18 +475,18 @@ export function answerRuntime(connection, request, spool) {
             return turnArrived(connection, request.conversation, request.turn);
         case 'conversation.rows':
             return conversationRows(connection, request.conversations);
-        case 'conversation.jobs':
-            return jobMarkers(connection, request.conversation);
         case 'conversation.tallies':
             return conversationTallies(connection, request.conversations, request.since);
+        case 'conversation.facts':
+            return conversationFacts(connection);
+        case 'conversation.fact': {
+            const { kind: _kind, ...fact } = request;
+            return keptFact(connection, fact);
+        }
+        case 'conversation.stored':
+            return storedConversations(connection, null);
         case 'conversation.drop':
-            chatDraft(connection, {
-                kind: 'authored.chatDraft',
-                kept: [],
-                dropped: request.conversations,
-            });
-            droppedMessages(connection, request.conversations);
-            return null;
+            return droppedConversations(connection, request.conversations);
         case 'space.probe':
             return spool.probe(PROBE_BYTES).then(() => null);
         case 'read.stored':

package/dist/tallies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tallies.d.ts","sourceRoot":"","sources":["../src/tallies.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAI1D,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;IAC7E,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAmHpG,wBAAgB,WAAW,CACzB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,SAAS,SAAS,EAAE,EAC3B,KAAK,EAAE,MAAM,GACZ,SAAS,EAAE,CAwBb;AA0BD,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,EACvC,KAAK,EAAE,MAAM,GACZ,iBAAiB,EAAE,CAerB"}
+{"version":3,"file":"tallies.d.ts","sourceRoot":"","sources":["../src/tallies.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAI1D,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;IAC7E,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAmHpG,wBAAgB,WAAW,CACzB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,SAAS,SAAS,EAAE,EAC3B,KAAK,EAAE,MAAM,GACZ,SAAS,EAAE,CAwBb;AA0BD,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,EACvC,KAAK,EAAE,MAAM,GACZ,iBAAiB,EAAE,CAerB"}

package/dist/tallies.js

@@ -1,5 +1,4 @@
-import { instantKey, sql } from '@agentshouse/mdmodel';
-import { CHAT_MESSAGE_TYPE, CHAT_TYPE } from './chat-types.js';
+import { CHAT_MESSAGE_TYPE, CHAT_TYPE, instantKey, sql } from '@agentshouse/mdmodel';
 import { answerQuery, VISIBLE, within } from './compile.js';
 import { HOUSE_DIRECTORY } from './figures.js';
 const NONE = { count: 0, size: 0 };

package/dist/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,UAAU,EAGhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM7D,KAAK,QAAQ,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpF,MAAM,MAAM,IAAI,GAAG,CACjB,KAAK,EAAE,MAAM,GAAG,IAAI,KACjB,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAAC;AAEtF,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAwBvF,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,UAAU,CAAC,CA6CrB;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1F,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;CAChF,CAAC;AAkBF,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,UAAU,CAAC,CAgCrB"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,UAAU,EAGhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAgD,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAMjG,KAAK,QAAQ,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpF,MAAM,MAAM,IAAI,GAAG,CACjB,KAAK,EAAE,MAAM,GAAG,IAAI,KACjB,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAAC;AAEtF,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAoBvF,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,UAAU,CAAC,CA6CrB;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1F,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;CAChF,CAAC;AAgBF,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,UAAU,CAAC,CAgCrB"}

package/dist/validation.js

@@ -1,13 +1,10 @@
-import { assess, parse, parseFrontmatter, verdicts, } from '@agentshouse/mdmodel';
-import { selected } from './collection.js';
+import { assess, parse, verdicts, } from '@agentshouse/mdmodel';
+import { definitionsAt, selected, textType, typedText } from './collection.js';
 import { paced, ROW_WEIGHT, yielded } from './turn.js';
 const NO_TYPES = { types: {} };
 function modelOf(model) {
     return model.status === 'unavailable' ? NO_TYPES : { types: model.types };
 }
-function typedText(read) {
-    return read.ok && read.document.type !== undefined && read.document.type !== 'any';
-}
 function partVerdict(part) {
     return part.unmodeled !== null
         ? { verdict: 'refuse', rule: 'model-unavailable', file: part.unmodeled }
@@ -27,7 +24,7 @@ export async function validatedCollection(walk, lookup, composition) {
             if (content === null)
                 continue;
             const part = partOf(path);
-            const parsed = parse(content, path);
+            const parsed = parse(content, path, definitionsAt(composition, path));
             if (part.model.status === 'unavailable' && part.unmodeled === null && typedText(parsed)) {
                 part.unmodeled = path;
             }
@@ -57,10 +54,7 @@ export async function validatedCollection(walk, lookup, composition) {
     return refusals.find((refusal) => refusal.rule !== 'model-unavailable') ?? refusals[0];
 }
 function declared(content) {
-    if (content === undefined || content === null)
-        return undefined;
-    const read = parseFrontmatter(content);
-    return read.ok ? (read.frontmatter.type ?? 'any') : undefined;
+    return content === undefined || content === null ? undefined : textType(parse(content));
 }
 function shifted({ was, now }) {
     return ((now === undefined) !== (was === undefined) ||