@agent-relay/utils 2.0.28 → 2.0.30

package/dist/relay-pty-path.js

@@ -12,24 +12,59 @@
  * 4. System-wide installs (/usr/local/bin)
  */
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
+/**
+ * Get the platform-specific binary name for the current system.
+ * Returns null if the platform is not supported.
+ */
+function getPlatformBinaryName() {
+    const platform = os.platform();
+    const arch = os.arch();
+    // Map to supported platforms
+    if (platform === 'darwin' && arch === 'arm64')
+        return 'relay-pty-darwin-arm64';
+    if (platform === 'darwin' && arch === 'x64')
+        return 'relay-pty-darwin-x64';
+    if (platform === 'linux' && arch === 'arm64')
+        return 'relay-pty-linux-arm64';
+    if (platform === 'linux' && arch === 'x64')
+        return 'relay-pty-linux-x64';
+    return null;
+}
 /** Cached result of relay-pty binary check */
 let cachedBinaryPath;
 let cacheChecked = false;
+/** Store the last search results for debugging */
+let lastSearchPaths = [];
+/**
+ * Get the paths that were checked in the last binary search.
+ * Useful for debugging when the binary is not found.
+ */
+export function getLastSearchPaths() {
+    return [...lastSearchPaths];
+}
 /**
  * Find the relay-pty binary.
  *
  * Search order:
- * 1. bin/relay-pty in package root (installed by postinstall)
- * 2. relay-pty/target/release/relay-pty (local Rust build)
- * 3. /usr/local/bin/relay-pty (global install)
- * 4. In node_modules when installed as dependency
- * 5. Global npm installs (nvm) - both scoped and root packages
+ * 1. RELAY_PTY_BINARY environment variable (explicit override)
+ * 2. bin/relay-pty in package root (installed by postinstall)
+ * 3. relay-pty/target/release/relay-pty (local Rust build)
+ * 4. /usr/local/bin/relay-pty (global install)
+ * 5. In node_modules when installed as dependency
+ * 6. Global npm installs (nvm) - both scoped and root packages
  *
  * @param callerDirname - The __dirname of the calling module (needed to resolve relative paths)
  * @returns Path to relay-pty binary, or null if not found
  */
 export function findRelayPtyBinary(callerDirname) {
+    // Check for explicit environment variable override first
+    const envOverride = process.env.RELAY_PTY_BINARY;
+    if (envOverride && fs.existsSync(envOverride)) {
+        lastSearchPaths = [envOverride];
+        return envOverride;
+    }
     // Determine the agent-relay package root
     // This code runs from either:
     // - packages/{package}/dist/ (development/workspace)
@@ -61,6 +96,8 @@ export function findRelayPtyBinary(callerDirname) {
     if (nodeModulesMatch) {
         nodeModulesRoot = nodeModulesMatch[1];
     }
+    // Get platform-specific binary name as fallback (in case postinstall didn't run)
+    const platformBinary = getPlatformBinaryName();
     const candidates = [
         // Primary: installed by postinstall from platform-specific binary
         path.join(packageRoot, 'bin', 'relay-pty'),
@@ -90,6 +127,24 @@ export function findRelayPtyBinary(callerDirname) {
         // pnpm global
         candidates.push(path.join(process.env.HOME, '.local', 'share', 'pnpm', 'global', 'node_modules', 'agent-relay', 'bin', 'relay-pty'));
     }
+    // FALLBACK: If postinstall didn't run, try platform-specific binaries directly
+    // This handles cases where better-sqlite3 rebuild failed and blocked postinstall.js
+    if (platformBinary) {
+        // Add platform-specific binary candidates for all the same locations
+        candidates.push(path.join(packageRoot, 'bin', platformBinary));
+        candidates.push(path.join(process.cwd(), 'node_modules', 'agent-relay', 'bin', platformBinary));
+        candidates.push(path.join(process.env.HOME || '', '.nvm', 'versions', 'node', process.version, 'lib', 'node_modules', 'agent-relay', 'bin', platformBinary));
+        if (nodeModulesRoot) {
+            candidates.push(path.join(nodeModulesRoot, 'agent-relay', 'bin', platformBinary));
+        }
+        if (process.env.HOME) {
+            candidates.push(path.join('/usr/local/lib/node_modules', 'agent-relay', 'bin', platformBinary));
+            candidates.push(path.join('/opt/homebrew/lib/node_modules', 'agent-relay', 'bin', platformBinary));
+            candidates.push(path.join(process.env.HOME, '.local', 'share', 'pnpm', 'global', 'node_modules', 'agent-relay', 'bin', platformBinary));
+        }
+    }
+    // Store search paths for debugging
+    lastSearchPaths = candidates;
     for (const candidate of candidates) {
         if (fs.existsSync(candidate)) {
             return candidate;

package/dist/relay-pty-path.js.map

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

package/package.json

@@ -1,67 +1,83 @@
 {
   "name": "@agent-relay/utils",
-  "version": "2.0.28",
+  "version": "2.0.30",
   "description": "Shared utilities for agent-relay: logging, name generation, command resolution, update checking",
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/cjs/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "require": "./dist/cjs/index.js",
+      "import": "./dist/index.js",
+      "default": "./dist/cjs/index.js"
     },
     "./logger": {
       "types": "./dist/logger.d.ts",
+      "require": "./dist/cjs/logger.js",
       "import": "./dist/logger.js",
-      "default": "./dist/logger.js"
+      "default": "./dist/cjs/logger.js"
     },
     "./name-generator": {
       "types": "./dist/name-generator.d.ts",
+      "require": "./dist/cjs/name-generator.js",
       "import": "./dist/name-generator.js",
-      "default": "./dist/name-generator.js"
+      "default": "./dist/cjs/name-generator.js"
     },
     "./command-resolver": {
       "types": "./dist/command-resolver.d.ts",
+      "require": "./dist/cjs/command-resolver.js",
       "import": "./dist/command-resolver.js",
-      "default": "./dist/command-resolver.js"
+      "default": "./dist/cjs/command-resolver.js"
     },
     "./update-checker": {
       "types": "./dist/update-checker.d.ts",
+      "require": "./dist/cjs/update-checker.js",
       "import": "./dist/update-checker.js",
-      "default": "./dist/update-checker.js"
+      "default": "./dist/cjs/update-checker.js"
     },
     "./git-remote": {
       "types": "./dist/git-remote.d.ts",
+      "require": "./dist/cjs/git-remote.js",
       "import": "./dist/git-remote.js",
-      "default": "./dist/git-remote.js"
+      "default": "./dist/cjs/git-remote.js"
     },
     "./precompiled-patterns": {
       "types": "./dist/precompiled-patterns.d.ts",
+      "require": "./dist/cjs/precompiled-patterns.js",
       "import": "./dist/precompiled-patterns.js",
-      "default": "./dist/precompiled-patterns.js"
+      "default": "./dist/cjs/precompiled-patterns.js"
     },
     "./error-tracking": {
       "types": "./dist/error-tracking.d.ts",
+      "require": "./dist/cjs/error-tracking.js",
       "import": "./dist/error-tracking.js",
-      "default": "./dist/error-tracking.js"
+      "default": "./dist/cjs/error-tracking.js"
     },
     "./model-mapping": {
       "types": "./dist/model-mapping.d.ts",
+      "require": "./dist/cjs/model-mapping.js",
       "import": "./dist/model-mapping.js",
-      "default": "./dist/model-mapping.js"
+      "default": "./dist/cjs/model-mapping.js"
     },
     "./relay-pty-path": {
       "types": "./dist/relay-pty-path.d.ts",
+      "require": "./dist/cjs/relay-pty-path.js",
       "import": "./dist/relay-pty-path.js",
-      "default": "./dist/relay-pty-path.js"
-    }
+      "default": "./dist/cjs/relay-pty-path.js"
+    },
+    "./package.json": "./package.json"
   },
   "files": [
     "dist",
     "README.md"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "npm run clean && npm run build:esm && npm run build:cjs",
+    "build:esm": "tsc",
+    "build:cjs": "node ./scripts/build-cjs.mjs",
+    "postbuild": "npm run build:cjs",
+    "prepack": "if [ -d node_modules ]; then npm run build; else true; fi",
     "clean": "rm -rf dist",
     "test": "vitest run",
     "test:watch": "vitest"