agent-relay 2.1.21 → 2.1.23-beta.0

package/packages/utils/src/model-commands.ts

@@ -0,0 +1,118 @@
+/**
+ * Model Command Registry
+ *
+ * Maps CLI types to their mid-session model-switch commands.
+ * Used by the spawner to send model switch commands to running agents.
+ */
+
+/**
+ * Model command configuration for a specific CLI type.
+ */
+export interface ModelCommandConfig {
+  /** Whether this CLI supports mid-session model switching */
+  supported: boolean;
+  /** Function to generate the command string for switching to a given model */
+  buildCommand?: (model: string) => string;
+  /** Valid model names for this CLI */
+  validModels?: string[];
+  /** Normalize a model name to the CLI's expected format */
+  normalizeModel?: (model: string) => string;
+}
+
+/** Model name aliases for Claude Code */
+const CLAUDE_MODEL_ALIASES: Record<string, string> = {
+  'claude-opus-4': 'opus',
+  'claude-opus-4.5': 'opus',
+  'claude-opus-4-6': 'opus',
+  'claude-sonnet-4': 'sonnet',
+  'claude-sonnet-4-5': 'sonnet',
+  'claude-haiku-3.5': 'haiku',
+  'claude-haiku-4.5': 'haiku',
+};
+
+const CLAUDE_VALID_MODELS = ['opus', 'sonnet', 'haiku'];
+
+/**
+ * Registry of CLI model switch commands.
+ * Claude-first; other CLIs can be added as they gain support.
+ */
+const CLI_MODEL_COMMANDS: Record<string, ModelCommandConfig> = {
+  claude: {
+    supported: true,
+    buildCommand: (model: string) => `/model ${model}\n`,
+    validModels: [
+      ...CLAUDE_VALID_MODELS,
+      ...Object.keys(CLAUDE_MODEL_ALIASES),
+    ],
+    normalizeModel: (model: string) => {
+      const normalized = model.trim().toLowerCase();
+      return CLAUDE_MODEL_ALIASES[normalized] ?? normalized;
+    },
+  },
+  codex: { supported: false },
+  gemini: { supported: false },
+  droid: { supported: false },
+  opencode: { supported: false },
+  aider: { supported: false },
+  goose: { supported: false },
+  cursor: { supported: false },
+};
+
+/**
+ * Get the model command configuration for a CLI type.
+ */
+export function getModelCommandConfig(cli: string): ModelCommandConfig {
+  const baseCli = cli.split(':')[0].toLowerCase();
+  return CLI_MODEL_COMMANDS[baseCli] ?? { supported: false };
+}
+
+/**
+ * Check if a CLI type supports mid-session model switching.
+ */
+export function isModelSwitchSupported(cli: string): boolean {
+  return getModelCommandConfig(cli).supported;
+}
+
+/**
+ * Build the command string to switch models for a given CLI.
+ * Returns null if the CLI doesn't support model switching.
+ */
+export function buildModelSwitchCommand(cli: string, model: string): string | null {
+  const config = getModelCommandConfig(cli);
+  if (!config.supported || !config.buildCommand) {
+    return null;
+  }
+
+  const normalizedModel = config.normalizeModel ? config.normalizeModel(model) : model;
+  return config.buildCommand(normalizedModel);
+}
+
+/**
+ * Validate a model name for a given CLI.
+ * Returns the normalized model name if valid.
+ */
+export function validateModelForCli(
+  cli: string,
+  model: string,
+): { valid: boolean; error?: string; normalizedModel?: string } {
+  const config = getModelCommandConfig(cli);
+
+  if (!config.supported) {
+    return {
+      valid: false,
+      error: `CLI "${cli}" does not support mid-session model switching`,
+    };
+  }
+
+  const normalizedModel = config.normalizeModel ? config.normalizeModel(model) : model;
+
+  if (config.validModels && !config.validModels.includes(normalizedModel)) {
+    const displayModels = config.validModels.filter(m => !m.includes('-')); // Show short names only
+    return {
+      valid: false,
+      error: `Invalid model "${model}" for CLI "${cli}". Valid models: ${displayModels.join(', ')}`,
+    };
+  }
+
+  return { valid: true, normalizedModel };
+}

package/packages/utils/src/relay-pty-path.test.ts

@@ -14,8 +14,10 @@
  * 10. Environment variable override
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import nodePath from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
 import {
   findRelayPtyBinary,
   getLastSearchPaths,
@@ -332,20 +334,42 @@ describe('findRelayPtyBinary - search path verification', () => {
   });
 
   describe('Environment variable override', () => {
-    it('should use RELAY_PTY_BINARY when file is executable', () => {
-      // Use an actual executable that exists on all Unix systems
-      // /bin/ls is guaranteed to exist and be executable
-      const executableFile = '/bin/ls';
-      process.env.RELAY_PTY_BINARY = executableFile;
+    let tmpDir: string;
 
-      const result = findRelayPtyBinary('/any/path');
-
-      // Should return the env var path since the file is executable
-      expect(result).toBe(executableFile);
+    beforeEach(() => {
+      tmpDir = fs.mkdtempSync(nodePath.join(os.tmpdir(), 'relay-pty-env-test-'));
+    });
 
+    afterEach(() => {
+      fs.rmSync(tmpDir, { recursive: true, force: true });
       delete process.env.RELAY_PTY_BINARY;
     });
 
+    it('should use RELAY_PTY_BINARY when file is executable and platform-compatible', () => {
+      // Create a fake binary with correct magic bytes for the current platform
+      const binPath = nodePath.join(tmpDir, 'relay-pty');
+      const buf = Buffer.alloc(64);
+      if (process.platform === 'darwin') {
+        // Mach-O 64-bit little-endian magic
+        buf.writeUInt8(0xcf, 0);
+        buf.writeUInt8(0xfa, 1);
+        buf.writeUInt8(0xed, 2);
+        buf.writeUInt8(0xfe, 3);
+      } else {
+        // ELF magic
+        buf.writeUInt8(0x7f, 0);
+        buf.writeUInt8(0x45, 1);
+        buf.writeUInt8(0x4c, 2);
+        buf.writeUInt8(0x46, 3);
+      }
+      fs.writeFileSync(binPath, buf);
+      fs.chmodSync(binPath, 0o755);
+
+      process.env.RELAY_PTY_BINARY = binPath;
+      const result = findRelayPtyBinary('/any/path');
+      expect(result).toBe(binPath);
+    });
+
     it('should fall back to normal search when RELAY_PTY_BINARY file does not exist', () => {
       process.env.RELAY_PTY_BINARY = '/nonexistent/path/relay-pty';
 
@@ -354,8 +378,6 @@ describe('findRelayPtyBinary - search path verification', () => {
 
       // Should have searched multiple paths (not just the env var)
       expect(paths.length).toBeGreaterThan(1);
-
-      delete process.env.RELAY_PTY_BINARY;
     });
   });
 
@@ -375,6 +397,108 @@ describe('findRelayPtyBinary - search path verification', () => {
   });
 });
 
+describe('isPlatformCompatibleBinary - cross-platform binary validation', () => {
+  let tmpDir: string;
+
+  beforeEach(() => {
+    clearBinaryCache();
+    tmpDir = fs.mkdtempSync(nodePath.join(os.tmpdir(), 'relay-pty-test-'));
+  });
+
+  afterEach(() => {
+    fs.rmSync(tmpDir, { recursive: true, force: true });
+    delete process.env.RELAY_PTY_BINARY;
+  });
+
+  function createFakeBinary(name: string, magicBytes: number[]): string {
+    const filePath = nodePath.join(tmpDir, name);
+    const buf = Buffer.alloc(64);
+    for (let i = 0; i < magicBytes.length; i++) {
+      buf[i] = magicBytes[i];
+    }
+    fs.writeFileSync(filePath, buf);
+    fs.chmodSync(filePath, 0o755);
+    return filePath;
+  }
+
+  // Mach-O 64-bit (as it appears on arm64/x64 little-endian systems)
+  const MACHO_CIGAM_64 = [0xcf, 0xfa, 0xed, 0xfe];
+  // Mach-O 64-bit native byte order
+  const MACHO_MAGIC_64 = [0xfe, 0xed, 0xfa, 0xcf];
+  // Universal/fat binary
+  const FAT_MAGIC = [0xca, 0xfe, 0xba, 0xbe];
+  // ELF magic: 7F 45 4C 46
+  const ELF_MAGIC = [0x7f, 0x45, 0x4c, 0x46];
+
+  it('should accept correct binary for current platform via RELAY_PTY_BINARY', () => {
+    const platform = process.platform;
+    const magic = platform === 'darwin' ? MACHO_CIGAM_64 : ELF_MAGIC;
+    const binPath = createFakeBinary('relay-pty', magic);
+    process.env.RELAY_PTY_BINARY = binPath;
+
+    const result = findRelayPtyBinary('/any/path');
+    expect(result).toBe(binPath);
+  });
+
+  it('should reject wrong-platform binary via RELAY_PTY_BINARY', () => {
+    const platform = process.platform;
+    // Use the opposite platform's magic bytes
+    const magic = platform === 'darwin' ? ELF_MAGIC : MACHO_CIGAM_64;
+    const binPath = createFakeBinary('relay-pty', magic);
+    process.env.RELAY_PTY_BINARY = binPath;
+
+    const result = findRelayPtyBinary('/any/path');
+    // Should NOT return the env override since binary is for wrong platform
+    expect(result).not.toBe(binPath);
+  });
+
+  it('should reject file too small to be a valid binary', () => {
+    const binPath = nodePath.join(tmpDir, 'relay-pty');
+    fs.writeFileSync(binPath, Buffer.from([0x00, 0x00])); // Only 2 bytes
+    fs.chmodSync(binPath, 0o755);
+    process.env.RELAY_PTY_BINARY = binPath;
+
+    const result = findRelayPtyBinary('/any/path');
+    expect(result).not.toBe(binPath);
+  });
+
+  if (process.platform === 'darwin') {
+    it('should accept MH_MAGIC_64 (native byte order) on macOS', () => {
+      const binPath = createFakeBinary('relay-pty', MACHO_MAGIC_64);
+      process.env.RELAY_PTY_BINARY = binPath;
+
+      const result = findRelayPtyBinary('/any/path');
+      expect(result).toBe(binPath);
+    });
+
+    it('should accept fat/universal binaries on macOS', () => {
+      const binPath = createFakeBinary('relay-pty', FAT_MAGIC);
+      process.env.RELAY_PTY_BINARY = binPath;
+
+      const result = findRelayPtyBinary('/any/path');
+      expect(result).toBe(binPath);
+    });
+  }
+
+  if (process.platform === 'linux') {
+    it('should reject Mach-O binaries on Linux', () => {
+      const binPath = createFakeBinary('relay-pty', MACHO_CIGAM_64);
+      process.env.RELAY_PTY_BINARY = binPath;
+
+      const result = findRelayPtyBinary('/any/path');
+      expect(result).not.toBe(binPath);
+    });
+
+    it('should reject fat/universal binaries on Linux', () => {
+      const binPath = createFakeBinary('relay-pty', FAT_MAGIC);
+      process.env.RELAY_PTY_BINARY = binPath;
+
+      const result = findRelayPtyBinary('/any/path');
+      expect(result).not.toBe(binPath);
+    });
+  }
+});
+
 describe('isPlatformSupported', () => {
   it('should return true for current platform (darwin/linux arm64/x64)', () => {
     const platform = process.platform;

package/packages/utils/src/relay-pty-path.ts

@@ -93,7 +93,7 @@ export function getLastSearchPaths(): string[] {
 export function findRelayPtyBinary(callerDirname: string): string | null {
   // Check for explicit environment variable override first
   const envOverride = process.env.RELAY_PTY_BINARY;
-  if (envOverride && isExecutable(envOverride)) {
+  if (envOverride && isExecutable(envOverride) && isPlatformCompatibleBinary(envOverride)) {
     lastSearchPaths = [envOverride];
     return envOverride;
   }
@@ -266,7 +266,7 @@ export function findRelayPtyBinary(callerDirname: string): string | null {
   lastSearchPaths = candidates;
 
   for (const candidate of candidates) {
-    if (isExecutable(candidate)) {
+    if (isExecutable(candidate) && isPlatformCompatibleBinary(candidate)) {
       return candidate;
     }
   }
@@ -287,6 +287,59 @@ function isExecutable(filePath: string): boolean {
   }
 }
 
+/**
+ * Check if a binary is compatible with the current platform by reading its magic bytes.
+ * Prevents using a macOS binary on Linux or vice versa, which would fail at runtime
+ * with cryptic errors like "Syntax error: word unexpected".
+ */
+function isPlatformCompatibleBinary(filePath: string): boolean {
+  let fd: number | undefined;
+  try {
+    fd = fs.openSync(filePath, 'r');
+    const header = Buffer.alloc(4);
+    const bytesRead = fs.readSync(fd, header, 0, 4, 0);
+    if (bytesRead < 4) {
+      return false; // Too small to be a valid binary
+    }
+
+    const magic = header.readUInt32BE(0);
+    const platform = os.platform();
+
+    if (platform === 'darwin') {
+      return isMachOBinary(magic);
+    }
+    if (platform === 'linux') {
+      // ELF magic: 0x7f 'E' 'L' 'F'
+      return magic === 0x7f454c46;
+    }
+
+    // Unknown platform — don't block
+    return true;
+  } catch {
+    // Can't read file (e.g. execute-only permissions) — let execution attempt proceed
+    return true;
+  } finally {
+    if (fd !== undefined) {
+      try { fs.closeSync(fd); } catch { /* ignore close errors */ }
+    }
+  }
+}
+
+/**
+ * Check if a magic value corresponds to any valid Mach-O format.
+ * Handles all variants: 32/64-bit, native/byte-swapped, and fat/universal.
+ */
+function isMachOBinary(magic: number): boolean {
+  return (
+    magic === 0xcffaedfe || // MH_CIGAM_64 — 64-bit, byte-swapped (arm64/x64 LE files read as BE)
+    magic === 0xfeedfacf || // MH_MAGIC_64 — 64-bit, native byte order
+    magic === 0xcefaedfe || // MH_CIGAM    — 32-bit, byte-swapped
+    magic === 0xfeedface || // MH_MAGIC    — 32-bit, native byte order
+    magic === 0xcafebabe || // FAT_MAGIC   — universal/fat binary
+    magic === 0xbebafeca    // FAT_CIGAM   — universal/fat binary, byte-swapped
+  );
+}
+
 /**
  * Check if relay-pty binary is available (cached).
  * Returns true if the binary exists, false otherwise.

package/packages/wrapper/dist/relay-pty-orchestrator.d.ts

@@ -220,6 +220,11 @@ export declare class RelayPtyOrchestrator extends BaseWrapper {
      * Order: daemon socket → dashboard API → onRelease callback
      */
     private executeReleaseWithFallbacks;
+    /**
+     * Register an agent's cwd with the dashboard API.
+     * Used after daemon socket spawns which bypass /api/spawn and its agentCwdMap.
+     */
+    private registerCwdWithDashboard;
     /**
      * Spawn agent via dashboard API
      */

package/packages/wrapper/dist/relay-pty-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relay-pty-orchestrator.d.ts","sourceRoot":"","sources":["../src/relay-pty-orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"relay-pty-orchestrator.d.ts","sourceRoot":"","sources":["../src/relay-pty-orchestrator.ts"],"names":[],"mappings":"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"}

package/packages/wrapper/dist/relay-pty-orchestrator.js

@@ -976,8 +976,8 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         switch (parsed.kind) {
             case 'spawn':
                 if (parsed.spawn_name && parsed.spawn_cli) {
-                    this.log(` Spawn detected: ${parsed.spawn_name} (${parsed.spawn_cli})`);
-                    this.handleSpawnCommand(parsed.spawn_name, parsed.spawn_cli, parsed.spawn_task || '');
+                    this.log(` Spawn detected: ${parsed.spawn_name} (${parsed.spawn_cli})${parsed.spawn_cwd ? ` in ${parsed.spawn_cwd}` : ''}`);
+                    this.handleSpawnCommand(parsed.spawn_name, parsed.spawn_cli, parsed.spawn_task || '', parsed.spawn_cwd);
                 }
                 break;
             case 'release':
@@ -1072,7 +1072,7 @@ export class RelayPtyOrchestrator extends BaseWrapper {
      * now handles it after waitUntilCliReady(). Sending it here would cause
      * duplicate task delivery.
      */
-    handleSpawnCommand(name, cli, task) {
+    handleSpawnCommand(name, cli, task, cwd) {
         const key = `spawn:${name}:${cli}`;
         if (this.processedSpawnCommands.has(key)) {
             this.log(`Spawn already processed: ${key}`);
@@ -1080,11 +1080,11 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         }
         this.processedSpawnCommands.add(key);
         // Log spawn attempts (only in debug mode to avoid TUI pollution)
-        this.log(`SPAWN REQUEST: ${name} (${cli})`);
+        this.log(`SPAWN REQUEST: ${name} (${cli})${cwd ? ` cwd=${cwd}` : ''}`);
         this.log(`  client=${this.client.state}, dashboardPort=${this.config.dashboardPort}, onSpawn=${!!this.config.onSpawn}`);
         // Try daemon socket first (most reliable - daemon has relay-pty binary),
         // then dashboard API, then onSpawn callback as final fallback.
-        this.executeSpawnWithFallbacks(name, cli, task).catch(err => {
+        this.executeSpawnWithFallbacks(name, cli, task, cwd).catch(err => {
             this.logError(`SPAWN FAILED: ${name} - all methods exhausted: ${err.message}`);
         });
     }
@@ -1092,14 +1092,21 @@ export class RelayPtyOrchestrator extends BaseWrapper {
      * Execute spawn with daemon-first fallback chain.
      * Order: daemon socket → dashboard API → onSpawn callback
      */
-    async executeSpawnWithFallbacks(name, cli, task) {
+    async executeSpawnWithFallbacks(name, cli, task, cwd) {
         // 1. Try daemon socket spawn first (daemon always has access to relay-pty)
         if (this.client.state === 'READY') {
             try {
                 this.log(`Spawning ${name} via daemon socket`);
-                const result = await this.client.spawn({ name, cli, task });
+                const result = await this.client.spawn({ name, cli, task, cwd });
                 if (result.success) {
                     this.log(`SPAWN SUCCESS: ${name} via daemon socket`);
+                    // Also register cwd with dashboard API so agentCwdMap is populated
+                    // (daemon socket spawn bypasses /api/spawn which normally sets this)
+                    if (cwd && this.config.dashboardPort) {
+                        this.registerCwdWithDashboard(name, cwd).catch(err => {
+                            this.log(`Failed to register cwd with dashboard: ${err.message}`);
+                        });
+                    }
                 }
                 else {
                     // Daemon explicitly rejected - respect its decision (policy, duplicate, etc.)
@@ -1116,7 +1123,7 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         if (this.config.dashboardPort) {
             try {
                 this.log(`Spawning ${name} via dashboard API at port ${this.config.dashboardPort}`);
-                await this.spawnViaDashboardApi(name, cli, task);
+                await this.spawnViaDashboardApi(name, cli, task, cwd);
                 this.log(`SPAWN SUCCESS: ${name} via dashboard API`);
                 return;
             }
@@ -1185,16 +1192,32 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         }
         throw new Error(`No release mechanism available (client=${this.client.state}, dashboardPort=${this.config.dashboardPort}, onRelease=${!!this.config.onRelease})`);
     }
+    /**
+     * Register an agent's cwd with the dashboard API.
+     * Used after daemon socket spawns which bypass /api/spawn and its agentCwdMap.
+     */
+    async registerCwdWithDashboard(name, cwd) {
+        const url = `http://localhost:${this.config.dashboardPort}/api/agents/${encodeURIComponent(name)}/cwd`;
+        const response = await fetch(url, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ cwd }),
+        });
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`);
+        }
+    }
     /**
      * Spawn agent via dashboard API
      */
-    async spawnViaDashboardApi(name, cli, task) {
+    async spawnViaDashboardApi(name, cli, task, cwd) {
         const url = `http://localhost:${this.config.dashboardPort}/api/spawn`;
         const body = {
             name,
             cli,
             task,
             spawnerName: this.config.name, // Include spawner name so task appears from correct agent
+            cwd,
         };
         try {
             const response = await fetch(url, {