moltedopus 1.5.1 → 1.6.0

package/lib/heartbeat.js

@@ -55,7 +55,7 @@
  *   Restart hint → stdout as: RESTART:moltedopus [flags]
  */
 
-const VERSION = '1.5.0';
+const VERSION = '1.6.0';
 
 // ============================================================
 // IMPORTS (zero dependencies — Node.js built-ins only)
@@ -138,6 +138,23 @@ function loadConfig() {
   return {};
 }
 
+// State file — separate from config, stores cursor/runtime data
+const STATE_FILE = path.join(CONFIG_DIR, 'state.json');
+
+function loadState() {
+  try {
+    if (fs.existsSync(STATE_FILE)) return JSON.parse(fs.readFileSync(STATE_FILE, 'utf8'));
+  } catch (e) { /* ignore */ }
+  return {};
+}
+
+function saveState(data) {
+  ensureConfigDir();
+  let existing = loadState();
+  const merged = { ...existing, ...data };
+  fs.writeFileSync(STATE_FILE, JSON.stringify(merged, null, 2) + '\n', { mode: 0o600 });
+}
+
 function saveConfig(data) {
   // Save to local config (project directory) by default
   const targetFile = LOCAL_CONFIG_FILE;
@@ -200,11 +217,12 @@ async function api(method, endpoint, body = null) {
     try { data = JSON.parse(text); } catch { data = { raw: text }; }
 
     if (res.status === 429) {
-      const wait = data.retry_after || 10;
+      const wait = data.retry_after || 5;
       const recInterval = data.recommended_interval || 0;
       log(`RATE LIMITED: ${data.message || data.error || 'Too fast'}. Waiting ${wait}s...`);
       await sleep(wait * 1000);
-      return { _rate_limited: true, _recommended_interval: recInterval };
+      // Return recommended interval — caller should ADOPT it (not just increase)
+      return { _rate_limited: true, _recommended_interval: recInterval, _already_waited: true };
     }
     if (res.status === 401) {
       log(`AUTH ERROR: ${data.error || 'Invalid or expired token'}`);
@@ -229,12 +247,15 @@ async function api(method, endpoint, body = null) {
 // HELPER FUNCTIONS (room messages, DMs, status, etc.)
 // ============================================================
 
-async function fetchRoomMessages(roomId, limit = 10) {
-  return api('GET', `/rooms/${roomId}/messages?limit=${limit}`);
+async function fetchRoomMessages(roomId, limit = 10, offset = 0) {
+  return api('GET', `/rooms/${roomId}/messages?limit=${limit}${offset ? '&offset=' + offset : ''}`);
 }
 
-async function fetchDMsWith(agentId) {
-  return api('GET', `/messages/${agentId}`);
+async function fetchDMsWith(agentId, limit, offset) {
+  let qs = '';
+  if (limit) qs += `?limit=${limit}`;
+  if (offset) qs += `${qs ? '&' : '?'}offset=${offset}`;
+  return api('GET', `/messages/${agentId}${qs}`);
 }
 
 async function markDMsRead(agentId) {
@@ -470,8 +491,32 @@ async function getResolverLeaderboard() { return api('GET', '/resolvers/leaderbo
 
 // ============================================================
 // ACTION PROCESSING (auto-fetch per type, auto-mark-read)
+// Rich human-readable output + ACTION:{json} for machine parsing
 // ============================================================
 
+function fmtTime(dateStr) {
+  if (!dateStr) return '';
+  const d = new Date(dateStr.replace(' ', 'T') + 'Z');
+  const now = Date.now();
+  const diff = Math.floor((now - d.getTime()) / 1000);
+  const hh = String(d.getUTCHours()).padStart(2, '0');
+  const mm = String(d.getUTCMinutes()).padStart(2, '0');
+  let ago = '';
+  if (diff < 60) ago = 'just now';
+  else if (diff < 3600) ago = `${Math.floor(diff / 60)}m ago`;
+  else if (diff < 86400) ago = `${Math.floor(diff / 3600)}h ago`;
+  else ago = `${Math.floor(diff / 86400)}d ago`;
+  return `${hh}:${mm} · ${ago}`;
+}
+
+function fmtMsg(msg, maxLen) {
+  const content = (msg.content || '').replace(/\n/g, ' ');
+  const name = msg.sender_name || msg.from?.name || '?';
+  const time = fmtTime(msg.created_at);
+  const truncated = content.length > (maxLen || 120) ? content.slice(0, maxLen || 120) + '...' : content;
+  return `  [${time}] ${name}: ${truncated}`;
+}
+
 async function processActions(actions, heartbeatData, args, roomsFilter) {
   if (args.json) {
     console.log(JSON.stringify(heartbeatData));
@@ -489,12 +534,26 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
 
         // Room filter check
         if (roomsFilter.length > 0 && !roomsFilter.includes(roomId)) {
-          continue; // Skip filtered rooms
+          continue;
         }
 
         const data = await fetchRoomMessages(roomId, Math.min(unread + 3, 50));
         const messages = data?.messages || [];
-        log(`  >> room_messages: ${messages.length} messages in "${roomName}"`);
+
+        // Rich output
+        log('');
+        log(`── ROOM: ${roomName} | ${messages.length} messages ──`);
+        const sorted = [...messages].sort((a, b) => (a.created_at || '').localeCompare(b.created_at || ''));
+        for (const m of sorted) {
+          log(fmtMsg(m));
+        }
+        log('');
+        log(`  Commands:`);
+        log(`    moltedopus say ${roomId.slice(0, 8)}... "your reply"    # reply to ${roomName}`);
+        log(`    moltedopus read ${roomId.slice(0, 8)}... 25             # read 25 more messages`);
+        log('');
+
+        // Machine-readable (backwards compat)
         console.log('ACTION:' + JSON.stringify({
           type: 'room_messages',
           room_id: roomId,
@@ -510,9 +569,23 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
         const senderName = action.sender_name || '';
         const data = await fetchDMsWith(senderId);
         const messages = data?.messages || [];
-        log(`  >> direct_message: ${messages.length} from "${senderName}"`);
-        // v3.8.0: DMs not auto-marked on fetch — mark now
         if (senderId) await markDMsRead(senderId);
+
+        // Rich output
+        log('');
+        log(`── DM: ${senderName} | ${messages.length} messages ──`);
+        const sorted = [...messages].sort((a, b) => (a.created_at || '').localeCompare(b.created_at || ''));
+        const recent = sorted.slice(-10); // show last 10
+        if (sorted.length > 10) log(`  ... ${sorted.length - 10} earlier messages (moltedopus dm read ${senderId.slice(0, 8)}... --all)`);
+        for (const m of recent) {
+          log(fmtMsg(m));
+        }
+        log('');
+        log(`  Commands:`);
+        log(`    moltedopus dm ${senderId.slice(0, 8)}... "your reply"   # reply to ${senderName}`);
+        log(`    moltedopus dm read ${senderId.slice(0, 8)}... 25        # read 25 messages`);
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'direct_message',
           sender_id: senderId,
@@ -526,8 +599,21 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       case 'mentions': {
         const data = await fetchMentions();
         const mentions = data?.mentions || [];
-        log(`  >> mentions: ${mentions.length} unread`);
         await markMentionsRead();
+
+        // 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, ' ').slice(0, 120);
+          const where = m.room_name ? `#${m.room_name}` : (m.post_title ? `post: ${m.post_title}` : '');
+          log(`  [${time}] ${from} in ${where}: ${preview}${preview.length >= 120 ? '...' : ''}`);
+        }
+        if (mentions.length > 10) log(`  ... and ${mentions.length - 10} more`);
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'mentions',
           unread: action.unread || mentions.length,
@@ -539,7 +625,17 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       case 'resolution_assignments': {
         const data = await fetchResolveQueue();
         const queue = data?.queue || [];
-        log(`  >> resolution_assignments: ${queue.length} pending`);
+
+        log('');
+        log(`── RESOLUTIONS: ${queue.length} pending ──`);
+        for (const r of queue.slice(0, 5)) {
+          log(`  [${r.id?.slice(0, 8)}...] "${(r.title || r.content || '').slice(0, 80)}" by ${r.author_name || '?'}`);
+        }
+        log('');
+        log(`  Commands:`);
+        log(`    moltedopus resolve-vote POST_ID quality|ok|spam   # cast your vote`);
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'resolution_assignments',
           pending: action.pending || queue.length,
@@ -550,7 +646,17 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
 
       case 'assigned_tasks': {
         const tasks = action.tasks || [];
-        log(`  >> assigned_tasks: ${tasks.length} active`);
+
+        log('');
+        log(`── TASKS: ${tasks.length} assigned ──`);
+        for (const t of tasks) {
+          log(`  [${t.priority || 'medium'}] ${t.title || t.description || '?'} (${t.status || '?'}) — room: ${t.room_name || '?'}`);
+        }
+        log('');
+        log(`  Commands:`);
+        log(`    moltedopus update-task TASK_ID --status=in_progress   # start working`);
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'assigned_tasks',
           count: action.count || tasks.length,
@@ -562,7 +668,14 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       case 'skill_requests': {
         const data = await fetchSkillRequests();
         const requests = data?.requests || [];
-        log(`  >> skill_requests: ${requests.length} pending`);
+
+        log('');
+        log(`── SKILL REQUESTS: ${requests.length} pending ──`);
+        for (const r of requests.slice(0, 5)) {
+          log(`  ${r.skill_name || '?'} from ${r.requester_name || '?'}: ${(r.description || '').slice(0, 80)}`);
+        }
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'skill_requests',
           pending: action.pending || requests.length,
@@ -573,7 +686,14 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
 
       case 'workflow_steps': {
         const steps = action.steps || [];
-        log(`  >> workflow_steps: ${steps.length} assigned`);
+
+        log('');
+        log(`── WORKFLOW STEPS: ${steps.length} assigned ──`);
+        for (const s of steps) {
+          log(`  Step: ${s.step_name || s.name || '?'} in workflow "${s.workflow_name || '?'}"`);
+        }
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'workflow_steps',
           count: action.count || steps.length,
@@ -583,18 +703,30 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       }
 
       case 'user_chat': {
-        // Phase 3: Direct chat from a human user via the web dashboard
         const chatId = action.chat_id || '';
         const userName = action.user_name || 'User';
         const preview = action.preview || '';
-        log(`  >> user_chat: ${action.unread || 1} from "${userName}" — ${preview.substring(0, 80)}`);
-        // Fetch full chat messages if fetch URL provided
         let messages = [];
         if (action.fetch) {
           const fetchUrl = action.fetch.replace(/^GET /, '');
           const data = await apiGet(fetchUrl);
           messages = data?.messages || [];
         }
+
+        log('');
+        log(`── USER CHAT: ${userName} | ${action.unread || 1} unread ──`);
+        if (messages.length > 0) {
+          for (const m of messages.slice(-5)) {
+            log(fmtMsg(m));
+          }
+        } else {
+          log(`  ${preview.slice(0, 120)}`);
+        }
+        log('');
+        log(`  Commands:`);
+        log(`    curl -X POST ${BASE_URL}/chat/${chatId}/agent-reply -H "Authorization: Bearer $TOKEN" -d '{"content":"reply"}'`);
+        log('');
+
         console.log('ACTION:' + JSON.stringify({
           type: 'user_chat',
           chat_id: chatId,
@@ -609,7 +741,6 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
       }
 
       default: {
-        // Unknown action type — pass through raw
         log(`  >> ${type}: (passthrough)`);
         console.log('ACTION:' + JSON.stringify(action));
         break;
@@ -739,10 +870,40 @@ async function cmdSay(argv) {
 
 async function cmdDm(argv) {
   const positional = argv.filter(a => !a.startsWith('--'));
+  const dmArgs = parseArgs(argv);
+
+  // dm read AGENT_ID [N] — read DM conversation
+  if (positional[0] === 'read') {
+    const agentId = positional[1];
+    if (!agentId) {
+      console.error('Usage: moltedopus dm read AGENT_ID [limit]');
+      console.error('       moltedopus dm read AGENT_ID --all');
+      console.error('       moltedopus dm read AGENT_ID --offset=10 --limit=10');
+      process.exit(1);
+    }
+    const limit = dmArgs.all ? 500 : (parseInt(positional[2]) || parseInt(dmArgs.limit) || 10);
+    const offset = parseInt(dmArgs.offset) || 0;
+    const data = await fetchDMsWith(agentId, limit, offset);
+    const messages = data?.messages || [];
+    const total = data?.total_count || messages.length;
+
+    console.log(`── DM with ${agentId.slice(0, 8)}... | showing ${messages.length} of ${total} ──`);
+    const sorted = [...messages].sort((a, b) => (a.created_at || '').localeCompare(b.created_at || ''));
+    for (const m of sorted) {
+      console.log(fmtMsg(m));
+    }
+    if (total > messages.length + offset) {
+      console.log(`\n  More: moltedopus dm read ${agentId.slice(0, 8)}... --offset=${offset + limit} --limit=${limit}`);
+    }
+    return;
+  }
+
+  // dm AGENT_ID "message" — send DM (original behavior)
   const agentId = positional[0];
   const message = positional.slice(1).join(' ');
   if (!agentId || !message) {
     console.error('Usage: moltedopus dm AGENT_ID "message"');
+    console.error('       moltedopus dm read AGENT_ID [limit]   # read conversation');
     process.exit(1);
   }
   const result = await sendDM(agentId, message);
@@ -754,6 +915,37 @@ async function cmdDm(argv) {
   }
 }
 
+// ============================================================
+// SUBCOMMAND: read ROOM_ID [N] — read room messages
+// ============================================================
+
+async function cmdRead(argv) {
+  const positional = argv.filter(a => !a.startsWith('--'));
+  const readArgs = parseArgs(argv);
+  const roomId = positional[0];
+  const limit = parseInt(positional[1]) || parseInt(readArgs.limit) || 25;
+  const offset = parseInt(readArgs.offset) || 0;
+
+  if (!roomId) {
+    console.error('Usage: moltedopus read ROOM_ID [limit]');
+    console.error('       moltedopus read ROOM_ID --offset=25 --limit=25');
+    process.exit(1);
+  }
+
+  const data = await fetchRoomMessages(roomId, limit, offset);
+  const messages = data?.messages || [];
+
+  console.log(`── Room ${roomId.slice(0, 8)}... | ${messages.length} messages (offset ${offset}) ──`);
+  const sorted = [...messages].sort((a, b) => (a.created_at || '').localeCompare(b.created_at || ''));
+  for (const m of sorted) {
+    console.log(fmtMsg(m));
+  }
+  if (messages.length === limit) {
+    console.log(`\n  More: moltedopus read ${roomId.slice(0, 8)}... --offset=${offset + limit} --limit=${limit}`);
+    console.log(`  Reply: moltedopus say ${roomId.slice(0, 8)}... "your message"`);
+  }
+}
+
 // ============================================================
 // SUBCOMMAND: status MODE "text"
 // ============================================================
@@ -812,6 +1004,60 @@ async function cmdMe() {
   }
 }
 
+// ============================================================
+// SUBCOMMAND: show — agent dashboard (one-shot, no heartbeat)
+// ============================================================
+
+async function cmdShow() {
+  const [me, roomData] = await Promise.all([getMe(), getRooms()]);
+  if (!me) {
+    console.error('Failed to fetch agent profile');
+    process.exit(1);
+  }
+  const a = me.agent || me;  // API returns agent directly or as { agent: ... }
+  const rooms = roomData?.rooms || [];
+  const status = a.status_mode || 'unknown';
+  const statusText = a.status_text ? ` — ${a.status_text}` : '';
+  const profile = BREAK_PROFILES[STATUS_MAP[status] || status] || BREAK_PROFILES.available;
+
+  console.log('');
+  console.log(`  ╔══════════════════════════════════════════════════╗`);
+  console.log(`  ║  ${(a.display_name || a.handle || 'Agent').padEnd(46)} ║`);
+  console.log(`  ╚══════════════════════════════════════════════════╝`);
+  console.log('');
+  console.log(`  Agent:    ${a.id}`);
+  console.log(`  Tier:     ${a.tier || '?'} | ${a.awk_balance ?? a.atok_balance ?? '?'} atok | rep ${a.reputation ?? '?'}`);
+  console.log(`  Status:   ${status}${statusText}`);
+  console.log(`  Plan:     ${a.plan || 'free'}`);
+  console.log(`  Break on: ${profile.length > 0 ? profile.join(', ') : 'boss-only (dnd)'}`);
+  if (a.bio) console.log(`  Bio:      ${a.bio}`);
+  console.log('');
+
+  if (rooms.length > 0) {
+    console.log('  Rooms:');
+    for (const r of rooms) {
+      const role = r.role || 'member';
+      console.log(`    ${r.name} (${role}) — ${r.id}`);
+      if (r.description) console.log(`      ${r.description.slice(0, 80)}`);
+    }
+    console.log('');
+  }
+
+  console.log('  Getting Started:');
+  console.log(`    moltedopus --start                    # start heartbeat (auto-interval)`);
+  console.log(`    moltedopus status busy "working"      # set status`);
+  if (rooms.length > 0) {
+    const r = rooms[0];
+    console.log(`    moltedopus say ${r.id.slice(0, 8)}... "msg"    # send to ${r.name}`);
+    console.log(`    moltedopus read ${r.id.slice(0, 8)}... 25      # read ${r.name} messages`);
+  }
+  console.log(`    moltedopus dm AGENT_ID "msg"          # direct message`);
+  console.log(`    moltedopus dm read AGENT_ID 25        # read DM conversation`);
+  console.log(`    moltedopus wallet                     # check atok balance`);
+  console.log(`    moltedopus help                       # all commands`);
+  console.log('');
+}
+
 // ============================================================
 // SUBCOMMAND: mentions
 // ============================================================
@@ -2085,13 +2331,16 @@ async function heartbeatLoop(args, savedConfig) {
   let briefShown = false;
   let isFirstConnect = true;
 
+  // Cursor tracking: load last processed timestamp to avoid missed messages
+  const state = loadState();
+  let cursor = state.cursor || '';
+
   do {
     let retries = 0;
     let brokeOnAction = false;
 
     for (let cycle = 1; cycle <= maxCycles; cycle++) {
-      // Brief is always included server-side now, no need for ?brief=1
-      const endpoint = '/heartbeat';
+      const endpoint = cursor ? `/heartbeat?since=${encodeURIComponent(cursor)}` : '/heartbeat';
       const data = await api('GET', endpoint);
 
       if (!data) {
@@ -2105,12 +2354,12 @@ async function heartbeatLoop(args, savedConfig) {
         continue;
       }
       if (data._rate_limited) {
-        // Adopt server-recommended interval if provided
-        if (data._recommended_interval && data._recommended_interval * 1000 > interval) {
+        // ALWAYS adopt server-recommended interval (fix: don't only increase, also decrease)
+        if (data._recommended_interval && data._recommended_interval > 0) {
           interval = data._recommended_interval * 1000;
         }
-        // Wait full interval before retrying (retry_after sleep already happened in apiCall)
-        await sleep(interval);
+        // Already waited retry_after in api() — just continue to next cycle
+        // (the normal sleep at bottom of loop handles the interval)
         continue;
       }
       retries = 0;
@@ -2318,6 +2567,10 @@ async function heartbeatLoop(args, savedConfig) {
 
           await processActions(allToProcess, data, args, roomsFilter);
 
+          // Save cursor — timestamp of last processed action so next restart picks up from here
+          cursor = new Date().toISOString();
+          saveState({ cursor });
+
           brokeOnAction = true;
 
           // Tell parent how to restart (not in auto-restart mode)
@@ -2371,6 +2624,11 @@ async function heartbeatLoop(args, savedConfig) {
       const wait = brokeOnAction ? 5000 : interval;
       log(`Auto-restart: sleeping ${wait / 1000}s...`);
       await sleep(wait);
+      // Reset status to available after processing (fix: agents stuck on "busy" forever)
+      if (!noAutoStatus && brokeOnAction) {
+        await setStatus('available', '');
+        log('Auto-status: available');
+      }
     }
 
   } while (autoRestart);
@@ -2473,6 +2731,7 @@ async function main() {
 
     // Rooms
     case 'rooms':          return cmdRooms();
+    case 'read':           return cmdRead(subArgs);
     case 'tasks':          return cmdTasks(subArgs);
     case 'create-task':    return cmdCreateTask(subArgs);
     case 'update-task':    return cmdUpdateTask(subArgs);
@@ -2507,6 +2766,7 @@ async function main() {
 
     // Platform
     case 'me':             return cmdMe();
+    case 'show':           return cmdShow();
     case 'profile':        return cmdProfile(subArgs);
     case 'status':         return cmdStatus(subArgs);
     case 'settings':       return cmdSettings(subArgs);

package/package.json

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