@agentshouse/mdruntime 0.1.0-cd9e28a590f84 → 0.1.0-cdded6c080913

package/dist/stored.js

@@ -1,20 +1,21 @@
+import { instantKey, sql } from '@agentshouse/mdmodel';
 import { composedOf } from './collection.js';
-import { described, derived } from './rows.js';
+import { described, derived, heldOf } from './rows.js';
 export const REPLICA_TABLES = [
     'CREATE TABLE replica_keys (key INTEGER PRIMARY KEY AUTOINCREMENT, locator TEXT NOT NULL, transfer TEXT NOT NULL, fingerprint TEXT NOT NULL, rederiving INTEGER)',
-    'CREATE TABLE replica_rooms (locator TEXT PRIMARY KEY, key INTEGER NOT NULL, record TEXT NOT NULL) WITHOUT ROWID',
-    'CREATE TABLE replica_entries (id INTEGER PRIMARY KEY, key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, visible INTEGER NOT NULL, present INTEGER NOT NULL, queried INTEGER NOT NULL, binary TEXT, revision TEXT, file_id TEXT, change TEXT, written TEXT, type TEXT, declared TEXT, folder TEXT NOT NULL, fields TEXT, content TEXT, outline TEXT)',
+    'CREATE TABLE replica_rooms (locator TEXT PRIMARY KEY, key INTEGER NOT NULL, record TEXT NOT NULL, documents INTEGER NOT NULL DEFAULT 0) WITHOUT ROWID',
+    'CREATE TABLE replica_models (identity TEXT NOT NULL, version TEXT NOT NULL, schema TEXT NOT NULL, PRIMARY KEY (identity, version)) WITHOUT ROWID',
+    "CREATE TABLE replica_entries (id INTEGER PRIMARY KEY, key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, visible INTEGER NOT NULL, present INTEGER NOT NULL, queried INTEGER NOT NULL, binary TEXT, revision TEXT, file_id TEXT, change TEXT, written TEXT, type TEXT, declared TEXT, folder TEXT NOT NULL, fields TEXT, links TEXT, part TEXT, created TEXT, created_instant TEXT, changed_instant TEXT, bytes INTEGER GENERATED ALWAYS AS (CASE WHEN binary IS NULL THEN length(CAST(content AS BLOB)) ELSE binary ->> '$.byteLength' END) STORED, content TEXT)",
     'CREATE UNIQUE INDEX replica_entries_path ON replica_entries (key, layer, path)',
     'CREATE INDEX replica_entries_visible ON replica_entries (key, visible, present, path, binary)',
     'CREATE INDEX replica_entries_folder ON replica_entries (key, folder, path)',
     'CREATE INDEX replica_entries_type ON replica_entries (key, type, visible, present, queried, folder)',
     'CREATE INDEX replica_entries_key ON replica_entries (key)',
-    'CREATE TABLE replica_values (doc INTEGER NOT NULL, keys TEXT NOT NULL, places TEXT NOT NULL, item INTEGER NOT NULL, kind TEXT NOT NULL, value, size INTEGER, PRIMARY KEY (doc, keys, places, item)) WITHOUT ROWID',
+    sql.VALUE_TABLE,
     'CREATE TABLE replica_links (doc INTEGER NOT NULL, key INTEGER NOT NULL, kind TEXT NOT NULL, keys TEXT NOT NULL, places TEXT NOT NULL, target TEXT NOT NULL, field TEXT NOT NULL, PRIMARY KEY (doc, kind, keys, places, target)) WITHOUT ROWID',
     'CREATE INDEX replica_links_target ON replica_links (key, target, kind, keys)',
-    'CREATE TABLE replica_folders (key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, present INTEGER NOT NULL, PRIMARY KEY (key, layer, path)) WITHOUT ROWID',
+    'CREATE TABLE replica_folders (key INTEGER NOT NULL, layer INTEGER NOT NULL, path TEXT NOT NULL, present INTEGER NOT NULL, part TEXT, PRIMARY KEY (key, layer, path)) WITHOUT ROWID',
     'CREATE TABLE replica_erasing (key INTEGER PRIMARY KEY, locator TEXT NOT NULL)',
-    'CREATE TABLE replica_opened (locator TEXT NOT NULL, path TEXT NOT NULL, PRIMARY KEY (locator, path)) WITHOUT ROWID',
     'CREATE TABLE replica_facts (name TEXT PRIMARY KEY, value TEXT NOT NULL) WITHOUT ROWID',
     'CREATE TABLE replica_presentation (app TEXT PRIMARY KEY, value TEXT NOT NULL) WITHOUT ROWID',
 ];
@@ -29,8 +30,7 @@ const ABSENT = {
     queried: false,
     folder: '',
     fields: null,
-    values: [],
-    links: [],
+    links: null,
 };
 function text(value) {
     return typeof value === 'string' ? value : null;
@@ -51,17 +51,11 @@ function dropDerived(connection, doc) {
     connection.run('DELETE FROM replica_values WHERE doc = ?', [doc]);
     connection.run('DELETE FROM replica_links WHERE doc = ?', [doc]);
 }
-function scalarText(value) {
-    if (value === Infinity)
-        return 'Infinity';
-    if (value === -Infinity)
-        return '-Infinity';
-    return JSON.stringify(value);
-}
-function writeDerived(connection, doc, key, made) {
+function writeDerived(connection, doc, key, path, held, composition) {
+    const made = derived(path, held, composition);
     if (made.values.length > 0) {
-        const rows = made.values.map((value) => `[${JSON.stringify(value.keys)},${JSON.stringify(value.places)},${value.item},${JSON.stringify(value.kind)},${scalarText(value.value)},${JSON.stringify(value.size)}]`);
-        connection.run('INSERT INTO replica_values (doc, keys, places, item, kind, value, size) SELECT ?, value ->> 0, value ->> 1, value ->> 2, value ->> 3, value ->> 4, value ->> 5 FROM json_each(?)', [doc, `[${rows.join(',')}]`]);
+        const inserted = sql.insertedValues(doc, made.values);
+        connection.run(inserted.sql, inserted.bind);
     }
     if (made.links.length > 0) {
         connection.run('INSERT OR IGNORE INTO replica_links (doc, key, kind, keys, places, target, field) SELECT ?, ?, value ->> 0, value ->> 1, value ->> 2, value ->> 3, value ->> 4 FROM json_each(?)', [
@@ -82,8 +76,8 @@ function removeEntry(connection, key, layer, path) {
     dropDerived(connection, id);
     connection.run('DELETE FROM replica_entries WHERE id = ?', [id]);
 }
-function insertEntry(connection, key, layer, entry, present, made) {
-    connection.run('INSERT INTO replica_entries (key, layer, path, visible, present, queried, content, outline, binary, revision, file_id, change, written, type, declared, folder, fields) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
+function insertEntry(connection, key, layer, entry, present, made, part = null) {
+    connection.run('INSERT INTO replica_entries (key, layer, path, visible, present, queried, content, binary, revision, file_id, created, created_instant, change, changed_instant, written, type, declared, folder, fields, links, part) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', [
         key,
         layer,
         entry.path,
@@ -91,16 +85,20 @@ function insertEntry(connection, key, layer, entry, present, made) {
         flag(present),
         flag(made.queried),
         entry.binary === null ? entry.content : null,
-        entry.binary === null && entry.outline !== null ? JSON.stringify(entry.outline) : null,
         entry.binary === null ? null : JSON.stringify(entry.binary),
         entry.revision,
         entry.fileId,
+        entry.created,
+        instantKey(entry.created),
         entry.change === null ? null : JSON.stringify(entry.change),
+        instantKey(entry.change?.time),
         entry.written,
         made.type,
         made.declared,
         made.folder,
         made.fields,
+        made.links,
+        part,
     ]);
 }
 function textOf(entry) {
@@ -109,16 +107,15 @@ function textOf(entry) {
 function putEntry(connection, key, layer, entry, present, composition) {
     removeEntry(connection, key, layer, entry.path);
     const content = textOf(entry);
-    const made = present ? derived(entry.path, content, entry.outline, composition) : ABSENT;
-    insertEntry(connection, key, layer, entry, present, made);
+    insertEntry(connection, key, layer, entry, present, present ? described(entry.path, content, entry.facts) : ABSENT);
     if (!present)
         return;
     const id = entryId(connection, key, layer, entry.path);
-    writeDerived(connection, id, key, made);
+    writeDerived(connection, id, key, entry.path, heldOf(entry.path, content, entry.facts), composition);
 }
-function placeEntry(connection, key, entry) {
+function placeEntry(connection, key, entry, part) {
     removeEntry(connection, key, CONFIRMED, entry.path);
-    insertEntry(connection, key, CONFIRMED, entry, true, described(entry.path, textOf(entry), entry.outline));
+    insertEntry(connection, key, CONFIRMED, entry, true, described(entry.path, textOf(entry), entry.facts), part);
 }
 function revealed(connection, key, touched) {
     if (touched.length === 0)
@@ -145,17 +142,83 @@ export function entered(connection, locator, composition, rows) {
     return key;
 }
 export function stage(connection, request) {
+    if (request.key === null) {
+        for (const row of connection.rows(STAGED_KEYS, [request.locator])) {
+            erasing(connection, number(row.key), request.locator);
+        }
+    }
     const key = request.key ??
         newKey(connection, request.locator, request.transfer, request.fingerprint, false);
     recomposed(connection, key, request.fingerprint);
-    connection.run('UPDATE replica_keys SET rederiving = coalesce(rederiving, last) FROM (SELECT coalesce(max(id), 0) AS last FROM replica_entries) WHERE key = ?', [key]);
+    owing(connection, key);
     for (const entry of request.entries)
-        placeEntry(connection, key, entry);
+        placeEntry(connection, key, entry, request.part);
     for (const path of request.folders) {
-        connection.run('INSERT OR REPLACE INTO replica_folders (key, layer, path, present) VALUES (?, ?, ?, 1)', [key, CONFIRMED, path]);
+        connection.run('INSERT OR REPLACE INTO replica_folders (key, layer, path, present, part) VALUES (?, ?, ?, 1, ?)', [key, CONFIRMED, path, request.part]);
     }
     return key;
 }
+function owing(connection, key) {
+    connection.run('UPDATE replica_keys SET rederiving = coalesce(rederiving, last) FROM (SELECT coalesce(max(id), 0) AS last FROM replica_entries) WHERE key = ?', [key]);
+}
+const STAGED_KEYS = `SELECT k.key, k.transfer FROM replica_keys k WHERE k.locator = ?
+  AND NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
+  AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)
+  ORDER BY k.key DESC`;
+const UNPARTED = `EXISTS (SELECT 1 FROM replica_entries e WHERE e.key = k.key AND e.part IS NULL)
+  OR EXISTS (SELECT 1 FROM replica_folders f WHERE f.key = k.key AND f.part IS NULL)`;
+function partsOf(connection, key, layer) {
+    const scoped = layer === null ? '' : ` AND layer = ${layer}`;
+    return new Set(connection
+        .rows(`SELECT part FROM replica_entries WHERE key = ?${scoped} AND part IS NOT NULL UNION SELECT part FROM replica_folders WHERE key = ?${scoped} AND part IS NOT NULL`, [key, key])
+        .map((row) => text(row.part)));
+}
+function resumable(connection, locator) {
+    let kept = null;
+    for (const row of connection.rows(STAGED_KEYS, [locator])) {
+        const key = number(row.key);
+        const parted = kept === null &&
+            connection.rows(`SELECT 1 FROM replica_keys k WHERE k.key = ? AND NOT (${UNPARTED})`, [key])
+                .length > 0;
+        if (parted)
+            kept = { key, transfer: text(row.transfer) };
+        else
+            erasing(connection, key, locator);
+    }
+    return kept;
+}
+export function resume(connection, request) {
+    const wanted = new Set(request.parts);
+    const held = resumable(connection, request.locator);
+    const staged = held === null ? new Set() : partsOf(connection, held.key, null);
+    const dropped = [...staged].filter((part) => !wanted.has(part));
+    if (held !== null && dropped.length > 0) {
+        const named = JSON.stringify(dropped);
+        const rows = `SELECT id FROM replica_entries WHERE key = ? AND part IN (SELECT value FROM json_each(?))`;
+        for (const table of ['replica_values', 'replica_links']) {
+            connection.run(`DELETE FROM ${table} WHERE doc IN (${rows})`, [held.key, named]);
+        }
+        connection.run(`DELETE FROM replica_entries WHERE id IN (${rows})`, [held.key, named]);
+        connection.run('DELETE FROM replica_folders WHERE key = ? AND part IN (SELECT value FROM json_each(?))', [held.key, named]);
+    }
+    const kept = [...staged].filter((part) => wanted.has(part));
+    const publishedParts = request.published === null
+        ? new Set()
+        : partsOf(connection, request.published, CONFIRMED);
+    const copied = request.parts.filter((part) => !staged.has(part) && publishedParts.has(part));
+    if (held === null && copied.length === 0) {
+        return { key: null, transfer: request.transfer, staged: [] };
+    }
+    const key = held?.key ?? newKey(connection, request.locator, request.transfer, request.fingerprint, false);
+    recomposed(connection, key, request.fingerprint);
+    if (copied.length > 0 && request.published !== null) {
+        owing(connection, key);
+        const named = JSON.stringify(copied);
+        connection.run(`INSERT INTO replica_entries (key, layer, path, visible, present, queried, content, binary, revision, file_id, created, created_instant, change, changed_instant, written, type, declared, folder, fields, links, part) SELECT ?, ${CONFIRMED}, path, 1, 1, queried, content, binary, revision, file_id, created, created_instant, change, changed_instant, written, type, declared, folder, fields, links, part FROM replica_entries WHERE key = ? AND layer = ${CONFIRMED} AND present = 1 AND part IN (SELECT value FROM json_each(?)) ORDER BY path`, [key, request.published, named]);
+        connection.run(`INSERT OR REPLACE INTO replica_folders (key, layer, path, present, part) SELECT ?, ${CONFIRMED}, path, 1, part FROM replica_folders WHERE key = ? AND layer = ${CONFIRMED} AND present = 1 AND part IN (SELECT value FROM json_each(?))`, [key, request.published, named]);
+    }
+    return { key, transfer: held?.transfer ?? request.transfer, staged: [...kept, ...copied] };
+}
 export function refreshing(connection, request) {
     const held = connection.rows('SELECT 1 FROM replica_keys k WHERE k.key = ? AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)', [request.key]);
     if (held.length === 0)
@@ -169,12 +232,13 @@ export function refreshing(connection, request) {
         putEntry(connection, request.key, REFRESHED, {
             path,
             content: null,
-            outline: null,
             binary: null,
             revision: null,
             fileId: null,
+            created: null,
             change: null,
             written: null,
+            facts: null,
         }, false, composition);
     }
     for (const [list, present] of [
@@ -231,15 +295,18 @@ function counted(connection, key, roots) {
     const [row] = connection.rows(`SELECT count(*) AS held FROM replica_entries WHERE key = ? AND visible = 1 AND present = 1 AND (binary IS NOT NULL OR substr(path, -3) = '.md') AND NOT ${beneathRoots('replica_entries.path')}`, [key, JSON.stringify(roots)]);
     return number(row.held);
 }
-export function counts(connection, rooms) {
-    return rooms.map(({ key, roots }) => counted(connection, key, roots));
-}
 function erasing(connection, key, locator) {
     connection.run('INSERT OR REPLACE INTO replica_erasing (key, locator) VALUES (?, ?)', [
         key,
         locator,
     ]);
 }
+function saved(connection, key, entry, at) {
+    if (!entry.present || entry.created !== null)
+        return entry;
+    const [held] = connection.rows(`SELECT created FROM replica_entries WHERE key = ? AND layer = ${OVERLAY} AND path = ? AND present = 1`, [key, entry.path]);
+    return { ...entry, created: text(held?.created) ?? at };
+}
 function commitRoom(connection, room) {
     const touched = new Set();
     recomposed(connection, room.key, room.composed.fingerprint);
@@ -261,8 +328,9 @@ function commitRoom(connection, room) {
         removeEntry(connection, room.key, CONFIRMED, path);
         touched.add(path);
     }
+    const savedAt = new Date().toISOString();
     for (const entry of room.overlay?.set ?? []) {
-        putEntry(connection, room.key, OVERLAY, entry, entry.present, composition);
+        putEntry(connection, room.key, OVERLAY, saved(connection, room.key, entry, savedAt), entry.present, composition);
         touched.add(entry.path);
     }
     for (const path of room.overlay?.cleared ?? []) {
@@ -272,27 +340,44 @@ function commitRoom(connection, room) {
     const changed = [...touched];
     revealed(connection, room.key, changed);
     if (room.record !== undefined) {
-        connection.run('INSERT OR REPLACE INTO replica_rooms (locator, key, record) VALUES (?, ?, ?)', [
-            room.locator,
-            room.key,
-            room.record,
-        ]);
+        connection.run(KEEP_MODEL, [room.record, room.record, room.record, room.record]);
+        connection.run(`INSERT OR REPLACE INTO replica_rooms (locator, key, record) VALUES (?, ?, ${MODEL_LEFT})`, [room.locator, room.key, room.record, room.record, room.record]);
     }
     return room.published === undefined ? changed : null;
 }
+const SCHEMA = '$.model.snapshot.schema';
+const KEEP_MODEL = `INSERT OR IGNORE INTO replica_models (identity, version, schema)
+  SELECT json_extract(?, '$.model.snapshot.identity'), json_extract(?, '$.model.snapshot.version'),
+    json_extract(?, '${SCHEMA}')
+  WHERE json_type(?, '${SCHEMA}') = 'text'`;
+const MODEL_LEFT = `CASE WHEN json_type(?, '${SCHEMA}') = 'text' THEN json_set(?, '${SCHEMA}', json('null')) ELSE ? END`;
+const UNHELD_MODELS = `DELETE FROM replica_models WHERE NOT EXISTS (
+  SELECT 1 FROM replica_rooms r
+  WHERE json_extract(r.record, '$.model.snapshot.identity') = replica_models.identity
+    AND json_extract(r.record, '$.model.snapshot.version') = replica_models.version
+)`;
+const HELD_RECORDS = `SELECT r.locator, r.key, CASE WHEN m.schema IS NULL THEN r.record
+    ELSE json_set(r.record, '${SCHEMA}', m.schema) END AS record
+  FROM replica_rooms r
+  LEFT JOIN replica_models m
+    ON m.identity = json_extract(r.record, '$.model.snapshot.identity')
+   AND m.version = json_extract(r.record, '$.model.snapshot.version')`;
 export function commit(connection, rooms) {
-    const counted = {};
     const changed = {};
     const indexed = {};
     for (const room of rooms) {
         changed[room.locator] = commitRoom(connection, room);
-        counted[room.locator] = counts(connection, [
-            { key: room.key, roots: room.roots ?? rootsOf(connection, room.locator) },
-        ])[0];
+        connection.run('UPDATE replica_rooms SET documents = ? WHERE locator = ? AND key = ?', [
+            counted(connection, room.key, room.roots ?? rootsOf(connection, room.locator)),
+            room.locator,
+            room.key,
+        ]);
         const [held] = connection.rows('SELECT rederiving FROM replica_keys WHERE key = ?', [room.key]);
         indexed[room.locator] = held !== undefined && held.rederiving === null;
     }
-    return { counts: counted, changed, indexed };
+    if (rooms.some((room) => room.record !== undefined))
+        connection.run(UNHELD_MODELS);
+    return { changed, indexed };
 }
 function rootsOf(connection, locator) {
     const [row] = connection.rows('SELECT record FROM replica_rooms WHERE locator = ?', [locator]);
@@ -305,8 +390,8 @@ export function fenceRooms(connection, locators) {
             erasing(connection, number(row.key), locator);
         }
         connection.run('DELETE FROM replica_rooms WHERE locator = ?', [locator]);
-        connection.run('DELETE FROM replica_opened WHERE locator = ?', [locator]);
     }
+    connection.run(UNHELD_MODELS);
     return null;
 }
 export function abandon(connection, locator) {
@@ -359,17 +444,20 @@ export function rederive(connection, key, composed, bytes, ms, floor) {
     let built = 0;
     let read = false;
     reading: for (;;) {
-        const rows = connection.rows('SELECT id, path, content, outline FROM replica_entries WHERE key = ? AND present = 1 AND id > ? ORDER BY id LIMIT ?', [key, last, DERIVED_ROWS]);
+        const rows = connection.rows('SELECT id, path, type, fields, links, octet_length(content) AS size FROM replica_entries WHERE key = ? AND present = 1 AND id > ? ORDER BY id LIMIT ?', [key, last, DERIVED_ROWS]);
         for (const row of rows) {
             const id = number(row.id);
             const path = text(row.path);
-            const content = text(row.content);
-            const made = derived(path, content, json(row.outline), composition);
+            const size = row.size === null ? 0 : number(row.size);
             dropDerived(connection, id);
-            writeDerived(connection, id, key, made);
-            built += content?.length ?? 0;
+            writeDerived(connection, id, key, path, {
+                type: text(row.type),
+                fields: json(row.fields),
+                links: json(row.links) ?? [],
+            }, composition);
+            built += size;
             last = id;
-            spent += ENTRY_WEIGHT + (content?.length ?? 0);
+            spent += ENTRY_WEIGHT + size;
             if (spent >= bytes || (spent >= floor && performance.now() - started >= ms))
                 break reading;
         }
@@ -381,63 +469,31 @@ export function rederive(connection, key, composed, bytes, ms, floor) {
     connection.run('UPDATE replica_keys SET rederiving = ? WHERE key = ?', [read ? null : last, key]);
     return { done: read, text: built };
 }
-function outlinedAgain(connection, row, key, content, composition) {
-    const id = number(row.id);
-    const path = text(row.path);
-    const made = derived(path, content, json(row.outline), composition);
-    connection.run('UPDATE replica_entries SET content = ?, type = ?, declared = ?, queried = ?, folder = ?, fields = ? WHERE id = ?', [content, made.type, made.declared, flag(made.queried), made.folder, made.fields, id]);
-    dropDerived(connection, id);
-    writeDerived(connection, id, key, made);
-}
-export function holdTexts(connection, request) {
-    const held = [];
-    for (const { path, revision, content } of request.texts) {
-        const [row] = connection.rows(`SELECT id, path, outline FROM replica_entries WHERE key = ? AND layer = ${CONFIRMED} AND path = ? AND revision = ? AND content IS NULL AND outline IS NOT NULL`, [request.key, path, revision]);
-        if (row === undefined)
-            continue;
-        outlinedAgain(connection, row, request.key, content, request.composed.composition);
-        connection.run('INSERT OR IGNORE INTO replica_opened (locator, path) VALUES (?, ?)', [
-            request.locator,
-            path,
-        ]);
-        held.push(path);
-    }
-    return held;
-}
-export function unholdTexts(connection, request) {
-    connection.run('DELETE FROM replica_opened WHERE locator = ?', [request.locator]);
-    const rows = connection.rows(`SELECT id, path, outline, octet_length(content) AS bytes FROM replica_entries WHERE key = ? AND layer = ${CONFIRMED} AND visible = 1 AND content IS NOT NULL AND outline IS NOT NULL`, [request.key]);
-    for (const row of rows) {
-        outlinedAgain(connection, row, request.key, null, request.composed.composition);
-    }
-    return {
-        paths: rows.map((row) => text(row.path)),
-        bytes: rows.reduce((total, row) => total + number(row.bytes), 0),
-    };
-}
-export function remembered(connection, request) {
-    connection.run(`INSERT OR IGNORE INTO replica_opened (locator, path) SELECT ?, path FROM replica_entries WHERE key = ? AND layer = ${CONFIRMED} AND content IS NOT NULL AND binary IS NULL AND path IN (SELECT value FROM json_each(?))`, [request.locator, request.key, paths(request.paths)]);
-    return null;
-}
-export function wanted(connection, request) {
-    return connection
-        .rows(`SELECT e.path, e.revision FROM replica_opened o JOIN replica_entries e ON e.key = ? AND e.layer = ${CONFIRMED} AND e.path = o.path WHERE o.locator = ? AND e.content IS NULL AND e.outline IS NOT NULL AND e.revision IS NOT NULL`, [request.key, request.locator])
-        .map((row) => ({ path: text(row.path), revision: text(row.revision) }));
-}
 function heldEntry(row) {
     return {
         path: text(row.path),
         content: text(row.content),
-        outline: json(row.outline),
         binary: json(row.binary),
         revision: text(row.revision),
         fileId: text(row.file_id),
+        created: text(row.created),
         change: json(row.change),
         written: text(row.written),
         type: text(row.type),
+        facts: factsHeld(row),
     };
 }
-const ENTRY_COLUMNS = 'e.path, e.content, e.outline, e.binary, e.revision, e.file_id, e.change, e.written, e.type';
+function factsHeld(row) {
+    const type = text(row.declared);
+    if (type === null)
+        return null;
+    return {
+        type,
+        fields: json(row.fields) ?? {},
+        links: json(row.links) ?? [],
+    };
+}
+const ENTRY_COLUMNS = 'e.path, e.content, e.binary, e.revision, e.file_id, e.created, e.change, e.written, e.type, e.declared, e.fields, e.links';
 function unrefreshed(alias) {
     return `NOT EXISTS (SELECT 1 FROM replica_entries r WHERE r.key = ${alias}.key AND r.layer = ${REFRESHED} AND r.path = ${alias}.path)`;
 }
@@ -448,22 +504,6 @@ function viewed(view, alias) {
         return `${alias}.layer = ${CONFIRMED}`;
     return `${alias}.present = 1 AND (${alias}.layer = ${REFRESHED} OR (${alias}.layer = ${CONFIRMED} AND ${unrefreshed(alias)}))`;
 }
-function layers(view) {
-    if (view !== 'refreshed')
-        return [viewed(view, 'e')];
-    return [
-        `e.layer = ${REFRESHED} AND e.present = 1`,
-        `e.layer = ${CONFIRMED} AND e.present = 1 AND ${unrefreshed('e')}`,
-    ];
-}
-function pathOrdered(connection, columns, key, view, condition, after, limit) {
-    const beyond = after === null ? '' : ' AND e.path > ?';
-    const parts = layers(view).map((layer) => `SELECT ${columns} FROM replica_entries e WHERE e.key = ? AND ${layer}${condition}${beyond}`);
-    return connection.rows(`${parts.join(' UNION ALL ')} ORDER BY path LIMIT ?`, [
-        ...parts.flatMap(() => (after === null ? [key] : [key, after])),
-        limit,
-    ]);
-}
 export function entries(connection, key, view, list) {
     if (list.length === 0)
         return [];
@@ -482,19 +522,12 @@ export function typed(connection, key, view, list) {
         binary: number(row.binary) === 1,
     }));
 }
-export function referrers(connection, key, view, targets, kinds) {
+export function referrers(connection, key, view, targets) {
     if (targets.length === 0)
         return [];
     return connection
-        .rows(`SELECT DISTINCT e.path, l.target, l.kind FROM replica_links l JOIN replica_entries e ON e.id = l.doc WHERE l.key = ? AND l.target IN (SELECT value FROM json_each(?)) AND l.kind IN (SELECT value FROM json_each(?)) AND ${viewed(view, 'e')}`, [key, paths(targets), JSON.stringify(kinds)])
-        .map((row) => ({
-        path: text(row.path),
-        target: text(row.target),
-        kind: text(row.kind),
-    }));
-}
-export function files(connection, key, view, after, limit) {
-    return pathOrdered(connection, 'e.path, e.revision', key, view, ' AND e.content IS NOT NULL AND e.revision IS NOT NULL', after, limit).map((row) => ({ path: text(row.path), revision: text(row.revision) }));
+        .rows(`SELECT DISTINCT e.path, l.target FROM replica_links l JOIN replica_entries e ON e.id = l.doc WHERE l.key = ? AND l.target IN (SELECT value FROM json_each(?)) AND ${viewed(view, 'e')}`, [key, paths(targets)])
+        .map((row) => ({ path: text(row.path), target: text(row.target) }));
 }
 export function folders(connection, key, view, list) {
     return list.filter((path) => connection.rows(`SELECT 1 FROM replica_folders f WHERE f.key = ? AND f.layer = ${CONFIRMED} AND f.present = 1 AND f.path = ? UNION ALL SELECT 1 FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.path >= ? AND e.path < ? LIMIT 1`, [key, path, key, `${path}/`, `${path}0`]).length > 0);
@@ -502,44 +535,99 @@ export function folders(connection, key, view, list) {
 export function typedWithin(connection, key, view, roots, within) {
     return (connection.rows(`SELECT 1 FROM replica_entries e WHERE e.key = ? AND ${viewed(view, 'e')} AND e.declared IS NOT NULL AND e.declared <> 'any' AND ${within ? '' : 'NOT '}${beneathRoots('e.path')} LIMIT 1`, [key, JSON.stringify(roots)]).length > 0);
 }
+const ORPHANS = `SELECT k.key FROM replica_keys k
+  WHERE NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
+    AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)
+    AND (${UNPARTED} OR NOT EXISTS (
+      SELECT 1 FROM replica_entries e WHERE e.key = k.key
+      UNION ALL SELECT 1 FROM replica_folders f WHERE f.key = k.key
+    ))`;
+const STAGED = `SELECT DISTINCT k.locator FROM replica_keys k
+  WHERE NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
+    AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)
+    AND k.key NOT IN (${ORPHANS})`;
 export function opened(connection) {
-    const facts = {};
-    for (const row of connection.rows('SELECT name, value FROM replica_facts')) {
-        facts[text(row.name)] = text(row.value);
-    }
     return {
-        rooms: connection.rows('SELECT locator, key, record FROM replica_rooms').map((row) => ({
-            locator: text(row.locator),
-            key: number(row.key),
-            record: text(row.record),
-        })),
-        keys: connection
-            .rows('SELECT key, locator, transfer, rederiving FROM replica_keys')
-            .map((row) => ({
-            key: number(row.key),
-            locator: text(row.locator),
-            transfer: text(row.transfer),
-            rederiving: cursor(row.rederiving),
-        })),
-        facts,
-        presentation: connection.rows('SELECT app, value FROM replica_presentation').map((row) => ({
-            app: text(row.app),
-            value: text(row.value),
-        })),
-        overlaid: connection
-            .rows(`SELECT key, path FROM replica_entries WHERE layer = ${OVERLAY}`)
-            .map((row) => ({ key: number(row.key), path: text(row.path) })),
-        orphans: connection
-            .rows(`SELECT k.key FROM replica_keys k
-         WHERE NOT EXISTS (SELECT 1 FROM replica_rooms r WHERE r.key = k.key)
-           AND NOT EXISTS (SELECT 1 FROM replica_erasing e WHERE e.key = k.key)`)
-            .map((row) => number(row.key)),
-        erasing: connection.rows('SELECT key, locator FROM replica_erasing').map((row) => ({
-            key: number(row.key),
-            locator: text(row.locator),
-        })),
+        orphans: connection.rows(ORPHANS).map((row) => number(row.key)),
+        erasing: connection.rows('SELECT 1 FROM replica_erasing LIMIT 1').length > 0,
+    };
+}
+const ROOM_ROWS = `SELECT h.locator, h.key, h.record, r.documents, k.rederiving IS NULL AS indexed
+  FROM (${HELD_RECORDS}) h
+  JOIN replica_rooms r ON r.locator = h.locator
+  LEFT JOIN replica_keys k ON k.key = h.key`;
+function roomRow(row) {
+    return {
+        locator: text(row.locator),
+        key: number(row.key),
+        record: text(row.record),
+        indexed: number(row.indexed) === 1,
+        documents: number(row.documents),
     };
 }
+export function heldRooms(connection, locators) {
+    return (locators === null
+        ? connection.rows(`${ROOM_ROWS} ORDER BY h.locator`)
+        : connection.rows(`${ROOM_ROWS} WHERE h.locator IN (SELECT value FROM json_each(?)) ORDER BY h.locator`, [JSON.stringify(locators)])).map(roomRow);
+}
+export function heldRoom(connection, locator) {
+    return heldRooms(connection, [locator])[0] ?? null;
+}
+export function overlaid(connection, key) {
+    return connection
+        .rows(`SELECT path FROM replica_entries WHERE key = ? AND layer = ${OVERLAY}`, [key])
+        .map((row) => text(row.path));
+}
+export function covering(connection) {
+    return connection
+        .rows(`SELECT r.locator, r.key, r.documents, json_extract(r.record, '$.transfer') AS transfer,
+         json_extract(r.record, '$.roomVersion') AS room_version,
+         coalesce(json_extract(r.record, '$.inventory.bytes'), 0) AS bytes,
+         json_extract(r.record, '$.replica.offline') AS offline,
+         k.rederiving IS NULL AS indexed
+       FROM replica_rooms r LEFT JOIN replica_keys k ON k.key = r.key ORDER BY r.locator`)
+        .map((row) => ({
+        locator: text(row.locator),
+        key: number(row.key),
+        transfer: text(row.transfer),
+        roomVersion: text(row.room_version),
+        indexed: number(row.indexed) === 1,
+        documents: number(row.documents),
+        bytes: number(row.bytes),
+        offline: text(row.offline),
+    }));
+}
+export function offlineMode(connection, locator) {
+    const [held] = connection.rows("SELECT json_extract(record, '$.replica.offline') AS offline FROM replica_rooms WHERE locator = ?", [locator]);
+    return text(held?.offline);
+}
+export function stagedLocators(connection) {
+    return connection.rows(STAGED).map((row) => text(row.locator));
+}
+export function heldLocators(connection) {
+    return connection
+        .rows(`SELECT locator FROM replica_rooms
+       UNION SELECT locator FROM authored_room_drafts
+       UNION SELECT locator FROM authored_queues
+       UNION ${STAGED}`)
+        .map((row) => text(row.locator));
+}
+export function demoted(connection) {
+    connection.run(`UPDATE replica_rooms SET record = json_set(record, '$.model.status', 'cached')
+     WHERE json_extract(record, '$.model.status') = 'current'`);
+    return null;
+}
+export function facts(connection) {
+    const held = {};
+    for (const row of connection.rows('SELECT name, value FROM replica_facts')) {
+        held[text(row.name)] = text(row.value);
+    }
+    return held;
+}
+export function presentation(connection, app) {
+    const [held] = connection.rows('SELECT value FROM replica_presentation WHERE app = ?', [app]);
+    return text(held?.value);
+}
 export function ended(connection) {
     for (const statement of REPLICA_TABLES) {
         const table = /^CREATE TABLE (\w+)/u.exec(statement)?.[1];