@astrosheep/square 0.4.0 → 0.4.2

package/dist/square-sqlite.js

@@ -1,20 +1,20 @@
-import { DatabaseSync as MemoryDatabase } from 'node:sqlite';
 import { validateActivityMetadata, activityMetadataHasContent } from './model.js';
-import { catchCoverage, deriveLanding, landingFacts, extendLandingCatchCoverage } from './square-domain.js';
+import { deriveLanding, landingFacts } from './square-domain.js';
 import { formatActivityId } from './square-core.js';
 import { compileSearchPattern } from './search.js';
-import { createChannelSqlite, endpoint, endpointGeneration, messageAddress, deliveryEvidence, deliveryDeferral, receiveClaim } from './sqlite-channel.js';
+import { validateEndpointGeneration as endpointGeneration } from './message.js';
+import { createProducerDriver, producerSchemaSql, initializeProducerSqlite, resetProducerSqlite } from './square-producer-sqlite.js';
 import { readStorageRevision, initializeStorageMeta, STORAGE_META_SQL, validateSchema } from './sqlite-framing.js';
-import { encode, key, invalidArtifact, requireFact, integer, finite, string, json, object, shape, strings, decoded, immutable, stableJson, pageRows, pageLimit } from './sqlite-values.js';
+import { encode, key, invalidArtifact, requireFact, integer, finite, string, json, object, shape, strings, decoded, immutable, pageRows, pageLimit } from './sqlite-values.js';
 export { invalidArtifact } from './sqlite-values.js';
-export { endpointGeneration } from './sqlite-channel.js';
+export { validateEndpointGeneration as endpointGeneration } from './message.js';
 export const APPLICATION_ID = 0x53515245;
-export const CURRENT_USER_VERSION = 11;
+export const CURRENT_USER_VERSION = 12;
 export function emptyRuntimeState(nextActIndex = 0) {
     return { nextActIndex, observations: {}, leases: {} };
 }
 const ACTIVITY_KIND_CHECK = "kind IN ('join','done','say','read','listen','ignore','unlisten')";
-/** Agora owns only its allocator/configuration header and social tables; neutral storage owns the revision header. */
+/** Square owns activity, audience, participant, and read-state facts. */
 export const AGORA_SCHEMA_SQL = `CREATE TABLE square_meta (
   id INTEGER PRIMARY KEY CHECK (id = 1),
   next_act_index INTEGER NOT NULL CHECK (next_act_index BETWEEN 0 AND 9007199254740991),
@@ -31,9 +31,7 @@ CREATE TABLE activities (
   actor_key_json TEXT COLLATE BINARY NOT NULL,
   reach TEXT CHECK (reach = 'bell'),
   reply_index INTEGER CHECK (reply_index >= 0 AND reply_index < act_index),
-  message_index INTEGER CHECK (message_index IS NULL OR message_index BETWEEN 0 AND 9007199254740991),
   payload_json TEXT NOT NULL CHECK (json_valid(payload_json)),
-  CHECK ((kind = 'say') = (message_index IS NOT NULL)),
   CHECK (kind = 'say' OR (reach IS NULL AND reply_index IS NULL))
 );
 CREATE INDEX activity_kind_index ON activities(kind, act_index);
@@ -41,7 +39,6 @@ CREATE INDEX activity_actor_index ON activities(actor_key_json, act_index);
 CREATE INDEX activity_say_actor_index ON activities(actor_key_json, act_index) WHERE kind='say';
 CREATE INDEX activity_say_time ON activities(at, act_index) WHERE kind='say';
 CREATE INDEX activity_bell_actor_time ON activities(actor_key_json, at, act_index) WHERE kind='say' AND reach='bell';
-CREATE UNIQUE INDEX activity_message ON activities(message_index) WHERE message_index IS NOT NULL;
 CREATE TABLE participants (
   name_key_json TEXT COLLATE BINARY PRIMARY KEY NOT NULL,
   name_json TEXT NOT NULL,
@@ -67,31 +64,47 @@ CREATE TABLE landed_audience (
   recipient_key_json TEXT COLLATE BINARY NOT NULL,
   recipient_order INTEGER NOT NULL CHECK (recipient_order >= 0),
   reason TEXT NOT NULL CHECK (reason IN ('mention','reply','attention','bell')),
+  owner_json TEXT,
+  generation_json TEXT,
   PRIMARY KEY (act_index, recipient_key_json),
   UNIQUE (act_index, recipient_order)
 ) WITHOUT ROWID;
-CREATE INDEX audience_recipient ON landed_audience(recipient_key_json, act_index);`;
+CREATE INDEX audience_recipient ON landed_audience(recipient_key_json, act_index);
+CREATE TABLE participant_seats (
+  participant_key_json TEXT PRIMARY KEY NOT NULL, participant_json TEXT NOT NULL,
+  owner_json TEXT NOT NULL, generation_json TEXT NOT NULL,
+  wake_address_json TEXT, attachment TEXT NOT NULL CHECK (attachment IN ('attached','detached'))
+) WITHOUT ROWID;
+CREATE INDEX participant_seat_owner ON participant_seats(owner_json);
+CREATE TABLE caught_activity (
+  recipient_key_json TEXT NOT NULL, act_index INTEGER NOT NULL, at REAL NOT NULL,
+  PRIMARY KEY (recipient_key_json,act_index)
+) WITHOUT ROWID;
+CREATE TABLE catch_leases (
+  recipient_key_json TEXT PRIMARY KEY NOT NULL, generation_json TEXT NOT NULL,
+  lease_json TEXT NOT NULL CHECK (json_valid(lease_json))
+) WITHOUT ROWID;`;
 export function initializeAgoraSqlite(db, configuration = {}) {
     db.exec(AGORA_SCHEMA_SQL);
     db.prepare('INSERT INTO square_meta(id,next_act_index,hard_cap,throttle_per_minute,preamble_json,warmup_json) VALUES(1,0,?,?,?,?)')
         .run(configuration.hardCap ?? null, configuration.throttlePerMinute ?? null, JSON.stringify(configuration.preamble ?? []), JSON.stringify(configuration.warmup ?? []));
 }
 export function resetAgoraSqlite(db) {
-    for (const table of ['landed_audience', 'attention', 'participants', 'activities', 'square_meta'])
+    for (const table of ['catch_leases', 'caught_activity', 'participant_seats', 'landed_audience', 'attention', 'participants', 'activities', 'square_meta'])
         db.exec(`DROP TABLE ${table}`);
 }
-function validateSquareFraming(db, lower, location = '') {
+function validateSquareFraming(db, location = '') {
     const identity = db.prepare('SELECT application_id, user_version FROM pragma_application_id, pragma_user_version').get();
     requireFact(identity.application_id === APPLICATION_ID, 'unrelated SQLite database.');
-    requireFact(identity.user_version === CURRENT_USER_VERSION, 'unsupported SQLite format version; this build opens only fresh format-11 squares.');
-    validateSchema(db, [STORAGE_META_SQL, lower.schemaSql, AGORA_SCHEMA_SQL].join('\n'), location);
+    requireFact(identity.user_version === CURRENT_USER_VERSION, 'unsupported SQLite format version; this build opens only fresh format-12 squares.');
+    validateSchema(db, [STORAGE_META_SQL, producerSchemaSql, AGORA_SCHEMA_SQL].join('\n'), location);
 }
-/** Explicit full-Square framing and reset, composed from the neutral store and the supplied Channel schema. */
-export function squareStoreFormat(lower, resetStorage) {
+/** Full Square framing and reset, including producer state. */
+export function squareStoreFormat(resetStorage) {
     return {
         applicationId: APPLICATION_ID, userVersion: CURRENT_USER_VERSION, observerKey: 'square',
-        validate: (db, location) => validateSquareFraming(db, lower, location),
-        reset(db) { lower.reset(db); resetAgoraSqlite(db); resetStorage(db); },
+        validate: (db, location) => validateSquareFraming(db, location),
+        reset(db) { resetProducerSqlite(db); resetAgoraSqlite(db); resetStorage(db); },
     };
 }
 const kinds = ['join', 'done', 'say', 'read', 'listen', 'ignore', 'unlisten'];
@@ -103,14 +116,11 @@ function head(row) {
     requireFact(row.reach === null || row.kind === 'say' && row.reach === 'bell');
     if (row.reply_index !== null)
         requireFact(row.kind === 'say' && integer(row.reply_index) < index);
-    const messageIndex = row.message_index === null || row.message_index === undefined ? undefined : integer(row.message_index);
-    requireFact((row.kind === 'say') === (messageIndex !== undefined));
     return immutable({
         index, at, kind: row.kind, actor, ...(row.reach === null ? {} : { reach: 'bell' }), ...(row.reply_index === null ? {} : { reply: row.reply_index }),
-        ...(messageIndex === undefined ? {} : { messageIndex }),
     });
 }
-/** A persisted upper activity. A say is a relation: it may not carry content and must name its message. */
+/** Validate the complete persisted activity. */
 export function validateStoredActivity(value) {
     const a = object(value);
     integer(a.index);
@@ -120,15 +130,24 @@ export function validateStoredActivity(value) {
     string(a.actor, true);
     switch (a.kind) {
         case 'say':
-            shape(a, [...common], ['mentions', 'reach', 'reply', 'messageIndex']);
-            requireFact(Object.hasOwn(a, 'messageIndex'), 'say is missing its message.');
+            shape(a, [...common], ['mentions', 'reach', 'reply', 'body', 'metadata']);
+            if (a.body !== undefined)
+                string(a.body);
+            if (a.metadata !== undefined) {
+                try {
+                    validateActivityMetadata(a.metadata);
+                }
+                catch {
+                    throw invalidArtifact('say metadata is malformed.');
+                }
+            }
+            requireFact((typeof a.body === 'string' && a.body.trim() !== '') || activityMetadataHasContent(a.metadata), 'say must contain a non-empty body or non-empty metadata.');
             if (Object.hasOwn(a, 'mentions'))
                 strings(a.mentions);
             if (Object.hasOwn(a, 'reach'))
                 requireFact(a.reach === 'bell');
             if (Object.hasOwn(a, 'reply'))
                 requireFact(integer(a.reply) < a.index);
-            integer(a.messageIndex);
             break;
         case 'done':
             shape(a, common, ['body']);
@@ -149,44 +168,24 @@ export function validateStoredActivity(value) {
     }
     return value;
 }
-/** The explicit upper projection of a stored say onto its authoritative message content. */
+/** Validate complete activity content. */
 export function validateHydratedActivity(value) {
     const a = object(value);
     if (a.kind !== 'say')
         return validateStoredActivity(a);
-    const { body, metadata, ...relation } = a;
-    const stored = validateStoredActivity(relation);
-    if (body !== undefined)
-        string(body);
-    if (metadata !== undefined) {
-        try {
-            validateActivityMetadata(metadata);
-        }
-        catch {
-            throw invalidArtifact('say metadata is malformed.');
-        }
-    }
-    requireFact((typeof body === 'string' && body.trim() !== '') || activityMetadataHasContent(metadata), 'say must contain a non-empty body or non-empty metadata.');
-    return { ...stored, ...(body === undefined ? {} : { body: body }), ...(metadata === undefined ? {} : { metadata: metadata }) };
+    return validateStoredActivity(a);
 }
-/** Stored Agora relation only: say content lives in its linked Channel message. */
+/** Decode an activity with its complete payload. */
 function activity(row) {
     const h = head(row), payload = object(json(row.payload_json));
-    // Payload cannot shadow indexed structural columns or message-owned content.
-    const allowed = h.kind === 'say' ? ['mentions'] : h.kind === 'done' ? ['body'] : h.kind === 'read' ? ['through'] : h.kind === 'listen' || h.kind === 'ignore' || h.kind === 'unlisten' ? ['target'] : [];
+    // Payload cannot shadow indexed structural columns.
+    const allowed = h.kind === 'say' ? ['mentions', 'body', 'metadata'] : h.kind === 'done' ? ['body'] : h.kind === 'read' ? ['through'] : h.kind === 'listen' || h.kind === 'ignore' || h.kind === 'unlisten' ? ['target'] : [];
     requireFact(Object.keys(payload).every(k => allowed.includes(k)));
     return immutable(validateStoredActivity({ ...h, ...payload }));
 }
-/** Explicit upper projection: the stored say plus its authoritative Channel content. */
+/** Activity and content are one stored fact. */
 function activityWithContent(row) {
-    const stored = activity(row);
-    if (stored.kind !== 'say')
-        return stored;
-    requireFact(row.body_json !== null && row.body_json !== undefined, 'say message is missing.');
-    const metadata = row.metadata_json === null || row.metadata_json === undefined ? undefined : json(row.metadata_json);
-    const body = decoded(row.body_json);
-    return immutable(validateHydratedActivity({ ...stored,
-        ...(body === '' ? {} : { body }), ...(metadata === undefined ? {} : { metadata }) }));
+    return activity(row);
 }
 function participant(row) {
     const name = decoded(row.name_json, true);
@@ -254,8 +253,7 @@ function activitySelection(filter, alias = 'a') {
         terms.push(`NOT EXISTS (
             SELECT 1 FROM json_each(?) field WHERE NOT EXISTS (
                 WITH RECURSIVE walk(value,type,depth) AS (
-                    SELECT CASE WHEN ${alias}.kind='say' THEN json_extract(m.metadata_json,'$') ELSE json_extract(${alias}.payload_json,'$.metadata') END,
-                      CASE WHEN ${alias}.kind='say' THEN json_type(m.metadata_json,'$') ELSE json_type(${alias}.payload_json,'$.metadata') END,0
+                    SELECT json_extract(${alias}.payload_json,'$.metadata'), json_type(${alias}.payload_json,'$.metadata'),0
                     UNION ALL
                     SELECT child.value,child.type,walk.depth+1
                     FROM walk JOIN json_each(CASE WHEN walk.type='object' THEN walk.value ELSE '{}' END) child
@@ -271,12 +269,12 @@ function activitySelection(filter, alias = 'a') {
         args.push(encode(filter.metadataMatch.fields));
     }
     if (filter.search !== undefined) {
-        terms.push(`square_search(?,?,'act/'||${alias}.act_index,${alias}.actor_json,CASE WHEN ${alias}.kind='say' THEN json_extract(m.body_json,'$') ELSE json_extract(${alias}.payload_json,'$.body') END)=1`);
+        terms.push(`square_search(?,?,'act/'||${alias}.act_index,${alias}.actor_json,json_extract(${alias}.payload_json,'$.body'))=1`);
         args.push(filter.search.mode, filter.search.text);
     }
     return { sql: terms.length ? terms.join(' AND ') : '1', args };
 }
-export function createSqliteDriver(db, channelDriver = createChannelSqlite(db)) {
+export function createSqliteDriver(db) {
     let changed = false;
     const all = (sql, args = []) => db.prepare(sql).all(...args);
     const one = (sql, args = []) => db.prepare(sql).get(...args);
@@ -304,41 +302,34 @@ export function createSqliteDriver(db, channelDriver = createChannelSqlite(db))
         return activitySelection(filter);
     }
     const read = {};
-    const channel = channelDriver, channelRead = channel, channelWrite = channel;
-    const currentEndpoint = (name) => channel.endpoint(name);
-    const owner = (requested) => read.participant(requested)?.name ?? requested;
+    const producer = createProducerDriver(db);
+    const currentEndpoint = (name) => {
+        const row = one('SELECT * FROM participant_seats WHERE participant_key_json=?', [key(name)]);
+        if (!row)
+            return undefined;
+        return immutable({ participant: decoded(row.participant_json, true), owner: decoded(row.owner_json, true), generation: endpointGeneration(decoded(row.generation_json, true)), attachment: row.attachment, ...(row.wake_address_json === null ? {} : { wakeAddress: json(row.wake_address_json) }) });
+    };
     function directedSelection(recipient, filter) {
         const participant = read.participant(recipient), base = selectActivity({ ...filter, actors: filter.senders });
         base.sql += ' AND d.recipient_key_json=?';
         base.args.push(participant ? key(participant.name) : '');
         if (filter.currentGeneration) {
-            base.sql += ' AND (ma.generation_json IS NULL OR ma.generation_json=?)';
+            base.sql += ' AND (d.generation_json IS NULL OR d.generation_json=?)';
             base.args.push(participant ? encode(currentEndpoint(participant.name)?.generation ?? '') : '');
         }
         if (filter.unseenOnly) {
-            base.sql += ' AND NOT EXISTS (SELECT 1 FROM receipts r WHERE r.owner_key_json=? AND r.msg_index=a.message_index)';
-            base.args.push(encode(participant?.name ?? recipient));
+            base.sql += ' AND NOT EXISTS (SELECT 1 FROM caught_activity r WHERE r.recipient_key_json=? AND r.act_index=a.act_index)';
+            base.args.push(key(participant?.name ?? recipient));
         }
         if (filter.attentionOnly)
             base.sql += " AND d.reason IN ('mention','reply','bell')";
         return { base, participant };
     }
     // ----- Upper Agora read capabilities -----
-    const lower = channelRead;
     const readMethods = {
-        seat(name) { const endpointFact = currentEndpoint(name); return endpointFact === undefined ? undefined : endpointFact; },
-        seatsForOwner: (requested) => lower.endpointsForOwner(requested),
-        deliveryEvidence: (participant, generation, activity) => lower.deliveryEvidence(participant, generation, activity),
-        deliveryByToken: (token) => lower.deliveryByToken(token),
-        cancelledThrough(participant, generation) {
-            const boundary = lower.cancelledThrough(participant, generation);
-            if (boundary === undefined)
-                return undefined;
-            if (boundary < 0)
-                return -1;
-            const row = one('SELECT MAX(act_index) AS act_index FROM activities WHERE message_index IS NOT NULL AND message_index<=?', [boundary]);
-            return row?.act_index === null || row?.act_index === undefined ? -1 : integer(row.act_index);
-        },
+        pendingPosts: producer.pendingPosts, postedPosts: producer.postedPosts, ownsPost: producer.ownsPost,
+        seat: currentEndpoint,
+        seatsForOwner: requested => immutable(all('SELECT participant_json FROM participant_seats WHERE owner_json=?', [encode(requested)]).map(row => currentEndpoint(decoded(row.participant_json, true)))),
         header() { return readSquareHeader(db); },
         participant(name) { const r = one('SELECT * FROM participants WHERE name_key_json=?', [key(name)]); return r ? participant(r) : undefined; },
         participantCounts() {
@@ -352,19 +343,15 @@ export function createSqliteDriver(db, channelDriver = createChannelSqlite(db))
             const r = one('SELECT * FROM activities WHERE act_index=?', [integer(index)]);
             return r ? activity(r) : undefined;
         },
-        activityByMessage(index) {
-            const r = one("SELECT * FROM activities WHERE message_index=? AND kind='say'", [integer(index)]);
-            return r ? activity(r) : undefined;
-        },
         activityHeads(filter, page) {
             const s = selectActivity(filter), limit = pageLimit(page);
-            return pageRows(all(`SELECT a.*,m.body_json,m.metadata_json FROM activities a LEFT JOIN messages m ON m.msg_index=a.message_index WHERE ${s.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...s.args, limit]), page, head);
+            return pageRows(all(`SELECT a.* FROM activities a WHERE ${s.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...s.args, limit]), page, head);
         },
         activities(indexes) {
             indexes.forEach(v => integer(v));
-            return immutable(all('SELECT a.*,m.body_json,m.metadata_json FROM activities a LEFT JOIN messages m ON m.msg_index=a.message_index WHERE a.act_index IN (SELECT value FROM json_each(?)) ORDER BY a.act_index', [encode(indexes)]).map(activityWithContent));
+            return immutable(all('SELECT a.* FROM activities a WHERE a.act_index IN (SELECT value FROM json_each(?)) ORDER BY a.act_index', [encode(indexes)]).map(activityWithContent));
         },
-        activityCount(filter) { const s = selectActivity(filter); return integer(one(`SELECT COUNT(*) AS n FROM activities a LEFT JOIN messages m ON m.msg_index=a.message_index WHERE ${s.sql}`, s.args).n); },
+        activityCount(filter) { const s = selectActivity(filter); return integer(one(`SELECT COUNT(*) AS n FROM activities a WHERE ${s.sql}`, s.args).n); },
         contextIndexes(centers, before, after) {
             integer(before);
             integer(after);
@@ -406,62 +393,66 @@ export function createSqliteDriver(db, channelDriver = createChannelSqlite(db))
             args.push(integer(take));
             return immutable(all(`SELECT at FROM activities WHERE ${where} ORDER BY at DESC,act_index DESC LIMIT ?`, args).map(r => finite(r.at)).reverse());
         },
-        audience(index) { return immutable(all('SELECT p.name_json,d.reason,ma.generation_json FROM landed_audience d JOIN participants p ON p.name_key_json=d.recipient_key_json JOIN activities a ON a.act_index=d.act_index JOIN message_addresses ma ON ma.msg_index=a.message_index AND ma.recipient_key_json=d.recipient_key_json WHERE d.act_index=? ORDER BY d.recipient_order', [integer(index)]).map(r => ({ recipient: decoded(r.name_json, true), route: routeKind(r.reason), ...(r.generation_json === null ? {} : { generation: endpointGeneration(decoded(r.generation_json, true)) }) }))); },
+        audience(index) { return immutable(all('SELECT p.name_json,d.reason,d.generation_json,d.owner_json FROM landed_audience d JOIN participants p ON p.name_key_json=d.recipient_key_json WHERE d.act_index=? ORDER BY d.recipient_order', [integer(index)]).map(r => ({ recipient: decoded(r.name_json, true), route: routeKind(r.reason), ...(r.generation_json === null ? {} : { generation: endpointGeneration(decoded(r.generation_json, true)) }), ...(r.owner_json === null ? {} : { owner: decoded(r.owner_json, true) }) }))); },
         directed(recipient, filter, page) {
             const { base, participant: p } = directedSelection(recipient, filter), limit = pageLimit(page);
-            const rows = all(`SELECT a.*,m.body_json,m.metadata_json,d.reason,ma.generation_json FROM activities a JOIN messages m ON m.msg_index=a.message_index JOIN landed_audience d ON d.act_index=a.act_index JOIN message_addresses ma ON ma.msg_index=a.message_index AND ma.recipient_key_json=d.recipient_key_json WHERE ${base.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...base.args, limit]);
+            const rows = all(`SELECT a.*,d.reason,d.generation_json FROM activities a JOIN landed_audience d ON d.act_index=a.act_index WHERE ${base.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...base.args, limit]);
             return pageRows(rows, page, r => {
                 const h = head(r);
                 return { index: h.index, at: h.at, actor: h.actor, recipient: p?.name ?? recipient,
-                    route: routeKind(r.reason), messageIndex: h.messageIndex,
+                    route: routeKind(r.reason),
                     ...(r.generation_json === null ? {} : { generation: endpointGeneration(decoded(r.generation_json, true)) }) };
             });
         },
         directedAt(recipient, index) { return read.directed(recipient, { afterIndex: integer(index) - 1, throughIndex: index }, { edge: 'oldest', limit: 1 }).items[0]; },
         directedCount(recipient, filter) {
             const { base } = directedSelection(recipient, filter);
-            return integer(one(`SELECT COUNT(*) AS n FROM activities a LEFT JOIN messages m ON m.msg_index=a.message_index JOIN landed_audience d ON d.act_index=a.act_index JOIN message_addresses ma ON ma.msg_index=a.message_index AND ma.recipient_key_json=d.recipient_key_json WHERE ${base.sql}`, base.args).n);
+            return integer(one(`SELECT COUNT(*) AS n FROM activities a JOIN landed_audience d ON d.act_index=a.act_index WHERE ${base.sql}`, base.args).n);
         },
         receipt(name, index) {
-            const r = one('SELECT r.at FROM receipts r JOIN activities a ON a.message_index=r.msg_index WHERE r.owner_key_json=? AND a.act_index=?', [encode(owner(name)), integer(index)]);
+            const r = one('SELECT at FROM caught_activity WHERE recipient_key_json=? AND act_index=?', [key(name), integer(index)]);
             return r ? immutable({ at: finite(r.at) }) : undefined;
         },
         receiptFacts(name, afterIndex) {
-            const k = encode(owner(name));
-            const r = one('SELECT MAX(at) AS latest FROM receipts WHERE owner_key_json=?', [k]);
-            const e = one('SELECT MAX(a.act_index) AS latest FROM receipts r JOIN activities a ON a.message_index=r.msg_index WHERE r.owner_key_json=? AND a.act_index>?', [k, integer(afterIndex, -1)]);
+            const k = key(name);
+            const r = one('SELECT MAX(at) AS latest FROM caught_activity WHERE recipient_key_json=?', [k]);
+            const e = one('SELECT MAX(act_index) AS latest FROM caught_activity WHERE recipient_key_json=? AND act_index>?', [k, integer(afterIndex, -1)]);
             return immutable({ ...(r.latest === null ? {} : { latestAt: finite(r.latest) }), ...(e.latest === null ? {} : { latestActorActivityIndex: integer(e.latest) }) });
         },
         lease(name) {
-            const lease = lower.claimLease(name, 'agora');
-            if (lease === undefined)
-                return undefined;
-            const selector = object(lease.selector);
-            const parsed = { leaseId: lease.id, heartbeatAt: lease.heartbeatAt, expiresAt: lease.expiresAt };
-            if (selector.filter !== undefined)
-                parsed.filter = selector.filter;
-            return immutable(validateWatchLease(parsed));
+            const row = one('SELECT lease_json FROM catch_leases WHERE recipient_key_json=?', [key(name)]);
+            return row ? immutable(validateWatchLease(json(row.lease_json))) : undefined;
         },
-        deliveryDeferrals: (participant, generation) => lower.deliveryDeferrals(participant, generation),
     };
-    Object.assign(read, readMethods, { channel: channelRead });
+    Object.assign(read, readMethods);
     // ----- Upper Agora writes / landing -----
     const writes = {
-        channel: channelWrite,
-        storeSeat(value) { return channelWrite.storeEndpoint(value); },
-        updateWakeAddress(value, wakeAddress) { return channelWrite.updateWakeAddress(value, wakeAddress); },
-        reattachSeat(value, address) { return channelWrite.reattachEndpoint(value, address); },
-        detachSeat(value) { return channelWrite.detachEndpoint(value); },
-        removeSeat(value) { return channelWrite.removeEndpoint(value); },
+        insertNotice: producer.insertNotice, ackMatching: producer.ackMatching,
+        acquirePost: producer.acquirePost, settlePost: producer.settlePost, foldReceipt: producer.foldReceipt,
+        setSeatAttachment(seat, attachment) {
+            const count = run('UPDATE participant_seats SET attachment=? WHERE participant_key_json=? AND owner_json=? AND generation_json=? AND attachment<>?', [attachment, key(seat.participant), encode(seat.owner), encode(seat.generation), attachment]);
+            changed ||= count > 0;
+            return count > 0;
+        },
+        storeSeat(value) {
+            run('INSERT INTO participant_seats(participant_key_json,participant_json,owner_json,generation_json,wake_address_json,attachment) VALUES(?,?,?,?,?,?) ON CONFLICT(participant_key_json) DO UPDATE SET participant_json=excluded.participant_json,owner_json=excluded.owner_json,generation_json=excluded.generation_json,wake_address_json=excluded.wake_address_json,attachment=excluded.attachment', [key(value.participant), encode(value.participant), encode(value.owner), encode(value.generation), value.wakeAddress === undefined ? null : encode(value.wakeAddress), value.attachment]);
+            changed = true;
+            return true;
+        },
+        removeSeat(value) {
+            const count = run('DELETE FROM participant_seats WHERE participant_key_json=? AND owner_json=? AND generation_json=?', [key(value.participant), encode(value.owner), encode(value.generation)]);
+            if (count)
+                run('DELETE FROM catch_leases WHERE recipient_key_json=? AND generation_json=?', [key(value.participant), encode(value.generation)]);
+            changed ||= count > 0;
+            return count > 0;
+        },
         applyLanding(effect) {
             const a = validateStoredActivity(effect.activity);
             requireFact(a.index >= read.header().nextActIndex && a.index < Number.MAX_SAFE_INTEGER, 'activity index cannot advance.');
-            const { index, at, kind, actor, reach, reply, messageIndex, ...payload } = a;
-            const storedPayload = payload;
-            run('INSERT INTO activities(act_index,at,kind,actor_json,actor_key_json,reach,reply_index,message_index,payload_json) VALUES(?,?,?,?,?,?,?,?,?)', [index, at, kind, encode(actor), key(actor), reach ?? null, reply ?? null, messageIndex ?? null, encode(storedPayload)]);
-            // One message address per landed recipient is written by land() through publishMessage.
+            const { index, at, kind, actor, reach, reply, ...payload } = a;
+            run('INSERT INTO activities(act_index,at,kind,actor_json,actor_key_json,reach,reply_index,payload_json) VALUES(?,?,?,?,?,?,?,?)', [index, at, kind, encode(actor), key(actor), reach ?? null, reply ?? null, encode(payload)]);
             effect.audience.forEach((address, order) => {
-                run('INSERT INTO landed_audience(act_index,recipient_key_json,recipient_order,reason) VALUES(?,?,?,?)', [index, key(address.recipient), order, address.route]);
+                run('INSERT INTO landed_audience(act_index,recipient_key_json,recipient_order,reason,owner_json,generation_json) VALUES(?,?,?,?,?,?)', [index, key(address.recipient), order, address.route, address.owner === undefined ? null : encode(address.owner), address.generation === undefined ? null : encode(address.generation)]);
             });
             if (effect.participant) {
                 const p = effect.participant;
@@ -492,62 +483,54 @@ export function createSqliteDriver(db, channelDriver = createChannelSqlite(db))
                 run('INSERT INTO attention(listener_key_json,target_key_json,target_json,kind,since_index) VALUES(?,?,?,?,?) ON CONFLICT(listener_key_json,target_key_json) DO UPDATE SET target_json=excluded.target_json,kind=excluded.kind,since_index=excluded.since_index', [key(t.listener), key(t.target), encode(t.target), t.kind, t.sinceIndex]);
             }
             run('UPDATE square_meta SET next_act_index=? WHERE id=1', [index + 1]);
-            extendLandingCatchCoverage(read, channelWrite.putReceiveClaim, a, effect.audience);
+            if (kind === 'say')
+                producer.consumeActivity(index, at);
             changed = true;
         },
-        putLease(name, value, generation, suppressed) {
-            const l = validateWatchLease(value), canonical = owner(name);
-            if (generation !== undefined)
-                endpointGeneration(generation);
-            const existing = channelRead.claimLease(canonical, 'agora');
-            if (existing !== undefined && generation !== undefined && existing.generation !== generation)
+        putLease(name, value, generation) {
+            const l = validateWatchLease(value), seat = currentEndpoint(name);
+            if (!seat || generation !== undefined && generation !== seat.generation)
                 return false;
-            return channelWrite.putReceiveClaim({ namespace: 'agora', id: l.leaseId, owner: canonical,
-                generation: generation ?? existing?.generation ?? currentEndpoint(canonical)?.generation ?? 'detached',
-                selector: { ...(l.filter === undefined ? {} : { filter: l.filter }) },
-                suppressed: suppressed ?? [], heartbeatAt: l.heartbeatAt, expiresAt: l.expiresAt });
+            run('INSERT INTO catch_leases(recipient_key_json,generation_json,lease_json) VALUES(?,?,?) ON CONFLICT(recipient_key_json) DO UPDATE SET generation_json=excluded.generation_json,lease_json=excluded.lease_json', [key(name), encode(seat.generation), encode(l)]);
+            changed = true;
+            return true;
         },
         removeLease(name, expected, generation) {
-            const canonical = owner(name), existing = channelRead.claimLease(canonical, 'agora');
-            if (existing === undefined || existing.id !== expected || generation !== undefined && existing.generation !== generation)
+            if (read.lease(name)?.leaseId !== expected || generation !== undefined && currentEndpoint(name)?.generation !== generation)
                 return false;
-            return channelWrite.removeReceiveClaim(canonical, 'agora', expected);
+            const count = run('DELETE FROM catch_leases WHERE recipient_key_json=?', [key(name)]);
+            changed ||= count > 0;
+            return count > 0;
+        },
+        markSeen(name, indexes, at) {
+            finite(at);
+            let count = 0;
+            for (const index of indexes)
+                count += run('INSERT OR IGNORE INTO caught_activity(recipient_key_json,act_index,at) SELECT recipient_key_json,act_index,? FROM landed_audience WHERE recipient_key_json=? AND act_index=?', [at, key(name), integer(index)]);
+            changed ||= count > 0;
+            return count;
         },
     };
     function importLanding(activityValue) {
         const validated = validateHydratedActivity(activityValue);
-        if (validated.kind !== 'say') {
-            const effect = deriveLanding(validated, landingFacts(read, validated));
-            driver.applyLanding(effect);
-            // Imported custody: a join establishes the endpoint its activity coordinate names; a done drops it.
-            if (validated.kind === 'join')
-                channelWrite.storeEndpoint({ participant: validated.actor, owner: 'import', generation: formatActivityId(validated.index), attachment: 'attached' });
-            else if (validated.kind === 'done') {
-                const current = channelRead.endpoint(validated.actor);
-                if (current !== undefined)
-                    channelWrite.removeEndpoint(current);
-            }
-            return validated;
+        driver.applyLanding(deriveLanding(validated, landingFacts(read, validated)));
+        if (validated.kind === 'join')
+            driver.storeSeat({ participant: validated.actor, owner: 'import', generation: formatActivityId(validated.index), attachment: 'attached' });
+        else if (validated.kind === 'done') {
+            const current = read.seat(validated.actor);
+            if (current)
+                driver.removeSeat(current);
         }
-        const effect = deriveLanding(validated, landingFacts(read, validated));
-        const published = channelWrite.publishMessage({ from: validated.actor, at: validated.at,
-            body: validated.body ?? '', ...(validated.metadata === undefined ? {} : { metadata: validated.metadata }),
-            to: effect.audience.map(({ recipient, generation }) => ({ recipient, ...(generation === undefined ? {} : { generation }) })) });
-        const landed = { kind: 'say', index: validated.index, at: validated.at, actor: validated.actor, messageIndex: published.index,
-            ...(validated.mentions === undefined ? {} : { mentions: validated.mentions }),
-            ...(validated.reach === undefined ? {} : { reach: validated.reach }),
-            ...(validated.reply === undefined ? {} : { reply: validated.reply }) };
-        driver.applyLanding({ ...effect, activity: landed });
-        return landed;
+        return validated;
     }
-    const driver = Object.defineProperties(Object.assign(read, writes, { channel, importLanding }), {
-        changed: { get: () => changed || channel.changed },
-        deliveryChanged: { get: () => channel.deliveryChanged },
+    const driver = Object.defineProperties(Object.assign(read, writes, { importLanding }), {
+        changed: { get: () => changed || producer.changed },
+        deliveryChanged: { get: () => producer.deliveryChanged },
     });
     return driver;
 }
 /** Explicit import replay. Caller owns the transaction and format publication. */
-export function initializeSqlite(db, state, revision, lower) {
+export function initializeSqlite(db, state, revision) {
     integer(revision);
     integer(state.runtime.nextActIndex);
     if (state.hardCap !== null)
@@ -555,14 +538,14 @@ export function initializeSqlite(db, state, revision, lower) {
     if (state.throttlePerMinute !== undefined)
         integer(state.throttlePerMinute, 1);
     initializeStorageMeta(db, revision);
-    lower.initialize(db);
+    initializeProducerSqlite(db);
     initializeAgoraSqlite(db, { ...state, preamble: strings(state.preamble), warmup: strings(state.warmup) });
     const driver = createSqliteDriver(db);
     for (const activity of state.acts)
         driver.importLanding(activity);
     requireFact(state.runtime.nextActIndex > driver.header().lastActIndex, 'nextActIndex is behind the activity history.');
     db.prepare('UPDATE square_meta SET next_act_index=? WHERE id=1').run(state.runtime.nextActIndex);
-    const insert = db.prepare('INSERT INTO receipts(owner_key_json,msg_index,at) VALUES(?,?,?)');
+    const insert = db.prepare('INSERT INTO caught_activity(recipient_key_json,act_index,at) VALUES(?,?,?)');
     for (const [owner, observations] of Object.entries(state.runtime.observations)) {
         string(owner, true);
         for (const [id, observation] of Object.entries(observations)) {
@@ -572,65 +555,41 @@ export function initializeSqlite(db, state, revision, lower) {
             requireFact(index < state.runtime.nextActIndex, 'receipt references an unassigned activity index.');
             requireFact(observation.state === 'seen');
             const activity = driver.activity(index);
-            if (activity?.kind !== 'say' || activity.messageIndex === undefined)
+            if (activity?.kind !== 'say')
                 continue;
-            insert.run(encode(owner), activity.messageIndex, finite(observation.at));
+            insert.run(key(owner), index, finite(observation.at));
         }
     }
     for (const [owner, value] of Object.entries(state.runtime.leases)) {
         string(owner, true);
         const l = validateWatchLease(value), generation = driver.seat(owner)?.generation ?? 'detached';
-        db.prepare('INSERT INTO receive_claims(namespace_key_json,owner_key_json,generation_json,claim_id_json,heartbeat_at,expires_at,selector_json,suppressed_json) VALUES(?,?,?,?,?,?,?,?)')
-            .run(encode('agora'), encode(owner), encode(generation), encode(l.leaseId), l.heartbeatAt, l.expiresAt, encode({ ...(l.filter === undefined ? {} : { filter: l.filter }) }), encode(catchCoverage(driver, owner, l)));
+        db.prepare('INSERT INTO catch_leases(recipient_key_json,generation_json,lease_json) VALUES(?,?,?)').run(key(owner), encode(generation), encode(l));
     }
 }
 export function exportSqliteState(db) {
     const d = createSqliteDriver(db), h = d.header();
     const observations = {}, leases = {};
-    // Receipts are message-coordinate now; export them under the establishing say's activity id.
-    for (const row of db.prepare('SELECT r.owner_key_json AS owner_json,r.msg_index AS act_index,r.at FROM receipts r').all()) {
-        const owner = decoded(row.owner_json, true);
-        const say = d.activityByMessage(integer(row.act_index));
-        if (say?.kind !== 'say')
-            continue;
+    for (const row of db.prepare('SELECT p.name_json,r.act_index,r.at FROM caught_activity r JOIN participants p ON p.name_key_json=r.recipient_key_json').all()) {
+        const owner = decoded(row.name_json, true);
         if (!Object.hasOwn(observations, owner))
             Object.defineProperty(observations, owner, { value: {}, enumerable: true, writable: true });
-        observations[owner][formatActivityId(say.index)] = { state: 'seen', at: finite(row.at) };
+        observations[owner][formatActivityId(integer(row.act_index))] = { state: 'seen', at: finite(row.at) };
     }
-    for (const row of db.prepare("SELECT * FROM receive_claims WHERE namespace_key_json=?").all(encode('agora'))) {
-        const owner = decoded(row.owner_key_json, true);
-        const selector = object(json(row.selector_json));
-        Object.defineProperty(leases, owner, { value: validateWatchLease({
-                leaseId: decoded(row.claim_id_json, true), heartbeatAt: finite(row.heartbeat_at), expiresAt: finite(row.expires_at), ...(selector.filter === undefined ? {} : { filter: selector.filter })
-            }), enumerable: true });
+    for (const row of db.prepare('SELECT p.name_json,l.lease_json FROM catch_leases l JOIN participants p ON p.name_key_json=l.recipient_key_json').all()) {
+        Object.defineProperty(leases, decoded(row.name_json, true), { value: validateWatchLease(json(row.lease_json)), enumerable: true });
     }
     return {
         hardCap: h.hardCap, ...(h.throttlePerMinute === undefined ? {} : { throttlePerMinute: h.throttlePerMinute }), preamble: [...h.preamble], warmup: [...h.warmup],
-        acts: db.prepare('SELECT a.*,m.body_json,m.metadata_json FROM activities a LEFT JOIN messages m ON m.msg_index=a.message_index ORDER BY a.act_index').all().map(activityWithContent),
+        acts: db.prepare('SELECT * FROM activities ORDER BY act_index').all().map(activityWithContent),
         runtime: { nextActIndex: h.nextActIndex, observations, leases }
     };
 }
-/** Read-only integrity inspection; maintained-index replay runs when the lower schema is supplied. */
-export function inspectSqlite(db, lower) {
-    return inspectRows(db, endpoint, lower);
-}
-function inspectRows(db, inspectEndpoint, lower) {
+/** Read-only integrity inspection. */
+export function inspectSqlite(db) {
     const check = db.prepare('PRAGMA integrity_check').all();
     requireFact(check.length === 1 && check[0].integrity_check === 'ok', 'SQLite integrity check failed.');
     const state = exportSqliteState(db), d = createSqliteDriver(db);
     d.roster();
-    for (const row of db.prepare('SELECT * FROM endpoints').all())
-        inspectEndpoint(row);
-    for (const row of db.prepare('SELECT * FROM delivery_evidence').all())
-        deliveryEvidence(row);
-    for (const row of db.prepare('SELECT * FROM delivery_deferrals').all())
-        deliveryDeferral(row);
-    for (const row of db.prepare('SELECT * FROM receive_claims').all())
-        receiveClaim(row);
-    for (const row of db.prepare('SELECT ma.*,m.msg_index AS existing_msg_index FROM message_addresses ma LEFT JOIN messages m ON m.msg_index=ma.msg_index').all()) {
-        requireFact(row.existing_msg_index !== null, 'message address references a missing message.');
-        messageAddress(row);
-    }
     for (const p of d.roster()) {
         d.attention(p.name);
         d.incomingAttention(p.name);
@@ -638,40 +597,5 @@ function inspectRows(db, inspectEndpoint, lower) {
     for (const a of state.acts)
         if (a.kind === 'say')
             d.audience(a.index);
-    const standingCount = d.roster().filter(p => p.joined).length;
-    if (lower === undefined)
-        return { standingCount };
-    const rebuilt = new MemoryDatabase(':memory:');
-    try {
-        initializeSqlite(rebuilt, state, d.header().revision, lower);
-        const retainName = rebuilt.prepare('UPDATE participants SET name_json=? WHERE name_key_json=?');
-        for (const p of d.roster())
-            retainName.run(encode(p.name), key(p.name));
-        for (const table of ['participants', 'attention', 'landed_audience']) {
-            const original = db.prepare(`SELECT * FROM ${table} ORDER BY 1,2`).all();
-            const expected = rebuilt.prepare(`SELECT * FROM ${table} ORDER BY 1,2`).all();
-            requireFact(stableJson(original) === stableJson(expected), `derived ${table} index is inconsistent.`);
-        }
-        // Only reason-bearing Agora content replays from explicit state. Native Channel messages
-        // and their unfenced addresses are not restorable from Agora activities; a null
-        // generation stays unfenced here even though current landing would fence a new address.
-        const upper = 'JOIN activities a ON a.message_index=ma.msg_index JOIN landed_audience d ON d.act_index=a.act_index';
-        for (const [table, select] of [
-            ['messages', 'SELECT DISTINCT m.* FROM messages m JOIN activities a ON a.message_index=m.msg_index JOIN landed_audience d ON d.act_index=a.act_index'],
-            ['message_addresses', `SELECT DISTINCT ma.* FROM message_addresses ma ${upper} AND d.recipient_key_json=ma.recipient_key_json`],
-        ]) {
-            const original = db.prepare(`${select} ORDER BY 1,2`).all();
-            const expected = rebuilt.prepare(`${select} ORDER BY 1,2`).all();
-            const comparable = (rows) => table === 'message_addresses'
-                ? rows.map(({ generation_json: _generation, recipient_json: _recipient, ...row }) => row) : rows;
-            requireFact(stableJson(comparable(original)) === stableJson(comparable(expected)), `derived ${table} index is inconsistent.`);
-        }
-        const actualAddresses = db.prepare("SELECT a.message_index AS msg_index,ma.recipient_key_json,ma.recipient_order FROM activities a JOIN message_addresses ma ON ma.msg_index=a.message_index WHERE a.kind='say' AND EXISTS (SELECT 1 FROM landed_audience d WHERE d.act_index=a.act_index) ORDER BY 1,2").all();
-        const expectedAddresses = db.prepare("SELECT a.message_index AS msg_index,d.recipient_key_json,d.recipient_order FROM activities a JOIN landed_audience d ON d.act_index=a.act_index WHERE a.kind='say' ORDER BY 1,2").all();
-        requireFact(stableJson(actualAddresses) === stableJson(expectedAddresses), 'derived message address identity/order is inconsistent.');
-        return { standingCount };
-    }
-    finally {
-        rebuilt.close();
-    }
+    return { standingCount: d.roster().filter(p => p.joined).length };
 }