agent-relay 2.3.13 → 2.4.0

package/packages/acp-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/acp-bridge",
-  "version": "2.3.13",
+  "version": "2.4.0",
   "description": "ACP (Agent Client Protocol) bridge for Agent Relay - expose relay agents to ACP-compatible editors like Zed",
   "type": "module",
   "main": "dist/index.js",
@@ -46,13 +46,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@agent-relay/sdk": "2.3.13",
+    "@agent-relay/sdk": "2.4.0",
     "@agentclientprotocol/sdk": "^0.12.0"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",
     "typescript": "^5.9.3",
-    "vitest": "^3.0.0"
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": ">=18.0.0"

package/packages/acp-bridge/src/acp-agent.ts

@@ -6,7 +6,7 @@
 
 import { randomUUID } from 'node:crypto';
 import * as acp from '@agentclientprotocol/sdk';
-import { RelayClient, type ClientConfig } from '@agent-relay/sdk';
+import { AgentRelay, type Agent, type Message } from '@agent-relay/sdk';
 import type {
   ACPBridgeConfig,
   SessionState,
@@ -62,7 +62,7 @@ export class RelayACPAgent implements acp.Agent {
   private static readonly RECONNECT_COOLDOWN_MS = 10_000;
 
   private readonly config: ACPBridgeConfig;
-  private relayClient: RelayClient | null = null;
+  private relay: AgentRelay | null = null;
   private connection: acp.AgentSideConnection | null = null;
   private sessions = new Map<string, SessionState>();
   private messageBuffer = new Map<string, RelayMessage[]>();
@@ -73,36 +73,21 @@ export class RelayACPAgent implements acp.Agent {
 
   constructor(config: ACPBridgeConfig) {
     this.config = config;
+    this.relay = this.createRelay();
   }
 
   /**
    * Start the ACP agent with stdio transport
    */
   async start(): Promise<void> {
-    // Connect to relay daemon
-    const relayConfig: Partial<ClientConfig> = {
-      agentName: this.config.agentName,
-      program: '@agent-relay/acp-bridge',
-      cli: 'acp-bridge',
-      quiet: true,
-    };
-
-    if (this.config.socketPath) {
-      relayConfig.socketPath = this.config.socketPath;
-    }
-
-    this.relayClient = new RelayClient(relayConfig);
+    this.relay = this.relay ?? this.createRelay();
     this.setupRelayHandlers();
 
     try {
-      await this.relayClient.connect();
-      this.debug('Connected to relay daemon via SDK');
-
-      // Subscribe to #general channel to receive broadcast messages
-      this.relayClient.subscribe('#general');
-      this.debug('Subscribed to #general channel');
+      await this.relay.getStatus();
+      this.debug('Connected to relay broker via broker SDK');
     } catch (err) {
-      this.debug('Failed to connect to relay daemon via SDK:', err);
+      this.debug('Failed to connect to relay broker via broker SDK:', err);
       // Continue anyway - we can still function without relay
     }
 
@@ -134,141 +119,101 @@ export class RelayACPAgent implements acp.Agent {
     this.dedupeCache.clear();
     this.closedSessionIds.clear();
 
-    this.relayClient?.destroy();
-    this.relayClient = null;
+    try {
+      await this.relay?.shutdown();
+    } catch (err) {
+      this.debug('Error during relay shutdown:', err);
+    }
+    this.relay = null;
     this.connection = null;
     this.debug('ACP agent stopped');
   }
 
   /**
-   * Wire up message, channel, state change, and error handlers on the relay client.
+   * Create a relay facade configured for this ACP bridge.
    */
-  private setupRelayHandlers(): void {
-    if (!this.relayClient) return;
-
-    this.relayClient.onMessage = (from, payload, messageId) => {
-      if (typeof payload.body !== 'string') {
-        return;
-      }
-
-      this.handleRelayMessage({
-        id: messageId,
-        from,
-        body: payload.body,
-        thread: payload.thread,
-        timestamp: Date.now(),
-        data: payload.data as Record<string, unknown> | undefined,
-      });
-    };
+  private createRelay(): AgentRelay {
+    return new AgentRelay({
+      brokerName: this.config.agentName,
+      channels: ['general'],
+    });
+  }
 
-    this.relayClient.onChannelMessage = (from, channel, body) => {
-      this.debug('Received channel message:', from, channel, body.substring(0, 50));
+  /**
+   * Wire up relay message handlers.
+   */
+  private setupRelayHandlers(): void {
+    if (!this.relay) return;
 
+    this.relay.onMessageReceived = (msg: Message) => {
       this.handleRelayMessage({
-        id: `channel-${randomUUID()}`,
-        from: `${from} [${channel}]`,
-        body,
+        id: msg.eventId,
+        from: msg.from,
+        body: msg.text,
+        thread: msg.threadId,
         timestamp: Date.now(),
       });
     };
-
-    this.relayClient.onStateChange = (state) => {
-      this.debug('Relay client state:', state);
-
-      // Re-subscribe to #general on successful reconnect
-      if (state === 'READY' && this.relayClient) {
-        this.relayClient.subscribe('#general');
-        this.debug('Re-subscribed to #general after reconnect');
-      }
-    };
-
-    this.relayClient.onError = (error) => {
-      this.debug('Relay client error:', error);
-    };
   }
 
   /**
-   * Attempt to reconnect to the relay daemon.
-   * Creates a fresh RelayClient to reset reconnect attempt counters.
+   * Attempt to reconnect to the relay broker with a fresh AgentRelay instance.
    */
   private async reconnectToRelay(): Promise<boolean> {
-    this.debug('Attempting to reconnect to relay daemon...');
-
-    if (this.relayClient) {
-      this.relayClient.destroy();
-      this.relayClient = null;
-    }
-
-    const relayConfig: Partial<ClientConfig> = {
-      agentName: this.config.agentName,
-      program: '@agent-relay/acp-bridge',
-      cli: 'acp-bridge',
-      quiet: true,
-    };
+    this.debug('Attempting to reconnect to relay broker...');
 
-    if (this.config.socketPath) {
-      relayConfig.socketPath = this.config.socketPath;
+    if (this.relay) {
+      try {
+        await this.relay.shutdown();
+      } catch (err) {
+        this.debug('Error shutting down stale relay instance:', err);
+      }
     }
 
-    this.relayClient = new RelayClient(relayConfig);
+    this.relay = this.createRelay();
     this.setupRelayHandlers();
 
     try {
-      await this.relayClient.connect();
-      this.debug('Reconnected to relay daemon');
-      this.relayClient.subscribe('#general');
-      this.debug('Re-subscribed to #general channel');
+      await this.relay.getStatus();
+      this.debug('Reconnected to relay broker');
       return true;
     } catch (err) {
-      this.debug('Failed to reconnect to relay daemon:', err);
+      this.debug('Failed to reconnect to relay broker:', err);
       return false;
     }
   }
 
   /**
-   * Ensure the relay client is connected and ready.
-   * If disconnected (SDK exhausted reconnect attempts), creates a fresh client.
-   * If in a transient state, waits briefly for READY.
+   * Ensure relay is responsive. Recreate relay instance if the broker is unavailable.
    */
   private async ensureRelayReady(): Promise<boolean> {
-    if (this.relayClient?.state === 'READY') {
-      return true;
+    if (!this.relay) {
+      return this.reconnectToRelay();
     }
 
-    if (!this.relayClient || this.relayClient.state === 'DISCONNECTED') {
-      // Deduplicate concurrent reconnect attempts
-      if (this.reconnectPromise) {
-        return this.reconnectPromise;
-      }
-
-      // Enforce cooldown to avoid rapid reconnect attempts
-      const elapsed = Date.now() - this.lastReconnectAttempt;
-      if (elapsed < RelayACPAgent.RECONNECT_COOLDOWN_MS) {
-        return false;
-      }
+    try {
+      await this.relay.getStatus();
+      return true;
+    } catch (err) {
+      this.debug('Relay status check failed:', err);
+    }
 
-      this.lastReconnectAttempt = Date.now();
-      this.reconnectPromise = this.reconnectToRelay().finally(() => {
-        this.reconnectPromise = null;
-      });
+    // Deduplicate concurrent reconnect attempts
+    if (this.reconnectPromise) {
       return this.reconnectPromise;
     }
 
-    // In a transient state (CONNECTING, HANDSHAKING, BACKOFF) — wait briefly.
-    // State changes asynchronously during await, so re-check the full type.
-    const client = this.relayClient;
-    const waitMs = 5000;
-    const startWait = Date.now();
-    while (Date.now() - startWait < waitMs) {
-      const currentState = client.state as string;
-      if (currentState === 'READY') return true;
-      if (currentState === 'DISCONNECTED') {
-        return this.ensureRelayReady();
-      }
-      await this.sleep(100);
+    // Enforce cooldown to avoid rapid reconnect attempts
+    const elapsed = Date.now() - this.lastReconnectAttempt;
+    if (elapsed < RelayACPAgent.RECONNECT_COOLDOWN_MS) {
+      return false;
     }
 
-    return false;
+    this.lastReconnectAttempt = Date.now();
+    this.reconnectPromise = this.reconnectToRelay().finally(() => {
+      this.reconnectPromise = null;
+    });
+    return this.reconnectPromise;
   }
 
   /**
@@ -470,7 +415,7 @@ export class RelayACPAgent implements acp.Agent {
           sessionUpdate: 'agent_message_chunk',
           content: {
             type: 'text',
-            text: 'Agent Relay daemon is not connected. Please ensure the relay daemon is running.',
+            text: 'Agent Relay broker is not connected. Please ensure the relay broker is running.',
           },
         },
       });
@@ -524,31 +469,47 @@ export class RelayACPAgent implements acp.Agent {
     });
 
     // Send to specific agents or broadcast
-    // relayClient is guaranteed non-null after ensureRelayReady() succeeds
-    const relay = this.relayClient!;
-    let sent = false;
+    const relay = this.relay!;
+    const human = relay.human({ name: this.config.agentName });
+    let sentCount = 0;
     if (hasTargets) {
       // Send to each mentioned agent
       for (const target of targets) {
-        const result = relay.sendMessage(target, cleanMessage, 'message', undefined, session.id);
-        if (result) sent = true;
+        try {
+          await human.sendMessage({
+            to: target,
+            text: cleanMessage,
+            threadId: session.id,
+          });
+          sentCount += 1;
+        } catch (err) {
+          this.debug(`Failed to send message to @${target}:`, err);
+        }
       }
     } else {
-      // Broadcast to all agents
-      sent = relay.sendMessage('*', userMessage, 'message', undefined, session.id);
+      try {
+        await human.sendMessage({
+          to: '*',
+          text: userMessage,
+          threadId: session.id,
+        });
+        sentCount = 1;
+      } catch (err) {
+        this.debug('Failed to broadcast message:', err);
+      }
     }
 
-    if (!sent) {
+    if (sentCount === 0) {
       await this.connection.sessionUpdate({
         sessionId,
         update: {
-          sessionUpdate: 'agent_message_chunk',
-          content: {
-            type: 'text',
-            text: 'Failed to send message to relay agents. Please check the relay daemon connection.',
+            sessionUpdate: 'agent_message_chunk',
+            content: {
+              type: 'text',
+              text: 'Failed to send message to relay agents. Please check the relay broker connection.',
+            },
           },
-        },
-      });
+        });
 
       return {
         success: false,
@@ -771,7 +732,7 @@ export class RelayACPAgent implements acp.Agent {
     }
 
     if (!await this.ensureRelayReady()) {
-      await this.sendTextUpdate(sessionId, 'Relay daemon is not connected (cannot spawn).');
+      await this.sendTextUpdate(sessionId, 'Relay broker is not connected (cannot spawn).');
       return true;
     }
 
@@ -779,18 +740,20 @@ export class RelayACPAgent implements acp.Agent {
     await this.sendTextUpdate(sessionId, `Spawning ${name} (${cli})${task ? `: ${task}` : ''}`);
 
     try {
-      const result = await this.relayClient!.spawn({
+      const relay = this.relay!;
+      const agent = await relay.spawnPty({
         name,
         cli,
         task,
-        waitForReady: true,
       });
-
-      if (result.success) {
-        const readyText = result.ready ? ' (ready)' : '';
-        await this.sendTextUpdate(sessionId, `Spawned ${name}${readyText}.`);
-      } else {
-        await this.sendTextUpdate(sessionId, `Failed to spawn ${name}: ${result.error || 'unknown error'}`);
+      try {
+        await relay.waitForAgentReady(name, 60_000);
+        await this.sendTextUpdate(sessionId, `Spawned ${agent.name} (ready).`);
+      } catch (readyErr) {
+        await this.sendTextUpdate(
+          sessionId,
+          `Spawned ${agent.name}, but it did not report ready within 60s: ${(readyErr as Error).message}`
+        );
       }
     } catch (err) {
       await this.sendTextUpdate(sessionId, `Spawn error for ${name}: ${(err as Error).message}`);
@@ -807,19 +770,22 @@ export class RelayACPAgent implements acp.Agent {
     }
 
     if (!await this.ensureRelayReady()) {
-      await this.sendTextUpdate(sessionId, 'Relay daemon is not connected (cannot release).');
+      await this.sendTextUpdate(sessionId, 'Relay broker is not connected (cannot release).');
       return true;
     }
 
     await this.sendTextUpdate(sessionId, `Releasing ${name}...`);
 
     try {
-      const result = await this.relayClient!.release(name);
-      if (result.success) {
-        await this.sendTextUpdate(sessionId, `Released ${name}.`);
-      } else {
-        await this.sendTextUpdate(sessionId, `Failed to release ${name}: ${result.error || 'unknown error'}`);
+      const relay = this.relay!;
+      const agents: Agent[] = await relay.listAgents();
+      const agent = agents.find((entry) => entry.name === name);
+      if (!agent) {
+        await this.sendTextUpdate(sessionId, `Failed to release ${name}: agent not found.`);
+        return true;
       }
+      await agent.release();
+      await this.sendTextUpdate(sessionId, `Released ${name}.`);
     } catch (err) {
       await this.sendTextUpdate(sessionId, `Release error for ${name}: ${(err as Error).message}`);
     }
@@ -829,16 +795,16 @@ export class RelayACPAgent implements acp.Agent {
 
   private async handleListAgentsCommand(sessionId: string): Promise<boolean> {
     if (!await this.ensureRelayReady()) {
-      await this.sendTextUpdate(sessionId, 'Relay daemon is not connected (cannot list agents).');
+      await this.sendTextUpdate(sessionId, 'Relay broker is not connected (cannot list agents).');
       return true;
     }
 
     try {
-      const agents = await this.relayClient!.listConnectedAgents();
+      const agents = await this.relay!.listAgents();
       if (!agents.length) {
         await this.sendTextUpdate(sessionId, 'No agents are currently connected.');
       } else {
-        const lines = agents.map((agent) => `- ${agent.name}${agent.cli ? ` (${agent.cli})` : ''}`);
+        const lines = agents.map((agent) => `- ${agent.name} (${agent.runtime})`);
         await this.sendTextUpdate(sessionId, ['Connected agents:', ...lines].join('\n'));
       }
     } catch (err) {
@@ -851,26 +817,23 @@ export class RelayACPAgent implements acp.Agent {
   private async handleStatusCommand(sessionId: string): Promise<boolean> {
     const lines: string[] = ['Agent Relay Status', ''];
 
-    if (!this.relayClient) {
+    if (!this.relay) {
       lines.push('Relay client: Not initialized');
       await this.sendTextUpdate(sessionId, lines.join('\n'));
       return true;
     }
 
-    const state = this.relayClient.state;
-    const isConnected = state === 'READY';
-
+    const isConnected = await this.ensureRelayReady();
     lines.push(`Connection: ${isConnected ? 'Connected' : 'Disconnected'}`);
-    lines.push(`State: ${state}`);
     lines.push(`Agent name: ${this.config.agentName}`);
 
     if (isConnected) {
-      // Try to get connected agents count
       try {
-        const agents = await this.relayClient.listConnectedAgents();
-        lines.push(`Connected agents: ${agents.length}`);
-      } catch {
-        // Ignore errors when listing agents
+        const status = await this.relay.getStatus();
+        lines.push(`Connected agents: ${status.agent_count}`);
+        lines.push(`Pending deliveries: ${status.pending_delivery_count}`);
+      } catch (err) {
+        lines.push(`Status details unavailable: ${(err as Error).message}`);
       }
     }
 

package/packages/acp-bridge/src/cli.ts

@@ -7,7 +7,7 @@
  *
  * Options:
  *   --name <name>     Agent name (default: relay-acp)
- *   --socket <path>   Relay daemon socket path
+ *   --socket <path>   Relay broker socket path
  *   --debug           Enable debug logging
  *
  * Environment:
@@ -56,7 +56,7 @@ USAGE:
 
 OPTIONS:
   --name <name>     Agent name for relay identification (default: relay-acp)
-  --socket <path>   Path to relay daemon socket
+  --socket <path>   Path to relay broker socket
   --debug           Enable debug logging to stderr
   --help, -h        Show this help message
   --version, -v     Show version
@@ -72,7 +72,7 @@ EXAMPLE:
   # See: https://zed.dev/docs/agents
 
 NOTES:
-  - Requires a running Agent Relay daemon
+  - Requires a running Agent Relay broker
   - Communicates with editors via stdin/stdout (ACP protocol)
   - Debug output goes to stderr to avoid interfering with ACP protocol
 `);

package/packages/acp-bridge/src/index.ts

@@ -19,8 +19,8 @@
  */
 
 export { RelayACPAgent } from './acp-agent.js';
-export { RelayClient } from '@agent-relay/sdk';
-export type { ClientConfig as RelayClientConfig } from '@agent-relay/sdk';
+export { AgentRelayClient as RelayClient } from '@agent-relay/sdk/client';
+export type { AgentRelayClientOptions as RelayClientConfig } from '@agent-relay/sdk/client';
 export type {
   ACPBridgeConfig,
   AgentCapabilities,

package/packages/acp-bridge/src/types.ts

@@ -7,9 +7,9 @@
  * Configuration for the ACP Bridge
  */
 export interface ACPBridgeConfig {
-  /** Agent name to use when connecting to relay daemon */
+  /** Agent name to use when connecting to relay broker */
   agentName: string;
-  /** Path to relay daemon socket */
+  /** Path to relay broker socket */
   socketPath?: string;
   /** Whether to enable debug logging */
   debug?: boolean;
@@ -76,7 +76,7 @@ export interface SessionMessage {
 }
 
 /**
- * Relay message received from the daemon
+ * Relay message received from the broker
  */
 export interface RelayMessage {
   /** Message ID */

package/packages/config/dist/bridge-config.d.ts

@@ -7,7 +7,7 @@ export interface ProjectConfig {
     path: string;
     /** Project identifier (derived from path hash) */
     id: string;
-    /** Socket path for this project's daemon */
+    /** Socket path for this project's broker */
     socketPath: string;
     /** Lead agent name (auto-generated from dirname if not specified) */
     leadName: string;
@@ -38,15 +38,15 @@ export declare function getDefaultLeadName(projectPath: string): string;
  */
 export declare function resolveProjects(cliPaths: string[], cliOverride?: string): ProjectConfig[];
 /**
- * Validate that daemons are running for all projects
+ * Validate that brokers are running for all projects
  */
-export declare function validateDaemons(projects: ProjectConfig[]): {
+export declare function validateBrokers(projects: ProjectConfig[]): {
     valid: ProjectConfig[];
     missing: ProjectConfig[];
 };
 /**
- * Start daemons for missing projects
+ * Start brokers for missing projects
  */
-export declare function startMissingDaemons(projects: ProjectConfig[]): Promise<void>;
+export declare function startMissingBrokers(projects: ProjectConfig[]): Promise<void>;
 export {};
 //# sourceMappingURL=bridge-config.d.ts.map

package/packages/config/dist/bridge-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-config.d.ts","sourceRoot":"","sources":["../src/bridge-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,WAAW,aAAa;IAC5B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;CACb;AAOD,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QACxB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,GAAG,IAAI,CAY1D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK7C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAAE,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,aAAa,EAAE,CAmDjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG;IAC1D,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B,CAaA;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
+{"version":3,"file":"bridge-config.d.ts","sourceRoot":"","sources":["../src/bridge-config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,MAAM,WAAW,aAAa;IAC5B,oCAAoC;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,EAAE,EAAE,MAAM,CAAC;IACX,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,CAAC;IACjB,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;CACb;AAOD,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QACxB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,gBAAgB,GAAG,IAAI,CAqB1D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAK7C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAAE,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,aAAa,EAAE,CAmDjB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG;IAC1D,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B,CAaA;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC,CAiBf"}

package/packages/config/dist/bridge-config.js

@@ -18,7 +18,14 @@ export function loadBridgeConfig() {
         if (fs.existsSync(configPath)) {
             try {
                 const content = fs.readFileSync(configPath, 'utf-8');
-                return JSON.parse(content);
+                if (typeof content !== 'string') {
+                    continue;
+                }
+                const trimmed = content.trim();
+                if (!trimmed) {
+                    continue;
+                }
+                return JSON.parse(trimmed);
             }
             catch (err) {
                 console.error(`[bridge] Failed to parse ${configPath}:`, err);
@@ -91,9 +98,9 @@ export function resolveProjects(cliPaths, cliOverride) {
     return projects;
 }
 /**
- * Validate that daemons are running for all projects
+ * Validate that brokers are running for all projects
  */
-export function validateDaemons(projects) {
+export function validateBrokers(projects) {
     const valid = [];
     const missing = [];
     for (const project of projects) {
@@ -107,23 +114,23 @@ export function validateDaemons(projects) {
     return { valid, missing };
 }
 /**
- * Start daemons for missing projects
+ * Start brokers for missing projects
  */
-export async function startMissingDaemons(projects) {
+export async function startMissingBrokers(projects) {
     const { execAsync } = await import('./bridge-utils.js');
     for (const project of projects) {
-        console.log(`[bridge] Starting daemon for ${project.id}...`);
+        console.log(`[bridge] Starting broker for ${project.id}...`);
         try {
-            // Start daemon in background
+            // Start broker in background
             await execAsync(`cd "${project.path}" && agent-relay up &`, {
                 timeout: 5000,
             });
             // Wait for socket to appear
             await waitForSocket(project.socketPath, 10000);
-            console.log(`[bridge] Daemon started for ${project.id}`);
+            console.log(`[bridge] Broker started for ${project.id}`);
         }
         catch (err) {
-            console.error(`[bridge] Failed to start daemon for ${project.id}:`, err);
+            console.error(`[bridge] Failed to start broker for ${project.id}:`, err);
         }
     }
 }

package/packages/config/dist/bridge-config.js.map

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

package/packages/config/dist/cli-auth-config.d.ts

@@ -2,7 +2,7 @@
  * Shared CLI Auth Configuration
  *
  * Provider-specific CLI commands and patterns for OAuth authentication.
- * Used by both the cloud API and workspace daemon.
+ * Used by both the cloud API and workspace broker.
  */
 /**
  * Interactive prompt handler configuration