@astrosheep/square 0.3.69 → 0.3.71

package/dist/presentation.js

@@ -1,13 +1,11 @@
-import { sameName } from './model.js';
+import { sameName, isSquareError } from './model.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import { participantIdentity } from './participant-identity.js';
 export { participantIdentity } from './participant-identity.js';
-import { audienceIncludes, audienceOf, MAX_IDENTITY_SET_SIZE } from './square-core.js';
-import { perceiveActivity } from './delivery.js';
-import { actId, sayNumberFor, HELD_WAIT_BUDGET_MS } from './runtime.js';
+import { formatActivityId, MAX_IDENTITY_SET_SIZE } from './square-core.js';
+import { HELD_WAIT_BUDGET_MS } from './runtime.js';
 import { formatDuration, formatRelativeTime, formatTimestamp } from './time.js';
-import { compareParticipantActivity } from './decisions.js';
 import { grepSnippet } from './search.js';
 import { style } from './tty-style.js';
 export function displayPath(squarePath, cwd = process.cwd()) {
@@ -39,6 +37,11 @@ export function formatRefusal(squarePath, bodyLines, opts = {}) {
         return body === '' ? '' : `${body}\n`;
     return withPathOutput(squarePath, body, { ...opts, plain: true });
 }
+export function refusalText(error) {
+    const text = error instanceof Error ? error.message : String(error);
+    const marked = isSquareError(error) && ['never_joined', 'not_standing', 'unmatched_mention'].includes(error.facts?.reason ?? '');
+    return marked ? text.split('\n').map((line) => `✕ ${line}`).join('\n') : text;
+}
 export function quoteShell(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
 }
@@ -69,11 +72,7 @@ function formatAge(ms) {
         return `${Math.max(0, ms)}ms`;
     return `${Math.floor(ms / 1000)}s`;
 }
-const PRESENCE_WINDOW_MS = 8 * 60 * 60 * 1000;
-export function renderPresenceLines(participants, now, limit = 5) {
-    const recent = participants
-        .filter((p) => p.state === 'done' || p.presence === 'watching' || (p.lastActiveAt !== undefined && now - p.lastActiveAt <= PRESENCE_WINDOW_MS))
-        .sort(compareParticipantActivity);
+export function renderPresenceLines(recent, now, limit = 5) {
     const shown = recent.slice(0, limit);
     if (shown.length === 0)
         return [style('dim', '  ○ nobody nearby')];
@@ -137,9 +136,11 @@ export function renderRoomChangeText(event) {
         case 'resume':
             return `${identity} lowered the hand`;
         case 'listen':
-            return `${identity} turned an ear toward ${participantIdentity(event.target)}`;
+            return `${identity} turned an ear toward ${participantIdentity(event.target ?? 'someone')}`;
         case 'ignore':
-            return `${identity} turned away from ${participantIdentity(event.target)}`;
+            return `${identity} turned away from ${participantIdentity(event.target ?? 'someone')}`;
+        default:
+            throw new Error('Expected a lifecycle activity');
     }
 }
 function renderedBody(body, maxChars) {
@@ -152,6 +153,12 @@ function bodySuffix(body) {
         return '';
     return `\n${body.split('\n').map((line) => `  ${line}`).join('\n')}`;
 }
+function eventId(event) {
+    return 'index' in event ? formatActivityId(event.index) : event.id;
+}
+function replyId(reply) {
+    return typeof reply === 'number' ? formatActivityId(reply) : reply;
+}
 function renderEventCliFacts(event, opts = {}) {
     const now = opts.now;
     const maxBody = opts.preview;
@@ -168,17 +175,17 @@ function renderEventCliFacts(event, opts = {}) {
         case 'say': {
             const body = renderedBody(event.body, maxBody);
             const mention = opts.mention;
-            const mentionSuffix = mention !== undefined && audienceIncludes(audienceOf(event), mention)
+            const mentionSuffix = mention !== undefined && (event.reach === 'bell' || event.mentions?.some((name) => sameName(name, mention)))
                 ? ` · calls your name across the square — ${participantIdentity(mention)}`
                 : '';
-            const replySuffix = event.reply === undefined ? '' : ` · replies to ${actId(event.reply)}`;
-            const meta = ` #${opts.actNumber ?? 1} · ${actId(event)} · ${formatRelativeTime(event.at, now)}${mentionSuffix}${replySuffix}`;
+            const replySuffix = event.reply === undefined ? '' : ` · replies to ${replyId(event.reply)}`;
+            const meta = ` #${opts.actNumber ?? 1} · ${eventId(event)} · ${formatRelativeTime(event.at, now)}${mentionSuffix}${replySuffix}`;
             return { text: `● ${participantIdentity(event.actor)}${style('dim', meta)}${bodySuffix(body.text)}`, bodyClipped: body.clipped };
         }
         case 'done': {
             const body = renderedBody(event.body, maxBody);
             return {
-                text: `${style('dim', '○')} ${participantIdentity(event.actor)} stepped out of the square — done${style('dim', ` · ${actId(event)} · ${formatRelativeTime(event.at, now)}`)}${bodySuffix(body.text)}`,
+                text: `${style('dim', '○')} ${participantIdentity(event.actor)} stepped out of the square — done${style('dim', ` · ${eventId(event)} · ${formatRelativeTime(event.at, now)}`)}${bodySuffix(body.text)}`,
                 bodyClipped: body.clipped,
             };
         }
@@ -190,9 +197,8 @@ export function renderEventCli(event, opts = {}) {
     return renderEventCliFacts(event, opts).text;
 }
 function renderPresenceOnlySay(event, opts = {}) {
-    const audience = audienceOf(event);
-    const targets = audience.kind === 'bell' ? [] : audience.names;
-    const meta = style('dim', ` #${opts.actNumber ?? 1} · ${actId(event)} · ${formatRelativeTime(event.at, opts.now)}`);
+    const targets = event.reach === 'bell' ? [] : event.mentions ?? [];
+    const meta = style('dim', ` #${opts.actNumber ?? 1} · ${eventId(event)} · ${formatRelativeTime(event.at, opts.now)}`);
     if (targets.length === 0) {
         return `● ${participantIdentity(event.actor)}${meta}`;
     }
@@ -207,10 +213,9 @@ function renderPresenceOnlySay(event, opts = {}) {
 export function renderAmbientEventFacts(event, viewer, opts = {}) {
     if (event.kind !== 'say')
         return renderEventCliFacts(event, opts);
-    if (opts.perception === undefined && opts.squareState === undefined) {
-        throw new Error('Ambient say rendering requires a settled perception or SquareState');
-    }
-    const seen = opts.perception ?? perceiveActivity(opts.squareState, event, viewer);
+    if (opts.perception === undefined)
+        throw new Error('Ambient say rendering requires a settled perception');
+    const seen = opts.perception;
     if (seen === 'presence') {
         const presence = renderPresenceOnlySay(event, opts);
         const body = opts.presencePreview === undefined ? { text: '', clipped: false } : renderedBody(event.body, opts.presencePreview);
@@ -248,17 +253,8 @@ function renderUnreadSummary(opts) {
         ...(remainingSummaries === 0 ? [] : [style('dim', `  · ${remainingSummaries} more participants have unread activity`)]),
     ];
 }
-export function renderPendingFeed(history, publicItems, viewer = '', squareState) {
-    const lines = [];
-    for (const act of publicItems) {
-        const rendered = renderAmbientEvent(act, viewer, {
-            actNumber: act.kind === 'say' ? sayNumberFor(history, act) : undefined,
-            ...(squareState === undefined ? {} : { squareState }),
-        });
-        if (rendered !== '')
-            lines.push(rendered);
-    }
-    return lines.join('\n\n');
+export function renderPendingFeed(publicItems, sayNumbers, perceptions, viewer) {
+    return publicItems.map((act) => renderAmbientEvent(act, viewer, { actNumber: sayNumbers[act.index], perception: perceptions[act.index] })).filter(Boolean).join('\n\n');
 }
 export function renderActivityBlocked(opts) {
     const readNowCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} catch`;
@@ -344,7 +340,7 @@ export function renderGrepActivitiesView(visible, totalMatches, noTruncate, squa
     let truncated = false;
     for (const act of publicVisible) {
         const rawBody = act.body ?? '';
-        const header = `${style('dim', actId(act.index))} · ${act.actor === undefined ? 'unknown' : participantIdentity(act.actor)} · ${style('dim', formatTimestamp(act.at))}`;
+        const header = `${style('dim', formatActivityId(act.index))} · ${act.actor === undefined ? 'unknown' : participantIdentity(act.actor)} · ${style('dim', formatTimestamp(act.at))}`;
         if (perception?.(act) === 'presence') {
             chunks.push(header);
             continue;
@@ -370,10 +366,10 @@ export function renderGrepActivitiesView(visible, totalMatches, noTruncate, squa
         chunks.push(`${header}\n  ${text.trim()}${omitted}`);
     }
     if (publicVisible.length === 1) {
-        chunks.push(`${commandPrefix(squarePath)} history --at ${actId(publicVisible[0].index)} -C 2${truncated ? ' --no-truncate' : ''}`);
+        chunks.push(`${commandPrefix(squarePath)} history --at ${formatActivityId(publicVisible[0].index)} -C 2${truncated ? ' --no-truncate' : ''}`);
     }
     else if (truncated && publicVisible.length > 1) {
-        chunks.push(`${commandPrefix(squarePath)} history --at ${actId(publicVisible[0].index)} -C 2 --no-truncate`);
+        chunks.push(`${commandPrefix(squarePath)} history --at ${formatActivityId(publicVisible[0].index)} -C 2 --no-truncate`);
     }
     return chunks.join('\n\n');
 }
@@ -447,20 +443,3 @@ export function renderDoctorClean() {
 export function renderDoctorUnfixable(reason) {
     return ['✕ unreadable artifact', `  · ${truncateExternalDiagnostic(reason)}`].join('\n');
 }
-export function renderWatchOutput(history, publicItems, opts) {
-    const sections = [];
-    if (publicItems.length > 0) {
-        const rendered = publicItems
-            .map((act) => renderAmbientEvent(act, opts.viewer, {
-            actNumber: act.kind === 'say' ? sayNumberFor(history, act) : undefined,
-            mention: opts.mention,
-            ...(opts.perceptions?.has(act.index) ? { perception: opts.perceptions.get(act.index) } : {}),
-            ...(opts.squareState === undefined ? {} : { squareState: opts.squareState }),
-        }))
-            .filter(Boolean)
-            .join('\n\n');
-        if (rendered !== '')
-            sections.push(rendered);
-    }
-    return sections.join('\n\n') + '\n';
-}

package/dist/routes.d.ts

@@ -1,4 +1,5 @@
 import { type WakeRoute, type WakeRouteKind } from './model.js';
+import type { SquareRead, SquareWrite } from './ports.js';
 export { WAKE_ROUTE_KINDS } from './model.js';
 export type { WakeRoute, WakeRouteKind } from './model.js';
 export declare const ROUTE_FRESH_MS: number;
@@ -18,25 +19,17 @@ export declare function routeIdentityKey(route: Pick<WakeRoute, 'location' | 'pa
 export type RouteEpoch = {
     readonly epoch?: number;
 };
-export declare function applyWakeRouteToState(state: import('./model.js').SquareState, route: Omit<WakeRoute, 'updatedAt'> & RouteEpoch, at?: number): void;
-export declare function dropSessionWakeRoutesFromState(state: import('./model.js').SquareState, location: string, sessionId: string, expectedEpoch?: number): void;
-/**
- * Drop one ended session's routes at a location, atomically with the lifecycle decide.
- *
- * A route survives when the ending transaction did not commit `done` and this session
- * still holds the sole live presence for its participant — an in-flight same-session
- * rejoin. `liveParticipants === undefined` means the ledger could not be read, so
- * nothing is dropped on suspicion. An explicit epoch fence additionally keeps routes
- * published by a later generation.
- */
-export declare function dropEndedSessionWakeRoutesFromState(state: import('./model.js').SquareState, location: string, sessionId: string, opts: {
+export declare function applyWakeRoute(facts: SquareWrite, route: Omit<WakeRoute, 'updatedAt'> & RouteEpoch, at?: number): void;
+export declare function dropSessionWakeRoutes(facts: SquareWrite, location: string, sessionId: string, expectedEpoch?: number): void;
+/** Keep an in-flight same-session rejoin; unknown host evidence is not a reason to retire it. */
+export declare function dropEndedSessionWakeRoutes(facts: SquareWrite, location: string, sessionId: string, opts: {
     readonly expectedEpoch?: number;
     readonly liveParticipants?: ReadonlySet<string>;
     readonly force: boolean;
     readonly participant?: string;
 }): void;
-export declare function dropParticipantWakeRoutesFromState(state: import('./model.js').SquareState, location: string, participant: string): void;
-export declare function sessionCanEndParticipant(state: import('./model.js').SquareState, location: string, participant: string, sessionId: string, currentSessionId?: string): boolean;
+export declare function dropParticipantWakeRoutes(facts: SquareWrite, location: string, participant: string): void;
+export declare function sessionCanEndParticipant(facts: SquareRead, location: string, participant: string, sessionId: string, sessionIdNow?: string): boolean;
 export declare function publishWakeRoute(artifact: import('./ports.js').SquareArtifactPort, route: Omit<WakeRoute, 'updatedAt'> & RouteEpoch, opts?: {
     at?: number;
     requireCurrentSession?: boolean;

package/dist/routes.js

@@ -1,5 +1,4 @@
 import { nameKey } from './model.js';
-import { isCurrentlyJoined } from './runtime.js';
 import { canonicalPath, canonicalPathSync } from './canonical-path.js';
 export { WAKE_ROUTE_KINDS } from './model.js';
 export const ROUTE_FRESH_MS = 24 * 60 * 60 * 1000;
@@ -44,89 +43,61 @@ function sameRouteAddress(left, right) {
     const rightKeys = Object.keys(right).sort();
     return leftKeys.length === rightKeys.length && leftKeys.every((key, index) => rightKeys[index] === key && left[key] === right[key]);
 }
-export function applyWakeRouteToState(state, route, at = Date.now()) {
+export function applyWakeRoute(facts, route, at = Date.now()) {
     const location = canonicalPathSync(route.location);
-    state.routes = [...(state.routes ?? []).filter((item) => {
-            const itemLocation = canonicalPathSync(item.location);
-            return !(itemLocation === location && routeIdentityKey(item, itemLocation) === routeIdentityKey(route, location));
-        }), { ...route, location, updatedAt: at }];
+    const identity = routeIdentityKey(route, location);
+    facts.replaceRoutes([...facts.routes().filter((item) => routeIdentityKey(item, canonicalPathSync(item.location)) !== identity),
+        { ...route, location, updatedAt: at, extra: {} }]);
 }
-export function dropSessionWakeRoutesFromState(state, location, sessionId, expectedEpoch) {
+export function dropSessionWakeRoutes(facts, location, sessionId, expectedEpoch) {
     const canonical = canonicalPathSync(location);
-    state.routes = (state.routes ?? []).filter((item) => {
-        if (item.sessionId !== sessionId || canonicalPathSync(item.location) !== canonical)
-            return true;
-        if (expectedEpoch === undefined)
-            return false;
-        return item.epoch !== expectedEpoch;
-    });
+    facts.replaceRoutes(facts.routes().filter((item) => item.sessionId !== sessionId || canonicalPathSync(item.location) !== canonical
+        || (expectedEpoch !== undefined && item.epoch !== expectedEpoch)));
 }
-/**
- * Drop one ended session's routes at a location, atomically with the lifecycle decide.
- *
- * A route survives when the ending transaction did not commit `done` and this session
- * still holds the sole live presence for its participant — an in-flight same-session
- * rejoin. `liveParticipants === undefined` means the ledger could not be read, so
- * nothing is dropped on suspicion. An explicit epoch fence additionally keeps routes
- * published by a later generation.
- */
-export function dropEndedSessionWakeRoutesFromState(state, location, sessionId, opts) {
+/** Keep an in-flight same-session rejoin; unknown host evidence is not a reason to retire it. */
+export function dropEndedSessionWakeRoutes(facts, location, sessionId, opts) {
     const canonical = canonicalPathSync(location);
-    state.routes = (state.routes ?? []).filter((item) => {
+    facts.replaceRoutes(facts.routes().filter((item) => {
         if (item.sessionId !== sessionId || canonicalPathSync(item.location) !== canonical)
             return true;
         if (opts.participant !== undefined && nameKey(item.participant) !== nameKey(opts.participant))
             return true;
-        if (!opts.force) {
-            // Keep only a route whose participant is still joined and whose ended session still
-            // holds the sole live presence — an in-flight same-session rejoin. A no-longer-joined
-            // participant is retired even when a stale presence row survives.
-            if (isCurrentlyJoined(state.acts, item.participant)
-                && (opts.liveParticipants === undefined || opts.liveParticipants.has(nameKey(item.participant))))
-                return true;
-        }
-        if (opts.expectedEpoch !== undefined && item.epoch !== opts.expectedEpoch)
+        if (!opts.force && facts.participant(item.participant)?.joined
+            && (opts.liveParticipants === undefined || opts.liveParticipants.has(nameKey(item.participant))))
             return true;
-        return false;
-    });
+        return opts.expectedEpoch !== undefined && item.epoch !== opts.expectedEpoch;
+    }));
 }
-export function dropParticipantWakeRoutesFromState(state, location, participant) {
+export function dropParticipantWakeRoutes(facts, location, participant) {
     const canonical = canonicalPathSync(location);
-    state.routes = (state.routes ?? []).filter((item) => !(nameKey(item.participant) === nameKey(participant) && canonicalPathSync(item.location) === canonical));
+    facts.replaceRoutes(facts.routes().filter((item) => !(nameKey(item.participant) === nameKey(participant) && canonicalPathSync(item.location) === canonical)));
 }
-export function sessionCanEndParticipant(state, location, participant, sessionId, currentSessionId) {
+export function sessionCanEndParticipant(facts, location, participant, sessionId, sessionIdNow) {
     const canonical = canonicalPathSync(location);
-    const owned = (state.routes ?? []).filter((item) => nameKey(item.participant) === nameKey(participant) && canonicalPathSync(item.location) === canonical);
+    const owned = facts.routes().filter((item) => nameKey(item.participant) === nameKey(participant) && canonicalPathSync(item.location) === canonical);
     if (owned.length === 0)
-        return currentSessionId === sessionId;
-    return owned.every((item) => item.sessionId === sessionId) && (currentSessionId === undefined || currentSessionId === sessionId);
+        return sessionIdNow === sessionId;
+    return owned.every((item) => item.sessionId === sessionId) && (sessionIdNow === undefined || sessionIdNow === sessionId);
 }
 export async function publishWakeRoute(artifact, route, opts = {}) {
     const location = await canonicalPath(route.location);
     const at = opts.at ?? Date.now();
-    await artifact.transact((state) => {
-        if (opts.requireCurrentSession) {
-            if (!isCurrentlyJoined(state.acts, route.participant)
-                || (state.routes ?? []).some((item) => nameKey(item.participant) === nameKey(route.participant) && canonicalPathSync(item.location) === location && item.sessionId !== route.sessionId))
-                return { state, result: undefined };
-        }
-        const identity = routeIdentityKey({ ...route, location });
-        const matching = (state.routes ?? []).filter((item) => routeIdentityKey(item, canonicalPathSync(item.location)) === identity);
+    await artifact.transact((facts) => {
+        const routes = facts.routes();
+        if (opts.requireCurrentSession && (!facts.participant(route.participant)?.joined
+            || routes.some((item) => nameKey(item.participant) === nameKey(route.participant) && canonicalPathSync(item.location) === location && item.sessionId !== route.sessionId)))
+            return;
+        const identity = routeIdentityKey(route, location);
+        const matching = routes.filter((item) => routeIdentityKey(item, canonicalPathSync(item.location)) === identity);
         const existing = matching[0];
-        const existingEpoch = existing?.epoch;
-        const epochMatches = route.epoch === undefined ? existingEpoch === undefined : existingEpoch === route.epoch;
-        if (matching.length === 1 && existing !== undefined && existing.updatedAt > at - ROUTE_FRESH_MS && existing.kind === route.kind && existing.channel === route.channel && sameRouteAddress(existing.address, route.address) && epochMatches)
-            return { result: undefined };
-        return { state: { ...state, routes: [...(state.routes ?? []).filter((item) => routeIdentityKey(item, canonicalPathSync(item.location)) !== identity), { ...route, location, updatedAt: at }] }, result: undefined };
+        if (matching.length === 1 && existing.updatedAt > at - ROUTE_FRESH_MS && existing.kind === route.kind
+            && existing.channel === route.channel && sameRouteAddress(existing.address, route.address) && existing.epoch === route.epoch)
+            return;
+        applyWakeRoute(facts, { ...route, location }, at);
     });
 }
 export async function retireWakeRouteFromArtifact(artifact, route, opts = {}) {
     const location = await canonicalPath(route.location);
-    const target = routeIdentityKey({ ...route, location });
-    await artifact.transact((state) => ({ state: { ...state, routes: (state.routes ?? []).filter((item) => {
-                const itemLocation = canonicalPathSync(item.location);
-                if (routeIdentityKey(item, itemLocation) !== target)
-                    return true;
-                return opts.expectedEpoch !== undefined && item.epoch !== opts.expectedEpoch;
-            }) }, result: undefined }));
+    const target = routeIdentityKey(route, location);
+    await artifact.transact((facts) => facts.replaceRoutes(facts.routes().filter((item) => routeIdentityKey(item, canonicalPathSync(item.location)) !== target || (opts.expectedEpoch !== undefined && item.epoch !== opts.expectedEpoch))));
 }

package/dist/runtime.d.ts

@@ -1,48 +1,21 @@
-import { type ActivityId, type LandedAudienceReplay, type Reach } from './square-core.js';
-import { type StoredAct, type SquareState, type HoldState, type ObservationState, type WatchLease } from './model.js';
+import { type ActivityId } from './square-core.js';
+import { type StoredAct, type WatchLease } from './model.js';
+import type { SquareRead } from './ports.js';
 export declare const WATCH_HEARTBEAT_MS: number;
 export declare const SLEEP_MS: number;
 export declare const STALE_MS: number;
 export declare const WATCH_STALE_MS: number;
 export declare const THROTTLE_WINDOW_MS: number;
 export declare const UNREAD_BLOCK_GRACE_MS: number;
-/** A held express waits for the hand to lower, but not forever: past this budget it gives up exactly like --no-wait (draft saved, retry printed). 0 disables waiting. */
 export declare const HELD_WAIT_BUDGET_MS: number;
+export declare const FACT_PAGE_SIZE = 100;
 export declare function nowMs(): number;
-/** Pure directed-activity filter. Bell matches every viewer; mentions match by audience. */
-export declare function matchesMentionTarget(act: {
-    body: string;
-    mentions?: readonly string[];
-    reach?: Reach;
-}, mention: string | true): boolean;
-export declare function foldedState(squareState: SquareState): import("./square-core.js").FoldedSquareState;
-export declare function rosterNames(squareState: SquareState): string[];
-export declare function inSquareCount(squareState: SquareState): number;
-export declare function resolveRosterName(squareState: SquareState, name: string): string | undefined;
-export declare function countSays(acts: StoredAct[], name: string): number;
-export declare function sayNumberFor(acts: StoredAct[], target: StoredAct): number;
-/** Shared terminal condition for a participant's watch lifecycle. */
-export declare function watchTerminalStatus(squareState: SquareState, name: string): 'capped' | 'quorum' | undefined;
-export declare function joinedNames(acts: StoredAct[]): Set<string>;
-export declare function isCurrentlyJoined(acts: StoredAct[], name: string): boolean;
-/** Stable index of the recipient's most recent join act, if any. */
-export declare function lastJoinIndex(acts: StoredAct[], name: string): number | undefined;
-export declare function actStableIndex(act: StoredAct): number;
+export declare function rosterNames(facts: SquareRead): string[];
+export declare function inSquareCount(facts: SquareRead): number;
 export declare function actId(actOrIndex: StoredAct | number): ActivityId;
-export declare function currentHold(acts: StoredAct[]): HoldState;
-export declare function publicActs(acts: StoredAct[]): Array<Extract<StoredAct, {
-    kind: 'say' | 'done';
-}>>;
-export declare function recordObservation(squareState: SquareState, name: string, index: number, state: ObservationState, at?: number): boolean;
-export declare function readCursor(squareState: SquareState, name: string, landed?: LandedAudienceReplay): number;
-/**
- * The last public act the participant was verifiably present for, or -1 when there is no evidence.
- *
- * "Was here" is a claim of presence, so it rides on evidence: the participant's own acts
- * and seen receipts after their latest join. Anything else — in particular acts merely
- * not addressed to them — says nothing about where they actually were.
- */
-export declare function presenceAnchor(squareState: SquareState, name: string, landed?: LandedAudienceReplay): number;
-export declare function freshWatchLease(squareState: SquareState, name: string, at?: number): WatchLease | undefined;
-export declare function writeWatchLease(squareState: SquareState, name: string, lease: WatchLease): void;
-export declare function removeWatchLease(squareState: SquareState, name: string, leaseId: string): boolean;
+export declare function watchTerminalStatus(facts: SquareRead, name: string): 'capped' | 'quorum' | undefined;
+/** A continuous prefix stops at the first unseen historical audience edge after join. */
+export declare function readCursor(facts: SquareRead, name: string): number;
+/** Presence rides on own activity or exact receipts, not nonaddressed cursor progress. */
+export declare function presenceAnchor(facts: SquareRead, name: string): number;
+export declare function freshWatchLease(facts: SquareRead, name: string, at?: number): WatchLease | undefined;

package/dist/runtime.js

@@ -1,13 +1,12 @@
-import { audienceIncludes, audienceOf, fold, formatActivityId, replayLandedAudiences } from './square-core.js';
-import { SquareError, findParticipantName, nameKey, sameName, } from './model.js';
+import { formatActivityId } from './square-core.js';
+import { SquareError, sameName } from './model.js';
 function parseIntegerEnv(name, fallback) {
     const raw = process.env[name];
     if (raw === undefined)
         return fallback;
     const value = parseInt(raw, 10);
-    if (!Number.isFinite(value) || value <= 0) {
+    if (!Number.isFinite(value) || value <= 0)
         throw new SquareError('invalid_args', `Invalid ${name}: expected a positive integer.`);
-    }
     return value;
 }
 export const WATCH_HEARTBEAT_MS = parseIntegerEnv('SQUARE_WATCH_HEARTBEAT_MS', 60000);
@@ -16,177 +15,47 @@ export const STALE_MS = parseIntegerEnv('SQUARE_WATCH_QUIET_MS', 300000);
 export const WATCH_STALE_MS = parseIntegerEnv('SQUARE_WATCH_STALE_MS', 180000);
 export const THROTTLE_WINDOW_MS = parseIntegerEnv('SQUARE_THROTTLE_WINDOW_MS', 60000);
 export const UNREAD_BLOCK_GRACE_MS = parseIntegerEnv('SQUARE_UNREAD_BLOCK_GRACE_MS', 90000);
-/** A held express waits for the hand to lower, but not forever: past this budget it gives up exactly like --no-wait (draft saved, retry printed). 0 disables waiting. */
 export const HELD_WAIT_BUDGET_MS = parseIntegerEnv('SQUARE_HELD_WAIT_BUDGET_MS', 10 * 60 * 1000);
+export const FACT_PAGE_SIZE = 100;
 export function nowMs() {
     const override = process.env.SQUARE_NOW_MS;
     if (override === undefined)
         return Date.now();
     const value = parseInt(override, 10);
-    if (!Number.isFinite(value)) {
+    if (!Number.isFinite(value))
         throw new SquareError('invalid_args', 'Invalid SQUARE_NOW_MS: expected integer milliseconds.');
-    }
     return value;
 }
-/** Pure directed-activity filter. Bell matches every viewer; mentions match by audience. */
-export function matchesMentionTarget(act, mention) {
-    const audience = audienceOf(act);
-    if (mention === true)
-        return audience.kind === 'bell' || audience.names.length > 0;
-    return audienceIncludes(audience, mention);
-}
-export function foldedState(squareState) {
-    return fold(squareState.acts);
-}
-export function rosterNames(squareState) {
-    return foldedState(squareState).participants.map((participant) => participant.name);
-}
-export function inSquareCount(squareState) {
-    return foldedState(squareState).joined.length;
-}
-export function resolveRosterName(squareState, name) {
-    return findParticipantName(rosterNames(squareState), name);
-}
-export function countSays(acts, name) {
-    return acts.filter((act) => act.kind === 'say' && sameName(act.actor, name)).length;
-}
-export function sayNumberFor(acts, target) {
-    if (target.kind !== 'say')
-        throw new Error('sayNumberFor only applies to say acts');
-    let number = 0;
-    for (const act of acts) {
-        if (act.kind === 'say' && sameName(act.actor, target.actor))
-            number++;
-        if (act === target)
-            return number;
-        if (target.index !== undefined && act.index === target.index)
-            return number;
-    }
-    throw new Error('target say act is not present in act history');
-}
-/** Shared terminal condition for a participant's watch lifecycle. */
-export function watchTerminalStatus(squareState, name) {
-    if (squareState.hardCap !== null && countSays(squareState.acts, name) >= squareState.hardCap)
+export function rosterNames(facts) { return facts.roster().map((participant) => participant.name); }
+export function inSquareCount(facts) { return facts.roster().filter((participant) => participant.joined).length; }
+export function actId(actOrIndex) { return formatActivityId(typeof actOrIndex === 'number' ? actOrIndex : actOrIndex.index); }
+export function watchTerminalStatus(facts, name) {
+    const cap = facts.header().hardCap;
+    if (cap !== null && (facts.participant(name)?.sayCount ?? 0) >= cap)
         return 'capped';
-    const done = new Set(fold(squareState.acts).done.map((participant) => nameKey(participant)));
-    done.delete(nameKey(name));
-    const peers = rosterNames(squareState).filter((participant) => !sameName(participant, name));
-    return peers.length > 0 && peers.every((peer) => done.has(nameKey(peer))) ? 'quorum' : undefined;
-}
-export function joinedNames(acts) {
-    return new Set(acts.filter((act) => act.kind === 'join').map((act) => nameKey(act.actor)));
-}
-export function isCurrentlyJoined(acts, name) {
-    return fold(acts).participants.some((participant) => sameName(participant.name, name) && participant.joined);
-}
-/** Stable index of the recipient's most recent join act, if any. */
-export function lastJoinIndex(acts, name) {
-    let last;
-    for (const act of acts) {
-        if (act.kind === 'join' && sameName(act.actor, name))
-            last = actStableIndex(act);
-    }
-    return last;
-}
-export function actStableIndex(act) {
-    if (act.index === undefined)
-        throw new Error(`act ${act.kind} is missing a stable index`);
-    return act.index;
-}
-export function actId(actOrIndex) {
-    const index = typeof actOrIndex === 'number' ? actOrIndex : actStableIndex(actOrIndex);
-    return formatActivityId(index);
-}
-function canonicalRuntimeName(squareState, name) {
-    return resolveRosterName(squareState, name) ?? name;
-}
-export function currentHold(acts) {
-    const hold = fold(acts).hold;
-    return hold.active ? { active: true, at: hold.at, reason: hold.reason } : { active: false };
-}
-export function publicActs(acts) {
-    return acts.filter((act) => act.kind === 'say' || act.kind === 'done');
-}
-export function recordObservation(squareState, name, index, state, at = Date.now()) {
-    if (!Number.isSafeInteger(index) || index < 0 || !Number.isFinite(at))
-        return false;
-    const key = canonicalRuntimeName(squareState, name);
-    const id = formatActivityId(index);
-    const current = squareState.runtime.observations[key]?.[id];
-    if (current?.state === 'seen' || (current?.state === state && current.at >= at))
-        return false;
-    const next = {
-        state: 'seen',
-        at: Math.max(current?.at ?? -Infinity, at),
-    };
-    ((squareState.runtime.observations ??= {})[key] ??= {})[id] = next;
-    return true;
-}
-export function readCursor(squareState, name, landed = replayLandedAudiences(squareState.acts)) {
-    const recipient = landed.resolveParticipant(name) ?? name;
-    const boundary = landed.lastJoinIndex(recipient) ?? -1;
-    let cursor = boundary;
-    for (const act of squareState.acts) {
-        if (act.index <= boundary || act.kind === 'read' || act.actor === undefined)
-            continue;
-        if (sameName(act.actor, recipient)) {
-            cursor = act.index;
-            continue;
-        }
-        if (!landed.includes(act, recipient)) {
-            cursor = act.index;
-            continue;
-        }
-        if (squareState.runtime.observations?.[recipient]?.[formatActivityId(act.index)]?.state !== 'seen')
-            break;
-        cursor = act.index;
-    }
-    return cursor;
-}
-/**
- * The last public act the participant was verifiably present for, or -1 when there is no evidence.
- *
- * "Was here" is a claim of presence, so it rides on evidence: the participant's own acts
- * and seen receipts after their latest join. Anything else — in particular acts merely
- * not addressed to them — says nothing about where they actually were.
- */
-export function presenceAnchor(squareState, name, landed = replayLandedAudiences(squareState.acts)) {
-    const recipient = landed.resolveParticipant(name) ?? name;
-    const boundary = landed.lastJoinIndex(recipient) ?? -1;
+    const peers = facts.roster().filter((participant) => !sameName(participant.name, name));
+    return peers.length > 0 && peers.every((peer) => peer.done) ? 'quorum' : undefined;
+}
+/** A continuous prefix stops at the first unseen historical audience edge after join. */
+export function readCursor(facts, name) {
+    const boundary = facts.participant(name)?.lastJoinIndex ?? -1;
+    const block = facts.directed(name, { afterIndex: boundary, unseenOnly: true }, { edge: 'oldest', limit: 1 }).items[0]?.index;
+    const last = facts.activityHeads({
+        afterIndex: boundary, ...(block === undefined ? {} : { beforeIndex: block }), actorRequired: true,
+        kinds: ['join', 'done', 'say', 'hold', 'resume', 'listen', 'ignore'],
+    }, { edge: 'newest', limit: 1 }).items[0]?.index;
+    return Math.max(boundary, last ?? boundary);
+}
+/** Presence rides on own activity or exact receipts, not nonaddressed cursor progress. */
+export function presenceAnchor(facts, name) {
+    const boundary = facts.participant(name)?.lastJoinIndex ?? -1;
     if (boundary < 0)
         return -1;
-    let evidence = boundary;
-    for (const act of squareState.acts) {
-        if (act.index <= boundary || act.index <= evidence || act.actor === undefined)
-            continue;
-        if (sameName(act.actor, recipient)
-            || squareState.runtime.observations?.[recipient]?.[formatActivityId(act.index)]?.state === 'seen') {
-            evidence = act.index;
-        }
-    }
-    for (let i = squareState.acts.length - 1; i >= 0; i--) {
-        const event = squareState.acts[i];
-        if (event.index <= boundary || event.index > evidence)
-            continue;
-        if (event.kind === 'say' || event.kind === 'done')
-            return event.index;
-    }
-    return -1;
-}
-export function freshWatchLease(squareState, name, at = Date.now()) {
-    const key = canonicalRuntimeName(squareState, name);
-    const lease = squareState.runtime.leases[key];
-    if (lease === undefined || lease.expiresAt <= at || at - lease.heartbeatAt > WATCH_STALE_MS)
-        return undefined;
-    return lease;
-}
-export function writeWatchLease(squareState, name, lease) {
-    squareState.runtime.leases[canonicalRuntimeName(squareState, name)] = lease;
+    const own = facts.activityHeads({ afterIndex: boundary, actors: [name] }, { edge: 'newest', limit: 1 }).items[0]?.index;
+    const evidence = Math.max(boundary, own ?? boundary, facts.receiptFacts(name, boundary).latestActorActivityIndex ?? boundary);
+    return facts.activityHeads({ afterIndex: boundary, throughIndex: evidence, kinds: ['say', 'done'] }, { edge: 'newest', limit: 1 }).items[0]?.index ?? -1;
 }
-export function removeWatchLease(squareState, name, leaseId) {
-    const key = canonicalRuntimeName(squareState, name);
-    if (squareState.runtime.leases[key]?.leaseId !== leaseId)
-        return false;
-    delete squareState.runtime.leases[key];
-    return true;
+export function freshWatchLease(facts, name, at = Date.now()) {
+    const lease = facts.lease(name);
+    return lease === undefined || lease.expiresAt <= at || at - lease.heartbeatAt > WATCH_STALE_MS ? undefined : lease;
 }