robot-resources 1.7.5 → 1.7.7

package/lib/tool-config.js

@@ -221,27 +221,48 @@ export function configureToolRouting() {
   return results;
 }
 
+/**
+ * Run a command with a heartbeat to keep agent sessions alive.
+ * OC kills processes after 5s of no output (noOutputTimeoutMs = 5000).
+ * Prints immediately, then every 4s (safely under the 5s threshold).
+ */
+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 += 4;
+      process.stdout.write(`  ${label}... ${seconds}s\n`);
+    }, 4000);
+
+    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);
+    });
+  });
+}
+
 /**
  * Restart the OpenClaw gateway so it picks up new plugin + config.
- * Spawns a detached process that waits 30s then restarts — lets the wizard
- * exit and the OC agent deliver the install report + answer at least one
- * follow-up before the gateway dies.
- *
- * Why deferred: a synchronous restart kills the OC session before the
- * install report is captured. The 30s window gives the agent time to
- * respond and handle a follow-up message. After the restart, the next
- * conversation loads the plugin and routing is active.
- *
- * History: PR #89 used synchronous await (worked but required user to
- * ask for updates). Session #26 used 5s delay (too short — killed
- * session mid-conversation). 30s balances report delivery with restart.
+ * Uses heartbeat to keep OC sessions alive during the restart.
+ * Telegram survives this restart — tested end-to-end (PR #89).
  */
 async function restartOpenClawGateway() {
-  spawn('sh', ['-c', 'sleep 30 && openclaw gateway restart'], {
-    stdio: 'ignore',
-    detached: true,
-  }).unref();
-  process.stdout.write('  Gateway restart scheduled (30s)...\n');
+  await spawnWithHeartbeat('openclaw', ['gateway', 'restart'], {
+    label: 'Restarting gateway',
+    timeout: 15_000,
+  });
 }
 
 // Exported for testing and direct use

package/lib/wizard.js

@@ -382,21 +382,19 @@ export async function runWizard({ nonInteractive = false } = {}) {
     }
   }
 
-  // ── Best-effort: Deferred gateway restart (MUST be last) ───────────────
+  // ── Best-effort: Single 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.
+  // Everything is already installed, configured, and reported above.
+  // The restart loads the plugin + scraper MCP into the running gateway.
+  // Telegram survives this restart. If the session dies here, the agent
+  // picks up on the next message with all tools loaded.
 
   if (isOpenClawInstalled() && (results.tools?.some(r => r.action === 'installed') || scraperRegistered)) {
-    try { await restartOpenClawGateway(); } catch { /* silent — best effort */ }
+    try {
+      await restartOpenClawGateway();
+      success('OpenClaw gateway restarted');
+    } catch {
+      // Best-effort — gateway picks up changes on next restart
+    }
   }
 }

package/package.json

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