agent-relay 1.3.2 → 1.5.0

package/dist/bridge/spawner.js

@@ -8,22 +8,39 @@ import path from 'node:path';
 import { sleep } from './utils.js';
 import { getProjectPaths } from '../utils/project-namespace.js';
 import { resolveCommand } from '../utils/command-resolver.js';
-import { PtyWrapper } from '../wrapper/pty-wrapper.js';
+import { RelayPtyOrchestrator } from '../wrapper/relay-pty-orchestrator.js';
 import { selectShadowCli } from './shadow-cli.js';
 import { AgentPolicyService } from '../policy/agent-policy.js';
 import { buildClaudeArgs } from '../utils/agent-config.js';
 import { getUserDirectoryService } from '../daemon/user-directory.js';
 /**
- * Get a minimal relay reminder.
- * Agents already have full relay docs via CLAUDE.md - this is just a brief reminder.
- * Loading full docs (400+ lines) overwhelms agents and causes "meandering".
+ * Get relay protocol instructions for a spawned agent.
+ * This provides the agent with the communication protocol it needs to work with the relay.
  */
-function getMinimalRelayReminder() {
-    return `# Quick Relay Reference
-- Send: \`->relay:Name <<<message>>>\`
-- ACK tasks, send DONE when complete
-- Use \`trail start/decision/complete\` for trajectories
-- Output \`[[SESSION_END]]..[[/SESSION_END]]\` when done`;
+function getRelayInstructions(agentName) {
+    return [
+        '# Agent Relay Protocol',
+        '',
+        `You are agent "${agentName}" connected to Agent Relay for multi-agent coordination.`,
+        '',
+        '## Sending Messages',
+        '',
+        'Use fenced format for all messages:',
+        '->relay:TargetAgent <<<',
+        'Your message here.>>>',
+        '',
+        '## Communication Rules',
+        '',
+        '1. **ACK immediately** - When you receive a task:',
+        '   ->relay:Sender <<<',
+        '   ACK: Brief description of task received>>>',
+        '',
+        '2. **Report completion** - When done:',
+        '   ->relay:Sender <<<',
+        '   DONE: Brief summary of what was completed>>>',
+        '',
+        '3. Close >>> must immediately follow content (no blank lines before it)',
+    ].join('\n');
 }
 export class AgentSpawner {
     activeWorkers = new Map();
@@ -40,7 +57,9 @@ export class AgentSpawner {
     constructor(projectRoot, _tmuxSession, dashboardPort) {
         const paths = getProjectPaths(projectRoot);
         this.projectRoot = paths.projectRoot;
-        this.agentsPath = path.join(paths.teamDir, 'agents.json');
+        // Use connected-agents.json (live socket connections) instead of agents.json (historical registry)
+        // This ensures spawned agents have actual daemon connections for channel message delivery
+        this.agentsPath = path.join(paths.teamDir, 'connected-agents.json');
         this.socketPath = paths.socketPath;
         this.logsDir = path.join(paths.teamDir, 'worker-logs');
         this.workersPath = path.join(paths.teamDir, 'workers.json');
@@ -94,7 +113,7 @@ export class AgentSpawner {
         this.onAgentDeath = callback;
     }
     /**
-     * Set cloud persistence handler for forwarding PtyWrapper events.
+     * Set cloud persistence handler for forwarding RelayPtyOrchestrator events.
      * When set, 'summary' and 'session-end' events from spawned agents
      * are forwarded to the handler for cloud persistence (PostgreSQL/Redis).
      *
@@ -105,7 +124,7 @@ export class AgentSpawner {
         console.log('[spawner] Cloud persistence handler set');
     }
     /**
-     * Bind cloud persistence event handlers to a PtyWrapper.
+     * Bind cloud persistence event handlers to a RelayPtyOrchestrator.
      * Returns the listener references for cleanup.
      */
     bindCloudPersistenceEvents(name, pty) {
@@ -132,7 +151,7 @@ export class AgentSpawner {
         return { summary: summaryListener, sessionEnd: sessionEndListener };
     }
     /**
-     * Unbind all tracked listeners from a PtyWrapper.
+     * Unbind all tracked listeners from a RelayPtyOrchestrator.
      */
     unbindListeners(pty, listeners) {
         if (!listeners)
@@ -209,6 +228,14 @@ export class AgentSpawner {
             if (isCodexCli && !args.includes('--dangerously-bypass-approvals-and-sandbox')) {
                 args.push('--dangerously-bypass-approvals-and-sandbox');
             }
+            // Inject relay protocol instructions via CLI-specific system prompt
+            const relayInstructions = getRelayInstructions(name);
+            if (isClaudeCli && !args.includes('--append-system-prompt')) {
+                args.push('--append-system-prompt', relayInstructions);
+            }
+            else if (isCodexCli && !args.some(a => a.includes('developer_instructions'))) {
+                args.push('--config', `developer_instructions=${relayInstructions}`);
+            }
             if (debug)
                 console.log(`[spawner:debug] Spawning ${name} with: ${command} ${args.join(' ')}`);
             // Create PtyWrapper config
@@ -233,20 +260,22 @@ export class AgentSpawner {
                     });
                 }
             }
+            if (debug)
+                console.log(`[spawner:debug] Socket path for ${name}: ${this.socketPath ?? 'undefined'}`);
             const ptyConfig = {
                 name,
                 command,
                 args,
                 socketPath: this.socketPath,
                 cwd: agentCwd,
-                logsDir: this.logsDir,
                 dashboardPort: this.dashboardPort,
                 env: userEnv,
-                // Interactive mode - disables auto-accept for auth setup flows
-                interactive: request.interactive,
+                streamLogs: true,
                 // Shadow agent configuration
                 shadowOf: request.shadowOf,
                 shadowSpeakOn: request.shadowSpeakOn,
+                // Skip continuity for spawned agents - they're short-lived workers
+                skipContinuity: true,
                 // Only use callbacks if dashboardPort is not set (for backwards compatibility)
                 onSpawn: this.dashboardPort ? undefined : async (workerName, workerCli, workerTask) => {
                     // Handle nested spawn requests (legacy path, may fail in non-TTY)
@@ -295,8 +324,8 @@ export class AgentSpawner {
                     }
                 },
             };
-            // Create and start the pty wrapper
-            const pty = new PtyWrapper(ptyConfig);
+            // Create and start the relay-pty orchestrator
+            const pty = new RelayPtyOrchestrator(ptyConfig);
             // Track listener references for proper cleanup
             const listeners = {};
             // Hook up output events for live log streaming
@@ -330,72 +359,9 @@ export class AgentSpawner {
                     error,
                 };
             }
-            // Build the full message: minimal relay reminder + policy instructions (if any) + task
-            // Only build message if there's an actual task - empty task means interactive mode
-            let fullMessage = task || '';
-            // Only prepend relay reminder if we have an actual task
-            // Empty task = interactive mode, user will respond to prompts directly
-            if (fullMessage.trim()) {
-                // Prepend a brief relay reminder (agents have full docs via CLAUDE.md)
-                // Note: Previously loaded full 400+ line docs which overwhelmed agents
-                const relayReminder = getMinimalRelayReminder();
-                if (relayReminder) {
-                    fullMessage = `${relayReminder}\n\n---\n\n${fullMessage}`;
-                    if (debug)
-                        console.log(`[spawner:debug] Prepended relay reminder for ${name}`);
-                }
-            }
-            // Prepend policy instructions if enforcement is enabled (only if we have a task)
-            if (fullMessage.trim() && this.policyEnforcementEnabled && this.policyService) {
-                const policyInstruction = await this.policyService.getPolicyInstruction(name);
-                if (policyInstruction) {
-                    fullMessage = `${policyInstruction}\n\n${fullMessage}`;
-                    if (debug)
-                        console.log(`[spawner:debug] Prepended policy instructions to task for ${name}`);
-                }
-            }
-            // Send task via relay message if provided (not via direct PTY injection)
-            // This ensures the agent is ready to receive before processing the task
-            if (fullMessage && fullMessage.trim()) {
-                if (debug)
-                    console.log(`[spawner:debug] Will send task via relay: ${fullMessage.substring(0, 50)}...`);
-                // If we have dashboard API, send task as relay message
-                if (this.dashboardPort) {
-                    // Wait a moment for the agent's relay client to be ready
-                    await sleep(1000);
-                    try {
-                        const response = await fetch(`http://localhost:${this.dashboardPort}/api/send`, {
-                            method: 'POST',
-                            headers: { 'Content-Type': 'application/json' },
-                            body: JSON.stringify({
-                                to: name,
-                                message: fullMessage,
-                                from: '__spawner__',
-                            }),
-                        });
-                        const result = await response.json();
-                        if (result.success) {
-                            if (debug)
-                                console.log(`[spawner:debug] Task sent via relay to ${name}`);
-                        }
-                        else {
-                            console.warn(`[spawner] Failed to send task via relay: ${result.error}`);
-                            // Fall back to direct injection
-                            pty.write(fullMessage + '\r');
-                        }
-                    }
-                    catch (err) {
-                        console.warn(`[spawner] Relay send failed, falling back to direct injection: ${err.message}`);
-                        pty.write(fullMessage + '\r');
-                    }
-                }
-                else {
-                    // No dashboard API available - use direct injection as fallback
-                    if (debug)
-                        console.log(`[spawner:debug] No dashboard API, using direct injection`);
-                    pty.write(fullMessage + '\r');
-                }
-            }
+            // Note: Task is NOT sent here. The spawning agent (wrapper) waits for the worker
+            // to come online and then sends the task via normal relay message.
+            // This avoids race conditions with the agent's readyForMessages state.
             // Track the worker
             const workerInfo = {
                 name,
@@ -669,15 +635,15 @@ export class AgentSpawner {
             return false;
         try {
             const raw = JSON.parse(fs.readFileSync(this.agentsPath, 'utf-8'));
-            const agents = Array.isArray(raw?.agents)
-                ? raw.agents
-                : raw?.agents && typeof raw.agents === 'object'
-                    ? Object.values(raw.agents)
-                    : [];
-            return agents.some((a) => a?.name === name);
+            // connected-agents.json format: { agents: string[], users: string[], updatedAt: number }
+            // agents is a string array of connected agent names (not objects)
+            const agents = Array.isArray(raw?.agents) ? raw.agents : [];
+            // Case-insensitive check to match router behavior
+            const lowerName = name.toLowerCase();
+            return agents.some((a) => typeof a === 'string' && a.toLowerCase() === lowerName);
         }
         catch (err) {
-            console.error('[spawner] Failed to read agents registry:', err.message);
+            console.error('[spawner] Failed to read connected-agents.json:', err.message);
             return false;
         }
     }

package/dist/cli/index.d.ts

@@ -3,12 +3,14 @@
  * Agent Relay CLI
  *
  * Commands:
- *   relay <cmd>         - Wrap agent with real-time messaging (default)
- *   relay -n Name cmd   - Wrap with specific agent name
- *   relay up            - Start daemon
- *   relay read <id>     - Read full message by ID
- *   relay agents        - List connected agents
- *   relay who           - Show currently active agents
+ *   relay claude                   - Start daemon + Dashboard coordinator with Claude
+ *   relay codex                    - Start daemon + Dasbboard coordinator with Codex
+ *   relay create-agent <cmd>       - Wrap agent with real-time messaging
+ *   relay create-agent -n Name cmd - Wrap with specific agent name
+ *   relay up                       - Start daemon + dashboard
+ *   relay read <id>                - Read full message by ID
+ *   relay agents                   - List connected agents
+ *   relay who                      - Show currently active agents
  */
 export {};
 //# sourceMappingURL=index.d.ts.map