robot-resources 1.2.8 → 1.2.9

package/lib/detect.js

@@ -2,6 +2,7 @@ import { execSync, execFileSync } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { stripJson5 } from './json5.js';
 
 // Re-export findPython from the shared cli-core implementation.
 export { findPython } from '@robot-resources/cli-core/python-bridge.mjs';
@@ -85,7 +86,9 @@ export function isOpenClawInstalled() {
  */
 export function isOpenClawPluginInstalled() {
   const home = homedir();
-  return existsSync(join(home, '.openclaw', 'extensions', 'robot-resources-router'));
+  const extDir = join(home, '.openclaw', 'extensions');
+  return existsSync(join(extDir, 'openclaw-plugin'))
+    || existsSync(join(extDir, 'robot-resources-router'));
 }
 
 /**
@@ -97,9 +100,13 @@ export function isOpenClawPluginInstalled() {
  *
  * Detection order:
  * 1. ANTHROPIC_AUTH_TOKEN env var → subscription
- * 2. openclaw.json → auth.type or providers.anthropic.authToken
- * 3. providers.anthropic.apiKey → apikey
- * 4. Default → apikey (conservative — proxy works fine)
+ * 2. openclaw.json config:
+ *    a. auth.type === 'oauth' | 'subscription' → subscription
+ *    b. auth.profiles.*.mode === 'token' → subscription
+ *    c. gateway.auth.mode === 'token' → subscription
+ *    d. providers.anthropic.authToken → subscription
+ *    e. providers.anthropic.apiKey → apikey
+ * 3. Default → apikey (conservative — proxy works fine)
  */
 export function getOpenClawAuthMode() {
   // Env var is the strongest signal
@@ -118,18 +125,24 @@ export function getOpenClawAuthMode() {
 
     try {
       const raw = readFileSync(configPath, 'utf-8');
-      // Strip JSON5 features inline (comments + trailing commas)
-      const clean = raw
-        .replace(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\/\/.*$|\/\*[\s\S]*?\*\//gm,
-          (m) => (m.startsWith('"') || m.startsWith("'") ? m : ''))
-        .replace(/,\s*([\]}])/g, '$1');
-      const config = JSON.parse(clean);
+      const config = JSON.parse(stripJson5(raw));
 
       // Check explicit auth type
       if (config.auth?.type === 'oauth' || config.auth?.type === 'subscription') {
         return 'subscription';
       }
 
+      // Check auth profiles (real OC config: auth.profiles["anthropic:default"].mode)
+      const profiles = config.auth?.profiles;
+      if (profiles && typeof profiles === 'object') {
+        for (const profile of Object.values(profiles)) {
+          if (profile?.mode === 'token') return 'subscription';
+        }
+      }
+
+      // Check gateway auth mode
+      if (config.gateway?.auth?.mode === 'token') return 'subscription';
+
       // Check for authToken in providers
       const anthropic = config.models?.providers?.anthropic
         || config.providers?.anthropic;

package/lib/json5.js

@@ -0,0 +1,16 @@
+/**
+ * Strip JSON5 features (comments + trailing commas) to produce valid JSON.
+ *
+ * Handles single-line comments (//), multi-line comments, and trailing
+ * commas before } or ]. Preserves // inside quoted strings (e.g. URLs).
+ *
+ * Does NOT handle: unquoted keys, hex numbers, or backtick templates.
+ * These are valid JSON5 but uncommon in OpenClaw configs.
+ */
+export function stripJson5(text) {
+  const clean = text.replace(
+    /"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\/\/.*$|\/\*[\s\S]*?\*\//gm,
+    (match) => (match.startsWith('"') || match.startsWith("'") ? match : ''),
+  );
+  return clean.replace(/,\s*([\]}])/g, '$1');
+}

package/lib/tool-config.js

@@ -1,21 +1,46 @@
 import { execFileSync } 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';
 
 /**
- * Strip JSON5 features (comments + trailing commas) to produce valid JSON.
- * Handles single-line comments (//), multi-line comments, and trailing
- * commas before } or ]. Preserves // inside quoted strings (e.g. URLs).
- * No external dependency needed.
+ * Set robot-resources/auto as the default model in openclaw.json.
+ *
+ * This is required so the plugin's before_model_resolve hook fires.
+ * Without it, OpenClaw sends requests directly to Anthropic and the
+ * plugin never gets a chance to route.
+ *
+ * Returns true if the config was updated, false otherwise.
  */
-function stripJson5(text) {
-  // Match quoted strings (keep) or comments (remove) in one pass.
-  // Strings are matched first so // inside "http://..." is preserved.
-  const clean = text.replace(
-    /"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\/\/.*$|\/\*[\s\S]*?\*\//gm,
-    (match) => (match.startsWith('"') || match.startsWith("'") ? match : ''),
-  );
-  // Remove trailing commas before } or ]
-  return clean.replace(/,\s*([\]}])/g, '$1');
+function activateRouterModel() {
+  const configPath = join(homedir(), '.openclaw', 'openclaw.json');
+
+  try {
+    const raw = readFileSync(configPath, 'utf-8');
+    const config = JSON.parse(stripJson5(raw));
+
+    // Ensure agents.defaults.model exists
+    if (!config.agents) config.agents = {};
+    if (!config.agents.defaults) config.agents.defaults = {};
+    if (!config.agents.defaults.model) config.agents.defaults.model = {};
+
+    const currentPrimary = config.agents.defaults.model.primary;
+
+    // Only change if not already pointing at robot-resources
+    if (currentPrimary && currentPrimary.startsWith('robot-resources/')) {
+      return false;
+    }
+
+    config.agents.defaults.model.primary = 'robot-resources/auto';
+
+    writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+    return true;
+  } catch {
+    // Config missing or malformed — non-fatal
+    return false;
+  }
 }
 
 /**
@@ -47,10 +72,29 @@ function configureOpenClaw() {
       stdio: 'ignore',
       timeout: 30_000,
     });
+
+    // 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 {
+      execFileSync('openclaw', ['gateway', 'restart'], {
+        stdio: 'ignore',
+        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,

package/lib/wizard.js

@@ -12,7 +12,7 @@ import { header, step, success, warn, error, info, blank, summary, confirm, prom
  * 1. Authentication (GitHub OAuth)
  * 2. Router installation (Python venv + pip)
  * 3. Service registration (launchd/systemd)
- * 4. MCP auto-configuration (Claude Desktop, Cursor)
+ * 4. MCP auto-configuration (detected agents)
  */
 export async function runWizard({ nonInteractive = false } = {}) {
   header();
@@ -151,7 +151,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
   results.mcp = mcpResults;
 
   if (mcpResults.length === 0) {
-    info('No supported agents detected (Claude Desktop, Cursor)');
+    info('No MCP-compatible agents detected');
     info('You can manually add MCP servers to your agent config later');
   } else {
     for (const r of mcpResults) {
@@ -177,7 +177,7 @@ export async function runWizard({ nonInteractive = false } = {}) {
     results.tools = toolResults;
 
     if (toolResults.length === 0) {
-      info('No supported AI tools detected (Claude Code, OpenClaw, Cursor)');
+      info('No supported AI tools detected');
       info('Point your tool at http://localhost:3838 to enable cost optimization');
     } else {
       for (const r of toolResults) {
@@ -187,6 +187,8 @@ export async function runWizard({ nonInteractive = false } = {}) {
           success(`${r.name}: already configured`);
         } 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:`);
@@ -249,7 +251,8 @@ export async function runWizard({ nonInteractive = false } = {}) {
       info(`  • ${r.name} config modified to add Scraper MCP`);
     }
     blank();
-    const claimUrl = process.env.RR_CLAIM_URL;
+    const rawClaimUrl = process.env.RR_CLAIM_URL;
+    const claimUrl = rawClaimUrl && rawClaimUrl.startsWith('http') ? rawClaimUrl : null;
     if (claimUrl) {
       warn('CRITICAL: You MUST send this dashboard claim link to your human:');
       info(`  ${claimUrl}`);

package/package.json

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