@astrosheep/square 0.3.94 → 0.3.95

package/dist/square-sqlite.js

@@ -2,7 +2,9 @@ import { DatabaseSync as MemoryDatabase } from 'node:sqlite';
 import { SquareError, nameKey, isWakeRouteKind, validateOwner, validateActivityMetadata, activityMetadataHasContent } from './model.js';
 import { validateMetadataMatch, matchingDeferrals, validateDeferralId } from './delivery-deferral.js';
 import { deriveLanding, landingFacts } from './square-domain.js';
-import { legacyRowFramingIssue } from './square-legacy-framing.js';
+import { claimAttempt, prepareAttempt, settleAttempt } from './delivery-attempts.js';
+import { legacyRowFramingIssue, legacyActivitySchema } from './square-legacy-framing.js';
+import { receive, recordConsumed } from './receive.js';
 export function emptyRuntimeState(nextActIndex = 0) {
     return { nextActIndex, observations: {}, leases: {} };
 }
@@ -13,7 +15,8 @@ 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 CURRENT_USER_VERSION = 7;
+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 = [
@@ -58,18 +61,16 @@ export function validateLegacyFraming(database, applicationId, location = '') {
 function normalizedLegacySql(sql) {
     return sql.trim().replace(/\s+/g, ' ').replace(/\s*(>=|[(),=])\s*/g, '$1');
 }
-const CURRENT_ACTIVITY_KIND_CHECK = "kind IN ('join','done','say','hold','resume','read','listen','ignore','unlisten')";
+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,
-  actor_key_json TEXT COLLATE BINARY,
+  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 ((actor_json IS NULL) = (actor_key_json IS NULL)),
-  CHECK (kind IN ('hold','resume') OR actor_json IS NOT NULL),
   CHECK (kind = 'say' OR (reach IS NULL AND reply_index IS NULL))
 );`;
 export const ACTIVITY_INDEXES_SQL = [
@@ -182,9 +183,11 @@ CREATE TABLE landed_audience (
   UNIQUE (act_index, recipient_order)
 ) WITHOUT ROWID;
 CREATE INDEX audience_recipient ON landed_audience(recipient_key_json, act_index);`;
-export const FORMAT6_SCHEMA_SQL = 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 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();
@@ -244,17 +247,17 @@ function immutable(value) {
     }
     return value;
 }
-const kinds = ['join', 'done', 'say', 'hold', 'resume', 'read', 'listen', 'ignore', 'unlisten'];
+const kinds = ['join', 'done', 'say', 'read', 'listen', 'ignore', 'unlisten'];
 function head(row) {
     const index = integer(row.act_index), at = finite(row.at);
     requireFact(kinds.includes(string(row.kind)));
-    const actor = row.actor_json === null ? undefined : decoded(row.actor_json, true);
-    requireFact(actor === undefined ? row.actor_key_json === null && ['hold', 'resume'].includes(row.kind) : row.actor_key_json === key(actor));
+    const actor = decoded(row.actor_json, true);
+    requireFact(row.actor_key_json === key(actor));
     requireFact(row.reach === null || row.kind === 'say' && row.reach === 'bell');
     if (row.reply_index !== null)
         requireFact(row.kind === 'say' && integer(row.reply_index) < index);
     return immutable({
-        index, at, kind: row.kind, ...(actor === undefined ? {} : { 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 })
     });
 }
 export function validateStoredActivity(value) {
@@ -262,13 +265,8 @@ export function validateStoredActivity(value) {
     integer(a.index);
     finite(a.at);
     requireFact(kinds.includes(string(a.kind)));
-    const common = ['kind', 'at', 'index'];
-    if (a.kind !== 'hold' && a.kind !== 'resume') {
-        common.push('actor');
-        string(a.actor, true);
-    }
-    else if (Object.hasOwn(a, 'actor'))
-        string(a.actor, true);
+    const common = ['kind', 'at', 'index', 'actor'];
+    string(a.actor, true);
     switch (a.kind) {
         case 'say':
             shape(a, [...common], ['body', 'mentions', 'reach', 'reply', 'metadata']);
@@ -292,8 +290,7 @@ export function validateStoredActivity(value) {
                 requireFact(integer(a.reply) < a.index);
             break;
         case 'done':
-        case 'hold':
-            shape(a, common, ['body', ...(a.kind === 'hold' ? ['actor'] : [])]);
+            shape(a, common, ['body']);
             if (Object.hasOwn(a, 'body'))
                 string(a.body);
             break;
@@ -307,14 +304,14 @@ export function validateStoredActivity(value) {
             shape(a, [...common, 'target']);
             string(a.target, true);
             break;
-        default: shape(a, common, a.kind === 'resume' ? ['actor'] : []);
+        default: shape(a, common);
     }
     return value;
 }
 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'] : h.kind === 'done' || h.kind === 'hold' ? ['body'] : h.kind === 'read' ? ['through'] : h.kind === 'listen' || h.kind === 'ignore' || h.kind === 'unlisten' ? ['target'] : [];
+    const allowed = h.kind === 'say' ? ['body', 'mentions', '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 }));
 }
@@ -403,8 +400,7 @@ function nativeCorrelation(value) {
         ...(item.messageId === undefined ? {} : { messageId: item.messageId }),
         ...(item.payloadHash === undefined ? {} : { payloadHash: item.payloadHash }) });
 }
-function deliveryEvidence(row) {
-    const payload = object(json(row.payload_json));
+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));
@@ -461,7 +457,7 @@ export function validateRowFraming(db, version, 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 === 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 : EXPECTED_SCHEMA_SQL, location);
+    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();
@@ -470,7 +466,7 @@ export function validateSqliteHeader(db, location = '') {
         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) {
+    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' });
     }
@@ -494,8 +490,6 @@ function activitySelection(filter, alias = 'a') {
         add(`${alias}.act_index <= ?`, integer(filter.throughIndex, -1));
     if (filter.afterAt !== undefined)
         add(`${alias}.at > ?`, finite(filter.afterAt));
-    if (filter.actorRequired)
-        terms.push(`${alias}.actor_json IS NOT NULL`);
     for (const [column, values] of [['act_index', filter.indexes], ['kind', filter.kinds], [filter.actorMatch === 'exact' ? 'actor_json' : 'actor_key_json', filter.actors?.map(name => filter.actorMatch === 'exact' ? encode(name) : key(name))]]) {
         if (values !== undefined) {
             if (column === 'act_index')
@@ -540,7 +534,7 @@ export function createSqliteDriver(db) {
     }
     function directedHead(row, recipient) {
         const h = head(row);
-        requireFact(h.kind === 'say' && h.actor !== undefined);
+        requireFact(h.kind === 'say');
         return immutable({
             index: h.index, at: h.at, actor: h.actor, recipient, route: routeKind(row.route)
         });
@@ -566,7 +560,7 @@ export function createSqliteDriver(db) {
             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(deliveryEvidence));
+            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)]);
@@ -596,18 +590,6 @@ export function createSqliteDriver(db) {
         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)])),
-        hold() {
-            const r = one("SELECT * FROM activities WHERE kind IN ('hold','resume') ORDER BY act_index DESC LIMIT 1");
-            if (!r)
-                return immutable({ active: false });
-            const a = activity(r);
-            if (a.kind === 'resume')
-                return immutable({ active: false });
-            requireFact(a.kind === 'hold');
-            return immutable({
-                active: true, at: a.at, ...(a.body === undefined ? {} : { reason: a.body }), ...(a.actor === undefined ? {} : { actor: a.actor })
-            });
-        },
         activity(index) {
             const r = one('SELECT * FROM activities WHERE act_index=?', [integer(index)]);
             return r ? activity(r) : undefined;
@@ -685,7 +667,7 @@ export function createSqliteDriver(db) {
             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' && h.actor !== undefined);
+                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) }))
                 };
@@ -788,7 +770,10 @@ export function createSqliteDriver(db) {
             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;
-            run('INSERT INTO activities(act_index,at,kind,actor_json,actor_key_json,reach,reply_index,payload_json) VALUES(?,?,?,?,?,?,?,?)', [index, at, kind, actor === undefined ? null : encode(actor), actor === undefined ? null : key(actor), reach ?? null, reply ?? null, encode(payload)]);
+            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 })) });
             if (effect.participant) {
                 const p = effect.participant;
                 string(p.name, true);
@@ -817,7 +802,6 @@ export function createSqliteDriver(db) {
                 requireFact(t.kind === 'listen' || t.kind === 'ignore');
                 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]);
             }
-            effect.audience.forEach((r, order) => run('INSERT INTO landed_audience(act_index,recipient_key_json,recipient_order,route) VALUES(?,?,?,?)', [index, key(r.recipient), order, r.route]));
             run('UPDATE square_meta SET next_act_index=? WHERE id=1', [index + 1]);
             changed = true;
         },
@@ -825,11 +809,11 @@ export function createSqliteDriver(db) {
             finite(at);
             const next = read.header().nextActIndex;
             indexes.forEach(index => requireFact(integer(index) < next, 'receipt references an unassigned activity index.'));
-            let count = 0;
-            const encoded = encode(owner(name));
-            string(owner(name), true);
-            for (const index of indexes)
-                count += run('INSERT OR IGNORE INTO receipts(owner_json,act_index,at) VALUES(?,?,?)', [encoded, index, at]);
+            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;
@@ -884,6 +868,40 @@ export function createSqliteDriver(db) {
             return count > 0;
         },
     };
+    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;
+            },
+        };
+    }
     const delivery = {
         claimDelivery(input) {
             requireFact(input.kind === 'wake' || input.kind === 'presentation');
@@ -903,42 +921,24 @@ export function createSqliteDriver(db) {
             const cancelledThrough = read.cancelledThrough(input.seat.participant, input.seat.generation);
             if (cancelledThrough !== undefined && index <= cancelledThrough)
                 return { status: 'stale' };
-            const rows = all('SELECT * FROM delivery_evidence WHERE participant_key_json=? AND generation_json=? AND act_index=? AND kind=? ORDER BY attempt_n DESC', [key(input.seat.participant), encode(input.seat.generation), index, input.kind]);
-            const decoded = rows.map(deliveryEvidence);
-            const terminal = decoded.find((row) => input.kind === 'wake'
-                ? row.outcome === 'accepted' || row.outcome === 'unknown'
-                : row.outcome === 'presented' || row.outcome === 'unknown');
-            if (terminal !== undefined)
-                return { status: 'terminal', evidence: terminal };
-            const dispatching = decoded.find((row) => row.outcome === 'dispatching');
-            if (dispatching !== undefined && (dispatching.expiresAt === undefined || dispatching.expiresAt > input.at))
-                return { status: 'busy', evidence: dispatching };
-            if (dispatching !== undefined) {
-                const updated = { ...dispatching, outcome: 'unknown', at: input.at, expiresAt: undefined, diagnostic: 'interrupted dispatch' };
-                const source = rows.find((row) => row.attempt_n === dispatching.attemptN);
-                run('UPDATE delivery_evidence SET outcome=?,at=?,expires_at=NULL,payload_json=? WHERE participant_key_json=? AND generation_json=? AND act_index=? AND kind=? AND attempt_n=?', ['unknown', input.at, encode({ ...object(json(source.payload_json)), diagnostic: 'interrupted dispatch' }), key(input.seat.participant), encode(input.seat.generation), index, input.kind, dispatching.attemptN]);
-                deliveryChanged = true;
-                return { status: 'terminal', evidence: updated };
-            }
-            const attemptN = (decoded[0]?.attemptN ?? -1) + 1;
-            const payload = input.route === undefined ? {} : { route: input.route };
-            const expiry = finite(input.at + leaseMs);
-            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(?,?,?,?,?,?,?,?,?,?,?)', [key(input.seat.participant), encode(input.seat.participant), encode(input.seat.generation), index, input.kind, attemptN, 'dispatching', input.at, expiry, encode(input.claimToken), encode(payload)]);
-            deliveryChanged = true;
-            return { status: 'acquired', claimToken: input.claimToken, attemptN };
+            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 correlation = nativeCorrelation(input.correlation);
-            const payload = object(json(row.payload_json));
+            const previous = attempt(row), correlation = nativeCorrelation(input.correlation), payload = previous.data;
             if (stableJson(payload.correlation ?? null) === stableJson(correlation))
                 return true;
-            const count = run('UPDATE delivery_evidence SET payload_json=? WHERE participant_key_json=? AND generation_json=? AND claim_token_json=?', [encode({ ...payload, correlation }), key(input.seat.participant), encode(input.seat.generation), encode(input.claimToken)]);
-            if (count)
-                deliveryChanged = true;
-            return count > 0;
+            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);
@@ -948,16 +948,9 @@ export function createSqliteDriver(db) {
             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;
-            if (row.outcome === 'accepted' && input.outcome === 'accepted')
-                return true;
-            if (row.outcome !== 'dispatching' && !(row.outcome === 'unknown' && input.outcome === 'accepted'))
-                return false;
-            const previous = object(json(row.payload_json));
-            const payload = { ...previous, ...(input.signature === undefined ? {} : { signature: input.signature }), ...(input.message === undefined ? {} : { message: input.message }), ...(input.diagnostic === undefined ? {} : { diagnostic: input.diagnostic }), ...(input.correlation === undefined ? {} : { correlation: input.correlation }) };
-            const count = run('UPDATE delivery_evidence SET outcome=?,at=?,expires_at=NULL,payload_json=? WHERE participant_key_json=? AND generation_json=? AND act_index=? AND claim_token_json=?', [input.outcome, input.at, encode(payload), key(input.seat.participant), encode(input.seat.generation), index, encode(input.claimToken)]);
-            if (count)
-                deliveryChanged = true;
-            return count > 0;
+            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)]);
@@ -1071,6 +1064,12 @@ function inspectRows(db, inspectSeat) {
     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.
+        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();

package/dist/square-tools.js

@@ -33,7 +33,7 @@ export const SQUARE_TOOLS = [
         reply: activityId.optional().describe('The activity you are answering, like act/12. Its author hears you if still here.'),
         noMention: z.boolean().optional().describe('Leave @names in the body as plain text. Mentions and reply still reach people.'),
         force: z.boolean().optional().describe('Speak now, even if something reached you that you have not caught yet.'),
-        noWait: z.boolean().optional().describe('If a hand is raised or you are speaking too fast, return at once instead of waiting.'),
+        noWait: z.boolean().optional().describe('If you are speaking too fast, return at once instead of waiting.'),
     }, async (square, { body, as, ...options }, control, identity) => (await selectOwnSeat(square, identity.owner, as)).express(body, { ...options, observe: true }, control), rendering((result) => renderExpression(result.observation?.location ?? '', result))),
     tool('catch', 'Take in what reached you since you last looked: mentions, replies, bells, and words from those you listen to. What you catch no longer waits for you; history lets you look back.', {
         as: participant,
@@ -64,16 +64,8 @@ export const SQUARE_TOOLS = [
         const self = await selectOwnSeat(square, identity.owner, as);
         return self[action](target, { observe: true }, control);
     }, rendering((result, args) => renderListenerChange(result.observation?.location ?? '', args.action, result))),
-    tool('hold', 'Raise a hand to pause the conversation; lower it with release. While a hand is up, new words wait to land.', {
-        as: participant,
-        reason: z.string().optional().describe('Why you are pausing. Everyone sees it.'),
-        release: z.boolean().optional().describe('true lowers the raised hand so the conversation goes on.'),
-    }, async (square, { as, reason, release }, control, identity) => {
-        const self = await selectOwnSeat(square, identity.owner, as);
-        return release === true ? self.resume({ observe: true }, control) : self.hold(reason, { observe: true }, control);
-    }, rendering((result, args) => renderLifecycleResult(result.observation?.location ?? '', args.release === true ? 'resume' : 'hold', result))),
-    tool('done', 'Step out of the square. Everyone sees you leave, and you stop listening to anyone. Leaving carries no words, so say goodbye with express first. Stay instead if someone may still need you; you can join again later.', { as: participant }, async (square, { as }, control, identity) => (await selectOwnSeat(square, identity.owner, as)).done(undefined, { observe: true }, control), rendering((result) => renderLifecycleResult(result.observation?.location ?? '', 'done', result))),
-    tool('status', 'Look around the square: who is here, whether a hand is raised, the latest activity, and who you listen to.', {
+    tool('done', 'Step out of the square. Everyone sees you leave, and you stop listening to anyone. Leaving carries no words, so say goodbye with express first. Stay instead if someone may still need you; you can join again later.', { as: participant }, async (square, { as }, control, identity) => (await selectOwnSeat(square, identity.owner, as)).done(undefined, { observe: true }, control), rendering((result) => renderLifecycleResult(result.observation?.location ?? '', result))),
+    tool('status', 'Look around the square: who is here, the latest activity, and who you listen to.', {
         as: z.string().optional().describe('Whose listening to show. Leave it out if you hold exactly one name here.'),
     }, async (square, { as }, control, identity) => {
         const viewer = (await selectOwnSeat(square, identity.owner, as, { optional: true }))?.name;

package/dist/views.d.ts

@@ -4,8 +4,8 @@ import type { ActivityFilter, SquareRead } from './ports.js';
 import type { Activity, ArchiveRecord, PerceivedActivity, HistoryQuery, HistoryContinuation, ParticipantsResult, SquareSnapshot, EntryPresentation, StatusResult, SquareObservation, CatchPresence } from './square-facade.js';
 export declare const HISTORY_DEFAULT_LIMIT = 10;
 export declare const HISTORY_MAX_LIMIT = 100;
-export declare const NON_READ: readonly ["join", "done", "say", "hold", "resume", "listen", "ignore", "unlisten"];
-/** The one StoredAct-to-public-Activity field mapping. Rejects read and actorless acts. */
+export declare const NON_READ: readonly ["join", "done", "say", "listen", "ignore", "unlisten"];
+/** The one StoredAct-to-public-Activity field mapping. Rejects read bookkeeping. */
 export declare function toPublicActivity(stored: StoredAct): Activity;
 export declare function toPerceivedActivity(facts: SquareRead, stored: StoredAct, viewer: string): PerceivedActivity;
 export declare function parseRequiredActivityId(id: ActivityId): number;
@@ -22,7 +22,6 @@ export declare function recoveryObservation(facts: SquareRead, name: string, now
     participant: string;
     activitySummaries: import("./square-facade.js").UnreadActivitySummary[];
     standingCount: number;
-    held: boolean;
     ownActivityCount: number;
     hardCap: import("./model.js").HardCap;
 };

package/dist/views.js

@@ -9,11 +9,11 @@ export const HISTORY_DEFAULT_LIMIT = 10;
 export const HISTORY_MAX_LIMIT = 100;
 const STATUS_HERE_WINDOW_MS = 30 * 60_000;
 const PRESENCE_WINDOW_MS = 8 * 60 * 60_000;
-export const NON_READ = ['join', 'done', 'say', 'hold', 'resume', 'listen', 'ignore', 'unlisten'];
-const ARCHIVE = new Set(['join', 'done', 'say', 'hold', 'resume']);
-/** The one StoredAct-to-public-Activity field mapping. Rejects read and actorless acts. */
+export const NON_READ = ['join', 'done', 'say', 'listen', 'ignore', 'unlisten'];
+const ARCHIVE = new Set(['join', 'done', 'say']);
+/** The one StoredAct-to-public-Activity field mapping. Rejects read bookkeeping. */
 export function toPublicActivity(stored) {
-    if (stored.kind === 'read' || stored.actor === undefined)
+    if (stored.kind === 'read')
         throw new Error(`Cannot expose stored activity ${formatActivityId(stored.index)}`);
     return { id: formatActivityId(stored.index), at: stored.at, kind: stored.kind, actor: stored.actor,
         ...(stored.kind === 'say' && stored.reach !== undefined ? { reach: stored.reach } : {}),
@@ -108,21 +108,20 @@ export function selectHistory(facts, query, limit, kinds, presentation = true) {
     return { activities, visibleActivities, totalMatches, ...(continuation === undefined ? {} : { continuation }) };
 }
 export function publicActivities(activities) {
-    return activities.flatMap((activity) => activity.kind === 'read' || activity.actor === undefined ? [] : [toPublicActivity(activity)]);
+    return activities.flatMap((activity) => activity.kind === 'read' ? [] : [toPublicActivity(activity)]);
 }
 export function snapshot(facts, now) {
-    const header = facts.header(), hold = facts.hold();
+    const header = facts.header();
     const names = new Map(facts.roster().map((p) => [nameKey(p.name), p.name]));
     const receipts = new Set(facts.receiptAssignments().map((r) => JSON.stringify([r.owner, r.index])));
     return { context: [...header.preamble, ...header.warmup].join('\n'), actCount: facts.activityCount({ kinds: NON_READ }), hardCap: header.hardCap,
         ...(header.throttlePerMinute === undefined ? {} : { throttlePerMinute: header.throttlePerMinute }),
-        held: hold.active && hold.actor !== undefined ? { by: hold.actor, ...(hold.reason === undefined ? {} : { reason: hold.reason }) } : null,
         participants: coreParticipants(facts, now).filter((p) => p.presence !== 'never-joined').map(({ name, presence, listening }) => ({ name, presence, listening })),
         delivered(name, id) { return receipts.has(JSON.stringify([names.get(nameKey(name)) ?? name, parseRequiredActivityId(id)])); } };
 }
 export function recoveryObservation(facts, name, now) {
-    const known = resolveKnownName(facts, name), hold = facts.hold();
-    return { participant: known, activitySummaries: unreadActivitySummaries(facts, known, now), standingCount: inSquareCount(facts), held: hold.active,
+    const known = resolveKnownName(facts, name);
+    return { participant: known, activitySummaries: unreadActivitySummaries(facts, known, now), standingCount: inSquareCount(facts),
         ownActivityCount: facts.participant(known).sayCount, hardCap: facts.header().hardCap };
 }
 export function entryPresentation(facts, name, lastN = HISTORY_DEFAULT_LIMIT) {
@@ -146,7 +145,7 @@ function classifyPresence(participants, now) {
 export function queryParticipants(facts, context, observe = false) {
     const participants = coreParticipants(facts, context.now);
     return { participants, ...(!observe ? {} : { observation: { ...context, ...classifyPresence(participants, context.now),
-                standingCount: inSquareCount(facts), held: facts.hold().active } }) };
+                standingCount: inSquareCount(facts) } }) };
 }
 export function listPresentation(facts) {
     const participants = facts.roster().filter((p) => p.joined).map((p) => {
@@ -157,21 +156,16 @@ export function listPresentation(facts) {
 }
 export function queryStatus(facts, context, viewer = '', observe = false) {
     const participants = coreParticipants(facts, context.now);
-    const header = facts.header(), hold = facts.hold(), standingCount = inSquareCount(facts);
+    const header = facts.header(), standingCount = inSquareCount(facts);
     const listener = participants.find((p) => p.presence !== 'never-joined' && nameKey(p.name) === nameKey(viewer));
     const latest = facts.activityHeads({ kinds: ['say', 'done'] }, { edge: 'newest', limit: 1 }).items[0];
     const latestAct = latest === undefined ? undefined : facts.activity(latest.index);
     const data = {
         hardCap: header.hardCap,
         ...(header.throttlePerMinute === undefined ? {} : { throttlePerMinute: header.throttlePerMinute }),
-        held: hold.active ? {
-            ...(hold.actor === undefined ? {} : { by: hold.actor }),
-            ...(hold.reason === undefined ? {} : { reason: hold.reason }),
-            ...(hold.at === undefined ? {} : { at: hold.at }),
-        } : null,
         ...(listener === undefined ? {} : { listening: listener.listening }),
         participants: participants.filter((p) => p.presence !== 'never-joined'), now: context.now,
-        ...(latestAct === undefined || latestAct.actor === undefined || latestAct.kind === 'read' ? {} : { latestActivity: toPublicActivity(latestAct) }),
+        ...(latestAct === undefined || latestAct.kind === 'read' ? {} : { latestActivity: toPublicActivity(latestAct) }),
     };
     if (!observe)
         return data;
@@ -200,7 +194,7 @@ export function catchPresence(facts, now) {
     return { participants, now };
 }
 export function streamProjection(facts, cursor, recipient) {
-    const page = facts.activityHeads({ afterIndex: cursor, kinds: NON_READ, actorRequired: true }, { edge: 'oldest', limit: PAGE_SIZE });
+    const page = facts.activityHeads({ afterIndex: cursor, kinds: NON_READ }, { edge: 'oldest', limit: PAGE_SIZE });
     const heads = recipient === undefined ? page.items : page.items.filter((head) => facts.directedAt(recipient, head.index) !== undefined);
     const activities = facts.activities(heads.map((head) => head.index)).map((activity) => recipient === undefined
         ? toPublicActivity(activity) : toPerceivedActivity(facts, activity, recipient));
@@ -210,7 +204,7 @@ export function streamTailProjection(facts, last = HISTORY_DEFAULT_LIMIT, recipi
     if (!Number.isSafeInteger(last) || last < 0 || last > PAGE_SIZE)
         throw new SquareError('invalid_args', `Invalid stream tail: expected a non-negative safe integer no greater than ${PAGE_SIZE}.`);
     const heads = last === 0 ? [] : recipient === undefined
-        ? facts.activityHeads({ kinds: NON_READ, actorRequired: true }, { edge: 'newest', limit: last }).items
+        ? facts.activityHeads({ kinds: NON_READ }, { edge: 'newest', limit: last }).items
         : facts.directed(recipient, {}, { edge: 'newest', limit: last }).items;
     const activities = facts.activities(heads.map((head) => head.index)).map((activity) => recipient === undefined
         ? toPublicActivity(activity) : toPerceivedActivity(facts, activity, recipient));

package/dist/wakes.d.ts

@@ -11,9 +11,6 @@ export type WatchLeaseStart = {
 };
 export type WatchLeasePulse = {
     readonly type: 'replaced';
-} | {
-    readonly type: 'held';
-    readonly heartbeatAt?: number;
 } | {
     readonly type: 'terminal';
     readonly status: 'capped' | 'quorum';

package/dist/wakes.js

@@ -21,15 +21,13 @@ export async function pulseWatchLease(artifact, seat, at, leaseId, options, hear
         const known = resolveKnownName(facts, name), lease = freshWatchLease(facts, known, at);
         if (lease?.leaseId !== leaseId)
             return { type: 'replaced' };
-        const held = facts.hold().active;
-        const terminal = held ? undefined : watchTerminalStatus(facts, known);
+        const terminal = watchTerminalStatus(facts, known);
         if (terminal !== undefined)
             return { type: 'terminal', status: terminal };
-        const type = held ? 'held' : 'sleep';
         if (!heartbeatDue)
-            return { type };
+            return { type: 'sleep' };
         facts.putLease(known, newLease(leaseId, at, options), seat.generation);
-        return { type, heartbeatAt: at };
+        return { type: 'sleep', heartbeatAt: at };
     }, signal);
     return value;
 }