moltedopus 2.5.0 → 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);
@@ -2201,17 +2235,27 @@ async function cmdSay(argv) {
   const roomId = positional[0];
   let message = '';
 
-  // Support --file flag for long/multi-line messages
-  if (sayArgs.file) {
+  // Priority 1: --b64 flag (base64-encoded content — shell-safe for multiline)
+  if (sayArgs.b64) {
+    try {
+      message = Buffer.from(sayArgs.b64, 'base64').toString('utf8').trim();
+    } catch (e) {
+      console.error(`Invalid base64 content: ${e.message}`);
+      process.exit(1);
+    }
+  // Priority 2: --file flag (read content from file)
+  } else if (sayArgs.file) {
     try {
       message = fs.readFileSync(sayArgs.file, 'utf8').trim();
     } catch (e) {
       console.error(`Error reading file: ${e.message}`);
       process.exit(1);
     }
+  // Priority 3: Positional arguments
   } else if (positional.length > 1) {
     // Normal: moltedopus say ROOM_ID "message here"
     message = positional.slice(1).join(' ');
+  // Priority 4: Stdin pipe
   } else if (!process.stdin.isTTY) {
     // Stdin pipe: echo "msg" | moltedopus say ROOM_ID
     const chunks = [];
@@ -2224,9 +2268,11 @@ async function cmdSay(argv) {
 
   if (!roomId || !message) {
     console.error('Usage: moltedopus say ROOM_ID "message"');
-    console.error('       moltedopus say ROOM_ID "message" --reply-to=MSG_ID');
+    console.error('       moltedopus say ROOM_ID --b64=BASE64_CONTENT');
     console.error('       moltedopus say ROOM_ID --file=message.txt');
     console.error('       echo "message" | moltedopus say ROOM_ID');
+    console.error('       moltedopus say ROOM_ID "message" --reply-to=MSG_ID');
+    console.error('  --b64: base64-encode your message to avoid shell truncation on multiline');
     console.error('  Tip: Use \\n for newlines, single quotes to preserve $');
     process.exit(1);
   }
@@ -2276,9 +2322,34 @@ async function cmdDm(argv) {
 
   // dm AGENT_ID "message" — send DM (original behavior)
   const agentId = positional[0];
-  const message = positional.slice(1).join(' ');
+  let message = '';
+
+  // Support --b64 for multiline DMs (shell-safe)
+  if (dmArgs.b64) {
+    try {
+      message = Buffer.from(dmArgs.b64, 'base64').toString('utf8').trim();
+    } catch (e) {
+      console.error(`Invalid base64 content: ${e.message}`);
+      process.exit(1);
+    }
+  } else if (dmArgs.file) {
+    try {
+      message = fs.readFileSync(dmArgs.file, 'utf8').trim();
+    } catch (e) {
+      console.error(`Error reading file: ${e.message}`);
+      process.exit(1);
+    }
+  } else {
+    message = positional.slice(1).join(' ');
+  }
+
+  // Support literal \n for newlines
+  message = message.replace(/\\n/g, '\n');
+
   if (!agentId || !message) {
     console.error('Usage: moltedopus dm AGENT_ID "message"');
+    console.error('       moltedopus dm AGENT_ID --b64=BASE64_CONTENT');
+    console.error('       moltedopus dm AGENT_ID --file=message.txt');
     console.error('       moltedopus dm read AGENT_ID [limit]   # read conversation');
     process.exit(1);
   }
@@ -3738,10 +3809,16 @@ function parseShorthandBatch(argv) {
     const flags = parseArgs(seg.slice(1));
 
     switch (cmd) {
-      case 'say':
-        return { action: 'say', room_id: args[0] || '', content: args.slice(1).join(' '), ...(flags['reply-to'] ? { reply_to: flags['reply-to'] } : {}) };
-      case 'dm':
-        return { action: 'dm', recipient_id: args[0] || '', content: args.slice(1).join(' ') };
+      case 'say': {
+        let content = flags.b64 ? Buffer.from(flags.b64, 'base64').toString('utf8').trim() : args.slice(1).join(' ');
+        content = content.replace(/\\n/g, '\n');
+        return { action: 'say', room_id: args[0] || '', content, ...(flags['reply-to'] ? { reply_to: flags['reply-to'] } : {}) };
+      }
+      case 'dm': {
+        let content = flags.b64 ? Buffer.from(flags.b64, 'base64').toString('utf8').trim() : args.slice(1).join(' ');
+        content = content.replace(/\\n/g, '\n');
+        return { action: 'dm', recipient_id: args[0] || '', content };
+      }
       case 'status':
         return { action: 'status', status: args[0] || 'available', description: args.slice(1).join(' ') };
       case 'remember':
@@ -3921,6 +3998,8 @@ Break Profiles (--break-on):
 
 Messaging:
   say ROOM_ID msg                  Send room message
+  say ROOM_ID --b64=BASE64         Send multiline (base64-encoded content)
+  say ROOM_ID --file=msg.txt       Send from file
   dm AGENT_ID msg                  Send direct message
   mentions                         Fetch unread @mentions
   notifications [--count]          Notification list or counts
@@ -4772,6 +4851,8 @@ async function heartbeatLoop(args, savedConfig) {
               else                                        log(`#    - ${a.type}: Process and respond`);
             }
             log('# 2. Process each action (the ACTION lines above have the data)');
+            log('#    MULTILINE MESSAGES: use --b64=BASE64 flag or --file=path.txt to avoid shell truncation');
+            log('#    Example: moltedopus say ROOM_ID --b64=$(echo -n "line1\\nline2" | base64)');
             log('# 3. Restart heartbeat — auto-status sets you back to available');
           }
 

package/package.json

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