robot-resources 1.2.3 → 1.2.4

package/lib/tool-config.js

@@ -51,25 +51,27 @@ function writeJsonSafe(filePath, data) {
 /**
  * Configure OpenClaw to route through the Router.
  *
- * Modifies the existing Anthropic provider's baseUrl to point at
- * Router (localhost:3838). This way all Anthropic calls go through
- * Router transparently — Router reads the x-api-key from the
- * request and forwards to Anthropic.
+ * Writes to TWO files (both required for OpenClaw to honor the override):
  *
- * If no Anthropic provider exists, creates one with just the baseUrl.
- * Removes any stale "robot-resources" custom provider from previous
- * wizard versions that added it incorrectly.
+ * 1. openclaw.json — config-level override. Needs baseUrl + models[] array
+ *    or OpenClaw rejects the config as invalid.
  *
- * OpenClaw uses openclaw.json (JSON5 format) — we read with
- * comment stripping and write back as standard JSON.
+ * 2. models.json (~/.openclaw/agents/main/agent/models.json) — runtime file
+ *    that OpenClaw actually reads. The baseUrl here is what gets used for
+ *    API calls. openclaw.json alone is not enough.
+ *
+ * Restarts the gateway via systemctl (SIGUSR1 doesn't reload config).
+ * The restart kills the current agent session, but it reconnects
+ * automatically within seconds.
  */
 function configureOpenClaw() {
   const home = homedir();
+
+  // ── 1. Find and update openclaw.json ────────────────────────
   const configPaths = [
     join(home, '.openclaw', 'openclaw.json'),
     join(home, 'openclaw.json'),
   ];
-
   const configPath = configPaths.find((p) => existsSync(p)) || configPaths[0];
   let config = readJsonSafe(configPath) || {};
 
@@ -78,13 +80,21 @@ function configureOpenClaw() {
   config.models.providers = config.models.providers || {};
   config.models.providers.anthropic = config.models.providers.anthropic || {};
 
-  // Check if already proxied through Router
   const anthropic = config.models.providers.anthropic;
+
+  // Check if already proxied through Router
   if (anthropic.baseUrl === `${ROUTER_URL}/v1`) {
-    return { name: 'OpenClaw', action: 'already_configured' };
+    // Also verify models.json is in sync
+    const modelsJsonPath = join(home, '.openclaw', 'agents', 'main', 'agent', 'models.json');
+    const modelsJson = readJsonSafe(modelsJsonPath);
+    const runtimeUrl = modelsJson?.providers?.anthropic?.baseUrl;
+    if (runtimeUrl === `${ROUTER_URL}/v1`) {
+      return { name: 'OpenClaw', action: 'already_configured' };
+    }
+    // openclaw.json is set but models.json is not — fall through to fix it
   }
 
-  // Save original baseUrl so it can be restored if needed
+  // Save original baseUrl for rollback
   if (anthropic.baseUrl && anthropic.baseUrl !== `${ROUTER_URL}/v1`) {
     anthropic._originalBaseUrl = anthropic.baseUrl;
   }
@@ -92,21 +102,54 @@ function configureOpenClaw() {
   // Point Anthropic provider at Router
   anthropic.baseUrl = `${ROUTER_URL}/v1`;
 
+  // OpenClaw requires models array on provider entries
+  if (!Array.isArray(anthropic.models)) {
+    anthropic.models = [];
+  }
+
   // Clean up stale "robot-resources" provider from previous wizard versions
   delete config.models.providers['robot-resources'];
 
   writeJsonSafe(configPath, config);
 
-  // Graceful config reload via SIGUSR1 — doesn't kill the agent's session.
-  // openclaw gateway restart would terminate the active session.
+  // ── 2. Update models.json (runtime file) ────────────────────
+  const modelsJsonPath = join(home, '.openclaw', 'agents', 'main', 'agent', 'models.json');
+  let modelsJson = readJsonSafe(modelsJsonPath) || {};
+
+  modelsJson.providers = modelsJson.providers || {};
+  modelsJson.providers.anthropic = modelsJson.providers.anthropic || {};
+
+  // Save original for rollback
+  const runtimeUrl = modelsJson.providers.anthropic.baseUrl;
+  if (runtimeUrl && runtimeUrl !== `${ROUTER_URL}/v1`) {
+    modelsJson.providers.anthropic._originalBaseUrl = runtimeUrl;
+  }
+
+  modelsJson.providers.anthropic.baseUrl = `${ROUTER_URL}/v1`;
+
+  // Clean up stale robot-resources provider
+  delete modelsJson.providers['robot-resources'];
+
+  writeJsonSafe(modelsJsonPath, modelsJson);
+
+  // ── 3. Restart gateway ──────────────────────────────────────
+  // SIGUSR1 doesn't reload config on OpenClaw. Full restart needed.
+  // systemctl --user restart is preferred (auto-reconnects).
+  // Falls back to openclaw gateway restart, then kill+start.
   try {
-    execSync('kill -USR1 $(pgrep -f openclaw-gateway)', {
+    execSync('systemctl --user restart openclaw-gateway', {
       stdio: 'ignore',
-      timeout: 5_000,
-      shell: true,
+      timeout: 10_000,
     });
   } catch {
-    // Gateway not running or pgrep not available — not fatal
+    try {
+      execSync('openclaw gateway restart', {
+        stdio: 'ignore',
+        timeout: 10_000,
+      });
+    } catch {
+      // Gateway not running or not installed as service — not fatal
+    }
   }
 
   return { name: 'OpenClaw', action: 'configured' };

package/package.json

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