robot-resources 1.5.1 → 1.6.0

package/lib/tool-config.js

@@ -1,13 +1,15 @@
 import { spawn } from 'node:child_process';
-import { readFileSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { readFileSync, writeFileSync, copyFileSync, mkdirSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { isOpenClawInstalled, isOpenClawPluginInstalled, getOpenClawAuthMode } from './detect.js';
 import { stripJson5 } from './json5.js';
 
 /**
- * Run a command with a heartbeat that prints progress every 5 seconds.
- * Prevents agent sessions from timing out during silent operations.
+ * Run a command with a heartbeat to keep agent sessions alive.
+ * OC kills processes after 5s of no output (noOutputTimeoutMs).
+ * Prints immediately, then every 4s (safely under the 5s threshold).
  */
 function spawnWithHeartbeat(cmd, args, { label, timeout = 30_000 } = {}) {
   return new Promise((resolve, reject) => {
@@ -16,11 +18,12 @@ function spawnWithHeartbeat(cmd, args, { label, timeout = 30_000 } = {}) {
       timeout,
     });
 
+    process.stdout.write(`  ${label}...\n`);
     let seconds = 0;
     const heartbeat = setInterval(() => {
-      seconds += 5;
+      seconds += 4;
       process.stdout.write(`  ${label}... ${seconds}s\n`);
-    }, 5000);
+    }, 4000);
 
     proc.on('close', (code) => {
       clearInterval(heartbeat);
@@ -110,11 +113,56 @@ function registerScraperMcp() {
   }
 }
 
+/**
+ * Copy the bundled plugin files to ~/.openclaw/extensions/openclaw-plugin/.
+ *
+ * The plugin ships as a CLI dependency (@robot-resources/openclaw-plugin).
+ * Instead of spawning `openclaw plugins install` (30s npm overhead),
+ * we copy the 3 files directly. Same destination, same result.
+ */
+function installPluginFiles() {
+  const require = createRequire(import.meta.url);
+  const pluginPkgPath = require.resolve('@robot-resources/openclaw-plugin/package.json');
+  const pluginDir = dirname(pluginPkgPath);
+
+  const targetDir = join(homedir(), '.openclaw', 'extensions', 'openclaw-plugin');
+  mkdirSync(targetDir, { recursive: true });
+
+  for (const file of ['index.js', 'openclaw.plugin.json', 'package.json']) {
+    copyFileSync(join(pluginDir, file), join(targetDir, file));
+  }
+}
+
+/**
+ * Register the plugin in openclaw.json so OC loads it on gateway start.
+ * Adds plugins.entries.openclaw-plugin = { enabled: true }.
+ */
+function registerPluginEntry() {
+  const configPath = join(homedir(), '.openclaw', 'openclaw.json');
+
+  try {
+    const raw = readFileSync(configPath, 'utf-8');
+    const config = JSON.parse(stripJson5(raw));
+
+    if (!config.plugins) config.plugins = {};
+    if (!config.plugins.entries) config.plugins.entries = {};
+
+    // Already registered
+    if (config.plugins.entries['openclaw-plugin']) return;
+
+    config.plugins.entries['openclaw-plugin'] = { enabled: true };
+
+    writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+  } catch {
+    // Non-fatal — plugin may still auto-load from extensions dir
+  }
+}
+
 /**
  * Configure OpenClaw to route through Robot Resources Router.
  *
- * Installs the @robot-resources/openclaw-plugin via OpenClaw's
- * native plugin system. The plugin uses before_model_resolve to
+ * Copies the bundled @robot-resources/openclaw-plugin files into
+ * ~/.openclaw/extensions/. The plugin uses before_model_resolve to
  * override the provider — survives gateway restarts because it
  * lives in ~/.openclaw/extensions/, not in openclaw.json.
  *
@@ -123,7 +171,7 @@ function registerScraperMcp() {
  *   OAuth tokens from third-party clients, so HTTP proxy won't work.
  * - apikey: Plugin is preferred (survives restarts) but proxy also works.
  */
-async function configureOpenClaw() {
+function configureOpenClaw() {
   const authMode = getOpenClawAuthMode();
 
   if (isOpenClawPluginInstalled()) {
@@ -135,39 +183,26 @@ async function configureOpenClaw() {
   }
 
   try {
-    await spawnWithHeartbeat('openclaw', ['plugins', 'install', '@robot-resources/openclaw-plugin'], {
-      label: 'Installing plugin',
-      timeout: 30_000,
-    });
+    installPluginFiles();
+
+    // Register plugin in openclaw.json so OC loads it on gateway start.
+    registerPluginEntry();
 
     // Set robot-resources/auto as the default model so the plugin's
     // before_model_resolve hook actually fires for every request.
     const configActivated = activateRouterModel();
 
-    // Restart the gateway so it picks up the new plugin + config.
-    let gatewayRestarted = false;
-    try {
-      await spawnWithHeartbeat('openclaw', ['gateway', 'restart'], {
-        label: 'Restarting gateway',
-        timeout: 15_000,
-      });
-      gatewayRestarted = true;
-    } catch {
-      // Non-fatal — gateway may not be running or command unsupported
-    }
-
     return {
       name: 'OpenClaw',
       action: 'installed',
       authMode,
       configActivated,
-      gatewayRestarted,
       note: authMode === 'subscription'
         ? 'Plugin required — subscription OAuth tokens are rejected by Anthropic when proxied via third-party clients.'
         : undefined,
     };
   } catch {
-    // Plugin install failed — fall back to instructions
+    // Plugin file copy failed — fall back to instructions
     const instructions = [
       'Could not auto-install plugin. Install manually:',
       '  openclaw plugins install @robot-resources/openclaw-plugin',
@@ -197,16 +232,27 @@ async function configureOpenClaw() {
  *
  * Returns array of { name, action, ... } results.
  */
-export async function configureToolRouting() {
+export function configureToolRouting() {
   const results = [];
 
   // OpenClaw
   if (isOpenClawInstalled()) {
-    results.push(await configureOpenClaw());
+    results.push(configureOpenClaw());
   }
 
   return results;
 }
 
+/**
+ * Restart the OpenClaw gateway so it picks up new plugin + config.
+ * Uses heartbeat to keep OC sessions alive during the restart.
+ */
+async function restartOpenClawGateway() {
+  await spawnWithHeartbeat('openclaw', ['gateway', 'restart'], {
+    label: 'Restarting gateway',
+    timeout: 15_000,
+  });
+}
+
 // Exported for testing and direct use
-export { stripJson5, configureOpenClaw, registerScraperMcp };
+export { stripJson5, configureOpenClaw, registerScraperMcp, restartOpenClawGateway };

package/lib/wizard.js

@@ -1,8 +1,8 @@
 import { readConfig, writeConfig } from '@robot-resources/cli-core/config.mjs';
-import { findPython, isPortAvailable, isHeadless } from './detect.js';
+import { findPython, isPortAvailable, isHeadless, isOpenClawInstalled } from './detect.js';
 import { setupRouter, isRouterInstalled, getVenvPythonPath } from './python-bridge.js';
 import { installService, isServiceRunning, isServiceInstalled } from './service.js';
-import { configureToolRouting, registerScraperMcp } from './tool-config.js';
+import { configureToolRouting, registerScraperMcp, restartOpenClawGateway } from './tool-config.js';
 import { header, step, success, warn, error, info, blank, summary } from './ui.js';
 /**
  * Main setup wizard. Handles the full onboarding flow:
@@ -172,7 +172,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
     blank();
     step('Configuring AI tools to use Router...');
 
-    const toolResults = await configureToolRouting();
+    const toolResults = configureToolRouting();
     results.tools = toolResults;
 
     if (toolResults.length === 0) {
@@ -187,7 +187,6 @@ export async function runWizard({ nonInteractive = false } = {}) {
         } else if (r.action === 'installed') {
           success(`${r.name}: plugin installed`);
           if (r.configActivated) success(`${r.name}: default model set to robot-resources/auto`);
-          if (r.gatewayRestarted) success(`${r.name}: gateway restarted`);
           if (r.note) info(`  ${r.note}`);
         } else if (r.action === 'instructions') {
           warn(`${r.name}: manual configuration needed:`);
@@ -204,19 +203,20 @@ export async function runWizard({ nonInteractive = false } = {}) {
   // ── Step 4: Scraper Installation ───────────────────────────────────────
   //
   // Independent of router. Scraper works even if router failed to install.
-  // 1. Register scraper MCP in openclaw.json (if OC is present)
-  // 2. Restart gateway so OC picks up the new MCP server
-  // No pre-cache needed — scraper is bundled as a CLI dependency
+  // Register scraper MCP in openclaw.json (if OC is present).
+  // Gateway restart happens once at the very end (merged with plugin restart).
 
   blank();
   step('Installing Scraper...');
 
   results.scraper = false;
+  let scraperRegistered = false;
 
   // Register MCP in openclaw.json
-  const scraperRegistered = registerScraperMcp();
+  scraperRegistered = registerScraperMcp();
   if (scraperRegistered) {
     success('Scraper MCP registered in OpenClaw — scraper_compress_url(url) available');
+    results.scraper = true;
   } else {
     // Either already registered, or no openclaw.json
     try {
@@ -226,75 +226,14 @@ export async function runWizard({ nonInteractive = false } = {}) {
       const ocConfig = JSON.parse(readFs(joinPath(home(), '.openclaw', 'openclaw.json'), 'utf-8'));
       if (ocConfig?.mcp?.servers?.['robot-resources-scraper']) {
         success('Scraper MCP already registered in OpenClaw');
+        results.scraper = true;
       }
     } catch {
       // No openclaw.json — not on OC, skip
     }
   }
 
-  results.scraper = true;
-
-  // Restart gateway so OC picks up the scraper MCP server
-  if (scraperRegistered) {
-    try {
-      const { spawn: spawnProc } = await import('node:child_process');
-      await new Promise((resolve, reject) => {
-        const proc = spawnProc('openclaw', ['gateway', 'restart'], {
-          stdio: ['ignore', 'pipe', 'pipe'],
-          timeout: 15_000,
-        });
-        let seconds = 0;
-        const hb = setInterval(() => {
-          seconds += 5;
-          process.stdout.write(`  Restarting gateway... ${seconds}s\n`);
-        }, 5000);
-        proc.on('close', (code) => { clearInterval(hb); code === 0 ? resolve() : reject(new Error(`exit ${code}`)); });
-        proc.on('error', (err) => { clearInterval(hb); reject(err); });
-      });
-      success('OpenClaw gateway restarted');
-      results.scraper = true;
-    } catch {
-      // Non-fatal — gateway may not be running
-    }
-  }
-
-  // ── Step 4.5: Healthchecks ────────────────────────────────────────────
-
-  // Scraper MCP: verify the server starts without crashing
-  if (results.scraper) {
-    step('Verifying Scraper MCP starts...');
-    try {
-      const { spawn } = await import('node:child_process');
-      const proc = spawn('npx', ['-y', '-p', '@robot-resources/scraper', 'scraper-mcp'], {
-        stdio: ['pipe', 'pipe', 'pipe'],
-        timeout: 10_000,
-      });
-
-      const healthy = await new Promise((resolve) => {
-        const timer = setTimeout(() => {
-          // Server stayed alive for 3s — it's working
-          proc.kill();
-          resolve(true);
-        }, 3000);
-
-        proc.on('error', () => { clearTimeout(timer); resolve(false); });
-        proc.on('exit', (code) => {
-          clearTimeout(timer);
-          // MCP servers don't exit on their own — if it exited, it crashed
-          resolve(code === 0);
-        });
-      });
-
-      if (healthy) {
-        success('Scraper MCP server healthy');
-      } else {
-        warn('Scraper MCP server exited unexpectedly');
-        results.scraper = false;
-      }
-    } catch {
-      warn('Could not verify Scraper MCP server');
-    }
-  }
+  // ── Step 4.5: Router Healthcheck ──────────────────────────────────────
 
   // Router: verify it's responding on localhost:3838
   if (results.service) {
@@ -384,4 +323,20 @@ export async function runWizard({ nonInteractive = false } = {}) {
     info(' More info: https://robotresources.ai"');
     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 {
+      // Best-effort — gateway picks up changes on next restart
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "robot-resources",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Robot Resources — AI agent runtime tools. One command to install everything.",
   "type": "module",
   "bin": {
@@ -18,6 +18,7 @@
   ],
   "dependencies": {
     "@robot-resources/cli-core": "*",
+    "@robot-resources/openclaw-plugin": "*",
     "@robot-resources/scraper": "^0.2.0"
   },
   "devDependencies": {