@ouro.bot/cli 0.1.0-alpha.66 → 0.1.0-alpha.660

package/dist/heart/session-activity.js

@@ -38,6 +38,8 @@ exports.findFreshestFriendSession = findFreshestFriendSession;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const runtime_1 = require("../nerves/runtime");
+const config_1 = require("./config");
+const session_events_1 = require("./session-events");
 const DEFAULT_ACTIVE_THRESHOLD_MS = 24 * 60 * 60 * 1000;
 function activityPriority(source) {
     return source === "friend-facing" ? 0 : 1;
@@ -54,7 +56,7 @@ function resolveFriendName(friendId, friendsDir, agentName) {
         return friendId;
     }
 }
-function parseFriendActivity(sessionPath) {
+function parseFriendActivity(sessionPath, activeThresholdMs, nowMs) {
     let mtimeMs;
     try {
         mtimeMs = fs.statSync(sessionPath).mtimeMs;
@@ -62,32 +64,49 @@ function parseFriendActivity(sessionPath) {
     catch {
         return null;
     }
-    try {
-        const raw = fs.readFileSync(sessionPath, "utf-8");
-        const parsed = JSON.parse(raw);
-        const explicit = parsed?.state?.lastFriendActivityAt;
-        if (typeof explicit === "string") {
-            const parsedMs = Date.parse(explicit);
-            if (Number.isFinite(parsedMs)) {
-                return {
-                    lastActivityMs: parsedMs,
-                    lastActivityAt: new Date(parsedMs).toISOString(),
-                    activitySource: "friend-facing",
-                };
-            }
+    if (Number.isFinite(activeThresholdMs) && nowMs - mtimeMs > activeThresholdMs) {
+        return null;
+    }
+    const envelope = (0, session_events_1.loadSessionEnvelopeFile)(sessionPath);
+    const chronology = envelope ? (0, session_events_1.deriveSessionChronology)(envelope.events) : null;
+    const explicit = envelope?.state.lastFriendActivityAt;
+    if (typeof explicit === "string") {
+        const parsedMs = Date.parse(explicit);
+        if (Number.isFinite(parsedMs)) {
+            return {
+                lastActivityMs: parsedMs,
+                lastActivityAt: new Date(parsedMs).toISOString(),
+                activitySource: "friend-facing",
+                lastInboundAt: chronology?.lastInboundAt ?? null,
+                lastOutboundAt: chronology?.lastOutboundAt ?? null,
+                unansweredInboundCount: chronology?.unansweredInboundCount ?? 0,
+            };
         }
     }
-    catch {
-        // fall back to file mtime below
+    if (chronology?.lastInboundAt) {
+        const parsedMs = Date.parse(chronology.lastInboundAt);
+        if (Number.isFinite(parsedMs)) {
+            return {
+                lastActivityMs: parsedMs,
+                lastActivityAt: new Date(parsedMs).toISOString(),
+                activitySource: "friend-facing",
+                lastInboundAt: chronology.lastInboundAt,
+                lastOutboundAt: chronology.lastOutboundAt,
+                unansweredInboundCount: chronology.unansweredInboundCount,
+            };
+        }
     }
     return {
         lastActivityMs: mtimeMs,
         lastActivityAt: new Date(mtimeMs).toISOString(),
         activitySource: "mtime-fallback",
+        lastInboundAt: chronology?.lastInboundAt ?? null,
+        lastOutboundAt: chronology?.lastOutboundAt ?? null,
+        unansweredInboundCount: chronology?.unansweredInboundCount ?? 0,
     };
 }
 function listSessionActivity(query) {
-    const { sessionsDir, friendsDir, agentName, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, currentSession = null, } = query;
+    const { sessionsDir, friendsDir, agentName, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, nowMs = Date.now(), currentSession = null, } = query;
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
         event: "daemon.session_activity_scan",
@@ -99,7 +118,6 @@ function listSessionActivity(query) {
     });
     if (!fs.existsSync(sessionsDir))
         return [];
-    const now = Date.now();
     const results = [];
     let friendDirs;
     try {
@@ -130,14 +148,17 @@ function listSessionActivity(query) {
                 if (!keyFile.endsWith(".json"))
                     continue;
                 const key = keyFile.replace(/\.json$/, "");
-                if (currentSession && friendId === currentSession.friendId && channel === currentSession.channel && key === currentSession.key) {
+                // Compare with sanitizeKey on both sides — session keys from the filesystem
+                // are already sanitized (colons → underscores), but the canonical key from
+                // the pipeline may still have colons (e.g. "chat:any" vs "chat_any").
+                if (currentSession && friendId === currentSession.friendId && channel === currentSession.channel && (0, config_1.sanitizeKey)(key) === (0, config_1.sanitizeKey)(currentSession.key)) {
                     continue;
                 }
                 const sessionPath = path.join(channelPath, keyFile);
-                const activity = parseFriendActivity(sessionPath);
+                const activity = parseFriendActivity(sessionPath, activeThresholdMs, nowMs);
                 if (!activity)
                     continue;
-                if (now - activity.lastActivityMs > activeThresholdMs)
+                if (nowMs - activity.lastActivityMs > activeThresholdMs)
                     continue;
                 results.push({
                     friendId,
@@ -148,6 +169,9 @@ function listSessionActivity(query) {
                     lastActivityAt: activity.lastActivityAt,
                     lastActivityMs: activity.lastActivityMs,
                     activitySource: activity.activitySource,
+                    lastInboundAt: activity.lastInboundAt,
+                    lastOutboundAt: activity.lastOutboundAt,
+                    unansweredInboundCount: activity.unansweredInboundCount,
                 });
             }
         }
@@ -160,10 +184,10 @@ function listSessionActivity(query) {
     });
 }
 function findFreshestFriendSession(query) {
-    const { activeOnly = false, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, ...rest } = query;
+    const { activeOnly = false, activeThresholdMs = DEFAULT_ACTIVE_THRESHOLD_MS, nowMs, ...rest } = query;
     const currentSession = rest.currentSession ?? null;
     const all = activeOnly
-        ? listSessionActivity({ ...rest, activeThresholdMs, currentSession })
-        : listSessionActivity({ ...rest, activeThresholdMs: Number.MAX_SAFE_INTEGER, currentSession });
+        ? listSessionActivity({ ...rest, activeThresholdMs, nowMs, currentSession })
+        : listSessionActivity({ ...rest, activeThresholdMs: Number.MAX_SAFE_INTEGER, nowMs, currentSession });
     return all.find((entry) => entry.friendId === query.friendId) ?? null;
 }