@astrosheep/square 0.3.106 → 0.4.0

package/dist/square-sqlite.js

@@ -1,161 +1,47 @@
 import { DatabaseSync as MemoryDatabase } from 'node:sqlite';
-import { SquareError, nameKey, isWakeRouteKind, validateOwner, validateActivityMetadata, validateActivityDelivery, activityMetadataHasContent } from './model.js';
-import { validateMetadataMatch, matchingDeferrals, validateDeferralId } from './delivery-deferral.js';
-import { deriveLanding, landingFacts } from './square-domain.js';
-import { claimAttempt, prepareAttempt, settleAttempt } from './delivery-attempts.js';
-import { legacyRowFramingIssue, legacyActivitySchema } from './square-legacy-framing.js';
-import { receive, recordConsumed } from './receive.js';
+import { validateActivityMetadata, activityMetadataHasContent } from './model.js';
+import { catchCoverage, deriveLanding, landingFacts, extendLandingCatchCoverage } 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 { 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';
+export { invalidArtifact } from './sqlite-values.js';
+export { endpointGeneration } from './sqlite-channel.js';
+export const APPLICATION_ID = 0x53515245;
+export const CURRENT_USER_VERSION = 11;
 export function emptyRuntimeState(nextActIndex = 0) {
     return { nextActIndex, observations: {}, leases: {} };
 }
-export const APPLICATION_ID = 0x53515245;
-const V1_USER_VERSION = 1;
-export const V2_USER_VERSION = 2;
-export const V3_USER_VERSION = 3;
-export const V4_USER_VERSION = 4;
-export const V5_USER_VERSION = 5;
-export const V6_USER_VERSION = 6;
-export const V7_USER_VERSION = 7;
-export const CURRENT_USER_VERSION = 8;
-export const V1_SNAPSHOT_TABLE = 'square_snapshot';
-const V1_SNAPSHOT_DDL = `CREATE TABLE ${V1_SNAPSHOT_TABLE} (id INTEGER PRIMARY KEY CHECK(id=1), revision INTEGER NOT NULL CHECK(revision>=0), state TEXT NOT NULL)`;
-const V1_SNAPSHOT_COLUMNS = [
-    { cid: 0, name: 'id', type: 'INTEGER', notnull: 0, dflt_value: null, pk: 1, hidden: 0 },
-    { cid: 1, name: 'revision', type: 'INTEGER', notnull: 1, dflt_value: null, pk: 0, hidden: 0 },
-    { cid: 2, name: 'state', type: 'TEXT', notnull: 1, dflt_value: null, pk: 0, hidden: 0 },
-];
-/**
- * Read-only legacy framing: application id, format version, journal mode and the
- * exact owned snapshot schema. It decodes no snapshot payload, writes no pragma
- * and runs no DDL, so ordinary open can establish ownership before requiring
- * migration. Anything else is unrelated or unsupported, not repaired.
- */
-export function validateLegacyFraming(database, applicationId, location = '') {
-    const identity = database.prepare('SELECT application_id, user_version FROM pragma_application_id, pragma_user_version').get();
-    if (identity.application_id !== applicationId)
-        throw invalidArtifact('unrelated SQLite database.');
-    if (identity.user_version !== V1_USER_VERSION)
-        throw invalidArtifact('unsupported SQLite format version.');
-    const journalMode = database.prepare('PRAGMA journal_mode').get().journal_mode;
-    if (typeof journalMode !== 'string' || journalMode !== (location === ':memory:' ? 'memory' : 'delete'))
-        throw invalidArtifact('unsupported journal mode.');
-    const objects = database.prepare("SELECT type, name, tbl_name, sql FROM sqlite_schema WHERE name NOT GLOB 'sqlite_*' ORDER BY type, name")
-        .all();
-    if (objects.length !== 1)
-        throw invalidArtifact('unsupported snapshot schema.');
-    const [object] = objects;
-    if (object.type !== 'table' || object.name !== V1_SNAPSHOT_TABLE || object.tbl_name !== V1_SNAPSHOT_TABLE
-        || typeof object.sql !== 'string' || normalizedLegacySql(object.sql) !== normalizedLegacySql(V1_SNAPSHOT_DDL))
-        throw invalidArtifact('unsupported snapshot schema.');
-    const columns = database.prepare('SELECT cid, name, type, "notnull", dflt_value, pk, hidden FROM pragma_table_xinfo(?) ORDER BY cid')
-        .all(V1_SNAPSHOT_TABLE);
-    if (columns.length !== V1_SNAPSHOT_COLUMNS.length || !columns.every((column, index) => {
-        const expected = V1_SNAPSHOT_COLUMNS[index];
-        return column.cid === expected.cid && column.name === expected.name && column.type === expected.type
-            && column.notnull === expected.notnull && column.dflt_value === expected.dflt_value
-            && column.pk === expected.pk && column.hidden === expected.hidden;
-    }))
-        throw invalidArtifact('unsupported snapshot schema.');
-    return { applicationId, userVersion: V1_USER_VERSION, journalMode };
-}
-function normalizedLegacySql(sql) {
-    return sql.trim().replace(/\s+/g, ' ').replace(/\s*(>=|[(),=])\s*/g, '$1');
-}
-const CURRENT_ACTIVITY_KIND_CHECK = "kind IN ('join','done','say','read','listen','ignore','unlisten')";
-export const ACTIVITIES_TABLE_SQL = `CREATE TABLE activities (
-  act_index INTEGER PRIMARY KEY CHECK (act_index BETWEEN 0 AND 9007199254740991),
-  at REAL NOT NULL,
-  kind TEXT NOT NULL CHECK (${CURRENT_ACTIVITY_KIND_CHECK}),
-  actor_json TEXT COLLATE BINARY NOT NULL,
-  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),
-  payload_json TEXT NOT NULL CHECK (json_valid(payload_json)),
-  CHECK (kind = 'say' OR (reach IS NULL AND reply_index IS NULL))
-);`;
-export const ACTIVITY_INDEXES_SQL = [
-    'CREATE INDEX activity_kind_index ON activities(kind, act_index)',
-    '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'",
-];
-export const DELIVERY_DEFERRALS_SQL = `CREATE TABLE delivery_deferrals (
-  participant_key_json TEXT COLLATE BINARY NOT NULL,
-  participant_json TEXT NOT NULL,
-  generation_json TEXT NOT NULL,
-  deferral_id_json TEXT NOT NULL,
-  match_json TEXT NOT NULL CHECK (json_valid(match_json)),
-  expires_at REAL NOT NULL,
-  PRIMARY KEY (participant_key_json,generation_json,deferral_id_json)
-) WITHOUT ROWID;
-CREATE INDEX delivery_deferral_expiry ON delivery_deferrals(participant_key_json,generation_json,expires_at);`;
-const ATTACHMENT_COLUMN_SQL = "attachment TEXT NOT NULL DEFAULT 'attached' CHECK (attachment IN ('attached','detached'))";
-export const SCHEMA_SQL = `CREATE TABLE square_meta (
+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. */
+export const AGORA_SCHEMA_SQL = `CREATE TABLE square_meta (
   id INTEGER PRIMARY KEY CHECK (id = 1),
-  revision INTEGER NOT NULL CHECK (revision BETWEEN 0 AND 9007199254740991),
-  delivery_revision INTEGER NOT NULL CHECK (delivery_revision BETWEEN 0 AND 9007199254740991),
   next_act_index INTEGER NOT NULL CHECK (next_act_index BETWEEN 0 AND 9007199254740991),
   hard_cap INTEGER CHECK (hard_cap BETWEEN 1 AND 9007199254740991),
   throttle_per_minute INTEGER CHECK (throttle_per_minute BETWEEN 1 AND 9007199254740991),
   preamble_json TEXT NOT NULL CHECK (json_valid(preamble_json)),
   warmup_json TEXT NOT NULL CHECK (json_valid(warmup_json))
 );
-${ACTIVITIES_TABLE_SQL}
-${ACTIVITY_INDEXES_SQL.join(';\n')};
-
-CREATE TABLE receipts (
-  owner_json TEXT COLLATE BINARY NOT NULL,
-  act_index INTEGER NOT NULL CHECK (act_index BETWEEN 0 AND 9007199254740991),
-  at REAL NOT NULL,
-  PRIMARY KEY (owner_json, act_index)
-) WITHOUT ROWID;
-CREATE INDEX receipt_owner_time ON receipts(owner_json, at);
-CREATE TABLE catch_leases (
-  owner_json TEXT COLLATE BINARY PRIMARY KEY NOT NULL,
-  generation_json TEXT NOT NULL DEFAULT '""',
-  lease_id_json TEXT NOT NULL,
-  heartbeat_at REAL NOT NULL,
-  expires_at REAL NOT NULL CHECK (expires_at >= heartbeat_at),
-  filter_json TEXT CHECK (filter_json IS NULL OR json_valid(filter_json))
-) WITHOUT ROWID;
-
-CREATE TABLE seats (
-  participant_key_json TEXT COLLATE BINARY PRIMARY KEY NOT NULL,
-  participant_json TEXT NOT NULL,
-  owner_json TEXT NOT NULL,
-  generation_json TEXT NOT NULL,
-  wake_address_json TEXT CHECK (wake_address_json IS NULL OR json_valid(wake_address_json)),
-  ${ATTACHMENT_COLUMN_SQL}
-) WITHOUT ROWID;
-CREATE INDEX seat_owner ON seats(owner_json);
-CREATE TABLE delivery_evidence (
-  participant_key_json TEXT COLLATE BINARY NOT NULL,
-  participant_json TEXT NOT NULL,
-  generation_json TEXT NOT NULL,
-  act_index INTEGER NOT NULL CHECK (act_index BETWEEN 0 AND 9007199254740991),
-  kind TEXT NOT NULL CHECK (kind IN ('wake','presentation')),
-  attempt_n INTEGER NOT NULL CHECK (attempt_n >= 0),
-  outcome TEXT NOT NULL CHECK (outcome IN ('dispatching','accepted','failed','unknown','released','presented','clipped')),
+CREATE TABLE activities (
+  act_index INTEGER PRIMARY KEY CHECK (act_index BETWEEN 0 AND 9007199254740991),
   at REAL NOT NULL,
-  expires_at REAL,
-  claim_token_json TEXT,
+  kind TEXT NOT NULL CHECK (${ACTIVITY_KIND_CHECK}),
+  actor_json TEXT COLLATE BINARY NOT NULL,
+  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)),
-  PRIMARY KEY (participant_key_json,generation_json,act_index,kind,attempt_n)
-) WITHOUT ROWID;
-CREATE UNIQUE INDEX delivery_claim_token ON delivery_evidence(claim_token_json) WHERE claim_token_json IS NOT NULL;
-CREATE INDEX delivery_activity ON delivery_evidence(participant_key_json,generation_json,act_index,kind,attempt_n);
-CREATE TABLE delivery_cancellations (
-  participant_key_json TEXT COLLATE BINARY NOT NULL,
-  generation_json TEXT NOT NULL,
-  through_index INTEGER NOT NULL CHECK (through_index BETWEEN 0 AND 9007199254740991),
-  PRIMARY KEY (participant_key_json,generation_json)
-) WITHOUT ROWID;
-
-${DELIVERY_DEFERRALS_SQL}
-
+  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);
+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,
@@ -180,74 +66,33 @@ CREATE TABLE landed_audience (
   act_index INTEGER NOT NULL,
   recipient_key_json TEXT COLLATE BINARY NOT NULL,
   recipient_order INTEGER NOT NULL CHECK (recipient_order >= 0),
-  route TEXT NOT NULL CHECK (route IN ('mention','reply','attention','bell')),
+  reason TEXT NOT NULL CHECK (reason IN ('mention','reply','attention','bell')),
   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);`;
-export const FORMAT7_SCHEMA_SQL = legacyActivitySchema(SCHEMA_SQL);
-export const FORMAT6_SCHEMA_SQL = FORMAT7_SCHEMA_SQL.replace(`  owner_json TEXT NOT NULL,\n  generation_json TEXT NOT NULL,`, `  channel_json TEXT NOT NULL,\n  session_json TEXT NOT NULL,\n  agent_json TEXT,\n  generation_json TEXT NOT NULL,`).replace('CREATE INDEX seat_owner ON seats(owner_json);', 'CREATE INDEX seat_body ON seats(channel_json, session_json, agent_json);');
-export const FORMAT5_SCHEMA_SQL = FORMAT6_SCHEMA_SQL.replace(`,\n  ${ATTACHMENT_COLUMN_SQL}`, '');
-export const FORMAT4_SCHEMA_SQL = FORMAT5_SCHEMA_SQL.replace(DELIVERY_DEFERRALS_SQL, '');
-const FORMAT7_SCHEMA = FORMAT7_SCHEMA_SQL.split(';').map(s => s.trim()).filter(Boolean).map(normalizedSql).sort();
-const FORMAT6_SCHEMA = FORMAT6_SCHEMA_SQL.split(';').map(s => s.trim()).filter(Boolean).map(normalizedSql).sort();
-const FORMAT5_SCHEMA = FORMAT5_SCHEMA_SQL.split(';').map(s => s.trim()).filter(Boolean).map(normalizedSql).sort();
-const EXPECTED_SCHEMA_SQL = SCHEMA_SQL.split(';').map(s => s.trim()).filter(Boolean).map(normalizedSql).sort();
-const FORMAT4_SCHEMA = FORMAT4_SCHEMA_SQL.split(';').map(s => s.trim()).filter(Boolean).map(normalizedSql).sort();
-const encode = JSON.stringify;
-const key = (name) => encode(nameKey(name));
-export function invalidArtifact(detail) {
-    return new SquareError('invalid_args', `Invalid square artifact: ${detail}`);
-}
-function requireFact(ok, detail = 'row is malformed.') {
-    if (!ok)
-        throw invalidArtifact(detail);
+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 ?? []));
 }
-function integer(value, minimum = 0) {
-    requireFact(Number.isSafeInteger(value) && value >= minimum);
-    return value;
-}
-function finite(value) {
-    requireFact(typeof value === 'number' && Number.isFinite(value));
-    return value;
-}
-function string(value, nonempty = false) {
-    requireFact(typeof value === 'string' && (!nonempty || value.length > 0));
-    return value;
-}
-function json(value) {
-    try {
-        return JSON.parse(string(value));
-    }
-    catch {
-        throw invalidArtifact('row contains invalid JSON.');
-    }
+export function resetAgoraSqlite(db) {
+    for (const table of ['landed_audience', 'attention', 'participants', 'activities', 'square_meta'])
+        db.exec(`DROP TABLE ${table}`);
 }
-function object(value) {
-    requireFact(typeof value === 'object' && value !== null && !Array.isArray(value));
-    return value;
-}
-function shape(value, required, optional = []) {
-    const result = object(value);
-    requireFact(required.every(k => Object.hasOwn(result, k)) && Object.keys(result).every(k => required.includes(k) || optional.includes(k)));
-    return result;
-}
-function strings(value) {
-    requireFact(Array.isArray(value) && value.every(v => typeof v === 'string'));
-    return value;
-}
-function decoded(value, nonempty = false) {
-    const result = string(json(value), nonempty);
-    requireFact(encode(result) === value, 'string encoding is malformed.');
-    return result;
+function validateSquareFraming(db, lower, 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);
 }
-function immutable(value) {
-    if (value !== null && typeof value === 'object') {
-        for (const item of Object.values(value))
-            immutable(item);
-        Object.freeze(value);
-    }
-    return value;
+/** Explicit full-Square framing and reset, composed from the neutral store and the supplied Channel schema. */
+export function squareStoreFormat(lower, 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); },
+    };
 }
 const kinds = ['join', 'done', 'say', 'read', 'listen', 'ignore', 'unlisten'];
 function head(row) {
@@ -258,10 +103,14 @@ 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 })
+        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. */
 export function validateStoredActivity(value) {
     const a = object(value);
     integer(a.index);
@@ -271,34 +120,15 @@ export function validateStoredActivity(value) {
     string(a.actor, true);
     switch (a.kind) {
         case 'say':
-            shape(a, [...common], ['body', 'mentions', 'reach', 'reply', 'metadata', 'delivery']);
-            if (Object.hasOwn(a, 'delivery')) {
-                requireFact(a.delivery !== undefined, 'say delivery is malformed.');
-                try {
-                    validateActivityDelivery(a.delivery);
-                }
-                catch {
-                    throw invalidArtifact('say delivery is malformed.');
-                }
-            }
-            if (Object.hasOwn(a, 'body'))
-                string(a.body);
-            if (Object.hasOwn(a, 'metadata')) {
-                requireFact(a.metadata !== undefined, 'say metadata is malformed.');
-                try {
-                    validateActivityMetadata(a.metadata);
-                }
-                catch {
-                    throw invalidArtifact('say metadata is malformed.');
-                }
-            }
-            requireFact((Object.hasOwn(a, 'body') && typeof a.body === 'string' && a.body.trim() !== '') || activityMetadataHasContent(a.metadata), 'say must contain a non-empty body or non-empty metadata.');
+            shape(a, [...common], ['mentions', 'reach', 'reply', 'messageIndex']);
+            requireFact(Object.hasOwn(a, 'messageIndex'), 'say is missing its message.');
             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']);
@@ -319,13 +149,45 @@ export function validateStoredActivity(value) {
     }
     return value;
 }
+/** The explicit upper projection of a stored say onto its authoritative message 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 }) };
+}
+/** Stored Agora relation only: say content lives in its linked Channel message. */
 function activity(row) {
     const h = head(row), payload = object(json(row.payload_json));
-    // Payload cannot shadow indexed structural columns.
-    const allowed = h.kind === 'say' ? ['body', 'mentions', 'metadata', 'delivery'] : h.kind === 'done' ? ['body'] : h.kind === 'read' ? ['through'] : h.kind === 'listen' || h.kind === 'ignore' || h.kind === 'unlisten' ? ['target'] : [];
+    // 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'] : [];
     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. */
+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 }) }));
+}
 function participant(row) {
     const name = decoded(row.name_json, true);
     requireFact(row.name_key_json === key(name) && [0, 1].includes(row.joined) && [0, 1].includes(row.done) && !(row.joined && row.done));
@@ -357,135 +219,14 @@ export function validateWatchLease(value) {
     }
     return value;
 }
-// Sorted object keys express small-value structural equality, never whole-state comparison.
-function stableJson(value) {
-    if (value === null || typeof value !== 'object') {
-        requireFact(value === null || typeof value === 'string' || typeof value === 'boolean' || typeof value === 'number' && Number.isFinite(value), 'value contains a non-finite or unsupported JSON value.');
-        return encode(value);
-    }
-    if (Array.isArray(value))
-        return '[' + value.map(stableJson).join(',') + ']';
-    return '{' + Object.keys(value).sort().map(k => encode(k) + ':' + stableJson(value[k])).join(',') + '}';
-}
-function activityId(value) {
-    const parsed = typeof value === 'string' ? /^act\/(0|[1-9]\d*)$/.exec(value) : null;
-    requireFact(parsed !== null, 'activity generation is malformed.');
-    const index = Number(parsed[1]);
-    requireFact(Number.isSafeInteger(index));
-    return value;
-}
-function activityIndex(value) {
-    const parsed = activityId(value);
-    return integer(Number(parsed.slice(4)));
-}
-function wakeAddress(value) {
-    const address = shape(value, ['kind', 'address']);
-    requireFact(isWakeRouteKind(address.kind));
-    const entries = object(address.address);
-    requireFact(Object.values(entries).every((item) => typeof item === 'string'));
-    stableJson(entries);
-    return immutable({ kind: address.kind, address: entries });
-}
-function ownerFrom(row) {
-    const owner = decoded(row.owner_json, true);
-    validateOwner(owner);
-    return owner;
-}
-function seat(row) {
-    const participant = decoded(row.participant_json, true);
-    requireFact(row.participant_key_json === key(participant));
-    const generation = activityId(decoded(row.generation_json, true));
-    const parsedWake = row.wake_address_json === null ? undefined : wakeAddress(json(row.wake_address_json));
-    requireFact(row.attachment === 'attached' || row.attachment === 'detached', 'seat attachment is malformed.');
-    requireFact(row.attachment !== 'detached' || parsedWake === undefined, 'a detached seat has a wake address.');
-    return immutable({ participant, owner: ownerFrom(row), generation, attachment: row.attachment, ...(parsedWake === undefined ? {} : { wakeAddress: parsedWake }) });
-}
-function nativeCorrelation(value) {
-    const item = shape(value, ['harness'], ['token', 'messageId', 'payloadHash']);
-    requireFact(['claude', 'opencode', 'pi'].includes(string(item.harness)));
-    for (const key of ['token', 'messageId', 'payloadHash'])
-        if (Object.hasOwn(item, key))
-            string(item[key], true);
-    return immutable({ harness: item.harness,
-        ...(item.token === undefined ? {} : { token: item.token }),
-        ...(item.messageId === undefined ? {} : { messageId: item.messageId }),
-        ...(item.payloadHash === undefined ? {} : { payloadHash: item.payloadHash }) });
-}
-function deliveryEvidence(row, payload = object(json(row.payload_json))) {
-    const participant = decoded(row.participant_json, true);
-    requireFact(row.participant_key_json === key(participant));
-    const generation = activityId(decoded(row.generation_json, true));
-    const activity = activityId(`act/${integer(row.act_index)}`);
-    requireFact(['wake', 'presentation'].includes(string(row.kind)) && ['dispatching', 'accepted', 'failed', 'unknown', 'released', 'presented', 'clipped'].includes(string(row.outcome)));
-    requireFact(Number.isSafeInteger(row.attempt_n) && row.attempt_n >= 0);
-    const nativeObservations = payload.nativeObservations === undefined ? undefined : (() => {
-        requireFact(Array.isArray(payload.nativeObservations));
-        return payload.nativeObservations.map((value) => {
-            const item = shape(value, ['eventId', 'messageId', 'state', 'observedAt'], ['reason']);
-            requireFact(['held', 'released', 'dropped'].includes(string(item.state)));
-            return {
-                eventId: string(item.eventId, true), messageId: string(item.messageId, true),
-                state: item.state,
-                ...(Object.hasOwn(item, 'reason') ? { reason: string(item.reason) } : {}), observedAt: finite(item.observedAt),
-            };
-        });
-    })();
-    return immutable({
-        participant, generation, activity, kind: row.kind,
-        outcome: row.outcome, attemptN: integer(row.attempt_n), at: finite(row.at),
-        ...(row.expires_at === null ? {} : { expiresAt: finite(row.expires_at) }),
-        ...(row.claim_token_json === null ? {} : { claimToken: decoded(row.claim_token_json, true) }),
-        ...(payload.route === undefined ? {} : { route: wakeAddress(payload.route) }),
-        ...(payload.signature === undefined ? {} : { signature: string(payload.signature) }),
-        ...(payload.message === undefined ? {} : { message: string(payload.message) }),
-        ...(payload.diagnostic === undefined ? {} : { diagnostic: payload.diagnostic }),
-        ...(payload.correlation === undefined ? {} : { correlation: nativeCorrelation(payload.correlation) }),
-        ...(nativeObservations === undefined ? {} : { nativeObservations }),
-    });
-}
-function deliveryDeferral(row) {
-    const participant = decoded(row.participant_json, true);
-    requireFact(row.participant_key_json === key(participant));
-    const generation = activityId(decoded(row.generation_json, true));
-    const id = validateDeferralId(decoded(row.deferral_id_json, true));
-    const match = validateMetadataMatch(json(row.match_json));
-    requireFact(encode(match) === row.match_json, 'delivery deferral match encoding is malformed.');
-    return immutable({ participant, generation, id, match, expiresAt: finite(row.expires_at) });
-}
-function normalizedSql(sql) { return sql.trim().replace(/;$/, '').replace(/\s+/g, ' ').replace(/\s*([(),=])\s*/g, '$1'); }
-function validateOwnedSchema(db, expected, location) {
-    const actual = db.prepare("SELECT sql FROM sqlite_schema WHERE name NOT GLOB 'sqlite_*' AND sql IS NOT NULL").all().map(r => normalizedSql(string(r.sql))).sort();
-    requireFact(actual.length === expected.length && actual.every((sql, i) => sql === expected[i]), 'unsupported row schema.');
-    requireFact(db.prepare('PRAGMA journal_mode').get().journal_mode === (location === ':memory:' ? 'memory' : 'delete'), 'unsupported journal mode.');
-}
-export function validateRowFraming(db, version, location = '') {
-    if (version === V2_USER_VERSION || version === V3_USER_VERSION) {
-        const issue = legacyRowFramingIssue(db, APPLICATION_ID, version, location, FORMAT4_SCHEMA_SQL);
-        if (issue !== undefined)
-            throw invalidArtifact(issue);
-        return;
-    }
-    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 === version, 'unsupported SQLite format version.');
-    validateOwnedSchema(db, version === V4_USER_VERSION ? FORMAT4_SCHEMA : version === V5_USER_VERSION ? FORMAT5_SCHEMA : version === V6_USER_VERSION ? FORMAT6_SCHEMA : version === V7_USER_VERSION ? FORMAT7_SCHEMA : EXPECTED_SCHEMA_SQL, location);
-}
-export function validateSqliteHeader(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.');
-    if (identity.user_version === 1) {
-        validateLegacyFraming(db, APPLICATION_ID, location);
-        throw new SquareError('invalid_args', `Square artifact at ${location} needs migration.\nStop sessions using it, back it up, then migrate and verify before restarting.`, { reason: 'migration_required' });
-    }
-    if (identity.user_version === V2_USER_VERSION || identity.user_version === V3_USER_VERSION || identity.user_version === V4_USER_VERSION || identity.user_version === V5_USER_VERSION || identity.user_version === V6_USER_VERSION || identity.user_version === V7_USER_VERSION) {
-        validateRowFraming(db, identity.user_version, location);
-        throw new SquareError('invalid_args', `Square artifact at ${location} needs migration.\nStop sessions using it, back it up, then migrate and verify before restarting.`, { reason: 'migration_required' });
-    }
-    if (identity.user_version === CURRENT_USER_VERSION) {
-        validateRowFraming(db, CURRENT_USER_VERSION, location);
-        return createSqliteDriver(db).header();
-    }
-    throw invalidArtifact('unsupported SQLite format version.');
+export function readSquareHeader(db) {
+    const rows = db.prepare('SELECT m.*, (SELECT COALESCE(MAX(act_index),-1) FROM activities) AS last_act_index FROM square_meta m').all();
+    requireFact(rows.length === 1 && rows[0].id === 1, 'header row is malformed.');
+    const r = rows[0], nextActIndex = integer(r.next_act_index), lastActIndex = integer(r.last_act_index, -1);
+    requireFact(nextActIndex > lastActIndex, 'nextActIndex is behind the activity history.');
+    return immutable({ revision: readStorageRevision(db), deliveryRevision: readStorageRevision(db, true), nextActIndex, lastActIndex,
+        hardCap: r.hard_cap === null ? null : integer(r.hard_cap, 1), ...(r.throttle_per_minute === null ? {} : { throttlePerMinute: integer(r.throttle_per_minute, 1) }),
+        preamble: strings(json(r.preamble_json)), warmup: strings(json(r.warmup_json)) });
 }
 function activitySelection(filter, alias = 'a') {
     const terms = [], args = [];
@@ -513,7 +254,8 @@ 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 json_extract(${alias}.payload_json,'$.metadata'),json_type(${alias}.payload_json,'$.metadata'),0
+                    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
                     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
@@ -529,134 +271,100 @@ function activitySelection(filter, alias = 'a') {
         args.push(encode(filter.metadataMatch.fields));
     }
     if (filter.search !== undefined) {
-        terms.push(`square_search(?,?,${alias}.act_index,${alias}.actor_json,json_extract(${alias}.payload_json,'$.body'))=1`);
+        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`);
         args.push(filter.search.mode, filter.search.text);
     }
     return { sql: terms.length ? terms.join(' AND ') : '1', args };
 }
-function pageRows(rows, page, decode) {
-    const hasMore = rows.length > page.limit;
-    if (hasMore)
-        rows.pop();
-    if (page.edge === 'newest')
-        rows.reverse();
-    return immutable({ items: rows.map(decode), hasMore });
-}
-function pageLimit(page) {
-    requireFact(page.edge === 'oldest' || page.edge === 'newest');
-    return Math.min(integer(page.limit, 1) + 1, Number.MAX_SAFE_INTEGER);
-}
-export function createSqliteDriver(db) {
-    let changed = false, deliveryChanged = false;
+export function createSqliteDriver(db, channelDriver = createChannelSqlite(db)) {
+    let changed = false;
     const all = (sql, args = []) => db.prepare(sql).all(...args);
     const one = (sql, args = []) => db.prepare(sql).get(...args);
     const run = (sql, args = []) => Number(db.prepare(sql).run(...args).changes);
     let searchRegistered = false;
+    function ensureSearch() {
+        if (searchRegistered)
+            return;
+        const patterns = new Map();
+        db.function('square_search', { deterministic: true }, (mode, text, index, actor, body) => {
+            const cacheKey = encode([mode, text]);
+            let pattern = patterns.get(cacheKey);
+            if (pattern === undefined) {
+                pattern = compileSearchPattern(string(text), mode === 'literal');
+                patterns.set(cacheKey, pattern);
+            }
+            return Number([string(index), decoded(actor, true), body === null ? '' : string(body)]
+                .some(field => pattern.test(field)));
+        });
+        searchRegistered = true;
+    }
     function selectActivity(filter) {
-        if (filter.search !== undefined && !searchRegistered) {
-            const patterns = new Map();
-            db.function('square_search', { deterministic: true }, (mode, text, index, actor, body) => {
-                const key = encode([mode, text]);
-                let pattern = patterns.get(key);
-                if (pattern === undefined) {
-                    pattern = compileSearchPattern(string(text), mode === 'literal');
-                    patterns.set(key, pattern);
-                }
-                return Number([formatActivityId(integer(index)), decoded(actor, true), body === null ? '' : string(body)]
-                    .some(field => pattern.test(field)));
-            });
-            searchRegistered = true;
-        }
+        if (filter.search !== undefined)
+            ensureSearch();
         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 attentionRows = (condition, args) => all(`SELECT t.*,p.name_json FROM attention t JOIN participants p ON p.name_key_json=t.listener_key_json WHERE ${condition} ORDER BY t.since_index`, args).map(attention);
     function directedSelection(recipient, filter) {
-        const p = read.participant(recipient), base = selectActivity({ ...filter, actors: filter.senders });
+        const participant = read.participant(recipient), base = selectActivity({ ...filter, actors: filter.senders });
         base.sql += ' AND d.recipient_key_json=?';
-        base.args.push(p ? key(p.name) : '');
+        base.args.push(participant ? key(participant.name) : '');
+        if (filter.currentGeneration) {
+            base.sql += ' AND (ma.generation_json IS NULL OR ma.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_json=? AND r.act_index=a.act_index)';
-            base.args.push(encode(p?.name ?? recipient));
+            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));
         }
         if (filter.attentionOnly)
-            base.sql += " AND d.route IN ('mention','reply','bell')";
-        return base;
-    }
-    function directedHead(row, recipient) {
-        const h = head(row);
-        requireFact(h.kind === 'say');
-        return immutable({
-            index: h.index, at: h.at, actor: h.actor, recipient, route: routeKind(row.route)
-        });
-    }
-    const directedFrom = 'landed_audience d JOIN activities a ON a.act_index=d.act_index';
-    const pendingFrom = `landed_audience d JOIN activities a ON a.act_index=d.act_index JOIN participants p ON p.name_key_json=d.recipient_key_json`;
-    const pendingWhere = `p.joined=1 AND d.act_index>COALESCE(p.last_join_index,-1) AND NOT EXISTS (SELECT 1 FROM receipts r WHERE r.owner_json=p.name_json AND r.act_index=d.act_index)`;
-    const latestSeats = `seats s JOIN participants p ON p.name_key_json=s.participant_key_json
-        JOIN activities a ON a.act_index=p.last_join_index AND a.kind='join' AND a.actor_key_json=p.name_key_json
-        AND s.generation_json='"act/'||a.act_index||'"'`;
-    function ownerSeats(owner) {
-        validateOwner(owner);
-        return immutable(all(`SELECT s.* FROM ${latestSeats} WHERE p.joined=1 AND s.owner_json=? ORDER BY s.participant_key_json`, [encode(owner)]).map(seat));
+            base.sql += " AND d.reason IN ('mention','reply','bell')";
+        return { base, participant };
     }
-    const read = {
-        seat(name) {
-            const r = one(`SELECT s.* FROM ${latestSeats} WHERE p.joined=1 AND s.participant_key_json=?`, [key(name)]);
-            return r ? seat(r) : undefined;
-        },
-        seatsForOwner: ownerSeats,
-        deliveryEvidence(participant, generation, activityIndex) {
-            const args = [key(participant), encode(generation)];
-            const filter = activityIndex === undefined ? '' : ' AND act_index=?';
-            if (activityIndex !== undefined)
-                args.push(integer(Number(activityIndex.slice(4))));
-            return immutable(all(`SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=?${filter} ORDER BY act_index,kind,attempt_n`, args).map(row => deliveryEvidence(row)));
-        },
-        deliveryByToken(claimToken) {
-            const row = one('SELECT * FROM delivery_evidence WHERE claim_token_json=?', [encode(claimToken)]);
-            return row === undefined ? undefined : deliveryEvidence(row);
-        },
+    // ----- 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 r = one('SELECT through_index FROM delivery_cancellations WHERE participant_key_json=? AND generation_json=?', [key(participant), encode(generation)]);
-            return r === undefined ? undefined : integer(r.through_index);
-        },
-        header() {
-            const rows = all('SELECT m.*, (SELECT COALESCE(MAX(act_index),-1) FROM activities) AS last_act_index FROM square_meta m');
-            requireFact(rows.length === 1 && rows[0].id === 1, 'header row is malformed.');
-            const r = rows[0], nextActIndex = integer(r.next_act_index), lastActIndex = integer(r.last_act_index, -1);
-            requireFact(nextActIndex > lastActIndex, 'nextActIndex is behind the activity history.');
-            return immutable({
-                revision: integer(r.revision), deliveryRevision: integer(r.delivery_revision), nextActIndex, lastActIndex, hardCap: r.hard_cap === null ? null : integer(r.hard_cap, 1), ...(r.throttle_per_minute === null ? {} : { throttlePerMinute: integer(r.throttle_per_minute, 1) }), preamble: strings(json(r.preamble_json)), warmup: strings(json(r.warmup_json))
-            });
-        },
-        participant(name) {
-            const r = one('SELECT * FROM participants WHERE name_key_json=?', [key(name)]);
-            return r ? participant(r) : undefined;
-        },
+            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);
+        },
+        header() { return readSquareHeader(db); },
+        participant(name) { const r = one('SELECT * FROM participants WHERE name_key_json=?', [key(name)]); return r ? participant(r) : undefined; },
         participantCounts() {
             const r = one('SELECT COUNT(*) AS known, COALESCE(SUM(joined),0) AS joined, COALESCE(SUM(done),0) AS done FROM participants');
             return immutable({ known: integer(r.known), joined: integer(r.joined), done: integer(r.done) });
         },
         roster: () => immutable(all('SELECT * FROM participants ORDER BY first_index').map(participant)),
-        attention: name => immutable(attentionRows('t.listener_key_json=?', [key(name)])),
-        incomingAttention: name => immutable(attentionRows('t.target_key_json=?', [key(name)])),
+        attention: name => immutable(all('SELECT t.*,p.name_json FROM attention t JOIN participants p ON p.name_key_json=t.listener_key_json WHERE t.listener_key_json=? ORDER BY t.since_index', [key(name)]).map(attention)),
+        incomingAttention: name => immutable(all('SELECT t.*,p.name_json FROM attention t JOIN participants p ON p.name_key_json=t.listener_key_json WHERE t.target_key_json=? ORDER BY t.since_index', [key(name)]).map(attention)),
         activity(index) {
             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.act_index,a.at,a.kind,a.actor_json,a.actor_key_json,a.reach,a.reply_index FROM activities a WHERE ${s.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...s.args, limit]), page, head);
+            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);
         },
         activities(indexes) {
             indexes.forEach(v => integer(v));
-            return immutable(all('SELECT * FROM activities WHERE act_index IN (SELECT value FROM json_each(?)) ORDER BY act_index', [encode(indexes)]).map(activity));
-        },
-        activityCount(filter) {
-            const s = selectActivity(filter);
-            return integer(one(`SELECT COUNT(*) AS n FROM activities a WHERE ${s.sql}`, s.args).n);
+            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));
         },
+        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); },
         contextIndexes(centers, before, after) {
             integer(before);
             integer(after);
@@ -676,7 +384,6 @@ export function createSqliteDriver(db) {
         sayOrdinals(indexes) {
             indexes.forEach(v => integer(v));
             const result = {};
-            // Only an actor's latest say can use its authoritative lifetime count.
             for (const r of all(`SELECT a.act_index, CASE
                 WHEN p.say_count IS NOT NULL AND a.act_index=(SELECT MAX(s.act_index) FROM activities s WHERE s.kind='say' AND s.actor_key_json=a.actor_key_json)
                 THEN p.say_count
@@ -699,131 +406,63 @@ export function createSqliteDriver(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.route 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.route) }))); },
+        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)) }) }))); },
         directed(recipient, filter, page) {
-            const s = directedSelection(recipient, filter), limit = pageLimit(page), canonical = owner(recipient);
-            return pageRows(all(`SELECT a.act_index,a.at,a.kind,a.actor_json,a.actor_key_json,a.reach,a.reply_index,d.route FROM ${directedFrom} WHERE ${s.sql} ORDER BY a.act_index ${page.edge === 'newest' ? 'DESC' : 'ASC'} LIMIT ?`, [...s.args, limit]), page, r => directedHead(r, canonical));
+            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]);
+            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,
+                    ...(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 s = directedSelection(recipient, filter);
-            return integer(one(`SELECT COUNT(*) AS n FROM ${directedFrom} WHERE ${s.sql}`, s.args).n);
-        },
-        pendingAudience(after, through, limit) {
-            const args = [integer(after, -1), integer(through, -1)], extra = pageLimit({ edge: 'oldest', limit });
-            const indices = all(`SELECT DISTINCT d.act_index FROM ${pendingFrom} WHERE ${pendingWhere} AND d.act_index>? AND d.act_index<=? ORDER BY d.act_index LIMIT ?`, [...args, extra]);
-            const hasMore = indices.length > limit;
-            if (hasMore)
-                indices.pop();
-            const groups = indices.map(r => {
-                const rows = all(`SELECT a.act_index,a.at,a.kind,a.actor_json,a.actor_key_json,a.reach,a.reply_index,p.name_json,d.route FROM ${pendingFrom} WHERE ${pendingWhere} AND d.act_index=? ORDER BY d.recipient_order`, [integer(r.act_index)]);
-                const h = head(rows[0]);
-                requireFact(h.kind === 'say');
-                return {
-                    index: h.index, at: h.at, actor: h.actor, recipients: rows.map(v => ({ recipient: decoded(v.name_json, true), route: routeKind(v.route) }))
-                };
-            });
-            return immutable({ groups, hasMore });
+            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);
         },
         receipt(name, index) {
-            const r = one('SELECT at FROM receipts WHERE owner_json=? AND act_index=?', [encode(owner(name)), integer(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)]);
             return r ? immutable({ at: finite(r.at) }) : undefined;
         },
         receiptFacts(name, afterIndex) {
-            const k = encode(owner(name)), r = one('SELECT MAX(at) AS latest FROM receipts WHERE owner_json=?', [k]), e = one('SELECT MAX(r.act_index) AS latest FROM receipts r JOIN activities a ON a.act_index=r.act_index WHERE r.owner_json=? AND r.act_index>? AND a.actor_json IS NOT NULL', [k, integer(afterIndex, -1)]);
+            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)]);
             return immutable({ ...(r.latest === null ? {} : { latestAt: finite(r.latest) }), ...(e.latest === null ? {} : { latestActorActivityIndex: integer(e.latest) }) });
         },
-        deliveryDeferrals(name, generation) {
-            const canonical = owner(name);
-            const current = read.seat(canonical);
-            if (current === undefined || current.generation !== generation)
-                return [];
-            return immutable(all('SELECT * FROM delivery_deferrals WHERE participant_key_json=? AND generation_json=? ORDER BY expires_at,deferral_id_json', [key(canonical), encode(generation)]).map(deliveryDeferral));
-        },
         lease(name) {
-            const canonical = owner(name), current = read.seat(canonical);
-            const r = current === undefined
-                ? one('SELECT * FROM catch_leases WHERE owner_json=?', [encode(canonical)])
-                : one('SELECT * FROM catch_leases WHERE owner_json=? AND (generation_json=? OR generation_json=?)', [encode(canonical), encode(current.generation), encode('')]);
-            return r ? immutable(validateWatchLease({
-                leaseId: decoded(r.lease_id_json, true), heartbeatAt: finite(r.heartbeat_at), expiresAt: finite(r.expires_at), ...(r.filter_json === null ? {} : { filter: json(r.filter_json) })
-            })) : undefined;
-        },
+            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));
+        },
+        deliveryDeferrals: (participant, generation) => lower.deliveryDeferrals(participant, generation),
     };
+    Object.assign(read, readMethods, { channel: channelRead });
+    // ----- Upper Agora writes / landing -----
     const writes = {
-        storeSeat(value) {
-            validateOwner(value.owner);
-            activityId(value.generation);
-            string(value.participant, true);
-            const existing = read.seat(value.participant);
-            if (existing !== undefined && stableJson(existing) === stableJson(value))
-                return false;
-            const wake = value.wakeAddress === undefined ? null : encode(value.wakeAddress);
-            run('INSERT INTO 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), wake, value.attachment]);
-            run('DELETE FROM catch_leases WHERE owner_json=?', [encode(value.participant)]);
-            run('DELETE FROM delivery_deferrals WHERE participant_key_json=?', [key(value.participant)]);
-            deliveryChanged = true;
-            return true;
-        },
-        updateWakeAddress(value, wakeAddress) {
-            const current = one('SELECT wake_address_json FROM seats WHERE participant_key_json=? AND generation_json=?', [key(value.participant), encode(value.generation)]);
-            if (wakeAddress !== undefined) {
-                requireFact(isWakeRouteKind(wakeAddress.kind));
-                requireFact(Object.values(wakeAddress.address).every((item) => typeof item === 'string'));
-            }
-            if (stableJson(current.wake_address_json === null ? null : json(current.wake_address_json)) === stableJson(wakeAddress ?? null))
-                return false;
-            const count = run('UPDATE seats SET wake_address_json=? WHERE participant_key_json=? AND generation_json=?', [wakeAddress === undefined ? null : encode(wakeAddress), key(value.participant), encode(value.generation)]);
-            if (count)
-                deliveryChanged = true;
-            return count > 0;
-        },
-        reattachSeat(value, address) {
-            const current = read.seat(value.participant);
-            if (current?.attachment !== 'detached')
-                return false;
-            run("UPDATE seats SET attachment='attached',wake_address_json=? WHERE participant_key_json=? AND generation_json=?", [address === undefined ? null : encode(wakeAddress(address)), key(value.participant), encode(value.generation)]);
-            deliveryChanged = true;
-            return true;
-        },
-        detachSeat(value) {
-            const count = run("UPDATE seats SET attachment='detached',wake_address_json=NULL WHERE participant_key_json=? AND generation_json=? AND attachment='attached'", [key(value.participant), encode(value.generation)]);
-            if (!count)
-                return false;
-            run('DELETE FROM catch_leases WHERE owner_json=?', [encode(value.participant)]);
-            run('DELETE FROM delivery_deferrals WHERE participant_key_json=? AND generation_json=?', [key(value.participant), encode(value.generation)]);
-            deliveryChanged = true;
-            return true;
-        },
-        removeSeat(value) {
-            const row = one(`SELECT s.* FROM ${latestSeats} WHERE p.done=1 AND s.participant_key_json=?`, [key(value.participant)]);
-            if (row === undefined || decoded(row.generation_json) !== value.generation || ownerFrom(row) !== value.owner)
-                return false;
-            run('DELETE FROM seats WHERE participant_key_json=?', [key(value.participant)]);
-            run('DELETE FROM catch_leases WHERE owner_json=?', [encode(value.participant)]);
-            run('DELETE FROM delivery_deferrals WHERE participant_key_json=?', [key(value.participant)]);
-            changed = true;
-            deliveryChanged = true;
-            return true;
-        },
-        cancelThrough(value, through) {
-            activityId(value.generation);
-            integer(through);
-            const prior = read.cancelledThrough(value.participant, value.generation) ?? -1;
-            if (through <= prior)
-                return false;
-            run('INSERT INTO delivery_cancellations(participant_key_json,generation_json,through_index) VALUES(?,?,?) ON CONFLICT(participant_key_json,generation_json) DO UPDATE SET through_index=excluded.through_index', [key(value.participant), encode(value.generation), through]);
-            deliveryChanged = true;
-            return true;
-        },
+        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); },
         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, ...payload } = a;
-            receive({
-                insertItem: () => { 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)]); },
-                insertAddress: (item, address, order) => { run('INSERT INTO landed_audience(act_index,recipient_key_json,recipient_order,route) VALUES(?,?,?,?)', [item, key(address.recipient), order, address.via]); },
-            }, { item: { key: index, data: a }, audience: effect.audience.map(r => ({ recipient: r.recipient, via: r.route })) });
+            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.
+            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]);
+            });
             if (effect.participant) {
                 const p = effect.participant;
                 string(p.name, true);
@@ -853,199 +492,77 @@ export function createSqliteDriver(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);
             changed = true;
         },
-        markSeen(name, indexes, at) {
-            finite(at);
-            const next = read.header().nextActIndex;
-            indexes.forEach(index => requireFact(integer(index) < next, 'receipt references an unassigned activity index.'));
-            const canonical = owner(name);
-            string(canonical, true);
-            const count = recordConsumed({
-                insertReceipt: (ref, time) => run('INSERT OR IGNORE INTO receipts(owner_json,act_index,at) VALUES(?,?,?)', [encode(ref.recipient), ref.item, time]) > 0,
-            }, indexes.map(item => ({ recipient: canonical, item })), at);
-            if (count)
-                changed = true;
-            return count;
-        },
-        putLease(name, value, generation) {
+        putLease(name, value, generation, suppressed) {
             const l = validateWatchLease(value), canonical = owner(name);
-            const old = read.lease(canonical), row = one('SELECT generation_json FROM catch_leases WHERE owner_json=?', [encode(canonical)]);
             if (generation !== undefined)
-                activityId(generation);
-            if (row !== undefined && generation !== undefined && decoded(row.generation_json) !== '' && decoded(row.generation_json) !== generation)
+                endpointGeneration(generation);
+            const existing = channelRead.claimLease(canonical, 'agora');
+            if (existing !== undefined && generation !== undefined && existing.generation !== generation)
                 return false;
-            if (old && stableJson(old) === stableJson(l) && (generation === undefined || row?.generation_json === encode(generation)))
-                return false;
-            string(canonical, true);
-            run('INSERT INTO catch_leases(owner_json,generation_json,lease_id_json,heartbeat_at,expires_at,filter_json) VALUES(?,?,?,?,?,?) ON CONFLICT(owner_json) DO UPDATE SET generation_json=excluded.generation_json,lease_id_json=excluded.lease_id_json,heartbeat_at=excluded.heartbeat_at,expires_at=excluded.expires_at,filter_json=excluded.filter_json', [encode(canonical), encode(generation ?? ''), encode(l.leaseId), l.heartbeatAt, l.expiresAt, l.filter === undefined ? null : encode(l.filter)]);
-            changed = true;
-            return true;
-        },
-        putDeliveryDeferral(seatRef, id, match, expiresAt, now) {
-            finite(now);
-            finite(expiresAt);
-            const canonicalMatch = validateMetadataMatch(match);
-            run('DELETE FROM delivery_deferrals WHERE participant_key_json=? AND expires_at<=?', [key(seatRef.participant), now]);
-            run('INSERT INTO delivery_deferrals(participant_key_json,participant_json,generation_json,deferral_id_json,match_json,expires_at) VALUES(?,?,?,?,?,?)', [key(seatRef.participant), encode(seatRef.participant), encode(seatRef.generation), encode(id), encode(canonicalMatch), expiresAt]);
-            deliveryChanged = true;
-            return true;
-        },
-        renewDeliveryDeferral(seatRef, id, expiresAt, now) {
-            finite(now);
-            finite(expiresAt);
-            const pruned = run('DELETE FROM delivery_deferrals WHERE participant_key_json=? AND expires_at<=?', [key(seatRef.participant), now]);
-            const count = run('UPDATE delivery_deferrals SET expires_at=? WHERE participant_key_json=? AND generation_json=? AND deferral_id_json=? AND expires_at>?', [expiresAt, key(seatRef.participant), encode(seatRef.generation), encode(id), now]);
-            if (count || pruned)
-                deliveryChanged = true;
-            return count > 0;
-        },
-        releaseDeliveryDeferral(seatRef, id, now) {
-            finite(now);
-            const pruned = run('DELETE FROM delivery_deferrals WHERE participant_key_json=? AND expires_at<=?', [key(seatRef.participant), now]);
-            const count = run('DELETE FROM delivery_deferrals WHERE participant_key_json=? AND generation_json=? AND deferral_id_json=? AND expires_at>?', [key(seatRef.participant), encode(seatRef.generation), encode(id), now]);
-            if (count || pruned)
-                deliveryChanged = true;
-            return count > 0;
+            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 });
         },
         removeLease(name, expected, generation) {
-            const canonical = owner(name), row = one('SELECT generation_json FROM catch_leases WHERE owner_json=? AND lease_id_json=?', [encode(canonical), encode(expected)]);
-            if (row === undefined || generation !== undefined && decoded(row.generation_json) !== generation)
+            const canonical = owner(name), existing = channelRead.claimLease(canonical, 'agora');
+            if (existing === undefined || existing.id !== expected || generation !== undefined && existing.generation !== generation)
                 return false;
-            const count = run('DELETE FROM catch_leases WHERE owner_json=? AND lease_id_json=? AND generation_json=?', [encode(canonical), encode(expected), row.generation_json]);
-            if (count)
-                changed = true;
-            return count > 0;
+            return channelWrite.removeReceiveClaim(canonical, 'agora', expected);
         },
     };
-    function attempt(row) {
-        const data = object(json(row.payload_json)), evidence = deliveryEvidence(row, data);
-        return { purpose: evidence.kind === 'wake' ? 'dispatch' : 'presentation', token: evidence.claimToken ?? '',
-            ordinal: evidence.attemptN, outcome: evidence.outcome, at: evidence.at, expiresAt: evidence.expiresAt, data };
-    }
-    function attemptRows(seat, index, kind, known) {
-        const scope = [key(seat.participant), encode(seat.generation), index, kind];
-        let sources = [];
-        return {
-            list() {
-                sources = all('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND act_index=? AND kind=? ORDER BY attempt_n DESC', scope);
-                return sources.map(attempt);
-            },
-            evidence(value) {
-                const source = sources.find(row => row.attempt_n === value.ordinal);
-                return deliveryEvidence({ ...source, outcome: value.outcome, at: value.at, expires_at: value.expiresAt ?? null }, value.data);
-            },
-            byToken(token) {
-                if (known?.token === token)
-                    return known;
-                const row = one('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND act_index=? AND kind=? AND claim_token_json=?', [...scope, encode(token)]);
-                return row === undefined ? undefined : attempt(row);
-            },
-            insert(value) {
-                run('INSERT INTO delivery_evidence(participant_key_json,participant_json,generation_json,act_index,kind,attempt_n,outcome,at,expires_at,claim_token_json,payload_json) VALUES(?,?,?,?,?,?,?,?,?,?,?)', [scope[0], encode(seat.participant), scope[1], index, kind, value.ordinal, value.outcome, value.at, value.expiresAt ?? null, encode(value.token), encode(value.data)]);
-                deliveryChanged = true;
-            },
-            replace(value) {
-                const count = run('UPDATE delivery_evidence SET outcome=?,at=?,expires_at=?,payload_json=? WHERE participant_key_json=? AND generation_json=? AND act_index=? AND kind=? AND attempt_n=? AND claim_token_json IS ?', [value.outcome, value.at, value.expiresAt ?? null, encode(value.data), ...scope, value.ordinal, value.token === '' ? null : encode(value.token)]);
-                if (count)
-                    deliveryChanged = true;
-            },
-        };
+    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;
+        }
+        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;
     }
-    const delivery = {
-        claimDelivery(input) {
-            requireFact(input.kind === 'wake' || input.kind === 'presentation');
-            const index = activityIndex(input.activity);
-            finite(input.at);
-            const leaseMs = integer(input.leaseMs, 1);
-            string(input.claimToken, true);
-            if (input.route !== undefined)
-                wakeAddress(input.route);
-            const currentSeat = read.seat(input.seat.participant);
-            const item = read.activity(index);
-            if (currentSeat === undefined || currentSeat.attachment !== 'attached' || currentSeat.generation !== input.seat.generation || currentSeat.owner !== input.seat.owner
-                || item?.kind !== 'say' || read.directedAt(input.seat.participant, index) === undefined)
-                return { status: 'stale' };
-            if (matchingDeferrals(read.deliveryDeferrals(currentSeat.participant, currentSeat.generation), item.metadata, input.at).length > 0)
-                return { status: 'deferred' };
-            const cancelledThrough = read.cancelledThrough(input.seat.participant, input.seat.generation);
-            if (cancelledThrough !== undefined && index <= cancelledThrough)
-                return { status: 'stale' };
-            const rows = attemptRows(input.seat, index, input.kind);
-            const result = claimAttempt({ ...rows, replace(value) {
-                    rows.replace({ ...value, data: { ...value.data, diagnostic: 'interrupted dispatch' } });
-                } }, { purpose: input.kind === 'wake' ? 'dispatch' : 'presentation', token: input.claimToken,
-                at: input.at, leaseMs, data: input.route === undefined ? {} : { route: input.route } });
-            if (result.status === 'acquired')
-                return { status: 'acquired', claimToken: result.token, attemptN: result.ordinal };
-            const evidence = result.interrupted ? { ...result.evidence, data: { ...result.evidence.data, diagnostic: 'interrupted dispatch' } } : result.evidence;
-            return { status: result.status, evidence: rows.evidence(evidence) };
-        },
-        prepareDelivery(input) {
-            const row = one('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND claim_token_json=?', [key(input.seat.participant), encode(input.seat.generation), encode(input.claimToken)]);
-            if (row === undefined || row.outcome !== 'dispatching')
-                return false;
-            const previous = attempt(row), correlation = nativeCorrelation(input.correlation), payload = previous.data;
-            if (stableJson(payload.correlation ?? null) === stableJson(correlation))
-                return true;
-            return prepareAttempt(attemptRows(input.seat, integer(row.act_index), row.kind, previous), { token: input.claimToken, data: { ...payload, correlation } });
-        },
-        completeDelivery(input) {
-            const index = activityIndex(input.activity);
-            finite(input.at);
-            requireFact(['accepted', 'failed', 'unknown', 'released', 'presented', 'clipped'].includes(input.outcome));
-            string(input.claimToken, true);
-            const row = one('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND act_index=? AND claim_token_json=?', [key(input.seat.participant), encode(input.seat.generation), index, encode(input.claimToken)]);
-            if (row === undefined)
-                return false;
-            const previous = attempt(row);
-            const payload = { ...previous.data, ...(input.signature === undefined ? {} : { signature: input.signature }), ...(input.message === undefined ? {} : { message: input.message }), ...(input.diagnostic === undefined ? {} : { diagnostic: input.diagnostic }), ...(input.correlation === undefined ? {} : { correlation: input.correlation }) };
-            return settleAttempt(attemptRows(input.seat, index, row.kind, previous), { token: input.claimToken, outcome: input.outcome, at: input.at, data: payload });
-        },
-        observeNativeDelivery(input) {
-            const row = one('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND claim_token_json=?', [key(input.seat.participant), encode(input.seat.generation), encode(input.claimToken)]);
-            if (row === undefined || !['dispatching', 'accepted', 'unknown'].includes(string(row.outcome)))
-                return false;
-            const observation = input.observation;
-            requireFact(typeof observation.eventId === 'string' && observation.eventId.length > 0);
-            requireFact(typeof observation.messageId === 'string' && observation.messageId.length > 0);
-            requireFact(observation.state === 'held' || observation.state === 'released' || observation.state === 'dropped');
-            finite(observation.observedAt);
-            if (observation.reason !== undefined)
-                string(observation.reason);
-            const payload = object(json(row.payload_json));
-            const observations = payload.nativeObservations === undefined ? [] : payload.nativeObservations;
-            requireFact(Array.isArray(observations));
-            if (observations.some((item) => object(item).eventId === observation.eventId))
-                return true;
-            const next = [...observations, observation];
-            const count = run('UPDATE delivery_evidence SET payload_json=? WHERE participant_key_json=? AND generation_json=? AND claim_token_json=?', [encode({ ...payload, nativeObservations: next }), key(input.seat.participant), encode(input.seat.generation), encode(input.claimToken)]);
-            if (count)
-                deliveryChanged = true;
-            return count > 0;
-        },
-    };
-    return Object.defineProperties(Object.assign(read, writes, delivery), {
-        changed: { get: () => changed },
-        deliveryChanged: { get: () => deliveryChanged },
+    const driver = Object.defineProperties(Object.assign(read, writes, { channel, importLanding }), {
+        changed: { get: () => changed || channel.changed },
+        deliveryChanged: { get: () => channel.deliveryChanged },
     });
+    return driver;
 }
-/** Explicit import only. Caller owns transaction, legacy validation and format publication. */
-export function initializeSqlite(db, state, revision = 0) {
+/** Explicit import replay. Caller owns the transaction and format publication. */
+export function initializeSqlite(db, state, revision, lower) {
     integer(revision);
     integer(state.runtime.nextActIndex);
     if (state.hardCap !== null)
         integer(state.hardCap, 1);
     if (state.throttlePerMinute !== undefined)
         integer(state.throttlePerMinute, 1);
-    db.exec(SCHEMA_SQL);
-    db.prepare('INSERT INTO square_meta(id,revision,delivery_revision,next_act_index,hard_cap,throttle_per_minute,preamble_json,warmup_json) VALUES(1,?,0,0,?,?,?,?)').run(revision, state.hardCap, state.throttlePerMinute ?? null, encode(strings(state.preamble)), encode(strings(state.warmup)));
+    initializeStorageMeta(db, revision);
+    lower.initialize(db);
+    initializeAgoraSqlite(db, { ...state, preamble: strings(state.preamble), warmup: strings(state.warmup) });
     const driver = createSqliteDriver(db);
     for (const activity of state.acts)
-        driver.applyLanding(deriveLanding(validateStoredActivity(activity), landingFacts(driver, activity)));
+        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_json,act_index,at) VALUES(?,?,?)');
+    const insert = db.prepare('INSERT INTO receipts(owner_key_json,msg_index,at) VALUES(?,?,?)');
     for (const [owner, observations] of Object.entries(state.runtime.observations)) {
         string(owner, true);
         for (const [id, observation] of Object.entries(observations)) {
@@ -1054,69 +571,79 @@ export function initializeSqlite(db, state, revision = 0) {
             const index = integer(Number(match[1]));
             requireFact(index < state.runtime.nextActIndex, 'receipt references an unassigned activity index.');
             requireFact(observation.state === 'seen');
-            insert.run(encode(owner), index, finite(observation.at));
+            const activity = driver.activity(index);
+            if (activity?.kind !== 'say' || activity.messageIndex === undefined)
+                continue;
+            insert.run(encode(owner), activity.messageIndex, finite(observation.at));
         }
     }
     for (const [owner, value] of Object.entries(state.runtime.leases)) {
         string(owner, true);
-        const l = validateWatchLease(value);
-        db.prepare('INSERT INTO catch_leases(owner_json,lease_id_json,heartbeat_at,expires_at,filter_json) VALUES(?,?,?,?,?)').run(encode(owner), encode(l.leaseId), l.heartbeatAt, l.expiresAt, l.filter === undefined ? null : encode(l.filter));
+        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)));
     }
 }
 export function exportSqliteState(db) {
     const d = createSqliteDriver(db), h = d.header();
     const observations = {}, leases = {};
-    for (const row of db.prepare('SELECT * FROM receipts').all()) {
-        const owner = decoded(row.owner_json, true), index = integer(row.act_index);
-        requireFact(index < h.nextActIndex, 'receipt references an unassigned activity index.');
+    // 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;
         if (!Object.hasOwn(observations, owner))
-            Object.defineProperty(observations, owner, {
-                value: {}, enumerable: true, writable: true
-            });
-        observations[owner][`act/${index}`] = { state: 'seen', at: finite(row.at) };
+            Object.defineProperty(observations, owner, { value: {}, enumerable: true, writable: true });
+        observations[owner][formatActivityId(say.index)] = { state: 'seen', at: finite(row.at) };
     }
-    for (const row of db.prepare('SELECT * FROM catch_leases').all()) {
-        const owner = decoded(row.owner_json, true);
+    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.lease_id_json, true), heartbeatAt: finite(row.heartbeat_at), expiresAt: finite(row.expires_at), ...(row.filter_json === null ? {} : { filter: json(row.filter_json) })
+                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 });
     }
     return {
-        hardCap: h.hardCap, ...(h.throttlePerMinute === undefined ? {} : { throttlePerMinute: h.throttlePerMinute }), preamble: [...h.preamble], warmup: [...h.warmup], acts: db.prepare('SELECT * FROM activities ORDER BY act_index').all().map(activity), runtime: {
-            nextActIndex: h.nextActIndex, observations, leases
-        }
+        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),
+        runtime: { nextActIndex: h.nextActIndex, observations, leases }
     };
 }
-/** Full read-only integrity inspection, including maintained-index replay comparison. */
-export function inspectSqlite(db) {
-    return inspectRows(db, seat);
+/** 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, inspectSeat) {
+function inspectRows(db, inspectEndpoint, lower) {
     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 seats').all())
-        inspectSeat(row);
+    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);
-    if (Number(db.prepare('PRAGMA user_version').get().user_version) >= V5_USER_VERSION) {
-        for (const row of db.prepare('SELECT * FROM delivery_deferrals').all())
-            deliveryDeferral(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);
     }
     for (const a of state.acts)
-        d.audience(a.index);
-    // A transient memory database checks derived indices without altering authority.
+        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);
-        // A migration may remove the activity that established canonical casing.
-        // Retained participant spelling stays authoritative while replay checks
-        // every derived lifecycle/count fact against surviving activities.
+        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));
@@ -1125,7 +652,24 @@ function inspectRows(db, inspectSeat) {
             const expected = rebuilt.prepare(`SELECT * FROM ${table} ORDER BY 1,2`).all();
             requireFact(stableJson(original) === stableJson(expected), `derived ${table} index is inconsistent.`);
         }
-        return { standingCount: d.roster().filter(p => p.joined).length };
+        // 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();