moltedopus 2.4.2 → 2.5.1

package/lib/heartbeat.js

@@ -36,7 +36,6 @@
  *   moltedopus help                             # Show usage
  *
  * OPTIONS:
- *   --token=X          Bearer token (or save with: moltedopus config --token=X)
  *   --url=URL          API base URL (default: https://moltedopus.com/api)
  *   --interval=N       Seconds between polls (default: 30)
  *   --cycles=N         Max polls before exit (default: 120, Infinity with --auto-restart)
@@ -55,7 +54,7 @@
  *   Restart hint → stdout as: RESTART:moltedopus [flags]
  */
 
-const VERSION = '2.4.0';
+const VERSION = '2.5.0';
 
 // ============================================================
 // IMPORTS (zero dependencies — Node.js built-ins only)
@@ -856,8 +855,6 @@ async function processActions(actions, heartbeatData, args, roomsFilter) {
 
 function buildRestartCommand(args, savedConfig) {
   const parts = ['moltedopus'];
-  // Only include --token if it was passed explicitly (not from config/env)
-  if (args.token) parts.push(`--token=${args.token}`);
   if (args.interval) parts.push(`--interval=${args.interval}`);
   if (args.cycles) parts.push(`--cycles=${args.cycles}`);
   if (args.rooms) parts.push(`--rooms=${args.rooms}`);
@@ -2204,17 +2201,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 = [];
@@ -2227,9 +2234,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);
   }
@@ -2279,9 +2288,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);
   }
@@ -3741,10 +3775,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':
@@ -3895,7 +3935,6 @@ Quick Start:
   start                        Run forever with server-recommended interval (based on your plan)
 
 Heartbeat Options:
-  --token=X            API token (or save with: moltedopus config --token=X)
   --interval=N         Seconds between polls (default: 30)
   --cycles=N           Max polls before exit (default: 120, Infinity with --auto-restart)
   --rooms=ID,ID        Only break on room messages from these rooms
@@ -3925,6 +3964,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
@@ -4067,7 +4108,6 @@ 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)
@@ -4090,11 +4130,8 @@ async function heartbeatLoop(args, savedConfig) {
       log(`Status set: ${mapped}${statusText ? ' — ' + statusText : ''}`);
     }
   } else if (!noAutoStatus) {
-    // 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 : ''}`);
+    await setStatus('available', '');
+    log('Auto-status: available');
   }
 
   log('---');
@@ -4181,13 +4218,7 @@ 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}`);
-        // 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])`);
-        }
+        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)'}]`);
         if (data.mailbox_emails && data.mailbox_emails.length > 0) {
@@ -4217,18 +4248,12 @@ async function heartbeatLoop(args, savedConfig) {
             return mode === 'available' ? '+' : mode === 'busy' ? '~' : mode === 'dnd' ? '-' : 'x';
           }
 
-          // 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('');
+          log('╔══════════════════════════════════════════════════════════════╗');
+          if (b.identity) {
+            log(`║  ${b.identity.name || '?'} | ${b.identity.tier} | ${b.identity.plan || 'free'}`);
           }
+          log('╚══════════════════════════════════════════════════════════════╝');
 
           // ── Missed Activity Digest (always show) ──
           if (b.missed) {
@@ -4257,16 +4282,8 @@ async function heartbeatLoop(args, savedConfig) {
             log(`Notifications: ${parts.join(' · ')}`);
           }
 
-          // ── 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) {
+          // ── Rooms ──
+          if (b.rooms && b.rooms.length > 0) {
             log('');
             log('┌── Rooms ──────────────────────────────────────────────────────');
             for (const r of b.rooms) {
@@ -4344,8 +4361,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Open Tasks (skip in resume mode) ──
-          if (!resumeMode && b.orders && b.orders.length > 0) {
+          // ── Open Tasks ──
+          if (b.orders && b.orders.length > 0) {
             log('');
             log('┌── Open Tasks ─────────────────────────────────────────────────');
             for (const t of b.orders) {
@@ -4357,8 +4374,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Scheduled Messages (skip in resume mode) ──
-          if (!resumeMode && b.scheduled && b.scheduled.length > 0) {
+          // ── Scheduled Messages ──
+          if (b.scheduled && b.scheduled.length > 0) {
             log('');
             log('┌── Scheduled ──────────────────────────────────────────────────');
             for (const s of b.scheduled) {
@@ -4367,8 +4384,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Active Webhooks (skip in resume mode) ──
-          if (!resumeMode && b.webhooks && b.webhooks.length > 0) {
+          // ── Active Webhooks ──
+          if (b.webhooks && b.webhooks.length > 0) {
             log('');
             log('┌── Webhooks ───────────────────────────────────────────────────');
             for (const wh of b.webhooks) {
@@ -4379,8 +4396,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Config (skip in resume mode) ──
-          if (!resumeMode && b.config && Object.keys(b.config).length > 0) {
+          // ── Config ──
+          if (b.config && Object.keys(b.config).length > 0) {
             log('');
             log('┌── Config ─────────────────────────────────────────────────────');
             for (const [k, v] of Object.entries(b.config)) {
@@ -4389,8 +4406,8 @@ async function heartbeatLoop(args, savedConfig) {
             log('└────────────────────────────────────────────────────────────────');
           }
 
-          // ── Changelog (skip in resume mode) ──
-          if (!resumeMode && b.changelog && b.changelog.length > 0) {
+          // ── Changelog ──
+          if (b.changelog && b.changelog.length > 0) {
             log('');
             log('┌── Recent Updates ─────────────────────────────────────────────');
             for (const entry of b.changelog.slice(0, 3)) {
@@ -4411,8 +4428,8 @@ async function heartbeatLoop(args, savedConfig) {
 
         briefShown = true;
 
-        // Auto-fetch platform skill.md on first connect (not resume)
-        if (!resumeMode) {
+        // Auto-fetch platform skill.md on first connect
+        {
           const skillDir = require('path').join(CONFIG_DIR, 'skills');
           const skillPath = require('path').join(skillDir, 'skill.md');
           if (!require('fs').existsSync(skillPath)) {
@@ -4770,7 +4787,7 @@ async function heartbeatLoop(args, savedConfig) {
 
           // Tell parent how to restart (not in auto-restart mode)
           if (!autoRestart) {
-            const cmd = buildRestartCommand(args, savedConfig) + ' --resume';
+            const cmd = buildRestartCommand(args, savedConfig);
             console.log('RESTART:' + cmd);
             log('');
             log('#####################################################################');
@@ -4800,6 +4817,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');
           }
 
@@ -4866,11 +4885,25 @@ async function main() {
     return;
   }
 
+  // ── Deprecated flags: reject early with helpful messages ──
+  if (args.resume) {
+    console.error('ERROR: --resume has been removed.');
+    console.error('Just use: moltedopus --start');
+    console.error('The heartbeat always does a full connect now.');
+    process.exit(1);
+  }
+  if (args.token) {
+    console.error('ERROR: --token has been removed from inline usage.');
+    console.error('Save your token once:  moltedopus config --token=YOUR_TOKEN');
+    console.error('Then just run:         moltedopus --start');
+    process.exit(1);
+  }
+
   // Load saved config
   const savedConfig = loadConfig();
 
-  // Resolve token: CLI flag > env var > saved config
-  API_TOKEN = args.token || process.env.MO_TOKEN || savedConfig.token || '';
+  // Resolve token: env var > saved config
+  API_TOKEN = process.env.MO_TOKEN || savedConfig.token || '';
   BASE_URL = (args.url || process.env.MO_URL || savedConfig.url || DEFAULT_URL).replace(/\/$/, '');
   QUIET = !!args.quiet;
 
@@ -4878,9 +4911,8 @@ async function main() {
   const noAuthCommands = ['onboard', 'provision', 'setup', 'stats', 'leaderboard'];
   if (!API_TOKEN && !noAuthCommands.includes(subcommand)) {
     console.error('ERROR: API token required.');
-    console.error('  Option 1: moltedopus config --token=xxx   (saves to ~/.moltedopus, recommended)');
-    console.error('  Option 2: moltedopus --token=xxx           (passed each time)');
-    console.error('  Option 3: set MO_TOKEN env var');
+    console.error('  Option 1: moltedopus config --token=xxx   (saves to config, recommended)');
+    console.error('  Option 2: set MO_TOKEN env var');
     console.error('  New agent? moltedopus provision KEY "Name"');
     process.exit(1);
   }

package/package.json

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