robot-resources 1.7.2 → 1.7.4

package/lib/tool-config.js

@@ -6,42 +6,6 @@ import { join, dirname } from 'node:path';
 import { isOpenClawInstalled, isOpenClawPluginInstalled, getOpenClawAuthMode } from './detect.js';
 import { stripJson5 } from './json5.js';
 
-/**
- * Heartbeat interval in ms. OC kills processes after 5s of no output
- * (noOutputTimeoutMs = 5000). This must stay under that threshold.
- */
-const HEARTBEAT_INTERVAL_MS = 4000;
-
-/**
- * Run a command with a heartbeat to keep agent sessions alive.
- */
-function spawnWithHeartbeat(cmd, args, { label, timeout = 30_000 } = {}) {
-  return new Promise((resolve, reject) => {
-    const proc = spawn(cmd, args, {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      timeout,
-    });
-
-    process.stdout.write(`  ${label}...\n`);
-    let seconds = 0;
-    const heartbeat = setInterval(() => {
-      seconds += HEARTBEAT_INTERVAL_MS / 1000;
-      process.stdout.write(`  ${label}... ${seconds}s\n`);
-    }, HEARTBEAT_INTERVAL_MS);
-
-    proc.on('close', (code) => {
-      clearInterval(heartbeat);
-      if (code === 0) resolve();
-      else reject(new Error(`${cmd} ${args.join(' ')} exited with code ${code}`));
-    });
-
-    proc.on('error', (err) => {
-      clearInterval(heartbeat);
-      reject(err);
-    });
-  });
-}
-
 /**
  * Read openclaw.json, creating it with a minimal structure if it doesn't exist.
  * Returns parsed config object. Throws on malformed JSON (caller handles).
@@ -259,30 +223,20 @@ export function configureToolRouting() {
 
 /**
  * Restart the OpenClaw gateway so it picks up new plugin + config.
- * Retries up to 3 times with 2s backoff — gateway restart MUST succeed
- * for MCP tools to be available. Silent failure = tools broken for user.
+ * Spawns a detached process that waits 5s then restarts — lets the wizard
+ * finish and return output to OC before the gateway dies.
+ *
+ * If called from inside an OC agent session (exec: npx robot-resources),
+ * a synchronous restart kills the session before output is captured.
+ * The deferred approach avoids this: wizard exits → OC captures output →
+ * 5s later gateway restarts → next conversation has all tools loaded.
  */
 async function restartOpenClawGateway() {
-  const MAX_RETRIES = 3;
-  const BACKOFF_MS = 2000;
-  let lastError;
-
-  for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-    try {
-      await spawnWithHeartbeat('openclaw', ['gateway', 'restart'], {
-        label: `Restarting gateway${attempt > 1 ? ` (attempt ${attempt}/${MAX_RETRIES})` : ''}`,
-        timeout: 15_000,
-      });
-      return; // success
-    } catch (err) {
-      lastError = err;
-      if (attempt < MAX_RETRIES) {
-        await new Promise(r => setTimeout(r, BACKOFF_MS));
-      }
-    }
-  }
-
-  throw lastError;
+  spawn('sh', ['-c', 'sleep 5 && openclaw gateway restart'], {
+    stdio: 'ignore',
+    detached: true,
+  }).unref();
+  process.stdout.write('  Restarting gateway...\n');
 }
 
 // Exported for testing and direct use

package/lib/wizard.js

@@ -339,23 +339,6 @@ export async function runWizard({ nonInteractive = false } = {}) {
     blank();
   }
 
-  // ── Best-effort: Single gateway restart ────────────────────────────────
-  //
-  // Merged from two previous restarts (after plugin install + after scraper
-  // registration). Everything is already installed and registered above.
-  // If the session dies during this restart, the gateway picks up changes
-  // on its next natural restart.
-
-  if (isOpenClawInstalled() && (results.tools?.some(r => r.action === 'installed') || scraperRegistered)) {
-    try {
-      await restartOpenClawGateway();
-      success('OpenClaw gateway restarted');
-    } catch {
-      warn('Gateway restart failed — tools may not be available until OpenClaw restarts.');
-      warn('Run manually: openclaw gateway restart');
-    }
-  }
-
   // ── Post-install health check ──────────────────────────────────────────
 
   let healthReport = null;
@@ -398,4 +381,22 @@ export async function runWizard({ nonInteractive = false } = {}) {
       // Non-fatal — status file is a convenience, not required
     }
   }
+
+  // ── Best-effort: Deferred gateway restart (MUST be last) ───────────────
+  //
+  // Gateway restart loads the newly installed plugin + scraper MCP.
+  // Without it, tools aren't available until the next natural gateway restart.
+  //
+  // MUST be the last thing in the wizard. The deferred spawn lets the wizard
+  // exit and return output to OC before the gateway dies. Silent catch —
+  // the plugin's install message already tells the user to start a new
+  // conversation. No warn/success needed.
+  //
+  // History: PR #89 (Manuel) had this right — restart last, silent catch.
+  // Session #25 moved it earlier with 3x retries, which killed OC Telegram
+  // sessions. Reverted to deferred spawn, positioned last.
+
+  if (isOpenClawInstalled() && (results.tools?.some(r => r.action === 'installed') || scraperRegistered)) {
+    try { await restartOpenClawGateway(); } catch { /* silent — best effort */ }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "robot-resources",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "Robot Resources — AI agent tools. One command to install everything.",
   "type": "module",
   "bin": {