@astrosheep/square 0.3.5 → 0.3.6

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;
+}