rentabots-sdk 1.7.7 → 1.7.13

package/dist/index.js

@@ -71,7 +71,7 @@ exports.MessageSchema = zod_1.z.object({
     })
 });
 // --- CORE SDK ENGINE ---
-let SDK_VERSION = '1.7.7'; // fallback when package.json is unavailable
+let SDK_VERSION = '1.7.13'; // fallback when package.json is unavailable
 try {
     const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), 'utf8'));
     SDK_VERSION = pkg.version;

package/init.js

@@ -66,29 +66,101 @@ async function main() {
     const queen = new Agent({ debug: true, persistState: true });
     const conn = await queen.connect();
     if (!conn.success) { console.error("❌ Auth failed:", conn.error); process.exit(1); }
-    updateStatus(queen, "Supervisor connected.");
 
-    queen.on('assignment', async (job) => {
-        console.log("🎯 Mission Secured:", job.title);
-        updateStatus(queen, "Mission Secured: " + job.title);
+    const agentId = conn.agent?.id;
+    const agentApiKey = process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY;
+    const apiBase = (process.env.RENTABOTS_API_URL || 'https://rentabots.com/api').replace(/\/$/, '');
 
-        // Write job to temp file (avoids CLI arg length limits)
+    const pushLog = async (level, message) => {
+      try {
+        if (!agentId || !agentApiKey) return;
+        await fetch(apiBase + '/agents/' + agentId + '/logs', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: 'Bearer ' + agentApiKey
+          },
+          body: JSON.stringify({ level, message })
+        });
+      } catch (_) {}
+    };
+
+    const spawnMissionWorker = async (job, source = 'assignment') => {
+      try {
         const jobDataPath = path.join(__dirname, 'workspace', '_job_' + job.id + '.json');
         fs.mkdirSync(path.dirname(jobDataPath), { recursive: true });
         fs.writeFileSync(jobDataPath, JSON.stringify(job));
 
+        await pushLog('INFO', 'Spawning worker for mission ' + job.id + ' from ' + source);
+
         const worker = fork(path.join(__dirname, 'worker.js'), [jobDataPath], {
-            stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
-            env: { ...process.env, RENTABOTS_API_KEY: process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY }
+          stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+          env: { ...process.env, RENTABOTS_API_KEY: process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY }
         });
+
         queen.workers.set(job.id, worker);
-        worker.on('exit', () => { queen.workers.delete(job.id); try { fs.unlinkSync(jobDataPath); } catch {} });
+
+        worker.stdout?.on('data', async (d) => {
+          const line = d.toString().trim();
+          if (!line) return;
+          console.log('[WORKER:' + job.id + '] ' + line);
+          await pushLog('INFO', '[WORKER:' + job.id + '] ' + line);
+        });
+
+        worker.stderr?.on('data', async (d) => {
+          const line = d.toString().trim();
+          if (!line) return;
+          console.error('[WORKER:' + job.id + '] ' + line);
+          await pushLog('ERROR', '[WORKER:' + job.id + '] ' + line);
+        });
+
+        worker.on('exit', async (code, signal) => {
+          queen.workers.delete(job.id);
+          try { fs.unlinkSync(jobDataPath); } catch {}
+          await pushLog('WARN', 'Worker exited for mission ' + job.id + ' (code=' + code + ', signal=' + (signal || 'none') + ')');
+        });
+
+        worker.on('error', async (err) => {
+          await pushLog('ERROR', 'Worker process error for mission ' + job.id + ': ' + err.message);
+        });
+
+        await queen.sendMessage(job.id, '👷 Worker dispatched by Queen. Streaming execution logs...');
+      } catch (err) {
+        const msg = err?.message || String(err);
+        await pushLog('ERROR', 'Failed to spawn worker for mission ' + (job?.id || 'unknown') + ': ' + msg);
+        if (job?.id) {
+          try { await queen.sendMessage(job.id, '⚠️ Worker spawn failed: ' + msg); } catch {}
+        }
+      }
+    };
+
+    updateStatus(queen, "Supervisor connected.");
+    await pushLog('SUCCESS', 'Queen online and connected.');
+
+    // Recover workers for already-active missions after restart
+    for (const [jobId, job] of queen.activeMissions) {
+        if (queen.workers.has(jobId)) continue;
+        await spawnMissionWorker(job, 'recovery');
+    }
+
+    queen.on('assignment', async (job) => {
+        console.log("🎯 Mission Secured:", job.title);
+        updateStatus(queen, "Mission Secured: " + job.title);
+        await pushLog('SUCCESS', 'Mission secured: ' + job.title + ' (' + job.id + ')');
+        await spawnMissionWorker(job, 'assignment');
     });
 
     queen.on('message', async (msg) => {
         if (msg.sender.type === 'agent') return;
         if (!queen.workers.has(msg.jobId)) {
+            const job = queen.activeMissions.get(msg.jobId);
+            if (!job) {
+                await queen.sendMessage(msg.jobId, "🤖 Supervisor online. Mission sync in progress.");
+                await pushLog('WARN', 'Message received for unknown mission ' + msg.jobId);
+                return;
+            }
             await queen.sendMessage(msg.jobId, "🤖 Supervisor here. Dispatching a worker shortly.");
+            await spawnMissionWorker(job, 'message-trigger');
         }
     });
 
@@ -116,15 +188,102 @@ async function main() {
     const task = 'PROJECT: ' + job.title + '. BRIEF: ' + job.description + '. INSTRUCTION: Execute this task. Create all files in the workspace.';
 
     // Use shell command string (not array args)
-    const cmd = 'openclaw sessions_spawn --task ' + JSON.stringify(task);
-    const { exitCode, output } = await agent.execute(job.id, cmd, { timeout: 300000, shell: true });
+    const taskArg = JSON.stringify(task);
+    const cmdCandidates = [
+        'openclaw sessions spawn --task ' + taskArg,
+        'openclaw sessions_spawn --task ' + taskArg,
+    ];
+
+    let beat = 0;
+    const heartbeat = setInterval(async () => {
+        try {
+            beat += 1;
+            const pct = Math.min(90, beat * 5);
+            await agent.setProgress(job.id, pct);
+            await agent.sendMessage(job.id, '⏳ Worker still running... ' + (beat * 30) + 's elapsed (' + pct + '%).');
+        } catch (_) {}
+    }, 30000);
+
+    let overallSuccess = false;
+    let lastOutput = '';
+
+    try {
+        for (const cmd of cmdCandidates) {
+            let exitCode = -1;
+            let output = '';
+
+            for (let attempt = 1; attempt <= 2; attempt++) {
+                const result = await agent.execute(job.id, cmd, { timeout: 900000, shell: true });
+                exitCode = result.exitCode;
+                output = result.output || '';
 
-    if (exitCode === 0) {
+                if (exitCode === 0) {
+                    overallSuccess = true;
+                    lastOutput = output;
+                    break;
+                }
+
+                lastOutput = output;
+                if (attempt < 2) {
+                    await agent.sendMessage(job.id, '⚠️ OpenClaw run delayed. Retrying once...');
+                    await new Promise(r => setTimeout(r, 5000));
+                }
+            }
+
+            if (overallSuccess) break;
+            if (lastOutput.toLowerCase().includes('unknown command')) {
+                await agent.sendMessage(job.id, 'ℹ️ Switching OpenClaw command compatibility mode...');
+                continue;
+            }
+            break;
+        }
+    } finally {
+        clearInterval(heartbeat);
+    }
+
+    if (overallSuccess) {
+        await agent.setProgress(job.id, 100);
         await agent.sendMessage(job.id, "✅ Execution complete. Deliverables ready.");
         if (process.send) process.send({ event: 'phase_complete', phase: 'BUILDER' });
     } else {
-        await agent.sendMessage(job.id, "⚠️ Technical delay. Awaiting review.");
-        console.error("Worker Error:", output);
+        const snippet = lastOutput.slice(-500) || 'No output captured';
+        console.error("Worker Error:", snippet);
+
+        // Fail-safe: keep user informed + attach diagnostic report to mission repo
+        await agent.setProgress(job.id, 25);
+        await agent.sendMessage(job.id, "⚠️ I hit an execution issue, but fail-safe mode is active. I’m preparing a diagnostic report and recovery path.");
+
+        try {
+            const repoRes = await agent.getRepo(job.id);
+            if (!repoRes.success || !repoRes.exists) {
+                await agent.createRepo(job.id, 'mission-recovery-' + job.id.slice(0, 8));
+            }
+
+            const report = [
+                '# FAILSAFE_REPORT',
+                '',
+                'Mission: ' + job.id,
+                'Title: ' + job.title,
+                'Time: ' + new Date().toISOString(),
+                '',
+                '## Failure Summary',
+                snippet,
+                '',
+                '## Auto-Recovery Actions Taken',
+                '- Retried OpenClaw run once',
+                '- Switched command compatibility mode when applicable',
+                '- Preserved mission state and logs',
+                '',
+                '## Next Human Step',
+                '- Send a short clarification in mission chat (expected output format, constraints, deadline)',
+                '- Worker will continue from current workspace state'
+            ].join('\n');
+
+            await agent.uploadRepoFile(job.id, 'FAILSAFE_REPORT.md', report, false);
+            await agent.sendMessage(job.id, "🛟 Fail-safe report uploaded to mission repo: FAILSAFE_REPORT.md");
+        } catch (e) {
+            await agent.sendMessage(job.id, "🛟 Fail-safe mode active, but report upload failed. You can still continue by sending updated instructions in chat.");
+        }
     }
 }
 main().catch(console.error);`;

package/init_templates.js

@@ -8,6 +8,7 @@ require('dotenv').config();
 const { Agent } = require('rentabots-sdk');
 const fs = require('fs');
 const path = require('path');
+const { fork } = require('child_process');
 
 const STATUS_FILE = path.join(__dirname, 'RENTABOT_STATUS.md');
 
@@ -26,7 +27,6 @@ function updateStatus(queen, event = "Monitoring grid.") {
 async function main() {
     const queen = new Agent({ 
         debug: true,
-        // Ensure state is saved in the isolated workspace to prevent conflict
         persistState: true
     });
     
@@ -35,41 +35,108 @@ async function main() {
         console.error("❌ Failed to connect:", connection.error);
         process.exit(1);
     }
-    
-    updateStatus(queen, "Supervisor connected.");
 
-    queen.on('assignment', async (job) => {
-        console.log("🎯 Mission Secured:", job.title);
-        updateStatus(queen, "Mission Secured: " + job.title);
+    const agentId = connection.agent?.id;
+    const agentApiKey = process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY;
+    const apiBase = (process.env.RENTABOTS_API_URL || 'https://rentabots.com/api').replace(/\/$/, '');
+
+    const pushLog = async (level, message) => {
+      try {
+        if (!agentId || !agentApiKey) return;
+        await fetch(\`${apiBase}/agents/\${agentId}/logs\`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: \`Bearer \${agentApiKey}\`
+          },
+          body: JSON.stringify({ level, message })
+        });
+      } catch (_) {}
+    };
 
-        // Write job to temp file (avoids CLI arg length limits)
+    const spawnMissionWorker = async (job, source = 'assignment') => {
+      try {
         const jobDataPath = path.join(__dirname, 'workspace', '_job_' + job.id + '.json');
         fs.mkdirSync(path.dirname(jobDataPath), { recursive: true });
         fs.writeFileSync(jobDataPath, JSON.stringify(job));
 
+        await pushLog('INFO', 'Spawning worker for mission ' + job.id + ' from ' + source);
+
         const worker = fork(path.join(__dirname, 'worker.js'), [jobDataPath], {
-            stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
-            env: { ...process.env, RENTABOTS_API_KEY: process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY }
+          stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+          env: { ...process.env, RENTABOTS_API_KEY: process.env.RENTABOTS_API_KEY || process.env.RENTABOTS_SECRET_KEY }
         });
+
         queen.workers.set(job.id, worker);
-        worker.on('exit', () => { queen.workers.delete(job.id); try { fs.unlinkSync(jobDataPath); } catch {} });
+
+        worker.stdout?.on('data', async (d) => {
+          const line = d.toString().trim();
+          if (!line) return;
+          console.log('[WORKER:' + job.id + '] ' + line);
+          await pushLog('INFO', '[WORKER:' + job.id + '] ' + line);
+        });
+
+        worker.stderr?.on('data', async (d) => {
+          const line = d.toString().trim();
+          if (!line) return;
+          console.error('[WORKER:' + job.id + '] ' + line);
+          await pushLog('ERROR', '[WORKER:' + job.id + '] ' + line);
+        });
+
+        worker.on('exit', async (code, signal) => {
+          queen.workers.delete(job.id);
+          try { fs.unlinkSync(jobDataPath); } catch {}
+          await pushLog('WARN', 'Worker exited for mission ' + job.id + ' (code=' + code + ', signal=' + (signal || 'none') + ')');
+        });
+
+        worker.on('error', async (err) => {
+          await pushLog('ERROR', 'Worker process error for mission ' + job.id + ': ' + err.message);
+        });
+
+        await queen.sendMessage(job.id, '👷 Worker dispatched by Queen. Streaming execution logs...');
+      } catch (err) {
+        const msg = err?.message || String(err);
+        await pushLog('ERROR', 'Failed to spawn worker for mission ' + (job?.id || 'unknown') + ': ' + msg);
+        if (job?.id) {
+          try { await queen.sendMessage(job.id, '⚠️ Worker spawn failed: ' + msg); } catch {}
+        }
+      }
+    };
+    
+    updateStatus(queen, "Supervisor connected.");
+    await pushLog('SUCCESS', 'Queen online and connected.');
+
+    // Recover workers for already-active missions after restart
+    for (const [jobId, job] of queen.activeMissions) {
+        if (queen.workers.has(jobId)) continue;
+        await spawnMissionWorker(job, 'recovery');
+    }
+
+    queen.on('assignment', async (job) => {
+        console.log("🎯 Mission Secured:", job.title);
+        updateStatus(queen, "Mission Secured: " + job.title);
+        await pushLog('SUCCESS', 'Mission secured: ' + job.title + ' (' + job.id + ')');
+        await spawnMissionWorker(job, 'assignment');
     });
 
     queen.on('message', async (msg) => {
         if (msg.sender.type === 'agent') return;
-        // In Fleet Mode, the Queen delegates chat to the specific Worker handling the job.
-        // We only respond if no worker is active for this job.
         if (!queen.workers.has(msg.jobId)) {
-             await queen.sendMessage(msg.jobId, "🤖 Supervisor here. Dispatching a worker to this channel shortly.");
              const job = queen.activeMissions.get(msg.jobId);
-             if (job) await queen.spawnWorker(job);
+             if (!job) {
+                await queen.sendMessage(msg.jobId, "🤖 Supervisor online. Mission sync in progress.");
+                await pushLog('WARN', 'Message received for unknown mission ' + msg.jobId);
+                return;
+             }
+
+             await queen.sendMessage(msg.jobId, "🤖 Supervisor here. Dispatching a worker to this channel shortly.");
+             await spawnMissionWorker(job, 'message-trigger');
         }
     });
 
-    // Start Autopilot (Scout for jobs every 5 mins to save tokens)
     queen.startAutopilot({ 
         scoutingInterval: 300000, 
-        minBudget: 5 // Only bid on jobs > $5
+        minBudget: 5
     });
     
     setInterval(() => updateStatus(queen), 60000);
@@ -105,16 +172,102 @@ async function main() {
     const task = \`PROJECT: \${job.title}. BRIEF: \${job.description}. INSTRUCTION: Execute this task in the current directory. Do not leave the workspace.\`;
     
     // --- 🦞 EXECUTE VIA OPENCLAW BRAIN ---
-    // Use shell command string (not array args) for reliable argument passing
-    const cmd = 'openclaw sessions_spawn --task ' + JSON.stringify(task);
-    const { exitCode, output } = await agent.execute(job.id, cmd, { timeout: 300000, shell: true });
+    const taskArg = JSON.stringify(task);
+    const cmdCandidates = [
+      'openclaw sessions spawn --task ' + taskArg,
+      'openclaw sessions_spawn --task ' + taskArg,
+    ];
+
+    let beat = 0;
+    const heartbeat = setInterval(async () => {
+      try {
+        beat += 1;
+        const pct = Math.min(90, beat * 5);
+        await agent.setProgress(job.id, pct);
+        await agent.sendMessage(job.id, '⏳ Worker still running... ' + (beat * 30) + 's elapsed (' + pct + '%).');
+      } catch (_) {}
+    }, 30000);
+
+    let overallSuccess = false;
+    let lastOutput = '';
+
+    try {
+      for (const cmd of cmdCandidates) {
+        let exitCode = -1;
+        let output = '';
+
+        for (let attempt = 1; attempt <= 2; attempt++) {
+          const result = await agent.execute(job.id, cmd, { timeout: 900000, shell: true });
+          exitCode = result.exitCode;
+          output = result.output || '';
 
-    if (exitCode === 0) {
-        await agent.sendMessage(job.id, "✅ Execution complete. Deliverables ready.");
-        if (process.send) process.send({ event: 'phase_complete', phase: 'BUILDER' });
+          if (exitCode === 0) {
+            overallSuccess = true;
+            lastOutput = output;
+            break;
+          }
+
+          lastOutput = output;
+          if (attempt < 2) {
+            await agent.sendMessage(job.id, '⚠️ OpenClaw run delayed. Retrying once...');
+            await new Promise(r => setTimeout(r, 5000));
+          }
+        }
+
+        if (overallSuccess) break;
+        if (lastOutput.toLowerCase().includes('unknown command')) {
+          await agent.sendMessage(job.id, 'ℹ️ Switching OpenClaw command compatibility mode...');
+          continue;
+        }
+        break;
+      }
+    } finally {
+      clearInterval(heartbeat);
+    }
+
+    if (overallSuccess) {
+      await agent.setProgress(job.id, 100);
+      await agent.sendMessage(job.id, "✅ Execution complete. Deliverables ready.");
+      if (process.send) process.send({ event: 'phase_complete', phase: 'BUILDER' });
     } else {
-        await agent.sendMessage(job.id, "⚠️ Technical delay. OpenClaw execution timed out or failed. Retrying...");
-        console.error("Worker Error:", output);
+      const snippet = lastOutput.slice(-500) || 'No output captured';
+      console.error("Worker Error:", snippet);
+
+      // Fail-safe: keep user informed + attach diagnostic report to mission repo
+      await agent.setProgress(job.id, 25);
+      await agent.sendMessage(job.id, "⚠️ I hit an execution issue, but fail-safe mode is active. I’m preparing a diagnostic report and recovery path.");
+
+      try {
+        const repoRes = await agent.getRepo(job.id);
+        if (!repoRes.success || !repoRes.exists) {
+          await agent.createRepo(job.id, 'mission-recovery-' + job.id.slice(0, 8));
+        }
+
+        const report = [
+          '# FAILSAFE_REPORT',
+          '',
+          'Mission: ' + job.id,
+          'Title: ' + job.title,
+          'Time: ' + new Date().toISOString(),
+          '',
+          '## Failure Summary',
+          snippet,
+          '',
+          '## Auto-Recovery Actions Taken',
+          '- Retried OpenClaw run once',
+          '- Switched command compatibility mode when applicable',
+          '- Preserved mission state and logs',
+          '',
+          '## Next Human Step',
+          '- Send a short clarification in mission chat (expected output format, constraints, deadline)',
+          '- Worker will continue from current workspace state'
+        ].join('\n');
+
+        await agent.uploadRepoFile(job.id, 'FAILSAFE_REPORT.md', report, false);
+        await agent.sendMessage(job.id, "🛟 Fail-safe report uploaded to mission repo: FAILSAFE_REPORT.md");
+      } catch (e) {
+        await agent.sendMessage(job.id, "🛟 Fail-safe mode active, but report upload failed. You can still continue by sending updated instructions in chat.");
+      }
     }
 }
 main().catch(console.error);`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rentabots-sdk",
-  "version": "1.7.7",
+  "version": "1.7.13",
   "description": "Official SDK for RentaBots AI Agent Marketplace",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",