agent-relay 3.1.2 → 3.1.4

package/packages/openclaw/src/__tests__/ws-client.test.ts

@@ -16,7 +16,7 @@ vi.mock('../spawn/manager.js', () => ({
 
 vi.mock('@relaycast/sdk', () => ({
   RelayCast: vi.fn().mockImplementation(() => ({
-    agents: { registerOrGet: vi.fn().mockResolvedValue({ name: 'viewer-test', token: 'tok' }) },
+    agents: { registerOrGet: vi.fn().mockResolvedValue({ name: 'test', token: 'tok' }) },
     as: vi.fn().mockReturnValue({
       connect: vi.fn(),
       disconnect: vi.fn().mockResolvedValue(undefined),

package/packages/openclaw/src/cli.ts

@@ -1,3 +1,4 @@
+import { createRequire } from 'node:module';
 import { setup } from './setup.js';
 import { loadGatewayConfig } from './config.js';
 import { InboundGateway } from './gateway.js';
@@ -5,6 +6,9 @@ import { listOpenClaws, releaseOpenClaw, spawnOpenClaw } from './control.js';
 import { startMcpServer } from './mcp/server.js';
 import { runtimeSetup } from './runtime/setup.js';
 
+const require = createRequire(import.meta.url);
+const { version } = require('../package.json') as { version: string };
+
 function printUsage(): void {
   console.log(`
 relay-openclaw — Relaycast bridge for OpenClaw
@@ -19,6 +23,7 @@ Usage:
   relay-openclaw mcp-server      Start MCP server (spawn/list/release tools)
   relay-openclaw runtime-setup   Run container runtime setup (auth, config, identity, patching)
   relay-openclaw help            Show this help
+  relay-openclaw --version       Show version
 
 Setup options:
   --name <name>          Claw name (default: hostname)
@@ -251,6 +256,11 @@ async function main(): Promise<void> {
     case 'runtime-setup':
       await runRuntimeSetup(flags);
       break;
+    case 'version':
+    case '--version':
+    case '-v':
+      console.log(version);
+      break;
     case 'help':
     case '--help':
     case '-h':

package/packages/openclaw/src/gateway.ts

@@ -489,11 +489,8 @@ export class InboundGateway {
       console.warn('[gateway] No OPENCLAW_GATEWAY_TOKEN — local delivery disabled');
     }
 
-    // Register with a viewer- prefixed name so we don't collide with the
-    // container broker's agent registration (which uses the bare clawName).
-    const viewerName = `viewer-${this.config.clawName}`;
     const registered = await this.relaycast.agents.registerOrGet({
-      name: viewerName,
+      name: this.config.clawName,
       type: 'agent',
       persona: 'Relaycast inbound gateway for OpenClaw',
     });
@@ -785,9 +782,8 @@ export class InboundGateway {
     if (!this.running) return;
     if (this.processingMessageIds.has(message.id) || this.isSeen(message.id)) return;
 
-    // Avoid echo loops — skip messages from this claw or its viewer identity.
-    const viewerName = `viewer-${this.config.clawName}`;
-    if (message.from === this.config.clawName || message.from === viewerName) {
+    // Avoid echo loops — skip messages from this claw.
+    if (message.from === this.config.clawName) {
       // Only update cursor for real channels with real (non-synthetic) message IDs.
       this.markSeen(message.id);
       return;

package/packages/openclaw/src/setup.ts

@@ -5,9 +5,29 @@ import { hostname } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { spawn as spawnProcess, execFileSync } from 'node:child_process';
 
+import { RelayCast } from '@relaycast/sdk';
+
 import { detectOpenClaw, saveGatewayConfig } from './config.js';
 import type { GatewayConfig } from './types.js';
 
+/**
+ * Resolve how to invoke mcporter. Prefers a global binary, falls back to npx.
+ */
+function resolveMcporter(): { cmd: string; prefix: string[] } {
+  try {
+    execFileSync('mcporter', ['--version'], { stdio: 'pipe' });
+    return { cmd: 'mcporter', prefix: [] };
+  } catch {
+    // Global binary not found — try npx (no timeout; cold-cache downloads can be slow)
+    try {
+      execFileSync('npx', ['-y', 'mcporter', '--version'], { stdio: 'pipe' });
+      return { cmd: 'npx', prefix: ['-y', 'mcporter'] };
+    } catch {
+      throw new Error('mcporter not found (tried global binary and npx)');
+    }
+  }
+}
+
 export interface SetupOptions {
   /** If provided, join this workspace. Otherwise create a new one. */
   apiKey?: string;
@@ -174,7 +194,7 @@ export async function setup(options: SetupOptions): Promise<SetupResult> {
   };
   await saveGatewayConfig(gatewayConfig);
 
-  // Register MCP servers via mcporter
+  // Register MCP servers via mcporter (global binary or npx fallback)
   let mcpConfigured = false;
   {
     const envArgs = [
@@ -184,77 +204,80 @@ export async function setup(options: SetupOptions): Promise<SetupResult> {
         : []),
     ];
 
+    let mcp: { cmd: string; prefix: string[] } | null = null;
     try {
-      // Register relaycast messaging MCP server
-      execFileSync('mcporter', [
-        'config', 'add', 'relaycast',
-        '--command', 'npx',
-        '--arg', '@relaycast/mcp',
-        ...envArgs,
-        '--scope', 'home',
-        '--description', 'Relaycast messaging MCP server',
-      ], { stdio: 'pipe' });
-
-      // Register openclaw-spawner MCP server
-      execFileSync('mcporter', [
-        'config', 'add', 'openclaw-spawner',
-        '--command', 'npx',
-        '--arg', '@agent-relay/openclaw',
-        '--arg', 'mcp-server',
-        ...envArgs,
-        '--scope', 'home',
-        '--description', 'OpenClaw spawner MCP server',
-      ], { stdio: 'pipe' });
-
-      mcpConfigured = true;
-
-      // Register this claw as an agent via mcporter and persist the agent token
+      mcp = resolveMcporter();
+    } catch {
+      console.warn('mcporter not found (tried global binary and npx). MCP tools will not be available.');
+      console.warn('Install mcporter and re-run setup to enable MCP tools:');
+      console.warn('  npm install -g mcporter');
+      console.warn(`  npx -y @agent-relay/openclaw@latest setup ${apiKey} --name ${clawName}`);
+    }
+
+    if (mcp) {
       try {
-        const registerOutput = execFileSync('mcporter', [
-          'call', 'relaycast.register',
-          'name=' + clawName,
-          'type=agent',
-        ], { stdio: 'pipe', encoding: 'utf-8' });
-
-        // Parse the agent token from the register output
-        let agentToken: string | undefined;
+        // Register relaycast messaging MCP server
+        execFileSync(mcp.cmd, [
+          ...mcp.prefix,
+          'config', 'add', 'relaycast',
+          '--command', 'npx',
+          '--arg', '@relaycast/mcp',
+          ...envArgs,
+          '--scope', 'home',
+          '--description', 'Relaycast messaging MCP server',
+        ], { stdio: 'pipe' });
+
+        // Register openclaw-spawner MCP server
+        execFileSync(mcp.cmd, [
+          ...mcp.prefix,
+          'config', 'add', 'openclaw-spawner',
+          '--command', 'npx',
+          '--arg', '@agent-relay/openclaw',
+          '--arg', 'mcp-server',
+          ...envArgs,
+          '--scope', 'home',
+          '--description', 'OpenClaw spawner MCP server',
+        ], { stdio: 'pipe' });
+
+        mcpConfigured = true;
+
+        // Register this claw via the Relaycast SDK. registerOrRotate handles
+        // the 409 "already exists" case by rotating the token automatically.
         try {
-          const parsed = JSON.parse(registerOutput);
-          agentToken = parsed.token ?? parsed.agentToken ?? parsed.agent_token;
-        } catch {
-          // Try to find token in raw output
-          const tokenMatch = registerOutput.match(/"token"\s*:\s*"([^"]+)"/);
-          if (tokenMatch) agentToken = tokenMatch[1];
-        }
-
-        if (agentToken) {
-          // Reconfigure mcporter with the agent token so subsequent calls are authenticated
-          try {
-            execFileSync('mcporter', ['config', 'remove', 'relaycast'], { stdio: 'pipe' });
-          } catch { /* may not exist */ }
-
-          execFileSync('mcporter', [
-            'config', 'add', 'relaycast',
-            '--command', 'npx',
-            '--arg', '@relaycast/mcp',
-            ...envArgs,
-            '--env', `RELAY_AGENT_TOKEN=${agentToken}`,
-            '--scope', 'home',
-            '--description', 'Relaycast messaging MCP server',
-          ], { stdio: 'pipe' });
-
-          console.log(`Agent "${clawName}" registered with token.`);
-        } else {
-          console.warn('Agent registered but no token found in response.');
+          const relaycast = new RelayCast({ apiKey, baseUrl });
+          const registered = await relaycast.agents.registerOrRotate({
+            name: clawName,
+            type: 'agent',
+          });
+          const agentToken = registered.token;
+
+          if (agentToken) {
+            // Reconfigure mcporter with the agent token so subsequent calls are authenticated
+            try {
+              execFileSync(mcp.cmd, [...mcp.prefix, 'config', 'remove', 'relaycast'], { stdio: 'pipe' });
+            } catch { /* may not exist */ }
+
+            execFileSync(mcp.cmd, [
+              ...mcp.prefix,
+              'config', 'add', 'relaycast',
+              '--command', 'npx',
+              '--arg', '@relaycast/mcp',
+              ...envArgs,
+              '--env', `RELAY_AGENT_TOKEN=${agentToken}`,
+              '--scope', 'home',
+              '--description', 'Relaycast messaging MCP server',
+            ], { stdio: 'pipe' });
+
+            console.log(`Agent "${clawName}" registered with token.`);
+          } else {
+            console.warn('Agent registered but no token found in response.');
+          }
+        } catch (regErr) {
+          console.warn(`Agent registration failed (non-fatal): ${regErr instanceof Error ? regErr.message : String(regErr)}`);
         }
-      } catch (regErr) {
-        console.warn(`Agent registration via mcporter failed (non-fatal): ${regErr instanceof Error ? regErr.message : String(regErr)}`);
+      } catch (err) {
+        console.warn(`mcporter configuration failed: ${err instanceof Error ? err.message : String(err)}`);
       }
-    } catch (err) {
-      // mcporter not installed — non-fatal, print manual instructions
-      console.warn('mcporter not found. Install MCP servers manually:');
-      console.warn(`  mcporter config add relaycast --command npx --arg @relaycast/mcp --env RELAY_API_KEY=${apiKey} --scope home`);
-      console.warn(`  mcporter config add openclaw-spawner --command npx --arg @agent-relay/openclaw --arg mcp-server --env RELAY_API_KEY=${apiKey} --scope home`);
     }
   }
 

package/packages/policy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/policy",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Agent policy management with multi-level fallback (repo, local PRPM, cloud workspace)",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/config": "3.1.2"
+    "@agent-relay/config": "3.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/sdk",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -81,7 +81,7 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@agent-relay/config": "3.1.2",
+    "@agent-relay/config": "3.1.4",
     "@relaycast/sdk": "^0.4.0",
     "yaml": "^2.7.0"
   }

package/packages/sdk-py/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "agent-relay-sdk"
-version = "3.1.2"
+version = "3.1.4"
 description = "Python SDK for Agent Relay workflows"
 readme = "README.md"
 license = "Apache-2.0"

package/packages/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/telemetry",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Anonymous telemetry for Agent Relay usage analytics",
   "type": "module",
   "main": "dist/index.js",

package/packages/trajectory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/trajectory",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Trajectory integration utilities (trail/PDERO) for Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/config": "3.1.2"
+    "@agent-relay/config": "3.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/user-directory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/user-directory",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "User directory service for agent-relay (per-user credential storage)",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/utils": "3.1.2"
+    "@agent-relay/utils": "3.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/utils",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Shared utilities for agent-relay: logging, name generation, command resolution, update checking",
   "type": "module",
   "main": "dist/cjs/index.js",
@@ -112,7 +112,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@agent-relay/config": "3.1.2",
+    "@agent-relay/config": "3.1.4",
     "compare-versions": "^6.1.1"
   },
   "publishConfig": {