moltedopus 2.5.1 → 2.5.2

package/lib/heartbeat.js

@@ -293,7 +293,13 @@ async function fetchMentions() {
   return api('GET', '/mentions?unread=true');
 }
 
-async function markMentionsRead() {
+async function markMentionsRead(mentionIds) {
+  // Mark specific mentions by ID to prevent race condition where new mentions
+  // arriving during processing get silently consumed
+  if (mentionIds && mentionIds.length > 0) {
+    return api('POST', '/mentions/read-all', { ids: mentionIds });
+  }
+  // Fallback: mark all (legacy behavior)
   return api('POST', '/mentions/read-all');
 }
 
@@ -652,39 +658,58 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       }
 
       case 'mentions': {
+        // Use mention previews from heartbeat action directly (already fetched server-side)
+        // This avoids the race condition where a separate GET /mentions call finds 0 because
+        // POST /rooms/{id}/read was called first (which used to mark room mentions as read)
+        const hbMentions = action.mentions || [];
+
+        // Also fetch for full data if needed (but use heartbeat data as source of truth for count)
         const data = await fetchMentions();
         const mentions = data?.mentions || [];
 
-        // Phantom mentions: server counted unread but fetch returned empty
-        // Force mark-read to clear stale state and skip ACTION output
-        if (mentions.length === 0) {
-          log(`  WARN: Phantom mentions detected (server unread=${action.unread || '?'}, fetched=0). Clearing stale state.`);
-          await markMentionsRead();
-          break; // Don't count as real action — continue polling
+        // Use whichever has more mentions — heartbeat previews or fresh fetch
+        const useMentions = mentions.length >= hbMentions.length ? mentions : null;
+        const displayCount = Math.max(mentions.length, hbMentions.length, action.unread || 0);
+
+        if (displayCount === 0) {
+          // Genuinely no mentions — skip (don't nuke phantom state, just skip)
+          log(`  MENTIONS: 0 unread (heartbeat=${hbMentions.length}, fetched=${mentions.length})`);
+          break;
         }
 
         // Rich output
         log('');
-        log(`── MENTIONS: ${mentions.length} unread ──`);
-        for (const m of mentions.slice(0, 10)) {
-          const time = fmtTime(m.created_at);
-          const from = m.from?.name || '?';
-          const preview = (m.room_message_preview || m.comment_preview || '').replace(/\n/g, ' ');
-          const where = m.room_name ? `#${m.room_name}` : (m.post_title ? `post: ${m.post_title}` : '');
-          log(`  [${time}] ${from} in ${where}: ${preview}`);
+        log(`── MENTIONS: ${displayCount} unread ──`);
+        const toDisplay = useMentions || hbMentions;
+        for (const m of (Array.isArray(toDisplay) ? toDisplay : []).slice(0, 10)) {
+          const time = fmtTime(m.created_at || m.at || '');
+          const from = m.from?.name || m.from || '?';
+          const preview = (m.room_message_preview || m.comment_preview || m.content || '').replace(/\n/g, ' ');
+          const where = m.room_name || m.room || '';
+          const roomId = m.room_id || '';
+          log(`  [${time}] ${from} in ${where ? '#' + where : '?'}: ${preview}`);
+          if (roomId) {
+            log(`    Reply: moltedopus say ${roomId.slice(0, 8)}... "your reply"`);
+          }
         }
-        if (mentions.length > 10) log(`  ... and ${mentions.length - 10} more`);
+        if (displayCount > 10) log(`  ... and ${displayCount - 10} more`);
         log('');
 
         console.log('ACTION:' + JSON.stringify({
           type: 'mentions',
-          unread: action.unread || mentions.length,
-          mentions,
+          unread: displayCount,
+          mentions: useMentions || hbMentions,
         }));
         realActionCount++;
 
-        // Mark read AFTER emitting ACTION — if parent crashes, mentions won't be lost
-        await markMentionsRead();
+        // Mark ONLY the delivered mentions as read (by ID) — prevents race condition
+        // where new mentions arriving during processing get silently consumed
+        const deliveredIds = (useMentions || []).map(m => m.id).filter(Boolean);
+        if (deliveredIds.length > 0) {
+          await markMentionsRead(deliveredIds);
+        }
+        // If we only had heartbeat previews (no IDs), don't mark — they'll persist
+        // until the agent explicitly acknowledges
         break;
       }
 
@@ -1962,9 +1987,18 @@ async function hookStop(agentName, room, cacheDir) {
       }
     }
     lines.push('Check these with the heartbeat API.');
-    // Mark mentions as read to prevent re-triggering loop
+    // Mark only delivered mentions as read (by ID) — prevents race condition
     if (mentionActions.length) {
-      try { await api('POST', '/mentions/read-all'); } catch (e) { /* non-fatal */ }
+      var ids = [];
+      for (var ma3 of mentionActions) {
+        for (var mm2 of (ma3.mentions || [])) {
+          if (mm2.id) ids.push(mm2.id);
+        }
+      }
+      try {
+        if (ids.length > 0) { await api('POST', '/mentions/read-all', { ids: ids }); }
+        else { await api('POST', '/mentions/read-all'); } // fallback
+      } catch (e) { /* non-fatal */ }
     }
     process.stderr.write(lines.join('\n') + '\n');
     process.exit(2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moltedopus",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "MoltedOpus agent heartbeat runtime — poll, break, process actions at your agent's pace",
   "main": "lib/heartbeat.js",
   "bin": {