agent-relay 2.1.3 → 2.1.4

package/packages/bridge/src/cli-resolution.test.ts

@@ -0,0 +1,225 @@
+/**
+ * Unit tests for CLI Resolution Utilities
+ *
+ * Tests the detection and resolution of CLI commands for different providers,
+ * particularly the Cursor CLI which has two names: 'agent' (newer) and 'cursor-agent' (older).
+ */
+
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { execSync } from 'node:child_process';
+import {
+  commandExists,
+  detectCursorCli,
+  resolveCli,
+  resetCursorCliCache,
+  CLI_COMMAND_MAP,
+} from './cli-resolution.js';
+
+// Mock child_process module
+vi.mock('node:child_process', () => ({
+  execSync: vi.fn(),
+}));
+
+const mockedExecSync = vi.mocked(execSync);
+
+describe('CLI Resolution', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    resetCursorCliCache();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  describe('commandExists', () => {
+    it('returns true when command exists', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+      expect(commandExists('agent')).toBe(true);
+      expect(mockedExecSync).toHaveBeenCalledWith('which agent', { stdio: 'ignore' });
+    });
+
+    it('returns false when command does not exist', () => {
+      mockedExecSync.mockImplementation(() => {
+        throw new Error('Command not found');
+      });
+      expect(commandExists('nonexistent-cmd')).toBe(false);
+    });
+
+    it('uses "where" on Windows', () => {
+      const originalPlatform = process.platform;
+      Object.defineProperty(process, 'platform', { value: 'win32' });
+
+      mockedExecSync.mockReturnValue(Buffer.from('C:\\Path\\agent.exe'));
+      commandExists('agent');
+      expect(mockedExecSync).toHaveBeenCalledWith('where agent', { stdio: 'ignore' });
+
+      Object.defineProperty(process, 'platform', { value: originalPlatform });
+    });
+  });
+
+  describe('detectCursorCli', () => {
+    it('returns "agent" when agent command exists', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+      expect(detectCursorCli()).toBe('agent');
+    });
+
+    it('returns "cursor-agent" when only cursor-agent exists', () => {
+      mockedExecSync.mockImplementation((cmd: string) => {
+        if (cmd === 'which agent') {
+          throw new Error('not found');
+        }
+        return Buffer.from('/usr/bin/cursor-agent');
+      });
+      expect(detectCursorCli()).toBe('cursor-agent');
+    });
+
+    it('returns null when neither command exists', () => {
+      mockedExecSync.mockImplementation(() => {
+        throw new Error('not found');
+      });
+      expect(detectCursorCli()).toBeNull();
+    });
+
+    it('caches the detected CLI', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+
+      // First call detects
+      expect(detectCursorCli()).toBe('agent');
+      expect(mockedExecSync).toHaveBeenCalledTimes(1);
+
+      // Second call uses cache
+      expect(detectCursorCli()).toBe('agent');
+      expect(mockedExecSync).toHaveBeenCalledTimes(1); // Still 1
+    });
+
+    it('cache can be reset', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+
+      detectCursorCli();
+      expect(mockedExecSync).toHaveBeenCalledTimes(1);
+
+      resetCursorCliCache();
+
+      detectCursorCli();
+      expect(mockedExecSync).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('resolveCli', () => {
+    it('resolves "cursor" to detected CLI (agent)', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+      expect(resolveCli('cursor')).toBe('agent');
+    });
+
+    it('resolves "cursor" to detected CLI (cursor-agent)', () => {
+      mockedExecSync.mockImplementation((cmd: string) => {
+        if (cmd === 'which agent') {
+          throw new Error('not found');
+        }
+        return Buffer.from('/usr/bin/cursor-agent');
+      });
+      expect(resolveCli('cursor')).toBe('cursor-agent');
+    });
+
+    it('resolves "cursor-agent" input to detected CLI', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+      expect(resolveCli('cursor-agent')).toBe('agent');
+    });
+
+    it('falls back to "agent" when cursor CLI not detected', () => {
+      mockedExecSync.mockImplementation(() => {
+        throw new Error('not found');
+      });
+      expect(resolveCli('cursor')).toBe('agent');
+    });
+
+    it('is case insensitive for cursor', () => {
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+      expect(resolveCli('CURSOR')).toBe('agent');
+      expect(resolveCli('Cursor')).toBe('agent');
+    });
+
+    it('resolves "google" to "gemini"', () => {
+      expect(resolveCli('google')).toBe('gemini');
+      expect(resolveCli('Google')).toBe('gemini');
+    });
+
+    it('returns other commands unchanged', () => {
+      expect(resolveCli('claude')).toBe('claude');
+      expect(resolveCli('codex')).toBe('codex');
+      expect(resolveCli('gemini')).toBe('gemini');
+      expect(resolveCli('opencode')).toBe('opencode');
+    });
+
+    it('preserves case for unknown commands', () => {
+      expect(resolveCli('MyCustomCli')).toBe('MyCustomCli');
+    });
+  });
+
+  describe('CLI_COMMAND_MAP', () => {
+    it('maps cursor to agent', () => {
+      expect(CLI_COMMAND_MAP['cursor']).toBe('agent');
+    });
+
+    it('maps cursor-agent to agent', () => {
+      expect(CLI_COMMAND_MAP['cursor-agent']).toBe('agent');
+    });
+
+    it('maps google to gemini', () => {
+      expect(CLI_COMMAND_MAP['google']).toBe('gemini');
+    });
+  });
+});
+
+describe('CLI Resolution Integration', () => {
+  describe('Cursor CLI scenarios', () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+      resetCursorCliCache();
+    });
+
+    it('handles user with newer Cursor (agent available)', () => {
+      // User has Cursor v0.50+ with "agent" CLI
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+
+      const resolved = resolveCli('cursor');
+      expect(resolved).toBe('agent');
+    });
+
+    it('handles user with older Cursor (cursor-agent available)', () => {
+      // User has older Cursor with "cursor-agent" CLI
+      mockedExecSync.mockImplementation((cmd: string) => {
+        if (cmd === 'which agent') {
+          throw new Error('not found');
+        }
+        return Buffer.from('/usr/bin/cursor-agent');
+      });
+
+      const resolved = resolveCli('cursor');
+      expect(resolved).toBe('cursor-agent');
+    });
+
+    it('handles team spawn request with cursor CLI', () => {
+      // Lead agent spawns worker with "cursor" - should resolve to available CLI
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+
+      // Simulate spawn request parsing
+      const cli = 'cursor';
+      const cliParts = cli.split(' ');
+      const rawCommand = cliParts[0];
+      const resolved = resolveCli(rawCommand);
+
+      expect(resolved).toBe('agent');
+    });
+
+    it('handles explicit cursor-agent in spawn request', () => {
+      // User explicitly requests cursor-agent - should still check availability
+      mockedExecSync.mockReturnValue(Buffer.from('/usr/bin/agent'));
+
+      const resolved = resolveCli('cursor-agent');
+      // Even when asking for cursor-agent, if agent is available, use agent
+      expect(resolved).toBe('agent');
+    });
+  });
+});

package/packages/bridge/src/cli-resolution.ts

@@ -0,0 +1,100 @@
+/**
+ * CLI Resolution Utilities
+ *
+ * Handles mapping and detection of CLI commands for different providers.
+ * Cursor has two CLI names: 'agent' (newer) and 'cursor-agent' (older).
+ */
+
+import { execSync } from 'node:child_process';
+import { createLogger } from '@agent-relay/utils/logger';
+
+const log = createLogger('cli-resolution');
+
+/**
+ * Check if a command exists in PATH
+ */
+export function commandExists(cmd: string): boolean {
+  try {
+    const whichCmd = process.platform === 'win32' ? 'where' : 'which';
+    execSync(`${whichCmd} ${cmd}`, { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// Cache for detected Cursor CLI command
+let detectedCursorCli: string | null = null;
+
+/**
+ * Reset the Cursor CLI detection cache.
+ * Useful for testing.
+ */
+export function resetCursorCliCache(): void {
+  detectedCursorCli = null;
+}
+
+/**
+ * Detect which Cursor CLI command is available.
+ * Newer versions use 'agent', older versions use 'cursor-agent'.
+ * Returns null if neither is found.
+ */
+export function detectCursorCli(): string | null {
+  if (detectedCursorCli !== null) {
+    return detectedCursorCli;
+  }
+
+  // Try newer 'agent' command first
+  if (commandExists('agent')) {
+    detectedCursorCli = 'agent';
+    log.debug('Detected Cursor CLI: agent (newer version)');
+    return 'agent';
+  }
+
+  // Fall back to older 'cursor-agent' command
+  if (commandExists('cursor-agent')) {
+    detectedCursorCli = 'cursor-agent';
+    log.debug('Detected Cursor CLI: cursor-agent (older version)');
+    return 'cursor-agent';
+  }
+
+  log.debug('Cursor CLI not found (neither agent nor cursor-agent)');
+  return null;
+}
+
+/**
+ * Resolve CLI command for a provider.
+ * For cursor, detects whether 'agent' or 'cursor-agent' is available.
+ */
+export function resolveCli(rawCommand: string): string {
+  const cmdLower = rawCommand.toLowerCase();
+
+  // Handle cursor specially - detect which CLI is installed
+  if (cmdLower === 'cursor' || cmdLower === 'cursor-agent') {
+    const cursorCli = detectCursorCli();
+    if (cursorCli) {
+      return cursorCli;
+    }
+    // Fall back to 'agent' if detection fails (let it fail at spawn time)
+    return 'agent';
+  }
+
+  // Handle other mappings
+  if (cmdLower === 'google') {
+    return 'gemini';
+  }
+
+  // Return as-is for other commands
+  return rawCommand;
+}
+
+/**
+ * CLI command mapping for providers (kept for reference, resolveCli handles logic)
+ * Maps provider names to actual CLI command names
+ */
+export const CLI_COMMAND_MAP: Record<string, string> = {
+  cursor: 'agent', // Cursor CLI installs as 'agent' (newer versions)
+  'cursor-agent': 'agent', // Cursor CLI older name, also maps to 'agent'
+  google: 'gemini', // Google provider uses 'gemini' CLI
+  // Other providers use their name as the command (claude, codex, etc.)
+};

package/packages/bridge/src/index.ts

@@ -13,6 +13,15 @@ export {
   type ShadowCliSelection,
 } from './shadow-cli.js';
 
+// CLI resolution utilities
+export {
+  commandExists,
+  detectCursorCli,
+  resolveCli,
+  resetCursorCliCache,
+  CLI_COMMAND_MAP,
+} from './cli-resolution.js';
+
 // Agent spawner
 export {
   AgentSpawner,

package/packages/bridge/src/spawner.ts

@@ -9,6 +9,7 @@ import { execFile } from 'node:child_process';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { sleep } from './utils.js';
+import { resolveCli } from './cli-resolution.js';
 import { getProjectPaths, getAgentOutboxTemplate } from '@agent-relay/config';
 import { resolveCommand } from '@agent-relay/utils/command-resolver';
 import { createTraceableError } from '@agent-relay/utils/error-tracking';
@@ -40,16 +41,6 @@ import type {
 // Logger instance for spawner (uses daemon log system instead of console)
 const log = createLogger('spawner');
 
-/**
- * CLI command mapping for providers
- * Maps provider names to actual CLI command names
- */
-const CLI_COMMAND_MAP: Record<string, string> = {
-  cursor: 'agent',  // Cursor CLI installs as 'agent'
-  google: 'gemini', // Google provider uses 'gemini' CLI
-  // Other providers use their name as the command (claude, codex, etc.)
-};
-
 function extractGhTokenFromHosts(content: string): string | null {
   const lines = content.split(/\r?\n/);
   let inGithubSection = false;
@@ -796,10 +787,10 @@ export class AgentSpawner {
     }
 
     try {
-      // Parse CLI command and apply mapping (e.g., cursor -> agent)
+      // Parse CLI command and resolve actual command (e.g., cursor -> agent or cursor-agent)
       const cliParts = cli.split(' ');
       const rawCommandName = cliParts[0];
-      const commandName = CLI_COMMAND_MAP[rawCommandName] || rawCommandName;
+      const commandName = resolveCli(rawCommandName);
       const args = cliParts.slice(1);
 
       if (commandName !== rawCommandName && debug) {
@@ -821,7 +812,7 @@ export class AgentSpawner {
       // Add auto-accept flags for non-interactive agents (normal spawns, not setup terminals)
       // When interactive=true (setup flows), we SKIP these flags so users can respond to prompts
       const isClaudeCli = commandName.startsWith('claude');
-      const isCursorCli = commandName === 'agent' || rawCommandName === 'cursor';
+      const isCursorCli = commandName === 'agent' || rawCommandName === 'cursor' || rawCommandName === 'cursor-agent';
 
       if (!interactive) {
         // Add --dangerously-skip-permissions for Claude agents

package/packages/cli-tester/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/cli-tester",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Manual interactive testing for CLI authentication flows",
   "type": "module",
   "main": "dist/index.js",

package/packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/config",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Shared configuration schemas and loaders for Agent Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -83,7 +83,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.1.3",
+    "@agent-relay/protocol": "2.1.4",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.1"
   },

package/packages/continuity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/continuity",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Session continuity manager for Relay (ledgers, handoffs, resume)",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/memory": "2.1.3"
+    "@agent-relay/memory": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/daemon",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Relay daemon server - agent coordination and message routing",
   "type": "module",
   "main": "dist/index.js",
@@ -22,17 +22,17 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.1.3",
-    "@agent-relay/config": "2.1.3",
-    "@agent-relay/storage": "2.1.3",
-    "@agent-relay/bridge": "2.1.3",
-    "@agent-relay/utils": "2.1.3",
-    "@agent-relay/policy": "2.1.3",
-    "@agent-relay/memory": "2.1.3",
-    "@agent-relay/resiliency": "2.1.3",
-    "@agent-relay/user-directory": "2.1.3",
-    "@agent-relay/wrapper": "2.1.3",
-    "@agent-relay/telemetry": "2.1.3",
+    "@agent-relay/protocol": "2.1.4",
+    "@agent-relay/config": "2.1.4",
+    "@agent-relay/storage": "2.1.4",
+    "@agent-relay/bridge": "2.1.4",
+    "@agent-relay/utils": "2.1.4",
+    "@agent-relay/policy": "2.1.4",
+    "@agent-relay/memory": "2.1.4",
+    "@agent-relay/resiliency": "2.1.4",
+    "@agent-relay/user-directory": "2.1.4",
+    "@agent-relay/wrapper": "2.1.4",
+    "@agent-relay/telemetry": "2.1.4",
     "ws": "^8.18.3",
     "pg": "^8.16.3",
     "uuid": "^10.0.0"

package/packages/hooks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/hooks",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Hook emitter, registry, and trajectory hooks for Agent Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -37,9 +37,9 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.1.3",
-    "@agent-relay/config": "2.1.3",
-    "@agent-relay/trajectory": "2.1.3"
+    "@agent-relay/protocol": "2.1.4",
+    "@agent-relay/config": "2.1.4",
+    "@agent-relay/trajectory": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/mcp",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "MCP server for Agent Relay - native messaging tools for AI agents in Claude, Cursor, and VS Code",
   "author": "Agent Workforce Inc.",
   "license": "Apache-2.0",
@@ -47,8 +47,8 @@
     "prepublishOnly": "npm run clean && npm run build && npm test"
   },
   "dependencies": {
-    "@agent-relay/config": "2.1.3",
-    "@agent-relay/protocol": "2.1.3",
+    "@agent-relay/config": "2.1.4",
+    "@agent-relay/protocol": "2.1.4",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "smol-toml": "^1.6.0",
     "zod": "^3.23.8"

package/packages/memory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/memory",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Semantic memory storage and retrieval system for agent-relay with multiple backend support",
   "type": "module",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/hooks": "2.1.3"
+    "@agent-relay/hooks": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/policy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/policy",
-  "version": "2.1.3",
+  "version": "2.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": "2.1.3"
+    "@agent-relay/config": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/protocol",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Wire protocol types and framing for Agent Relay",
   "type": "module",
   "main": "dist/index.js",

package/packages/resiliency/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/resiliency",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Health monitoring, logging, metrics, and crash resilience utilities for Agent Relay",
   "type": "module",
   "main": "dist/index.js",

package/packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/sdk",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Lightweight SDK for agent-to-agent communication via Agent Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -55,7 +55,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.1.3"
+    "@agent-relay/protocol": "2.1.4"
   },
   "engines": {
     "node": ">=18.0.0"

package/packages/spawner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/spawner",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Agent spawning types and utilities for Agent Relay",
   "type": "module",
   "main": "dist/index.js",

package/packages/state/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/state",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Agent state persistence for non-hook CLIs (Codex, Gemini, etc.)",
   "type": "module",
   "main": "dist/index.js",

package/packages/storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/storage",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Storage adapters and interfaces for Relay message/session persistence",
   "type": "module",
   "main": "dist/index.js",
@@ -56,7 +56,7 @@
     }
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.1.3"
+    "@agent-relay/protocol": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/telemetry",
-  "version": "2.1.3",
+  "version": "2.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": "2.1.3",
+  "version": "2.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": "2.1.3"
+    "@agent-relay/config": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/user-directory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/user-directory",
-  "version": "2.1.3",
+  "version": "2.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/resiliency": "2.1.3"
+    "@agent-relay/resiliency": "2.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",