nervepay 1.6.6 → 1.6.9

package/CHANGELOG.md

@@ -105,7 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [ ] Session tokens (reduce signature overhead)
 - [ ] ERC-4337 smart wallet integration
 - [ ] ERC-8004 on-chain reputation bridge
-- [ ] x402 payment protocol support
+- [ ] Agent attestation network
 - [ ] Sub-agent delegation tools
 - [ ] Real-time analytics dashboard
 - [ ] Multi-gateway load balancing

package/bin/nervepay-cli.js

@@ -5,7 +5,7 @@
  */
 
 import { readFile, writeFile, mkdir } from 'fs/promises';
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { execSync } from 'child_process';
 import { homedir, networkInterfaces } from 'os';
 import { join, dirname } from 'path';
@@ -80,6 +80,93 @@ function expandHomePath(inputPath) {
   return trimmed;
 }
 
+let openClawEnvCache = null;
+
+function parseEnvFile(content) {
+  const map = {};
+  for (const line of String(content || '').split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const normalized = trimmed.startsWith('export ') ? trimmed.slice(7).trim() : trimmed;
+    const eq = normalized.indexOf('=');
+    if (eq <= 0) continue;
+    const key = normalized.slice(0, eq).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) continue;
+    let value = normalized.slice(eq + 1).trim();
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+    map[key] = value;
+  }
+  return map;
+}
+
+function loadOpenClawEnvFile() {
+  if (openClawEnvCache !== null) return openClawEnvCache;
+  const candidates = [
+    process.env.OPENCLAW_ENV_PATH,
+    '/opt/openclaw.env',
+    '/etc/openclaw.env',
+  ];
+
+  for (const candidate of candidates) {
+    const filePath = expandHomePath(candidate);
+    if (!filePath || !existsSync(filePath)) continue;
+    try {
+      const content = readFileSync(filePath, 'utf-8');
+      openClawEnvCache = parseEnvFile(content);
+      return openClawEnvCache;
+    } catch {
+      // Try next candidate.
+    }
+  }
+
+  openClawEnvCache = {};
+  return openClawEnvCache;
+}
+
+function parseGatewayUrlInput(raw) {
+  if (typeof raw !== 'string') return { url: null, token: null };
+  const value = raw.trim();
+  if (!value) return { url: null, token: null };
+
+  try {
+    const parsed = new URL(value.includes('://') ? value : `http://${value}`);
+    const token =
+      parsed.searchParams.get('token') ||
+      parsed.searchParams.get('gateway_token') ||
+      parsed.searchParams.get('gatewayToken') ||
+      parsed.searchParams.get('access_token');
+
+    if (token) {
+      parsed.searchParams.delete('token');
+      parsed.searchParams.delete('gateway_token');
+      parsed.searchParams.delete('gatewayToken');
+      parsed.searchParams.delete('access_token');
+    }
+
+    const cleanUrl = parsed.toString().replace(/\?$/, '');
+    return {
+      url: cleanUrl || value,
+      token: token && token.trim() ? token.trim() : null,
+    };
+  } catch {
+    return { url: value, token: null };
+  }
+}
+
+function normalizeGatewayInput(url, token) {
+  const parsed = parseGatewayUrlInput(url);
+  return {
+    url: parsed.url || url || null,
+    token: token || parsed.token || null,
+    tokenFromUrl: Boolean(parsed.token && !token),
+  };
+}
+
 function findOpenClawConfigPath() {
   const candidates = [];
   const seen = new Set();
@@ -349,6 +436,7 @@ function extractGatewayConfig(config) {
   let publicUrl = null;
   let token = null;
   let warning = null;
+  const openClawEnv = loadOpenClawEnvFile();
 
   const mode = config?.gateway?.mode;
   const port = Number(config?.gateway?.port || config?.port || process.env.OPENCLAW_GATEWAY_PORT || 18789);
@@ -424,6 +512,16 @@ function extractGatewayConfig(config) {
     process.env.NERVEPAY_GATEWAY_URL ||
     process.env.OPENCLAW_PUBLIC_URL ||
     process.env.NERVEPAY_PUBLIC_URL ||
+    openClawEnv.OPENCLAW_GATEWAY_URL ||
+    openClawEnv.NERVEPAY_GATEWAY_URL ||
+    openClawEnv.OPENCLAW_PUBLIC_URL ||
+    openClawEnv.NERVEPAY_PUBLIC_URL ||
+    openClawEnv.OPENCLAW_DASHBOARD_URL ||
+    openClawEnv.DASHBOARD_URL ||
+    openClawEnv.APP_URL ||
+    openClawEnv.OPENCLAW_URL ||
+    openClawEnv.OPENCLAW_EXTERNAL_URL ||
+    openClawEnv.PUBLIC_URL ||
     config?.gateway?.publicUrl ||
     config?.gateway?.public_url ||
     config?.gateway?.url ||
@@ -432,7 +530,13 @@ function extractGatewayConfig(config) {
     config?.url;
 
   if (typeof explicitPublic === 'string' && explicitPublic.trim()) {
-    publicUrl = ensureHttpScheme(explicitPublic.trim(), secureGateway);
+    const parsedPublic = parseGatewayUrlInput(explicitPublic.trim());
+    if (parsedPublic.url) {
+      publicUrl = ensureHttpScheme(parsedPublic.url, secureGateway);
+    }
+    if (!token && parsedPublic.token) {
+      token = parsedPublic.token;
+    }
   } else if (!publicUrl) {
     if (!isLocalHost(configuredHost) && configuredHost !== '0.0.0.0' && configuredHost !== '::') {
       publicUrl = buildGatewayUrl({ scheme, host: configuredHost, port });
@@ -457,6 +561,14 @@ function extractGatewayConfig(config) {
   }
 
   // Environment token overrides should win.
+  if (!token) {
+    token =
+      openClawEnv.OPENCLAW_GATEWAY_TOKEN ||
+      openClawEnv.OPENCLAW_GATEWAY_PASSWORD ||
+      openClawEnv.OPENCLAW_TOKEN ||
+      openClawEnv.GATEWAY_TOKEN ||
+      token;
+  }
   if (process.env.OPENCLAW_GATEWAY_TOKEN) token = process.env.OPENCLAW_GATEWAY_TOKEN;
   if (!token && process.env.OPENCLAW_GATEWAY_PASSWORD) token = process.env.OPENCLAW_GATEWAY_PASSWORD;
 
@@ -732,7 +844,7 @@ program
   .command('setup')
   .description('Create agent identity and pair gateway')
   .option('--api-url <url>', 'NervePay API URL', DEFAULT_API_URL)
-  .option('--gateway-url <url>', 'Gateway URL override')
+  .option('--gateway-url <url>', 'Gateway URL override (OpenClaw Dashboard URL also works)')
   .option('--gateway-token <token>', 'Gateway token override')
   .action(async (options) => {
     banner();
@@ -743,9 +855,13 @@ program
       const openclawConfig = await readOpenClawConfig();
       const configPath = findOpenClawConfigPath();
       const gw = extractGatewayConfig(openclawConfig);
-      let gatewayConnectUrl = options.gatewayUrl || gw.connectUrl || gw.url;
-      let gatewayPublicUrl = options.gatewayUrl || gw.publicUrl || gw.url || gatewayConnectUrl;
-      let gatewayToken = options.gatewayToken || gw.token;
+      const normalizedSetupInput = normalizeGatewayInput(options.gatewayUrl, options.gatewayToken);
+      if (normalizedSetupInput.tokenFromUrl) {
+        logInfo('Extracted gateway token from --gateway-url query parameter');
+      }
+      let gatewayConnectUrl = normalizedSetupInput.url || gw.connectUrl || gw.url;
+      let gatewayPublicUrl = normalizedSetupInput.url || gw.publicUrl || gw.url || gatewayConnectUrl;
+      let gatewayToken = normalizedSetupInput.token || gw.token;
 
       if (gatewayConnectUrl) {
         logOk(`Found OpenClaw gateway: ${gatewayConnectUrl}`);
@@ -863,6 +979,7 @@ program
         if (!isExternallyReachableUrlCandidate(gatewayPublicUrl || gatewayConnectUrl)) {
           logWarn('Gateway pairing skipped: public URL is local-only or missing.');
           log(dim('Set a reachable URL via OPENCLAW_GATEWAY_URL or --gateway-url, and ensure gateway.bind is "lan" or behind a public reverse proxy.'));
+          log(dim('Tip: you can paste your OpenClaw Dashboard URL directly (token is auto-extracted).'));
           log(dim('Pair later with:'), info('nervepay pair --gateway-url <public-url>'));
         } else {
           console.log();
@@ -934,7 +1051,7 @@ program
   .description('Connect gateway via device protocol or pairing code')
   .option('--code <code>', 'Pairing code from dashboard (legacy flow)')
   .option('--api-url <url>', 'NervePay API URL', DEFAULT_API_URL)
-  .option('--gateway-url <url>', 'Gateway URL')
+  .option('--gateway-url <url>', 'Gateway URL (or Dashboard URL with ?token=...)')
   .option('--gateway-token <token>', 'Gateway auth token')
   .option('--name <name>', 'Gateway display name', 'OpenClaw Gateway')
   .option('--timeout <seconds>', 'Approval timeout in seconds', '300')
@@ -1174,9 +1291,13 @@ async function deviceNodePairing(options) {
     field('  DID', agentDid);
 
     // Resolve gateway URLs and token
-    let gatewayConnectUrl = options.gatewayUrl;
-    let gatewayPublicUrl = options.gatewayUrl;
-    let gatewayToken = options.gatewayToken;
+    const normalizedInput = normalizeGatewayInput(options.gatewayUrl, options.gatewayToken);
+    if (normalizedInput.tokenFromUrl) {
+      logInfo('Extracted gateway token from --gateway-url query parameter');
+    }
+    let gatewayConnectUrl = normalizedInput.url;
+    let gatewayPublicUrl = normalizedInput.url;
+    let gatewayToken = normalizedInput.token;
     if (!gatewayConnectUrl || !gatewayToken || !gatewayPublicUrl) {
       const oc = await readOpenClawConfig();
       const gwConf = extractGatewayConfig(oc);
@@ -1192,7 +1313,7 @@ async function deviceNodePairing(options) {
     if (!isExternallyReachableUrlCandidate(gatewayPublicUrl || gatewayConnectUrl)) {
       die(
         'Gateway public URL is local-only. NervePay cloud cannot reach localhost/127.0.0.1.',
-        'Set OPENCLAW_GATEWAY_URL or pass --gateway-url <public-url> and ensure gateway.bind is "lan" (or use a public reverse proxy).'
+        'Set OPENCLAW_GATEWAY_URL or pass --gateway-url <public-url> and ensure gateway.bind is "lan" (or use a public reverse proxy). You can paste your OpenClaw Dashboard URL directly; token query params are auto-extracted.'
       );
     }
 
@@ -1321,8 +1442,12 @@ async function legacyCodePairing(options) {
     console.log();
     logInfo('Reading gateway config...');
 
-    let gatewayUrl = options.gatewayUrl;
-    let gatewayToken = options.gatewayToken;
+    const normalizedInput = normalizeGatewayInput(options.gatewayUrl, options.gatewayToken);
+    if (normalizedInput.tokenFromUrl) {
+      logInfo('Extracted gateway token from --gateway-url query parameter');
+    }
+    let gatewayUrl = normalizedInput.url;
+    let gatewayToken = normalizedInput.token;
 
     if (!gatewayUrl || !gatewayToken) {
       const oc = await readOpenClawConfig();
@@ -1339,7 +1464,7 @@ async function legacyCodePairing(options) {
     if (!isExternallyReachableUrlCandidate(gatewayUrl)) {
       die(
         'Gateway URL is local-only. NervePay cloud cannot reach localhost/127.0.0.1.',
-        'Use --gateway-url <public-url> and ensure gateway.bind is "lan" (or use a public reverse proxy).'
+        'Use --gateway-url <public-url> and ensure gateway.bind is "lan" (or use a public reverse proxy). You can paste your OpenClaw Dashboard URL directly; token query params are auto-extracted.'
       );
     }
 

package/dist/tools/identity.d.ts

@@ -26,7 +26,7 @@ export interface WhoAmIResult {
     name: string;
     public_key: string;
     capabilities: {
-        max_spending_limit_usd?: number;
+        max_operations_per_day?: number;
         allowed_operations?: string[];
     };
     reputation_score: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nervepay",
-  "version": "1.6.6",
-  "description": "NervePay plugin for OpenClaw - Self-sovereign identity, vault, and orchestration",
+  "version": "1.6.9",
+  "description": "NervePay plugin for OpenClaw - Agent identity, vault, and orchestration",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",