agent-relay 2.0.11 → 2.0.13

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

@@ -19,7 +19,7 @@ import { spawn } from 'node:child_process';
 import { createConnection } from 'node:net';
 import { createHash } from 'node:crypto';
 import { join, dirname } from 'node:path';
-import { existsSync, unlinkSync, mkdirSync, symlinkSync, lstatSync, rmSync, watch, readdirSync } from 'node:fs';
+import { existsSync, unlinkSync, mkdirSync, symlinkSync, lstatSync, rmSync, watch, readdirSync, readlinkSync } from 'node:fs';
 import { getProjectPaths } from '@agent-relay/config/project-namespace';
 import { fileURLToPath } from 'node:url';
 // Get the directory where this module is located
@@ -27,6 +27,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 import { BaseWrapper } from './base-wrapper.js';
 import { parseSummaryWithDetails, parseSessionEndFromOutput } from './parser.js';
+import { findRelayPtyBinary as findRelayPtyBinaryUtil } from '@agent-relay/utils/relay-pty-path';
 import { stripAnsi, sleep, buildInjectionString, verifyInjection, INJECTION_CONSTANTS, AdaptiveThrottle, } from './shared.js';
 import { getMemoryMonitor, formatBytes, getCgroupManager, } from '@agent-relay/resiliency';
 // ============================================================================
@@ -238,22 +239,82 @@ export class RelayPtyOrchestrator extends BaseWrapper {
                 if (!existsSync(linkParent)) {
                     mkdirSync(linkParent, { recursive: true });
                 }
-                if (existsSync(linkPath)) {
+                // Remove existing path if it exists (file, symlink, or directory)
+                // Use lstatSync instead of existsSync to detect broken symlinks
+                // (existsSync returns false for broken symlinks, but the symlink itself still exists)
+                let pathExists = false;
+                try {
+                    lstatSync(linkPath);
+                    pathExists = true;
+                }
+                catch {
+                    // Path doesn't exist at all - proceed to create symlink
+                }
+                if (pathExists) {
                     try {
                         const stats = lstatSync(linkPath);
-                        if (stats.isSymbolicLink() || stats.isFile()) {
+                        if (stats.isSymbolicLink()) {
+                            // Handle both valid and broken symlinks
+                            try {
+                                const currentTarget = readlinkSync(linkPath);
+                                if (currentTarget === targetPath) {
+                                    // Symlink already points to correct target, no need to recreate
+                                    this.log(` Symlink already exists and is correct: ${linkPath} -> ${targetPath}`);
+                                    return;
+                                }
+                            }
+                            catch {
+                                // Broken symlink (target doesn't exist) - remove it
+                                this.log(` Removing broken symlink: ${linkPath}`);
+                            }
+                            unlinkSync(linkPath);
+                        }
+                        else if (stats.isFile()) {
                             unlinkSync(linkPath);
                         }
                         else if (stats.isDirectory()) {
+                            // Force remove directory - this is critical for fixing existing directories
                             rmSync(linkPath, { recursive: true, force: true });
+                            // Verify removal succeeded using lstatSync to catch broken symlinks
+                            try {
+                                lstatSync(linkPath);
+                                throw new Error(`Failed to remove existing directory: ${linkPath}`);
+                            }
+                            catch (err) {
+                                if (err.code !== 'ENOENT') {
+                                    throw err; // Re-throw if it's not a "doesn't exist" error
+                                }
+                                // Path successfully removed
+                            }
                         }
                     }
-                    catch {
-                        // Ignore cleanup errors
+                    catch (err) {
+                        // Log cleanup errors instead of silently ignoring them
+                        this.logError(` Failed to clean up existing path ${linkPath}: ${err.message}`);
+                        throw err; // Re-throw to prevent symlink creation on failed cleanup
+                    }
+                }
+                // Create the symlink
+                try {
+                    symlinkSync(targetPath, linkPath);
+                    // Verify symlink was created correctly
+                    if (!existsSync(linkPath)) {
+                        throw new Error(`Symlink creation failed: ${linkPath}`);
+                    }
+                    const verifyStats = lstatSync(linkPath);
+                    if (!verifyStats.isSymbolicLink()) {
+                        throw new Error(`Created path is not a symlink: ${linkPath}`);
+                    }
+                    const verifyTarget = readlinkSync(linkPath);
+                    if (verifyTarget !== targetPath) {
+                        throw new Error(`Symlink points to wrong target: expected ${targetPath}, got ${verifyTarget}`);
                     }
+                    this.log(` Created symlink: ${linkPath} -> ${targetPath}`);
+                }
+                catch (err) {
+                    this.logError(` Failed to create symlink ${linkPath} -> ${targetPath}: ${err.message}`);
+                    throw err;
                 }
-                symlinkSync(targetPath, linkPath);
-                this.log(` Created symlink: ${linkPath} -> ${targetPath}`);
             };
             // In workspace mode, create symlinks so agents can use canonical path
             if (this._workspaceId) {
@@ -388,37 +449,15 @@ export class RelayPtyOrchestrator extends BaseWrapper {
     // =========================================================================
     /**
      * Find the relay-pty binary
+     * Uses shared utility from @agent-relay/utils
      */
     findRelayPtyBinary() {
         // Check config path first
         if (this.config.relayPtyPath && existsSync(this.config.relayPtyPath)) {
             return this.config.relayPtyPath;
         }
-        // Get the project root (three levels up from packages/wrapper/dist/)
-        // packages/wrapper/dist/ -> packages/wrapper -> packages -> project root
-        const projectRoot = join(__dirname, '..', '..', '..');
-        // Check common locations (ordered by priority)
-        const candidates = [
-            // Primary: installed by postinstall from platform-specific binary
-            join(projectRoot, 'bin', 'relay-pty'),
-            // Development: local Rust build
-            join(projectRoot, 'relay-pty', 'target', 'release', 'relay-pty'),
-            join(projectRoot, 'relay-pty', 'target', 'debug', 'relay-pty'),
-            // Local build in cwd (for development)
-            join(process.cwd(), 'relay-pty', 'target', 'release', 'relay-pty'),
-            join(process.cwd(), 'relay-pty', 'target', 'debug', 'relay-pty'),
-            // Installed globally
-            '/usr/local/bin/relay-pty',
-            // In node_modules (when installed as dependency)
-            join(process.cwd(), 'node_modules', 'agent-relay', 'bin', 'relay-pty'),
-            join(process.cwd(), 'node_modules', '.bin', 'relay-pty'),
-        ];
-        for (const candidate of candidates) {
-            if (existsSync(candidate)) {
-                return candidate;
-            }
-        }
-        return null;
+        // Use shared utility with current module's __dirname
+        return findRelayPtyBinaryUtil(__dirname);
     }
     /**
      * Spawn the relay-pty process

package/packages/wrapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/wrapper",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "CLI agent wrappers for Agent Relay - tmux, pty integration",
   "type": "module",
   "main": "dist/index.js",
@@ -30,11 +30,11 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@agent-relay/api-types": "2.0.11",
-    "@agent-relay/protocol": "2.0.11",
-    "@agent-relay/config": "2.0.11",
-    "@agent-relay/continuity": "2.0.11",
-    "@agent-relay/resiliency": "2.0.11"
+    "@agent-relay/api-types": "2.0.13",
+    "@agent-relay/protocol": "2.0.13",
+    "@agent-relay/config": "2.0.13",
+    "@agent-relay/continuity": "2.0.13",
+    "@agent-relay/resiliency": "2.0.13"
   },
   "devDependencies": {
     "typescript": "^5.9.3",