robot-resources 1.4.1 → 1.5.1

package/lib/tool-config.js

@@ -1,10 +1,40 @@
-import { execFileSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } 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.
+ */
+function spawnWithHeartbeat(cmd, args, { label, timeout = 30_000 } = {}) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn(cmd, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      timeout,
+    });
+
+    let seconds = 0;
+    const heartbeat = setInterval(() => {
+      seconds += 5;
+      process.stdout.write(`  ${label}... ${seconds}s\n`);
+    }, 5000);
+
+    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);
+    });
+  });
+}
+
 /**
  * Set robot-resources/auto as the default model in openclaw.json.
  *
@@ -69,7 +99,7 @@ function registerScraperMcp() {
 
     config.mcp.servers['robot-resources-scraper'] = {
       command: 'npx',
-      args: ['-y', '@robot-resources/scraper-mcp'],
+      args: ['-y', '-p', '@robot-resources/scraper', 'scraper-mcp'],
     };
 
     writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
@@ -93,7 +123,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.
  */
-function configureOpenClaw() {
+async function configureOpenClaw() {
   const authMode = getOpenClawAuthMode();
 
   if (isOpenClawPluginInstalled()) {
@@ -105,8 +135,8 @@ function configureOpenClaw() {
   }
 
   try {
-    execFileSync('openclaw', ['plugins', 'install', '@robot-resources/openclaw-plugin'], {
-      stdio: 'ignore',
+    await spawnWithHeartbeat('openclaw', ['plugins', 'install', '@robot-resources/openclaw-plugin'], {
+      label: 'Installing plugin',
       timeout: 30_000,
     });
 
@@ -117,8 +147,8 @@ function configureOpenClaw() {
     // Restart the gateway so it picks up the new plugin + config.
     let gatewayRestarted = false;
     try {
-      execFileSync('openclaw', ['gateway', 'restart'], {
-        stdio: 'ignore',
+      await spawnWithHeartbeat('openclaw', ['gateway', 'restart'], {
+        label: 'Restarting gateway',
         timeout: 15_000,
       });
       gatewayRestarted = true;
@@ -167,12 +197,12 @@ function configureOpenClaw() {
  *
  * Returns array of { name, action, ... } results.
  */
-export function configureToolRouting() {
+export async function configureToolRouting() {
   const results = [];
 
   // OpenClaw
   if (isOpenClawInstalled()) {
-    results.push(configureOpenClaw());
+    results.push(await configureOpenClaw());
   }
 
   return results;

package/lib/wizard.js

@@ -172,7 +172,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
     blank();
     step('Configuring AI tools to use Router...');
 
-    const toolResults = configureToolRouting();
+    const toolResults = await configureToolRouting();
     results.tools = toolResults;
 
     if (toolResults.length === 0) {
@@ -204,9 +204,9 @@ 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. Pre-cache the scraper-mcp npm package
-  // 3. Restart gateway so OC picks up the new MCP server
+  // 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
 
   blank();
   step('Installing Scraper...');
@@ -232,26 +232,24 @@ export async function runWizard({ nonInteractive = false } = {}) {
     }
   }
 
-  // Pre-cache scraper-mcp package so OC doesn't need to download on first use
-  try {
-    const { execFileSync: execFs } = await import('node:child_process');
-    execFs('npx', ['-y', '@robot-resources/scraper-mcp', '--help'], {
-      stdio: 'ignore',
-      timeout: 60_000,
-    });
-    success('Scraper MCP package cached');
-    results.scraper = true;
-  } catch {
-    warn('Scraper MCP pre-cache failed — will download on first use');
-  }
+  results.scraper = true;
 
   // Restart gateway so OC picks up the scraper MCP server
   if (scraperRegistered) {
     try {
-      const { execFileSync: execFs2 } = await import('node:child_process');
-      execFs2('openclaw', ['gateway', 'restart'], {
-        stdio: 'ignore',
-        timeout: 15_000,
+      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;
@@ -267,7 +265,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
     step('Verifying Scraper MCP starts...');
     try {
       const { spawn } = await import('node:child_process');
-      const proc = spawn('npx', ['-y', '@robot-resources/scraper-mcp'], {
+      const proc = spawn('npx', ['-y', '-p', '@robot-resources/scraper', 'scraper-mcp'], {
         stdio: ['pipe', 'pipe', 'pipe'],
         timeout: 10_000,
       });

package/package.json

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