agent-relay 1.3.1 → 1.3.3

package/dist/bridge/multi-project-client.js

@@ -4,9 +4,9 @@
  */
 import net from 'node:net';
 import fs from 'node:fs';
-import { v4 as uuid } from 'uuid';
+import { generateId } from '../utils/id-generator.js';
 import { PROTOCOL_VERSION, } from '../protocol/types.js';
-import { encodeFrame, FrameParser } from '../protocol/framing.js';
+import { encodeFrameLegacy as encodeFrame, FrameParser } from '../protocol/framing.js';
 export class MultiProjectClient {
     projects;
     connections = new Map();
@@ -49,10 +49,12 @@ export class MultiProjectClient {
             const socket = net.createConnection(project.socketPath, () => {
                 this.sendHello(conn);
             });
+            const parser = new FrameParser();
+            parser.setLegacyMode(true); // Use 4-byte header for backwards compatibility
             const conn = {
                 config: project,
                 socket,
-                parser: new FrameParser(),
+                parser,
                 ready: false,
             };
             socket.on('data', (data) => this.handleData(conn, data));
@@ -96,7 +98,7 @@ export class MultiProjectClient {
         const hello = {
             v: PROTOCOL_VERSION,
             type: 'HELLO',
-            id: uuid(),
+            id: generateId(),
             ts: Date.now(),
             payload: {
                 agent: this.options.agentName,
@@ -142,7 +144,7 @@ export class MultiProjectClient {
                 this.send(conn, {
                     v: PROTOCOL_VERSION,
                     type: 'PONG',
-                    id: uuid(),
+                    id: generateId(),
                     ts: Date.now(),
                     payload: envelope.payload ?? {},
                 });
@@ -157,7 +159,7 @@ export class MultiProjectClient {
         this.send(conn, {
             v: PROTOCOL_VERSION,
             type: 'ACK',
-            id: uuid(),
+            id: generateId(),
             ts: Date.now(),
             payload: {
                 ack_id: envelope.id,
@@ -212,7 +214,7 @@ export class MultiProjectClient {
         const envelope = {
             v: PROTOCOL_VERSION,
             type: 'SEND',
-            id: uuid(),
+            id: generateId(),
             ts: Date.now(),
             to: targetAgent,
             payload: {
@@ -239,7 +241,7 @@ export class MultiProjectClient {
                 const envelope = {
                     v: PROTOCOL_VERSION,
                     type: 'SEND',
-                    id: uuid(),
+                    id: generateId(),
                     ts: Date.now(),
                     to: '*',
                     payload: {
@@ -313,9 +315,10 @@ export class MultiProjectClient {
         const socket = net.createConnection(conn.config.socketPath, () => {
             this.sendHello(conn);
         });
-        // Update connection with new socket
+        // Update connection with new socket and fresh parser
         conn.socket = socket;
         conn.parser = new FrameParser();
+        conn.parser.setLegacyMode(true); // Use 4-byte header for backwards compatibility
         socket.on('data', (data) => this.handleData(conn, data));
         socket.on('close', () => {
             const wasReady = conn.ready;
@@ -369,7 +372,7 @@ export class MultiProjectClient {
                 this.send(conn, {
                     v: PROTOCOL_VERSION,
                     type: 'BYE',
-                    id: uuid(),
+                    id: generateId(),
                     ts: Date.now(),
                     payload: {},
                 });

package/dist/bridge/spawner.d.ts

@@ -23,6 +23,8 @@ interface WorkerMeta {
     task: string;
     /** Optional team name this agent belongs to */
     team?: string;
+    /** Optional user ID for per-user credential scoping */
+    userId?: string;
     spawnedAt: number;
     pid?: number;
     logFile?: string;

package/dist/bridge/spawner.js

@@ -12,17 +12,35 @@ import { PtyWrapper } from '../wrapper/pty-wrapper.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();
@@ -150,7 +168,7 @@ export class AgentSpawner {
      * Spawn a new worker agent using node-pty
      */
     async spawn(request) {
-        const { name, cli, task, team, spawnerName } = request;
+        const { name, cli, task, team, spawnerName, userId } = request;
         const debug = process.env.DEBUG_SPAWN === '1';
         // Check if worker already exists
         if (this.activeWorkers.has(name)) {
@@ -208,6 +226,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
@@ -219,6 +245,19 @@ export class AgentSpawner {
             const agentCwd = request.cwd || this.projectRoot;
             // Log whether nested spawning will be enabled for this agent
             console.log(`[spawner] Spawning ${name}: dashboardPort=${this.dashboardPort || 'none'} (${this.dashboardPort ? 'nested spawns enabled' : 'nested spawns disabled'})`);
+            let userEnv;
+            if (userId) {
+                try {
+                    const userDirService = getUserDirectoryService();
+                    userEnv = userDirService.getUserEnvironment(userId);
+                }
+                catch (err) {
+                    console.warn('[spawner] Failed to resolve user environment, using default', {
+                        userId,
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                }
+            }
             const ptyConfig = {
                 name,
                 command,
@@ -227,11 +266,14 @@ export class AgentSpawner {
                 cwd: agentCwd,
                 logsDir: this.logsDir,
                 dashboardPort: this.dashboardPort,
+                env: userEnv,
                 // Interactive mode - disables auto-accept for auth setup flows
                 interactive: request.interactive,
                 // 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)
@@ -242,6 +284,7 @@ export class AgentSpawner {
                         cli: workerCli,
                         task: workerTask,
                         // Nested spawns don't inherit team - they're flat by default
+                        userId,
                     });
                 },
                 onRelease: this.dashboardPort ? undefined : async (workerName) => {
@@ -314,78 +357,16 @@ 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,
                 cli,
                 task,
                 team,
+                userId,
                 spawnedAt: Date.now(),
                 pid: pty.pid,
                 pty,
@@ -674,6 +655,7 @@ export class AgentSpawner {
                 cli: w.cli,
                 task: w.task,
                 team: w.team,
+                userId: w.userId,
                 spawnedAt: w.spawnedAt,
                 pid: w.pid,
                 logFile: w.logFile,

package/dist/bridge/types.d.ts

@@ -53,6 +53,8 @@ export interface SpawnRequest {
     shadowTriggers?: Array<'SESSION_END' | 'CODE_WRITTEN' | 'REVIEW_REQUEST' | 'EXPLICIT_ASK' | 'ALL_MESSAGES'>;
     /** When the shadow should speak (default: ['EXPLICIT_ASK']) */
     shadowSpeakOn?: Array<'SESSION_END' | 'CODE_WRITTEN' | 'REVIEW_REQUEST' | 'EXPLICIT_ASK' | 'ALL_MESSAGES'>;
+    /** User ID for per-user credential storage in shared workspaces */
+    userId?: string;
 }
 /** Policy decision details */
 export interface PolicyDecision {

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 + dashboard
- *   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