@astrosheep/square 0.3.5 → 0.3.7

package/dist/presentation.js

@@ -83,16 +83,16 @@ export function renderPresenceLines(participants, now, limit = 5) {
         lines.push(`  ○ …and ${remaining} more`);
     return lines;
 }
-const ACT_HINTS = [
+const EXPRESS_HINTS = [
     '*asterisks* are your body — *slams table*, *sketches in the air*, *shrugs*',
-    "you're standing in a square, not posting to a feed",
+    "you're standing in a square — words and gestures both land",
     'half-shaped is welcome — a sketch, an objection, a joke, a fragment',
     '@ only who you need — step back with catch --mention',
 ];
-export function actHintLine(ownActCount) {
-    if (ownActCount !== 1 && ownActCount % 5 !== 0)
+export function expressHintLine(ownActivityCount) {
+    if (ownActivityCount !== 1 && ownActivityCount % 5 !== 0)
         return undefined;
-    const hint = ACT_HINTS[Math.floor(ownActCount / 5) % ACT_HINTS.length];
+    const hint = EXPRESS_HINTS[Math.floor(ownActivityCount / 5) % EXPRESS_HINTS.length];
     return `· ${hint}`;
 }
 const BODY_PREVIEW_LENGTH = 200;
@@ -153,7 +153,8 @@ export function renderEventCli(event, opts = {}) {
             const mentionSuffix = mention !== undefined && extractMentions(event.body).some((name) => sameName(name, mention))
                 ? ` · calls your name across the square — @${mention}`
                 : '';
-            return `● ${event.actor} #${opts.actNumber ?? 1} · ${actId(event)} · ${formatRelativeTime(event.at, now)}${mentionSuffix}${bodySuffix(body)}`;
+            const replySuffix = event.reply === undefined ? '' : ` · replies to ${actId(event.reply)}`;
+            return `● ${event.actor} #${opts.actNumber ?? 1} · ${actId(event)} · ${formatRelativeTime(event.at, now)}${mentionSuffix}${replySuffix}${bodySuffix(body)}`;
         }
         case 'done': {
             const body = renderedBody(event.body, maxBody);
@@ -201,26 +202,21 @@ function renderUnreadSummary(opts) {
                 return `  · ${item.name} spoke — ${formatAge(item.latestActivityAgeMs)} ago · "${previewActivityBody(preview.act.body)}"`;
             }),
         ]),
-        ...opts.roomChanges.map(({ act }) => `  · ${renderRoomChangeText(act)}`),
+        ...opts.roomChanges.map((act) => `  · ${renderRoomChangeText(act)}`),
     ];
 }
-export function renderPendingFeed(publicItems, roomChanges, viewer = '') {
+export function renderPendingFeed(history, publicItems, roomChanges, viewer = '') {
     const lines = [];
-    for (const item of publicItems) {
-        if (item.act.kind === 'say' && item.number !== undefined && item.act.at) {
-            const rendered = renderVisibleEvent(publicItems
-                .filter((entry) => (entry.act.kind === 'say' || entry.act.kind === 'done') && entry.act.at !== undefined)
-                .map((entry, index) => ({ ...entry.act, index })), { kind: 'say', actor: item.act.actor, at: item.act.at, body: item.act.body ?? '', index: item.index }, viewer, { actNumber: item.number });
-            if (rendered !== '')
-                lines.push(rendered);
-        }
-        else if (item.act.kind === 'done' && item.act.at) {
-            lines.push(renderEventCli({ kind: 'done', actor: item.act.actor, at: item.act.at, body: item.act.body ?? '', index: item.index }));
-        }
+    for (const act of publicItems) {
+        const rendered = renderVisibleEvent(history, act, viewer, {
+            actNumber: act.kind === 'say' ? sayNumberFor(history, act) : undefined,
+        });
+        if (rendered !== '')
+            lines.push(rendered);
     }
     const publicIndexes = new Set(publicItems.map((item) => item.index));
-    for (const { act, index } of roomChanges) {
-        if (publicIndexes.has(index))
+    for (const act of roomChanges) {
+        if (publicIndexes.has(act.index))
             continue;
         lines.push(`· ${renderRoomChangeText(act)}`);
     }
@@ -229,32 +225,23 @@ export function renderPendingFeed(publicItems, roomChanges, viewer = '') {
 export function renderActivityBlocked(opts) {
     const readNowCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} catch --now`;
     return withPathOutput(opts.squarePath, [
-        "✕ your act doesn't land — the square moved behind your back",
+        "✕ your activity doesn't land — the square moved behind your back",
         ...renderUnreadSummary({ activitySummaries: opts.activitySummaries, roomChanges: opts.unreadRoomChanges, viewer: opts.name }),
         ...draftSavedLines(opts.draftPath),
         `» ${readNowCommand}`,
-        '  read, then act again',
+        '  take it in, then express again',
         `» ${withDraftInput(opts.forceCommand, opts.draftPath)}`,
-        '  only if you truly mean to speak over them',
+        '  only if you truly mean to express over unread activity',
     ].join('\n'), { participantCount: opts.participantCount, held: opts.held });
 }
-export function withJoinNextOutput(squarePath, body, opts = {}) {
-    return withPathOutput(squarePath, body.trimEnd(), opts);
-}
-export function withActivityNextOutput(squarePath, body = '', opts = {}) {
-    return withPathOutput(squarePath, body.trimEnd(), opts);
-}
-export function withWatchNextOutput(squarePath, body, opts = {}) {
-    return withPathOutput(squarePath, body.trimEnd(), opts);
-}
-export function renderActWaiting(opts) {
+export function renderExpressWaiting(opts) {
     if (opts.reason === 'throttled') {
-        return ['✕ the square is packed', `  · your act is waiting · next opening in ${formatDuration(opts.delayMs)}`].join('\n');
+        return ['✕ the square is packed', `  · your activity is waiting · next opening in ${formatDuration(opts.delayMs)}`].join('\n');
     }
-    return ["✕ your act doesn't land — a hand is raised", '  · your act is waiting'].join('\n');
+    return ["✕ your activity doesn't land — a hand is raised", '  · your activity is waiting'].join('\n');
 }
-export function renderActNoWait(opts) {
-    const retryCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} act -`;
+export function renderExpressNoWait(opts) {
+    const retryCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} express -`;
     const lines = opts.reason === 'throttled'
         ? [
             '✕ the square is packed',
@@ -263,7 +250,7 @@ export function renderActNoWait(opts) {
             `» ${withDraftInput(retryCommand, opts.draftPath)}`,
         ]
         : [
-            "✕ your act doesn't land — a hand is raised",
+            "✕ your activity doesn't land — a hand is raised",
             `  · ${opts.holdReason ?? 'the square holds its breath'}`,
             ...draftSavedLines(opts.draftPath),
             `» ${withDraftInput(retryCommand, opts.draftPath)}`,
@@ -295,7 +282,7 @@ function renderLastPresenceMarker(name) {
     return `· ${name}'s footprints reach here`;
 }
 export function renderActivitiesView(doc, visible, lastN, full, squarePath, viewer = '') {
-    const publicVisible = visible.filter((item) => item.act.kind === 'say' || item.act.kind === 'done');
+    const publicVisible = visible.filter((act) => act.kind === 'say' || act.kind === 'done');
     const shown = lastN == null ? publicVisible : publicVisible.slice(-lastN);
     const previewLen = full ? undefined : BODY_PREVIEW_LENGTH;
     const markers = new Map();
@@ -305,23 +292,23 @@ export function renderActivitiesView(doc, visible, lastN, full, squarePath, view
             markers.set(anchor, [...(markers.get(anchor) ?? []), participant]);
     }
     const chunks = [];
-    for (const item of shown) {
-        const rendered = renderVisibleEvent(doc.acts, item.act, viewer, {
+    for (const act of shown) {
+        const rendered = renderVisibleEvent(doc.acts, act, viewer, {
             preview: previewLen,
-            actNumber: item.act.kind === 'say' ? sayNumberFor(doc.acts, item.act) : undefined,
+            actNumber: act.kind === 'say' ? sayNumberFor(doc.acts, act) : undefined,
         });
         if (rendered !== '')
             chunks.push(rendered);
-        for (const participant of markers.get(item.index) ?? []) {
+        for (const participant of markers.get(act.index) ?? []) {
             chunks.push(renderLastPresenceMarker(participant));
         }
     }
     if (chunks.length === 0)
         return 'latest\n  ○ no public activity in this view';
     if (previewLen !== undefined) {
-        const truncated = shown.some((item) => item.act.kind === 'say' && item.act.body.length > previewLen);
+        const truncated = shown.some((act) => act.kind === 'say' && act.body.length > previewLen);
         if (truncated)
-            chunks.push(`» ${commandPrefix(squarePath)} echo --full`);
+            chunks.push(`» ${commandPrefix(squarePath)} history --full`);
     }
     return chunks.join('\n\n');
 }
@@ -332,22 +319,25 @@ function highlightGrepMatch(text) {
     return `\x1b[38;5;222m\x1b[1m${text}\x1b[0m`;
 }
 export function renderGrepActivitiesView(visible, totalMatches, full, squarePath, pattern, fixed = false) {
-    const publicVisible = visible.filter((item) => item.act.kind === 'say' || item.act.kind === 'done');
+    const publicVisible = visible.filter((act) => act.kind === 'say' || act.kind === 'done');
     if (totalMatches === 0)
         return `○ no activity matched ${quoteShell(pattern)}`;
     const matchLabel = totalMatches === 1 ? 'match' : 'matches';
     const chunks = [publicVisible.length === totalMatches ? `${totalMatches} ${matchLabel}` : `${publicVisible.length} of ${totalMatches} ${matchLabel}`];
     let truncated = false;
-    for (const item of publicVisible) {
-        const rawBody = item.act.body ?? '';
+    for (const act of publicVisible) {
+        const rawBody = act.body ?? '';
         if (full === true) {
             const body = rawBody.split('\n').map((line) => `  ${line}`).join('\n');
-            chunks.push(`${actId(item.index)} · ${item.act.actor ?? 'unknown'} · ${formatTimestamp(item.act.at)}\n${body}`);
+            chunks.push(`${actId(act.index)} · ${act.actor ?? 'unknown'} · ${formatTimestamp(act.at)}\n${body}`);
             continue;
         }
         const snippet = grepSnippet(rawBody, pattern, GREP_PREVIEW_CHARS, fixed);
-        if (snippet === undefined)
+        if (snippet === undefined) {
+            const preview = previewBody(rawBody, GREP_PREVIEW_CHARS);
+            chunks.push(`${actId(act.index)} · ${act.actor ?? 'unknown'} · ${formatTimestamp(act.at)}${preview === '' ? '' : `\n  ${preview}`}`);
             continue;
+        }
         const clippedBefore = snippet.beforeOmitted > 0;
         const clippedAfter = snippet.afterOmitted > 0;
         truncated ||= clippedBefore || clippedAfter;
@@ -355,13 +345,13 @@ export function renderGrepActivitiesView(visible, totalMatches, full, squarePath
         const omitted = clippedBefore || clippedAfter
             ? `\n  · ${snippet.beforeOmitted} chars before · ${snippet.afterOmitted} chars after`
             : '';
-        chunks.push(`${actId(item.index)} · ${item.act.actor ?? 'unknown'} · ${formatTimestamp(item.act.at)}\n  ${text.trim()}${omitted}`);
+        chunks.push(`${actId(act.index)} · ${act.actor ?? 'unknown'} · ${formatTimestamp(act.at)}\n  ${text.trim()}${omitted}`);
     }
     if (publicVisible.length === 1) {
-        chunks.push(`» ${commandPrefix(squarePath)} echo --at ${actId(publicVisible[0].index)} -C 2${truncated ? ' --full' : ''}`);
+        chunks.push(`» ${commandPrefix(squarePath)} history --at ${actId(publicVisible[0].index)} -C 2${truncated ? ' --full' : ''}`);
     }
     else if (truncated && publicVisible.length > 1) {
-        chunks.push(`» ${commandPrefix(squarePath)} echo --at ${actId(publicVisible[0].index)} -C 2 --full`);
+        chunks.push(`» ${commandPrefix(squarePath)} history --at ${actId(publicVisible[0].index)} -C 2 --full`);
     }
     return chunks.join('\n\n');
 }
@@ -369,7 +359,7 @@ function renderActivityLimitBody(opts) {
     const countText = opts.count !== undefined && opts.hardCap !== undefined ? ` (${opts.count}/${opts.hardCap})` : '';
     const doneCommand = `${participantCommandPrefix(opts.squarePath, opts.name)} done -`;
     return [
-        `✕ your act doesn't land — the cap is reached${countText}`,
+        `✕ your activity doesn't land — the cap is reached${countText}`,
         ...draftSavedLines(opts.draftPath),
         `» ${withDraftInput(doneCommand, opts.draftPath)}`,
     ].join('\n');
@@ -377,11 +367,8 @@ function renderActivityLimitBody(opts) {
 export function renderActivityLimit(opts) {
     return withPathOutput(opts.squarePath, renderActivityLimitBody(opts), { participantCount: opts.participantCount, held: opts.held });
 }
-export function renderWatchInterrupted(_opts) {
-    return '✕ catch stopped';
-}
 export function renderWatchAlreadyActive(opts) {
-    return ['✕ you are already catching', `» ${participantCommandPrefix(opts.squarePath, opts.name)} catch --force`].join('\n');
+    return ['✕ you are already catching', `» ${participantCommandPrefix(opts.squarePath, opts.name)} catch --idle 30m --replace`].join('\n');
 }
 export function renderWatchForceTakeover(_opts) {
     return '✓ your new catch takes over';
@@ -400,8 +387,11 @@ export function renderWatchStatus(opts) {
         case 'stale':
         case 'empty-now': {
             const prefix = participantCommandPrefix(opts.squarePath, opts.name);
+            const quiet = opts.status === 'stale' && opts.idleMs !== undefined
+                ? `○ ${formatDuration(opts.idleMs)} of quiet — nothing new for you`
+                : '○ only footsteps in the square — nothing new for you';
             return [
-                '○ only footsteps in the square — nothing new for you',
+                quiet,
                 ...(opts.showCatchHint === false
                     ? []
                     : [`» ${prefix} catch --idle 30m`, `  glance: ${prefix} catch --now`]),
@@ -417,7 +407,7 @@ export function renderWatchStatus(opts) {
 function renderRoomChanges(changes) {
     if (changes.length === 0)
         return '';
-    return ['▲ while your back was turned', ...changes.map(({ act }) => `  · ${renderRoomChangeText(act)}`)].join('\n');
+    return ['▲ while your back was turned', ...changes.map((act) => `  · ${renderRoomChangeText(act)}`)].join('\n');
 }
 export function renderDoctorClean() {
     return '✓ no problems found';
@@ -441,8 +431,11 @@ export function renderWatchOutput(history, publicItems, roomChanges, opts) {
     const sections = [];
     if (opts.stalePartial) {
         const prefix = participantCommandPrefix(opts.squarePath, opts.viewer);
+        const quiet = opts.idleMs === undefined
+            ? '○ only footsteps in the square — nothing new for you'
+            : `○ ${formatDuration(opts.idleMs)} of quiet — nothing else for you`;
         sections.push([
-            '○ only footsteps in the square — nothing new for you',
+            quiet,
             ...(opts.showCatchHint === false
                 ? []
                 : [`» ${prefix} catch --idle 30m`, `  glance: ${prefix} catch --now`]),
@@ -455,8 +448,8 @@ export function renderWatchOutput(history, publicItems, roomChanges, opts) {
         sections.push(room);
     if (publicItems.length > 0) {
         const rendered = publicItems
-            .map((item) => renderVisibleEvent(history, item.act, opts.viewer, {
-            actNumber: item.act.kind === 'say' ? sayNumberFor(history, item.act) : undefined,
+            .map((act) => renderVisibleEvent(history, act, opts.viewer, {
+            actNumber: act.kind === 'say' ? sayNumberFor(history, act) : undefined,
             mention: opts.mention,
         }))
             .filter(Boolean)

package/dist/presented.js

@@ -35,7 +35,6 @@ function readRows(filePath, now = Date.now()) {
             if (parsed.v !== 2 ||
                 typeof parsed.ts !== 'number' ||
                 typeof parsed.owner_id !== 'string' ||
-                typeof parsed.presenter_session_id !== 'string' ||
                 typeof parsed.square_path !== 'string' ||
                 typeof parsed.name !== 'string' ||
                 typeof parsed.act_index !== 'number' ||
@@ -155,17 +154,20 @@ function selectUnpresented(sessionId, inbox, rows) {
             : [{ membership: { ...membership, notifications }, ownerId }];
     });
 }
-/** True when the current participant owner has already received this attention. */
-export function hasPresentedAttention(squarePath, name, actIndex, env = process.env) {
-    const ownerIds = new Set(lookupParticipant(squarePath, name).map((binding) => binding.ownerId));
-    if (ownerIds.size === 0)
-        return false;
+export function hasPresentedForOwner(ownerId, squarePath, name, actIndex, env = process.env) {
     const resolved = canonicalSquarePath(squarePath);
-    return readRows(presentedPath(env)).some((row) => ownerIds.has(row.owner_id) &&
+    return readRows(presentedPath(env)).some((row) => row.owner_id === ownerId &&
         canonicalSquarePath(row.square_path) === resolved &&
         sameName(row.name, name) &&
         row.act_index === actIndex);
 }
+/** True when any current participant owner has already received this attention. */
+export function hasPresentedAttention(squarePath, name, actIndex, env = process.env) {
+    const ownerIds = new Set(lookupParticipant(squarePath, name).map((binding) => binding.ownerId));
+    if (ownerIds.size === 0)
+        return false;
+    return [...ownerIds].some((ownerId) => hasPresentedForOwner(ownerId, squarePath, name, actIndex, env));
+}
 /**
  * Serialize presentation only for the affected participants. Delivery runs
  * outside the short ledger-write lock, so unrelated owners never wait on an
@@ -192,7 +194,6 @@ export function presentOnce(sessionId, lookup, deliver, env = process.env, at =
                         v: 2,
                         ts: at,
                         owner_id: ownerId,
-                        presenter_session_id: sessionId,
                         square_path: canonicalSquarePath(membership.squarePath),
                         name: membership.name,
                         act_index: notification.actIndex,

package/dist/registry.js

@@ -9,11 +9,19 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { homedir } from 'node:os';
 import { randomUUID } from 'node:crypto';
+import { loadSquare } from './artifact.js';
 import { nameKey, sameName } from './model.js';
+import { isCurrentlyJoined } from './runtime.js';
 const MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
 const COMPACT_BYTES = 64 * 1024;
 const COMPACT_LINES = 1000;
 const VALID_CHANNELS = new Set(['claude-code', 'codex', 'opencode', 'pi', 'paseo', 'unknown']);
+const LOCAL_SESSION_SOURCES = [
+    { variable: 'CLAUDE_CODE_SESSION_ID', channel: 'claude-code', child: 'CLAUDE_CODE_CHILD_SESSION' },
+    { variable: 'CODEX_THREAD_ID', channel: 'codex' },
+    { variable: 'OPENCODE_SESSION_ID', channel: 'opencode' },
+    { variable: 'SQUARE_PI_SESSION_ID', channel: 'pi' },
+];
 export function registryPath() {
     if (process.env['SQUARE_REGISTRY'])
         return process.env['SQUARE_REGISTRY'];
@@ -113,9 +121,8 @@ function foldRegistry(raw, now) {
     }
     return active.sort((a, b) => b.updatedAt - a.updatedAt);
 }
-function compactRegistry(filePath, raw, now) {
-    const active = foldRegistry(raw, now);
-    const compacted = active
+function writeRegistryBindings(filePath, bindings) {
+    const compacted = bindings
         .slice()
         .reverse()
         .map((binding) => JSON.stringify({
@@ -135,6 +142,9 @@ function compactRegistry(filePath, raw, now) {
     fs.writeFileSync(temporary, compacted === '' ? '' : `${compacted}\n`, { mode: 0o600 });
     fs.renameSync(temporary, filePath);
 }
+function compactRegistry(filePath, raw, now) {
+    writeRegistryBindings(filePath, foldRegistry(raw, now));
+}
 function maybeCompactRegistry(filePath, now) {
     let stat;
     try {
@@ -214,53 +224,53 @@ export function lookupParticipant(squarePath, name, now = Date.now()) {
     const canonicalPath = canonicalSquarePath(squarePath);
     return readActiveBindings(now).filter((binding) => binding.squarePath === canonicalPath && sameName(binding.name, name));
 }
-export function localSessionIdentities(env = process.env) {
-    const paseoAgentId = env['PASEO_AGENT_ID']?.trim() || undefined;
-    const identities = [];
-    const claudeSessionId = env['CLAUDE_CODE_SESSION_ID']?.trim();
-    if (claudeSessionId) {
-        identities.push({
-            sessionId: claudeSessionId,
-            channel: 'claude-code',
-            child: env['CLAUDE_CODE_CHILD_SESSION'] === '1',
-            ...(paseoAgentId ? { paseoAgentId } : {}),
-        });
+/** Resolve the current local harness owner for a participant, if one is registered. */
+export function localParticipantOwner(squarePath, name, env = process.env, now = Date.now()) {
+    const sessionIds = new Set(localSessionIdentities(env).map((identity) => identity.sessionId));
+    if (sessionIds.size === 0)
+        return undefined;
+    return lookupParticipant(squarePath, name, now).find((binding) => sessionIds.has(binding.sessionId))?.ownerId;
+}
+function bindingIsProvablyObsolete(binding) {
+    if (!fs.existsSync(binding.squarePath))
+        return true;
+    try {
+        return !isCurrentlyJoined(loadSquare(binding.squarePath).acts, binding.name);
     }
-    const codexThreadId = env['CODEX_THREAD_ID']?.trim();
-    if (codexThreadId && !identities.some((identity) => identity.sessionId === codexThreadId)) {
-        identities.push({
-            sessionId: codexThreadId,
-            channel: 'codex',
-            child: false,
-            ...(paseoAgentId ? { paseoAgentId } : {}),
-        });
+    catch {
+        // A temporarily unreadable artifact is uncertain, so preserve its binding.
+        return false;
     }
-    const openCodeSessionId = env['OPENCODE_SESSION_ID']?.trim();
-    if (openCodeSessionId && !identities.some((identity) => identity.sessionId === openCodeSessionId)) {
-        identities.push({
-            sessionId: openCodeSessionId,
-            channel: 'opencode',
-            child: false,
-            ...(paseoAgentId ? { paseoAgentId } : {}),
-        });
+}
+/** Compact the registry and remove only bindings disproved by their authoritative artifact. */
+export function pruneRegistry(now = Date.now()) {
+    const filePath = registryPath();
+    let raw;
+    try {
+        raw = fs.readFileSync(filePath, 'utf8');
     }
-    const piSessionId = env['SQUARE_PI_SESSION_ID']?.trim();
-    if (piSessionId && !identities.some((identity) => identity.sessionId === piSessionId)) {
-        identities.push({
-            sessionId: piSessionId,
-            channel: 'pi',
-            child: false,
-            ...(paseoAgentId ? { paseoAgentId } : {}),
-        });
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return { removed: 0, kept: 0 };
+        throw error;
     }
-    if (paseoAgentId && !identities.some((identity) => identity.sessionId === paseoAgentId)) {
-        identities.push({
-            sessionId: paseoAgentId,
-            channel: 'paseo',
-            child: false,
-            paseoAgentId,
-        });
+    const active = foldRegistry(raw, now);
+    const kept = active.filter((binding) => !bindingIsProvablyObsolete(binding));
+    writeRegistryBindings(filePath, kept);
+    return { removed: active.length - kept.length, kept: kept.length };
+}
+function addLocalSession(identities, sessionId, channel, child, paseoAgentId) {
+    if (!sessionId || identities.some((identity) => identity.sessionId === sessionId))
+        return;
+    identities.push({ sessionId, channel, child, ...(paseoAgentId ? { paseoAgentId } : {}) });
+}
+export function localSessionIdentities(env = process.env) {
+    const paseoAgentId = env['PASEO_AGENT_ID']?.trim() || undefined;
+    const identities = [];
+    for (const source of LOCAL_SESSION_SOURCES) {
+        addLocalSession(identities, env[source.variable]?.trim(), source.channel, source.child !== undefined && env[source.child] === '1', paseoAgentId);
     }
+    addLocalSession(identities, paseoAgentId, 'paseo', false, paseoAgentId);
     return identities;
 }
 /** True when this process belongs to a harness that can deliver Square attention without a foreground catch. */

package/dist/runtime.js

@@ -59,8 +59,13 @@ export function extractMentions(body) {
         matches.push(match[1]);
     return matches;
 }
-/** Pure mention filter for say acts. Broadcast bodies (no @) match any named viewer. */
+/** Pure directed-activity filter. Broadcast bodies (no @) match any named viewer. */
 export function matchesMentionTarget(act, mention) {
+    if (act.reach === 'bell')
+        return true;
+    if (act.reach !== undefined) {
+        return mention === true || sameName(act.reach.beside, mention);
+    }
     const mentions = extractMentions(act.body);
     if (mention === true)
         return mentions.length > 0;
@@ -104,24 +109,12 @@ export function sayNumberFor(acts, target) {
 export function doneNames(acts) {
     return new Set(fold(acts).done.map((participant) => nameKey(participant)));
 }
-export function hasJoined(acts, name) {
-    return fold(acts).participants.some((participant) => sameName(participant.name, name) && participant.joined);
-}
 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);
 }
-/** Timestamp of the recipient's most recent join act, if any. */
-export function lastJoinAt(acts, name) {
-    let last;
-    for (const act of acts) {
-        if (act.kind === 'join' && sameName(act.actor, name))
-            last = act.at;
-    }
-    return last;
-}
 /** Stable index of the recipient's most recent join act, if any. */
 export function lastJoinIndex(acts, name) {
     let last;
@@ -131,11 +124,6 @@ export function lastJoinIndex(acts, name) {
     }
     return last;
 }
-/** Notifications are live only when they land after the recipient joined. */
-export function isPostJoinActivity(acts, name, actIndex) {
-    const joinIndex = lastJoinIndex(acts, name);
-    return joinIndex !== undefined && actIndex > joinIndex;
-}
 export function actStableIndex(act) {
     if (act.index === undefined)
         throw new Error(`act ${act.kind} is missing a stable index`);
@@ -158,26 +146,13 @@ export function currentHold(acts) {
 export function publicActs(acts) {
     return acts.filter((act) => act.kind === 'say' || act.kind === 'done');
 }
-export function roomChangeActs(acts) {
-    return acts.filter((act) => act.kind !== 'say' && act.kind !== 'read');
-}
-export function throttleDelayMs(doc, at) {
-    const limit = doc.throttlePerMinute;
-    if (limit === undefined)
-        return 0;
-    const recent = foldedState(doc).throttleActivityAts.filter((eventAt) => at - eventAt < THROTTLE_WINDOW_MS).sort((a, b) => a - b);
-    if (recent.length < limit)
-        return 0;
-    const releaseAt = recent[recent.length - limit] + THROTTLE_WINDOW_MS;
-    return Math.max(1, releaseAt - at);
-}
 function canonicalRuntimeName(doc, name) {
     return resolveRosterName(doc, name) ?? name;
 }
-export function advanceCursor(doc, name, index, source = 'watch', updatedAt = Date.now()) {
-    return touchPresenceCursor(doc, name, updatedAt, source, index);
+export function advanceCursor(doc, name, index, updatedAt = Date.now()) {
+    return touchPresenceCursor(doc, name, updatedAt, index);
 }
-export function touchPresenceCursor(doc, name, at, source, consumedThroughIndex) {
+export function touchPresenceCursor(doc, name, at, consumedThroughIndex) {
     if (!Number.isFinite(at))
         return false;
     if (consumedThroughIndex !== undefined && (!Number.isInteger(consumedThroughIndex) || consumedThroughIndex < 0))
@@ -188,63 +163,31 @@ export function touchPresenceCursor(doc, name, at, source, consumedThroughIndex)
         ? (current?.consumedThroughIndex ?? readCursor(doc, key))
         : Math.max(current?.consumedThroughIndex ?? -1, consumedThroughIndex);
     const updatedAt = current === undefined ? at : Math.max(current.updatedAt, at);
-    if (current?.consumedThroughIndex === nextIndex && current.updatedAt === updatedAt && current.source === source)
+    if (current?.consumedThroughIndex === nextIndex && current.updatedAt === updatedAt)
         return false;
-    doc.runtime.cursors[key] = { consumedThroughIndex: nextIndex, updatedAt, source };
+    doc.runtime.cursors[key] = { consumedThroughIndex: nextIndex, updatedAt };
     return true;
 }
-/** The canonical delivery ledger is keyed by (recipient, stable act id). */
-export function deliveryReceipt(doc, name, actOrIndex) {
-    const id = actId(actOrIndex);
-    // Delivery planners and runtime writers pass roster-canonical names. Keeping
-    // this a direct lookup is important: pending/status scans must stay linear in
-    // activities rather than folding the whole square once per notification.
-    return doc.runtime.mentionReceipts[name]?.[id];
-}
-export function isDeliveryDelivered(doc, name, actOrIndex) {
-    return deliveryReceipt(doc, name, actOrIndex)?.status === 'delivered';
-}
-export function recordDeliveredDelivery(doc, name, actOrIndex, receipt) {
-    const key = canonicalRuntimeName(doc, name);
-    const id = actId(actOrIndex);
-    const current = deliveryReceipt(doc, key, actOrIndex);
-    if (current?.status === 'delivered')
-        return false;
-    const receipts = doc.runtime.mentionReceipts[key] ?? {};
-    receipts[id] = { status: 'delivered', ...receipt };
-    doc.runtime.mentionReceipts[key] = receipts;
-    return true;
-}
-export function markDeliveredMention(doc, name, actOrIndex, at = Date.now()) {
-    return recordDeliveredDelivery(doc, name, actOrIndex, { at });
-}
-export function mentionDeliveredStatus(doc, name, actOrIndex) {
-    return isDeliveryDelivered(doc, name, actOrIndex) ? 'delivered' : undefined;
-}
-export function markDeliveredMentions(doc, name, delivered, at = Date.now()) {
-    let changed = false;
-    for (const item of delivered) {
-        const act = item.act;
-        if (act.kind !== 'say')
-            continue;
-        // A cursor says only where feed reading reached. The recipient/act receipt is
-        // the delivery fact, so never create one for a broadcast or unrelated say.
-        const directed = act.reach === 'bell' ||
-            (act.reach !== undefined && sameName(act.reach.beside, name)) ||
-            extractMentions(act.body).some((mention) => sameName(mention, name));
-        if (!directed)
-            continue;
-        changed = markDeliveredMention(doc, name, actStableIndex(act), at) || changed;
-    }
-    return changed;
-}
-export function latestIndexedActIndex(items) {
-    return items.reduce((max, item) => Math.max(max, item.index), -1);
+export function latestActIndex(acts) {
+    return acts.reduce((max, act) => Math.max(max, act.index), -1);
 }
 export function freshWatchLease(doc, name, at = Date.now()) {
     const key = canonicalRuntimeName(doc, name);
-    const lease = doc.runtime.leases[key];
+    const lease = watchLease(doc, key);
     if (lease === undefined || lease.expiresAt <= at || at - lease.heartbeatAt > WATCH_STALE_MS)
         return undefined;
     return lease;
 }
+export function watchLease(doc, name) {
+    return doc.runtime.leases[canonicalRuntimeName(doc, name)];
+}
+export function writeWatchLease(doc, name, lease) {
+    doc.runtime.leases[canonicalRuntimeName(doc, name)] = lease;
+}
+export function removeWatchLease(doc, name, leaseId) {
+    const key = canonicalRuntimeName(doc, name);
+    if (doc.runtime.leases[key]?.leaseId !== leaseId)
+        return false;
+    delete doc.runtime.leases[key];
+    return true;
+}