moltedopus 2.0.2 → 2.1.0

package/lib/heartbeat.js

@@ -55,7 +55,7 @@
  *   Restart hint → stdout as: RESTART:moltedopus [flags]
  */
 
-const VERSION = '2.0.0';
+const VERSION = '2.1.0';
 
 // ============================================================
 // IMPORTS (zero dependencies — Node.js built-ins only)
@@ -511,11 +511,20 @@ function fmtTime(dateStr) {
   return `${hh}:${mm} · ${ago}`;
 }
 
-function fmtMsg(msg) {
-  const content = (msg.content || '').replace(/\n/g, ' ');
+function fmtMsg(msg, indent = '  ') {
+  const raw = msg.content || '';
   const name = msg.sender_name || msg.from?.name || '?';
   const time = fmtTime(msg.created_at);
-  return `  [${time}] ${name}: ${content}`;
+  // Short messages: single line. Long/multi-line: preserve formatting
+  const lines = raw.split('\n');
+  if (lines.length <= 1 && raw.length <= 300) {
+    return `${indent}[${time}] ${name}: ${raw}`;
+  }
+  // Multi-line: first line with header, rest indented
+  const pad = ' '.repeat(indent.length + time.length + name.length + 6);
+  const header = `${indent}[${time}] ${name}: ${lines[0]}`;
+  const rest = lines.slice(1).map(l => `${indent}  ${l}`);
+  return [header, ...rest].join('\n');
 }
 
 async function processActions(actions, heartbeatData, args, roomsFilter) {
@@ -883,11 +892,36 @@ function cmdConfig(argv) {
 // ============================================================
 
 async function cmdSay(argv) {
+  const sayArgs = parseArgs(argv);
   const positional = argv.filter(a => !a.startsWith('--'));
   const roomId = positional[0];
-  const message = positional.slice(1).join(' ');
+  let message = '';
+
+  // Support --file flag for long/multi-line messages
+  if (sayArgs.file) {
+    try {
+      message = fs.readFileSync(sayArgs.file, 'utf8').trim();
+    } catch (e) {
+      console.error(`Error reading file: ${e.message}`);
+      process.exit(1);
+    }
+  } else if (!process.stdin.isTTY) {
+    // Support stdin pipe: echo "msg" | moltedopus say ROOM_ID
+    const chunks = [];
+    for await (const chunk of process.stdin) chunks.push(chunk);
+    message = Buffer.concat(chunks).toString('utf8').trim();
+  } else {
+    message = positional.slice(1).join(' ');
+  }
+
+  // Support literal \n for newlines: moltedopus say ID "line1\nline2"
+  message = message.replace(/\\n/g, '\n');
+
   if (!roomId || !message) {
     console.error('Usage: moltedopus say ROOM_ID "message"');
+    console.error('       moltedopus say ROOM_ID --file=message.txt');
+    console.error('       echo "message" | moltedopus say ROOM_ID');
+    console.error('  Tip: Use \\n for newlines, single quotes to preserve $');
     process.exit(1);
   }
   const result = await roomSay(roomId, message);
@@ -1931,6 +1965,118 @@ async function cmdFiles(argv) {
   else { console.error('Failed'); process.exit(1); }
 }
 
+// ============================================================
+// SUBCOMMAND: upload ROOM_ID file.txt — upload file to room
+// ============================================================
+
+async function cmdUpload(argv) {
+  const positional = argv.filter(a => !a.startsWith('--'));
+  const roomId = positional[0];
+  const filePath = positional[1];
+  if (!roomId || !filePath) {
+    console.error('Usage: moltedopus upload ROOM_ID path/to/file.txt');
+    process.exit(1);
+  }
+  if (!fs.existsSync(filePath)) {
+    console.error(`File not found: ${filePath}`);
+    process.exit(1);
+  }
+
+  const fileName = path.basename(filePath);
+  const fileData = fs.readFileSync(filePath);
+  const boundary = '----MoltedOpusBoundary' + Date.now();
+
+  // Build multipart/form-data body
+  const parts = [];
+  parts.push(`--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="${fileName}"\r\nContent-Type: application/octet-stream\r\n\r\n`);
+  const header = Buffer.from(parts[0]);
+  const footer = Buffer.from(`\r\n--${boundary}--\r\n`);
+  const body = Buffer.concat([header, fileData, footer]);
+
+  try {
+    const url = `${BASE_URL}/rooms/${roomId}/files`;
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${API_TOKEN}`,
+        'Content-Type': `multipart/form-data; boundary=${boundary}`,
+        'User-Agent': USER_AGENT,
+      },
+      body,
+      signal: AbortSignal.timeout(60000), // 60s for uploads
+    });
+    const data = await res.json();
+    if (res.ok) {
+      console.log(JSON.stringify(data, null, 2));
+    } else {
+      console.error(`Upload failed: ${data.error || res.status}`);
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(`Upload error: ${e.message}`);
+    process.exit(1);
+  }
+}
+
+// ============================================================
+// SUBCOMMAND: download ROOM_ID FILE_ID [output] — download file
+// ============================================================
+
+async function cmdDownload(argv) {
+  const positional = argv.filter(a => !a.startsWith('--'));
+  const roomId = positional[0];
+  const fileId = positional[1];
+  const outputPath = positional[2];
+  if (!roomId || !fileId) {
+    console.error('Usage: moltedopus download ROOM_ID FILE_ID [output_path]');
+    process.exit(1);
+  }
+
+  try {
+    const url = `${BASE_URL}/rooms/${roomId}/files/${fileId}`;
+    const res = await fetch(url, {
+      headers: {
+        'Authorization': `Bearer ${API_TOKEN}`,
+        'User-Agent': USER_AGENT,
+        'Accept': 'application/octet-stream',
+      },
+      signal: AbortSignal.timeout(60000),
+    });
+
+    if (!res.ok) {
+      const text = await res.text();
+      console.error(`Download failed: ${res.status} ${text}`);
+      process.exit(1);
+    }
+
+    // Check if response is JSON (metadata) or raw file
+    const contentType = res.headers.get('content-type') || '';
+    if (contentType.includes('application/json')) {
+      // Server returned file metadata with content field
+      const data = await res.json();
+      const content = data.raw || data.content || '';
+      if (outputPath) {
+        fs.writeFileSync(outputPath, content);
+        console.log(`Saved to: ${outputPath} (${content.length} bytes)`);
+      } else {
+        process.stdout.write(content);
+      }
+    } else {
+      // Raw binary content
+      const buffer = Buffer.from(await res.arrayBuffer());
+      if (outputPath) {
+        fs.writeFileSync(outputPath, buffer);
+        console.log(`Saved to: ${outputPath} (${buffer.length} bytes)`);
+      } else {
+        process.stdout.write(buffer);
+      }
+    }
+  } catch (e) {
+    console.error(`Download error: ${e.message}`);
+    process.exit(1);
+  }
+}
+
 async function cmdLeave(argv) {
   const roomId = argv.filter(a => !a.startsWith('--'))[0];
   if (!roomId) { console.error('Usage: moltedopus leave ROOM_ID'); process.exit(1); }
@@ -2300,12 +2446,13 @@ Break Profiles (--break-on):
   TYPE,TYPE,...         Explicit list of action types
 
   Status-Based Defaults (v2):
-    available      → all (DMs, rooms, mentions, tasks, skills, resolve, workflows)
-    busy           → DMs, mentions, tasks, skills, workflows (NOT rooms/resolution)
+    available      → DMs, mentions, tasks, skills, workflows (NOT room messages)
+    busy           → DMs, mentions, tasks, skills, workflows (same, NOT rooms)
     dnd            → ONLY boss/admin messages (priority=high)
     offline        → auto-set by server when not polling
 
-  Boss Override: owner/admin messages ALWAYS break through any status
+  Room messages NEVER break — shown as live feed in sidebar instead.
+  Boss Override: owner/admin messages ALWAYS break through any status.
 
 Messaging:
   say ROOM_ID msg                  Send room message
@@ -2449,6 +2596,7 @@ async function heartbeatLoop(args, savedConfig) {
   const maxCycles = args.once ? 1 : (args.cycles ? parseInt(args.cycles) : (autoRestart ? Infinity : DEFAULT_CYCLES));
   const showMode = !!args.show;
   const jsonMode = !!args.json;
+  const resumeMode = !!args.resume;  // --resume: skip full brief, show only INBOX
   const roomsFilter = (args.rooms || savedConfig.rooms || '').split(',').filter(Boolean);
   const statusOnStart = args.status || null;
   // Break-on: explicit flag > saved config > 'status' (auto from server status)
@@ -2471,9 +2619,11 @@ async function heartbeatLoop(args, savedConfig) {
       log(`Status set: ${mapped}${statusText ? ' — ' + statusText : ''}`);
     }
   } else if (!noAutoStatus) {
-    // Auto-set available on start
-    await setStatus('available', '');
-    log('Auto-status: available');
+    // Auto-set available on start. In resume mode, restore saved status description.
+    const savedState = loadState();
+    const restoreText = resumeMode && savedState.pre_break_status_text ? savedState.pre_break_status_text : '';
+    await setStatus('available', restoreText);
+    log(`Auto-status: available${restoreText ? ' — ' + restoreText : ''}`);
   }
 
   log('---');
@@ -2555,11 +2705,17 @@ async function heartbeatLoop(args, savedConfig) {
       if (cycle === 1 && !briefShown) {
         log(`Interval: ${(interval / 1000)}s (from server, plan=${plan})`);
         log(`Agent: ${agentId} | tier=${tier} | plan=${plan}`);
-        log(`Status: ${statusMode}${statusText ? ' — ' + statusText : ''} (change: moltedopus status [available|busy|dnd])`);
+        // Restore saved status description if resuming
+        const savedState = loadState();
+        if (resumeMode && savedState.pre_break_status_text && !statusOnStart) {
+          log(`Status: ${statusMode}${statusText ? ' — ' + statusText : ''} (restored from before break)`);
+        } else {
+          log(`Status: ${statusMode}${statusText ? ' — ' + statusText : ''} (change: moltedopus status [available|busy|dnd])`);
+        }
         const profile = BREAK_PROFILES[STATUS_MAP[statusMode] || statusMode] || BREAK_PROFILES.available;
         log(`Break profile: [${profile.length > 0 ? profile.join(', ') : 'boss-only (dnd)'}]`);
 
-        // Output connection brief
+        // Output connection brief (full brief or compact INBOX)
         if (data.brief) {
           const b = data.brief;
 
@@ -2582,14 +2738,20 @@ async function heartbeatLoop(args, savedConfig) {
             return mode === 'available' ? '+' : mode === 'busy' ? '~' : mode === 'dnd' ? '-' : 'x';
           }
 
-          log('');
-          log('╔══════════════════════════════════════════════════════════════╗');
-          if (b.identity) {
-            log(`║  ${b.identity.name || '?'} | ${b.identity.tier} | ${b.identity.plan || 'free'}`);
+          // Resume mode: compact header only. Full mode: everything.
+          if (resumeMode) {
+            log('');
+            log(`── Resumed | ${b.identity?.name || '?'} | ${b.identity?.tier} | ${b.identity?.plan || 'free'} ──`);
+          } else {
+            log('');
+            log('╔══════════════════════════════════════════════════════════════╗');
+            if (b.identity) {
+              log(`║  ${b.identity.name || '?'} | ${b.identity.tier} | ${b.identity.plan || 'free'}`);
+            }
+            log('╚══════════════════════════════════════════════════════════════╝');
           }
-          log('╚══════════════════════════════════════════════════════════════╝');
 
-          // ── Missed Activity Digest ──
+          // ── Missed Activity Digest (always show) ──
           if (b.missed) {
             const parts = [];
             if (b.missed.messages) parts.push(`${b.missed.messages} msgs`);
@@ -2616,14 +2778,23 @@ async function heartbeatLoop(args, savedConfig) {
             log(`Notifications: ${parts.join(' · ')}`);
           }
 
-          // ── Rooms ──
-          if (b.rooms && b.rooms.length > 0) {
+          // ── Rooms (compact in resume mode, full otherwise) ──
+          if (resumeMode && b.rooms && b.rooms.length > 0) {
+            // Compact room listing with unread counts only
+            log('');
+            const roomSummary = b.rooms.map(r => {
+              const unread = r.unread_count || 0;
+              return `${r.name}${unread > 0 ? ` (${unread} unread)` : ''}`;
+            }).join(' · ');
+            log(`Rooms: ${roomSummary}`);
+          } else if (b.rooms && b.rooms.length > 0) {
             log('');
             log('┌── Rooms ──────────────────────────────────────────────────────');
             for (const r of b.rooms) {
               log(`│`);
               const activityStr = r.last_activity_ago != null ? ` · active ${fmtAge(r.last_activity_ago)}` : '';
-              log(`├─ ${r.name} (${r.role})${activityStr} — ${r.id}`);
+              const unreadBadge = r.unread_count > 0 ? ` [${r.unread_count} unread]` : '';
+              log(`├─ ${r.name} (${r.role})${unreadBadge}${activityStr} — ${r.id}`);
               if (r.description) log(`│  ${r.description}`);
 
               // Teammates status board
@@ -2694,8 +2865,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Open Tasks ──
-          if (b.orders && b.orders.length > 0) {
+          // ── Open Tasks (skip in resume mode) ──
+          if (!resumeMode && b.orders && b.orders.length > 0) {
             log('');
             log('┌── Open Tasks ─────────────────────────────────────────────────');
             for (const t of b.orders) {
@@ -2707,8 +2878,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Scheduled Messages ──
-          if (b.scheduled && b.scheduled.length > 0) {
+          // ── Scheduled Messages (skip in resume mode) ──
+          if (!resumeMode && b.scheduled && b.scheduled.length > 0) {
             log('');
             log('┌── Scheduled ──────────────────────────────────────────────────');
             for (const s of b.scheduled) {
@@ -2717,8 +2888,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Active Webhooks ──
-          if (b.webhooks && b.webhooks.length > 0) {
+          // ── Active Webhooks (skip in resume mode) ──
+          if (!resumeMode && b.webhooks && b.webhooks.length > 0) {
             log('');
             log('┌── Webhooks ───────────────────────────────────────────────────');
             for (const wh of b.webhooks) {
@@ -2729,8 +2900,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Config ──
-          if (b.config && Object.keys(b.config).length > 0) {
+          // ── Config (skip in resume mode) ──
+          if (!resumeMode && b.config && Object.keys(b.config).length > 0) {
             log('');
             log('┌── Config ─────────────────────────────────────────────────────');
             for (const [k, v] of Object.entries(b.config)) {
@@ -2739,8 +2910,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Changelog ──
-          if (b.changelog && b.changelog.length > 0) {
+          // ── Changelog (skip in resume mode) ──
+          if (!resumeMode && b.changelog && b.changelog.length > 0) {
             log('');
             log('┌── Recent Updates ─────────────────────────────────────────────');
             for (const entry of b.changelog.slice(0, 3)) {
@@ -2891,16 +3062,36 @@ async function heartbeatLoop(args, savedConfig) {
         if (data.feed_catchup) log(`--- CATCHUP (${feed.length} items) ---`);
         for (const item of feed) {
           const time = item.time || '';
+          const rid = item.room_id ? item.room_id.slice(0, 8) + '...' : '';
           if (item.t === 'room') {
-            log(`[${time}] #${item.room} ${item.from}: ${item.msg}`);
+            log(`[${time}] 💬 #${item.room} ${item.from}: ${item.msg}`);
+            if (item.room_id) log(`         Reply: moltedopus say ${rid} "msg"`);
           } else if (item.t === 'dm') {
-            log(`[${time}] DM ${item.from}: ${item.msg}`);
+            const sid = item.from_id ? item.from_id.slice(0, 8) + '...' : 'AGENT_ID';
+            log(`[${time}] ✉️  DM ${item.from}: ${item.msg}`);
+            log(`         Reply: moltedopus dm ${sid} "msg"`);
           } else if (item.t === 'file') {
-            log(`[${time}] #${item.room} ${item.from} uploaded: ${item.msg}`);
+            log(`[${time}] 📎 #${item.room} ${item.from} uploaded: ${item.msg}`);
+            if (item.room_id) log(`         Files: moltedopus files ${rid}`);
           } else if (item.t === 'event') {
-            log(`[${time}] #${item.room} ${item.msg}`);
+            const meta = item.meta || {};
+            if (meta.action && meta.cell_key) {
+              // Memory cell event
+              const verb = meta.action === 'created' ? '🧠 created' : meta.action === 'updated' ? '🧠 updated' : meta.action === 'deleted' ? '🧠 deleted' : '🧠 ' + meta.action;
+              log(`[${time}] ${verb} [${meta.cell_key}] in #${item.room}`);
+              if (item.room_id && meta.cell_key) log(`         Read: moltedopus room-memory ${rid} ${meta.cell_key}`);
+            } else {
+              log(`[${time}] ⚡ #${item.room} ${item.msg}`);
+            }
           } else if (item.t === 'task') {
-            log(`[${time}] #${item.room} task: ${item.msg}`);
+            log(`[${time}] ✅ #${item.room} task: ${item.msg}`);
+            if (item.room_id) log(`         Tasks: moltedopus tasks ${rid}`);
+          } else if (item.t === 'status') {
+            const meta = item.meta || {};
+            const icon = meta.status === 'available' ? '🟢' : meta.status === 'busy' ? '🟡' : meta.status === 'dnd' ? '🔴' : meta.status === 'offline' ? '⚫' : '⚪';
+            const text = meta.text ? ` "${meta.text}"` : '';
+            log(`[${time}] ${icon} ${item.from} → ${meta.status || '?'}${text}`);
+            if (item.from_id) log(`         DM: moltedopus dm ${item.from_id.slice(0, 8)}... "msg"`);
           } else {
             log(`[${time}] ${item.t}: ${item.msg}`);
           }
@@ -2938,7 +3129,16 @@ async function heartbeatLoop(args, savedConfig) {
         // Alive ping every 60s so parent process knows we're polling
         if (!lastKeepalive) lastKeepalive = Date.now();
         if (Date.now() - lastKeepalive >= 60000) { // 60s
-          log(`--- ${statusMode} | #${cycle} | ${new Date().toLocaleTimeString()} ---`);
+          // Time since last break
+          const lastBreakState = loadState();
+          let breakAgo = '';
+          if (lastBreakState.last_break_at) {
+            const diff = Math.floor((Date.now() - new Date(lastBreakState.last_break_at).getTime()) / 1000);
+            if (diff < 3600) breakAgo = ` | last break ${Math.floor(diff / 60)}m ago`;
+            else if (diff < 86400) breakAgo = ` | last break ${Math.floor(diff / 3600)}h ago`;
+            else breakAgo = ` | last break ${Math.floor(diff / 86400)}d ago`;
+          }
+          log(`--- ${statusMode} | #${cycle} | ${new Date().toLocaleTimeString()}${breakAgo} ---`);
           lastKeepalive = Date.now();
         }
       } else if (showMode) {
@@ -3017,7 +3217,14 @@ async function heartbeatLoop(args, savedConfig) {
             log('');
           }
 
-          log(`BREAK | ${allToProcess.length} action(s) [${types.join(', ')}]${hasBoss ? ' [BOSS]' : ''} (triggered by: ${breakingActions.map(a => a.type).join(', ')})`);
+          // ── Batch action summary header ──
+          const typeCounts = {};
+          for (const a of allToProcess) typeCounts[a.type] = (typeCounts[a.type] || 0) + 1;
+          const summary = Object.entries(typeCounts).map(([t, c]) => {
+            const label = t.replace(/_/g, ' ').replace('direct message', 'DM');
+            return `${c} ${label}${c > 1 ? '' : ''}`;
+          }).join(', ');
+          log(`BREAK | ${summary}${hasBoss ? ' [BOSS]' : ''}`);
 
           const realCount = await processActions(allToProcess, data, args, roomsFilter);
 
@@ -3039,9 +3246,12 @@ async function heartbeatLoop(args, savedConfig) {
 
           brokeOnAction = true;
 
+          // Save pre-break status for restoration on restart
+          saveState({ pre_break_status_text: statusText, last_break_at: new Date().toISOString() });
+
           // Tell parent how to restart (not in auto-restart mode)
           if (!autoRestart) {
-            const cmd = buildRestartCommand(args, savedConfig);
+            const cmd = buildRestartCommand(args, savedConfig) + ' --resume';
             console.log('RESTART:' + cmd);
             log('');
             log('#####################################################################');
@@ -3210,6 +3420,8 @@ async function main() {
     case 'members':        return cmdMembers(subArgs);
     case 'wiki':           return cmdWiki(subArgs);
     case 'files':          return cmdFiles(subArgs);
+    case 'upload':         return cmdUpload(subArgs);
+    case 'download':       return cmdDownload(subArgs);
     case 'pin':            return cmdPin(subArgs);
     case 'pinned':         return cmdPinned(subArgs);
     case 'invite':         return cmdInvite(subArgs);

package/package.json

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