agent-relay 3.2.22 → 4.0.1

package/packages/sdk/src/broker-path.ts

@@ -7,64 +7,170 @@
  */
 
 import { existsSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { execSync } from 'node:child_process';
+import { join, dirname, resolve } from 'node:path';
+import { execFileSync } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 
 const BROKER_NAME = 'agent-relay-broker';
 
+function addUniquePath(paths: string[], candidate: string | null | undefined): void {
+  if (!candidate || paths.includes(candidate)) {
+    return;
+  }
+  paths.push(candidate);
+}
+
+function getImportMetaUrl(): string | null {
+  try {
+    return import.meta.url;
+  } catch {
+    return null;
+  }
+}
+
+function getCurrentModuleDir(): string | null {
+  if (typeof __dirname === 'string' && __dirname) {
+    return __dirname;
+  }
+  if (typeof __filename === 'string' && __filename) {
+    return dirname(__filename);
+  }
+
+  const importMetaUrl = getImportMetaUrl();
+  if (!importMetaUrl) {
+    return null;
+  }
+
+  try {
+    return dirname(fileURLToPath(importMetaUrl));
+  } catch {
+    return null;
+  }
+}
+
+function getCurrentModuleReference(): string | null {
+  if (typeof __filename === 'string' && __filename) {
+    return __filename;
+  }
+  if (typeof __dirname === 'string' && __dirname) {
+    return join(__dirname, 'broker-path.js');
+  }
+
+  return getImportMetaUrl();
+}
+
+function getSdkBinDirs(): string[] {
+  const binDirs: string[] = [];
+
+  const currentModuleDir = getCurrentModuleDir();
+  if (currentModuleDir) {
+    addUniquePath(binDirs, resolve(currentModuleDir, '..', 'bin'));
+  }
+
+  const currentModuleReference = getCurrentModuleReference();
+  if (currentModuleReference) {
+    try {
+      const sdkEntry = createRequire(currentModuleReference).resolve('@agent-relay/sdk');
+      addUniquePath(binDirs, resolve(dirname(sdkEntry), '..', 'bin'));
+    } catch {
+      // Continue with other resolution strategies.
+    }
+  }
+
+  const importMetaUrl = getImportMetaUrl();
+  if (importMetaUrl) {
+    try {
+      addUniquePath(binDirs, resolve(dirname(fileURLToPath(importMetaUrl)), '..', 'bin'));
+    } catch {
+      // Continue with other resolution strategies.
+    }
+  }
+
+  return binDirs;
+}
+
+function getDevelopmentBinaryPaths(ext: string, binDirs: string[]): string[] {
+  const binaryPaths: string[] = [];
+  const repoRoots = new Set<string>();
+
+  const addRepoRoot = (candidate: string | null | undefined): void => {
+    if (!candidate) {
+      return;
+    }
+
+    const repoRoot = resolve(candidate);
+    if (repoRoots.has(repoRoot)) {
+      return;
+    }
+    repoRoots.add(repoRoot);
+
+    addUniquePath(binaryPaths, join(repoRoot, 'target', 'release', `${BROKER_NAME}${ext}`));
+    addUniquePath(binaryPaths, join(repoRoot, 'target', 'debug', `${BROKER_NAME}${ext}`));
+  };
+
+  addRepoRoot(process.cwd());
+
+  const currentModuleDir = getCurrentModuleDir();
+  if (currentModuleDir) {
+    addRepoRoot(resolve(currentModuleDir, '..', '..', '..'));
+  }
+
+  for (const binDir of binDirs) {
+    addRepoRoot(resolve(binDir, '..', '..', '..'));
+  }
+
+  return binaryPaths;
+}
+
 /**
  * Resolve the agent-relay-broker binary path.
  *
  * Search order:
- *   1. SDK's bin/ directory (resolved via createRequire or import.meta.url)
+ *   1. SDK's bin/ directory (resolved via CJS globals, createRequire, or import.meta.url)
  *   2. Platform-specific name (agent-relay-broker-{platform}-{arch}) in bin/
- *   3. PATH lookup via `which` / `where`
+ *   3. Common Cargo development paths (target/release and target/debug)
+ *   4. PATH lookup via `which` / `where`
  *
  * @returns Absolute path to the broker binary, or null if not found
  */
 export function getBrokerBinaryPath(): string | null {
-  let binDir: string | null = null;
-  try {
-    // Use createRequire for ESM-compatible require.resolve
-    const esmRequire = createRequire(import.meta.url);
-    const sdkEntry = esmRequire.resolve('@agent-relay/sdk');
-    binDir = join(dirname(sdkEntry), '..', 'bin');
-  } catch {
-    try {
-      // Fallback: derive from import.meta.url
-      binDir = join(dirname(dirname(fileURLToPath(import.meta.url))), 'bin');
-    } catch {
-      // Neither method worked
-    }
-  }
-  if (!binDir) return null;
-
   const ext = process.platform === 'win32' ? '.exe' : '';
+  const binDirs = getSdkBinDirs();
+  const platformSpecific = `${BROKER_NAME}-${process.platform}-${process.arch}${ext}`;
 
   // 1. Exact name in bin/
-  const exactPath = join(binDir, `${BROKER_NAME}${ext}`);
-  if (existsSync(exactPath)) {
-    return exactPath;
+  for (const binDir of binDirs) {
+    const exactPath = join(binDir, `${BROKER_NAME}${ext}`);
+    if (existsSync(exactPath)) {
+      return exactPath;
+    }
   }
 
   // 2. Platform-specific name in bin/
-  const platformSpecific = `${BROKER_NAME}-${process.platform}-${process.arch}${ext}`;
-  const platformPath = join(binDir, platformSpecific);
-  if (existsSync(platformPath)) {
-    return platformPath;
+  for (const binDir of binDirs) {
+    const platformPath = join(binDir, platformSpecific);
+    if (existsSync(platformPath)) {
+      return platformPath;
+    }
+  }
+
+  // 3. Common development paths for local Cargo builds.
+  for (const developmentPath of getDevelopmentBinaryPaths(ext, binDirs)) {
+    if (existsSync(developmentPath)) {
+      return developmentPath;
+    }
   }
 
-  // 3. PATH lookup
+  // 4. PATH lookup
   try {
     const cmd = process.platform === 'win32' ? 'where' : 'which';
-    const result = execSync(`${cmd} ${BROKER_NAME}`, {
+    const result = execFileSync(cmd, [BROKER_NAME], {
       encoding: 'utf-8',
       stdio: ['pipe', 'pipe', 'pipe'],
     }).trim();
     if (result) {
-      return result.split('\n')[0].trim();
+      return result.split(/\r?\n/u)[0].trim();
     }
   } catch {
     // Not found on PATH