agent-relay 2.0.6 → 2.0.7

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

@@ -28,7 +28,7 @@ const __dirname = dirname(__filename);
 import { BaseWrapper } from './base-wrapper.js';
 import { parseSummaryWithDetails, parseSessionEndFromOutput } from './parser.js';
 import { stripAnsi, sleep, buildInjectionString, verifyInjection, INJECTION_CONSTANTS, AdaptiveThrottle, } from './shared.js';
-import { getMemoryMonitor, formatBytes, } from '@agent-relay/resiliency';
+import { getMemoryMonitor, formatBytes, getCgroupManager, } from '@agent-relay/resiliency';
 // ============================================================================
 // Types for relay-pty socket protocol
 // ============================================================================
@@ -89,6 +89,9 @@ export class RelayPtyOrchestrator extends BaseWrapper {
     // Memory/CPU monitoring
     memoryMonitor;
     memoryAlertHandler = null;
+    // CPU limiting via cgroups (optional, Linux only)
+    cgroupManager;
+    hasCgroupSetup = false;
     // Note: sessionEndProcessed and lastSummaryRawContent are inherited from BaseWrapper
     constructor(config) {
         super(config);
@@ -159,6 +162,8 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         this.isInteractive = config.headless ? false : (process.stdin.isTTY === true);
         // Initialize memory monitor (shared singleton, 10s polling interval)
         this.memoryMonitor = getMemoryMonitor({ checkIntervalMs: 10_000 });
+        // Initialize cgroup manager for CPU limiting (shared singleton)
+        this.cgroupManager = getCgroupManager();
     }
     /**
      * Debug log - only outputs when debug is enabled
@@ -172,9 +177,7 @@ export class RelayPtyOrchestrator extends BaseWrapper {
      * Error log - always outputs (errors are important)
      */
     logError(message) {
-        if (this.config.debug) {
-            console.error(`[relay-pty-orchestrator:${this.config.name}] ERROR: ${message}`);
-        }
+        console.error(`[relay-pty-orchestrator:${this.config.name}] ERROR: ${message}`);
     }
     /**
      * Get the outbox path for this agent (for documentation purposes)
@@ -320,6 +323,11 @@ export class RelayPtyOrchestrator extends BaseWrapper {
             this.memoryMonitor.off('alert', this.memoryAlertHandler);
             this.memoryAlertHandler = null;
         }
+        // Clean up cgroup if we set one up
+        if (this.hasCgroupSetup) {
+            await this.cgroupManager.removeAgentCgroup(this.config.name);
+            this.hasCgroupSetup = false;
+        }
         this.log(` Stopping...`);
         // Send shutdown command via socket
         if (this.socket && this.socketConnected) {
@@ -478,6 +486,11 @@ export class RelayPtyOrchestrator extends BaseWrapper {
                 this.memoryMonitor.off('alert', this.memoryAlertHandler);
                 this.memoryAlertHandler = null;
             }
+            // Clean up cgroup (fire and forget - process already exited)
+            if (this.hasCgroupSetup) {
+                this.cgroupManager.removeAgentCgroup(this.config.name).catch(() => { });
+                this.hasCgroupSetup = false;
+            }
             // Broadcast crash notification if not a graceful stop
             if (!this.isGracefulStop && this.client.state === 'READY') {
                 const canBroadcast = typeof this.client.broadcast === 'function';
@@ -530,6 +543,13 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         if (proc.pid) {
             this.memoryMonitor.register(this.config.name, proc.pid);
             this.memoryMonitor.start(); // Idempotent - starts if not already running
+            // Set up CPU limiting via cgroups (if configured and available)
+            // This prevents one agent from starving others during npm install/build
+            if (this.config.cpuLimitPercent && this.config.cpuLimitPercent > 0) {
+                this.setupCgroupLimit(proc.pid, this.config.cpuLimitPercent).catch((err) => {
+                    this.log(` Failed to set up cgroup CPU limit: ${err.message}`);
+                });
+            }
             // Set up alert handler to send resource alerts to dashboard only (not other agents)
             this.memoryAlertHandler = (alert) => {
                 if (alert.agentName !== this.config.name)
@@ -553,6 +573,25 @@ export class RelayPtyOrchestrator extends BaseWrapper {
             this.memoryMonitor.on('alert', this.memoryAlertHandler);
         }
     }
+    /**
+     * Set up cgroup CPU limit for this agent
+     */
+    async setupCgroupLimit(pid, cpuPercent) {
+        await this.cgroupManager.initialize();
+        if (!this.cgroupManager.isAvailable()) {
+            this.log(` cgroups not available, skipping CPU limit`);
+            return;
+        }
+        const created = await this.cgroupManager.createAgentCgroup(this.config.name, { cpuPercent });
+        if (!created) {
+            return;
+        }
+        const added = await this.cgroupManager.addProcess(this.config.name, pid);
+        if (added) {
+            this.hasCgroupSetup = true;
+            this.log(` CPU limit set to ${cpuPercent}% for agent ${this.config.name}`);
+        }
+    }
     /**
      * Handle output from relay-pty stdout (headless mode only)
      * In interactive mode, stdout goes directly to terminal via inherited stdio
@@ -1158,10 +1197,6 @@ export class RelayPtyOrchestrator extends BaseWrapper {
             });
         });
     }
-    /** Maximum retries for failed injections before giving up */
-    static MAX_INJECTION_RETRIES = 5;
-    /** Backoff delay multiplier (ms) for retries: delay = BASE * 2^retryCount */
-    static INJECTION_RETRY_BASE_MS = 2000;
     /**
      * Process queued messages
      */
@@ -1183,30 +1218,17 @@ export class RelayPtyOrchestrator extends BaseWrapper {
         this.isInjecting = true;
         this.injectionStartTime = Date.now();
         const msg = this.messageQueue.shift();
-        const retryCount = msg._retryCount ?? 0;
         const bodyPreview = msg.body.substring(0, 50).replace(/\n/g, '\\n');
-        this.log(` Processing message from ${msg.from}: "${bodyPreview}..." (remaining=${this.messageQueue.length}, retry=${retryCount})`);
+        this.log(` Processing message from ${msg.from}: "${bodyPreview}..." (remaining=${this.messageQueue.length})`);
         try {
             const success = await this.injectMessage(msg);
             // Metrics are now tracked in handleInjectResult which knows about retries
             if (!success) {
                 // Record failure for adaptive throttling
                 this.throttle.recordFailure();
-                // Re-queue with backoff if under retry limit
-                if (retryCount < RelayPtyOrchestrator.MAX_INJECTION_RETRIES) {
-                    const backoffMs = RelayPtyOrchestrator.INJECTION_RETRY_BASE_MS * Math.pow(2, retryCount);
-                    this.log(` Re-queuing message ${msg.messageId.substring(0, 8)} for retry ${retryCount + 1} in ${backoffMs}ms`);
-                    msg._retryCount = retryCount + 1;
-                    // Add to front of queue for priority
-                    this.messageQueue.unshift(msg);
-                    // Wait before retrying
-                    this.isInjecting = false;
-                    setTimeout(() => this.processMessageQueue(), backoffMs);
-                    return;
-                }
-                this.logError(` Injection failed for message ${msg.messageId.substring(0, 8)} after ${retryCount} retries`);
-                this.config.onInjectionFailed?.(msg.messageId, 'Injection failed after max retries');
-                this.sendSyncAck(msg.messageId, msg.sync, 'ERROR', { error: 'injection_failed_max_retries' });
+                this.logError(` Injection failed for message ${msg.messageId.substring(0, 8)}`);
+                this.config.onInjectionFailed?.(msg.messageId, 'Injection failed');
+                this.sendSyncAck(msg.messageId, msg.sync, 'ERROR', { error: 'injection_failed' });
             }
             else {
                 // Record success for adaptive throttling

package/packages/wrapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/wrapper",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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.6",
-    "@agent-relay/protocol": "2.0.6",
-    "@agent-relay/config": "2.0.6",
-    "@agent-relay/continuity": "2.0.6",
-    "@agent-relay/resiliency": "2.0.6"
+    "@agent-relay/api-types": "2.0.7",
+    "@agent-relay/protocol": "2.0.7",
+    "@agent-relay/config": "2.0.7",
+    "@agent-relay/continuity": "2.0.7",
+    "@agent-relay/resiliency": "2.0.7"
   },
   "devDependencies": {
     "typescript": "^5.9.3",