agent-relay 1.3.2 → 1.5.0

package/dist/cloud/services/persistence.d.ts

@@ -2,16 +2,16 @@
  * Cloud Persistence Service
  *
  * Handles durable persistence of agent session data for cloud deployments.
- * Subscribes to PtyWrapper events ('summary', 'session-end') and persists
+ * Subscribes to wrapper events ('summary', 'session-end') and persists
  * to PostgreSQL via Drizzle ORM.
  *
- * This decouples PtyWrapper from storage concerns - the wrapper emits events,
+ * This decouples wrappers from storage concerns - the wrapper emits events,
  * this service handles persistence. Different storage backends can be swapped
  * by implementing alternative persistence services.
  *
- * @see PtyWrapperEvents in src/wrapper/pty-wrapper.ts for event definitions
+ * @see RelayPtyOrchestratorEvents in src/wrapper/relay-pty-orchestrator.ts for event definitions
  */
-import type { PtyWrapper } from '../../wrapper/pty-wrapper.js';
+import type { RelayPtyOrchestrator } from '../../wrapper/relay-pty-orchestrator.js';
 /**
  * Configuration for CloudPersistenceService
  */
@@ -32,12 +32,12 @@ export interface CloudPersistenceConfig {
  *   workspaceId: 'workspace-123',
  * });
  *
- * // Bind to a PtyWrapper instance
- * const pty = new PtyWrapper(config);
- * const sessionId = await persistence.bindToPtyWrapper(pty);
+ * // Bind to a RelayPtyOrchestrator instance
+ * const pty = new RelayPtyOrchestrator(config);
+ * const sessionId = await persistence.bindToWrapper(pty);
  *
  * // When done, unbind to clean up listeners
- * persistence.unbindFromPtyWrapper(pty);
+ * persistence.unbindFromWrapper(pty);
  * ```
  */
 export declare class CloudPersistenceService {
@@ -45,19 +45,19 @@ export declare class CloudPersistenceService {
     private boundWrappers;
     constructor(config: CloudPersistenceConfig);
     /**
-     * Bind to a PtyWrapper instance and start persisting its events.
+     * Bind to a RelayPtyOrchestrator instance and start persisting its events.
      * Creates a new agent session record and returns the session ID.
      *
-     * @param wrapper The PtyWrapper to bind to
+     * @param wrapper The RelayPtyOrchestrator to bind to
      * @returns The session ID for this agent session
      */
-    bindToPtyWrapper(wrapper: PtyWrapper): Promise<string>;
+    bindToRelayPtyOrchestrator(wrapper: RelayPtyOrchestrator): Promise<string>;
     /**
-     * Unbind from a PtyWrapper and clean up event listeners.
+     * Unbind from a RelayPtyOrchestrator and clean up event listeners.
      *
-     * @param wrapper The PtyWrapper to unbind from
+     * @param wrapper The RelayPtyOrchestrator to unbind from
      */
-    unbindFromPtyWrapper(wrapper: PtyWrapper): void;
+    unbindFromRelayPtyOrchestrator(wrapper: RelayPtyOrchestrator): void;
     /**
      * Handle a summary event - persist to agent_summaries table.
      */
@@ -69,7 +69,7 @@ export declare class CloudPersistenceService {
     /**
      * Get the session ID for a bound wrapper.
      */
-    getSessionId(wrapper: PtyWrapper): string | undefined;
+    getSessionId(wrapper: RelayPtyOrchestrator): string | undefined;
     /**
      * Get all summaries for a session.
      */

package/dist/cloud/services/persistence.js

@@ -2,14 +2,14 @@
  * Cloud Persistence Service
  *
  * Handles durable persistence of agent session data for cloud deployments.
- * Subscribes to PtyWrapper events ('summary', 'session-end') and persists
+ * Subscribes to wrapper events ('summary', 'session-end') and persists
  * to PostgreSQL via Drizzle ORM.
  *
- * This decouples PtyWrapper from storage concerns - the wrapper emits events,
+ * This decouples wrappers from storage concerns - the wrapper emits events,
  * this service handles persistence. Different storage backends can be swapped
  * by implementing alternative persistence services.
  *
- * @see PtyWrapperEvents in src/wrapper/pty-wrapper.ts for event definitions
+ * @see RelayPtyOrchestratorEvents in src/wrapper/relay-pty-orchestrator.ts for event definitions
  */
 import { eq, and, desc } from 'drizzle-orm';
 import { getDb } from '../db/drizzle.js';
@@ -23,12 +23,12 @@ import { agentSessions, agentSummaries } from '../db/schema.js';
  *   workspaceId: 'workspace-123',
  * });
  *
- * // Bind to a PtyWrapper instance
- * const pty = new PtyWrapper(config);
- * const sessionId = await persistence.bindToPtyWrapper(pty);
+ * // Bind to a RelayPtyOrchestrator instance
+ * const pty = new RelayPtyOrchestrator(config);
+ * const sessionId = await persistence.bindToWrapper(pty);
  *
  * // When done, unbind to clean up listeners
- * persistence.unbindFromPtyWrapper(pty);
+ * persistence.unbindFromWrapper(pty);
  * ```
  */
 export class CloudPersistenceService {
@@ -38,13 +38,13 @@ export class CloudPersistenceService {
         this.config = config;
     }
     /**
-     * Bind to a PtyWrapper instance and start persisting its events.
+     * Bind to a RelayPtyOrchestrator instance and start persisting its events.
      * Creates a new agent session record and returns the session ID.
      *
-     * @param wrapper The PtyWrapper to bind to
+     * @param wrapper The RelayPtyOrchestrator to bind to
      * @returns The session ID for this agent session
      */
-    async bindToPtyWrapper(wrapper) {
+    async bindToRelayPtyOrchestrator(wrapper) {
         const db = getDb();
         const agentName = wrapper.name;
         // Create session record
@@ -79,11 +79,11 @@ export class CloudPersistenceService {
         return sessionId;
     }
     /**
-     * Unbind from a PtyWrapper and clean up event listeners.
+     * Unbind from a RelayPtyOrchestrator and clean up event listeners.
      *
-     * @param wrapper The PtyWrapper to unbind from
+     * @param wrapper The RelayPtyOrchestrator to unbind from
      */
-    unbindFromPtyWrapper(wrapper) {
+    unbindFromRelayPtyOrchestrator(wrapper) {
         const binding = this.boundWrappers.get(wrapper);
         if (!binding)
             return;
@@ -187,7 +187,7 @@ export class CloudPersistenceService {
      */
     destroy() {
         for (const wrapper of this.boundWrappers.keys()) {
-            this.unbindFromPtyWrapper(wrapper);
+            this.unbindFromRelayPtyOrchestrator(wrapper);
         }
     }
 }

package/dist/daemon/agent-manager.d.ts

@@ -3,11 +3,12 @@
  * Manages agents across workspaces with integrated resiliency.
  */
 import { EventEmitter } from 'events';
-import { PtyWrapper, type SummaryEvent, type SessionEndEvent } from '../wrapper/pty-wrapper.js';
+import { RelayPtyOrchestrator } from '../wrapper/relay-pty-orchestrator.js';
+import type { SummaryEvent, SessionEndEvent } from '../wrapper/pty-wrapper.js';
 import type { Agent, SpawnAgentRequest } from './types.js';
 /**
  * Optional cloud persistence handler.
- * When set, agent-manager forwards PtyWrapper events to this handler.
+ * When set, agent-manager forwards wrapper events to this handler.
  */
 export interface CloudPersistenceHandler {
     onSummary: (agentId: string, event: SummaryEvent) => Promise<void>;
@@ -16,7 +17,7 @@ export interface CloudPersistenceHandler {
     destroy?: () => void;
 }
 interface ManagedAgent extends Agent {
-    pty?: PtyWrapper;
+    pty?: RelayPtyOrchestrator;
 }
 export declare class AgentManager extends EventEmitter {
     private agents;
@@ -26,7 +27,7 @@ export declare class AgentManager extends EventEmitter {
     private cloudPersistence?;
     constructor(dataDir: string);
     /**
-     * Set cloud persistence handler for forwarding PtyWrapper events.
+     * Set cloud persistence handler for forwarding RelayPtyOrchestrator events.
      * When set, 'summary' and 'session-end' events from agents are forwarded
      * to the handler for cloud persistence (PostgreSQL/Redis).
      */
@@ -99,7 +100,7 @@ export declare class AgentManager extends EventEmitter {
      */
     private handleAgentExit;
     /**
-     * Bind PtyWrapper events to cloud persistence and daemon events.
+     * Bind RelayPtyOrchestrator events to cloud persistence and daemon events.
      *
      * Events bound:
      * - 'summary': Agent output a [[SUMMARY]] block

package/dist/daemon/agent-manager.js

@@ -8,7 +8,7 @@ import { EventEmitter } from 'events';
 import { createLogger } from '../resiliency/logger.js';
 import { getSupervisor } from '../resiliency/supervisor.js';
 import { detectProvider } from '../resiliency/provider-context.js';
-import { PtyWrapper } from '../wrapper/pty-wrapper.js';
+import { RelayPtyOrchestrator } from '../wrapper/relay-pty-orchestrator.js';
 import { resolveCommand } from '../utils/command-resolver.js';
 const logger = createLogger('agent-manager');
 function generateId() {
@@ -42,7 +42,7 @@ export class AgentManager extends EventEmitter {
         logger.info('Agent manager initialized');
     }
     /**
-     * Set cloud persistence handler for forwarding PtyWrapper events.
+     * Set cloud persistence handler for forwarding RelayPtyOrchestrator events.
      * When set, 'summary' and 'session-end' events from agents are forwarded
      * to the handler for cloud persistence (PostgreSQL/Redis).
      */
@@ -96,7 +96,9 @@ export class AgentManager extends EventEmitter {
                 command,
                 args,
                 cwd: workspacePath,
-                logsDir: this.logsDir,
+                streamLogs: true,
+                // Skip continuity for cloud-managed agents
+                skipContinuity: true,
                 env: {
                     CLOUD_API_URL: process.env.CLOUD_API_URL || '',
                     WORKSPACE_TOKEN: process.env.WORKSPACE_TOKEN || '',
@@ -109,11 +111,11 @@ export class AgentManager extends EventEmitter {
                 },
             };
             // Create and start PTY
-            const pty = new PtyWrapper(ptyConfig);
+            const pty = new RelayPtyOrchestrator(ptyConfig);
             await pty.start();
             agent.pid = pty.pid;
             agent.pty = pty;
-            // Subscribe to PtyWrapper events for cloud persistence
+            // Subscribe to RelayPtyOrchestrator events for cloud persistence
             this.bindPtyEvents(agent.id, pty);
             // Inject initial task
             if (task && task.trim()) {
@@ -340,7 +342,9 @@ export class AgentManager extends EventEmitter {
                 command,
                 args,
                 cwd: workspacePath,
-                logsDir: this.logsDir,
+                streamLogs: true,
+                // Skip continuity for cloud-managed agents
+                skipContinuity: true,
                 env: {
                     CLOUD_API_URL: process.env.CLOUD_API_URL || '',
                     WORKSPACE_TOKEN: process.env.WORKSPACE_TOKEN || '',
@@ -351,7 +355,7 @@ export class AgentManager extends EventEmitter {
                     this.handleAgentExit(agent.id, code);
                 },
             };
-            const pty = new PtyWrapper(ptyConfig);
+            const pty = new RelayPtyOrchestrator(ptyConfig);
             await pty.start();
             agent.pid = pty.pid;
             agent.pty = pty;
@@ -403,7 +407,7 @@ export class AgentManager extends EventEmitter {
         }
     }
     /**
-     * Bind PtyWrapper events to cloud persistence and daemon events.
+     * Bind RelayPtyOrchestrator events to cloud persistence and daemon events.
      *
      * Events bound:
      * - 'summary': Agent output a [[SUMMARY]] block

package/dist/daemon/channel-membership-store.d.ts

@@ -0,0 +1,48 @@
+export interface ChannelMembershipRecord {
+    channel: string;
+    member: string;
+}
+export interface ChannelMembershipStore {
+    loadMemberships(): Promise<ChannelMembershipRecord[]>;
+    addMember(channel: string, member: string): Promise<void>;
+    removeMember(channel: string, member: string): Promise<void>;
+}
+export interface CloudChannelMembershipStoreOptions {
+    workspaceId: string;
+    databaseUrl: string;
+}
+/**
+ * Cloud-backed membership store that uses the channel_members table in Postgres.
+ * This is used by the daemon when running in a cloud workspace so membership
+ * survives restarts and is shared across processes.
+ */
+export declare class CloudChannelMembershipStore implements ChannelMembershipStore {
+    private workspaceId;
+    private pool;
+    constructor(options: CloudChannelMembershipStoreOptions);
+    /**
+     * Load all memberships for the workspace from Postgres.
+     */
+    loadMemberships(): Promise<ChannelMembershipRecord[]>;
+    /**
+     * Add a member to a channel in Postgres (no-op if already present).
+     */
+    addMember(channel: string, member: string): Promise<void>;
+    /**
+     * Remove a member from a channel in Postgres.
+     */
+    removeMember(channel: string, member: string): Promise<void>;
+    /**
+     * Normalize channel name for DB lookups (strip leading '#' and ignore DMs).
+     */
+    private normalizeChannelId;
+    /**
+     * Convert DB channel_id to router/channel format (prepend '#').
+     */
+    private formatChannelId;
+    /**
+     * Look up the channel row ID for a workspace/channel_id combination.
+     */
+    private getChannelRowId;
+}
+//# sourceMappingURL=channel-membership-store.d.ts.map

package/dist/daemon/channel-membership-store.js

@@ -0,0 +1,149 @@
+import { Pool } from 'pg';
+import { createLogger } from '../utils/logger.js';
+const log = createLogger('channel-membership-store');
+/**
+ * Cloud-backed membership store that uses the channel_members table in Postgres.
+ * This is used by the daemon when running in a cloud workspace so membership
+ * survives restarts and is shared across processes.
+ */
+export class CloudChannelMembershipStore {
+    workspaceId;
+    pool;
+    constructor(options) {
+        this.workspaceId = options.workspaceId;
+        this.pool = new Pool({
+            connectionString: options.databaseUrl,
+            ssl: options.databaseUrl.includes('sslmode=require')
+                ? { rejectUnauthorized: false }
+                : undefined,
+            max: 5,
+            idleTimeoutMillis: 30_000,
+            connectionTimeoutMillis: 10_000,
+        });
+    }
+    /**
+     * Load all memberships for the workspace from Postgres.
+     */
+    async loadMemberships() {
+        try {
+            const result = await this.pool.query(`
+          SELECT c.channel_id AS channel_id, cm.member_id AS member_id
+          FROM channel_members cm
+          INNER JOIN channels c ON cm.channel_id = c.id
+          WHERE c.workspace_id = $1 AND c.status != 'archived'
+        `, [this.workspaceId]);
+            return result.rows
+                .map((row) => ({
+                channel: this.formatChannelId(row.channel_id),
+                member: row.member_id,
+            }))
+                .filter((row) => Boolean(row.channel && row.member));
+        }
+        catch (err) {
+            log.error('Failed to load channel memberships from cloud DB', {
+                error: err instanceof Error ? err.message : String(err),
+            });
+            return [];
+        }
+    }
+    /**
+     * Add a member to a channel in Postgres (no-op if already present).
+     */
+    async addMember(channel, member) {
+        const normalized = this.normalizeChannelId(channel);
+        if (!normalized) {
+            return;
+        }
+        const channelRowId = await this.getChannelRowId(normalized);
+        if (!channelRowId) {
+            return;
+        }
+        try {
+            await this.pool.query(`
+          INSERT INTO channel_members (channel_id, member_id, member_type, role)
+          VALUES ($1, $2, 'agent', 'member')
+          ON CONFLICT (channel_id, member_id) DO NOTHING
+        `, [channelRowId, member]);
+        }
+        catch (err) {
+            log.error('Failed to add channel member in cloud DB', {
+                channel: normalized,
+                member,
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    /**
+     * Remove a member from a channel in Postgres.
+     */
+    async removeMember(channel, member) {
+        const normalized = this.normalizeChannelId(channel);
+        if (!normalized) {
+            return;
+        }
+        const channelRowId = await this.getChannelRowId(normalized);
+        if (!channelRowId) {
+            return;
+        }
+        try {
+            await this.pool.query('DELETE FROM channel_members WHERE channel_id = $1 AND member_id = $2', [channelRowId, member]);
+        }
+        catch (err) {
+            log.error('Failed to remove channel member in cloud DB', {
+                channel: normalized,
+                member,
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    /**
+     * Normalize channel name for DB lookups (strip leading '#' and ignore DMs).
+     */
+    normalizeChannelId(channel) {
+        if (!channel)
+            return null;
+        if (channel.startsWith('dm:')) {
+            return null; // DM channels are not stored in channel_members
+        }
+        return channel.startsWith('#') ? channel.slice(1) : channel;
+    }
+    /**
+     * Convert DB channel_id to router/channel format (prepend '#').
+     */
+    formatChannelId(channelId) {
+        if (!channelId)
+            return '';
+        if (channelId.startsWith('#') || channelId.startsWith('dm:')) {
+            return channelId;
+        }
+        return `#${channelId}`;
+    }
+    /**
+     * Look up the channel row ID for a workspace/channel_id combination.
+     */
+    async getChannelRowId(channelId) {
+        try {
+            const result = await this.pool.query(`
+          SELECT id FROM channels
+          WHERE workspace_id = $1 AND channel_id = $2
+          LIMIT 1
+        `, [this.workspaceId, channelId]);
+            if (!result.rows[0]?.id) {
+                log.warn('Channel not found in cloud DB for membership update', {
+                    workspaceId: this.workspaceId,
+                    channelId,
+                });
+                return null;
+            }
+            return result.rows[0].id;
+        }
+        catch (err) {
+            log.error('Failed to look up channel row in cloud DB', {
+                channelId,
+                error: err instanceof Error ? err.message : String(err),
+            });
+            return null;
+        }
+    }
+}
+//# sourceMappingURL=channel-membership-store.js.map

package/dist/daemon/cloud-sync.d.ts

@@ -76,6 +76,8 @@ export declare class CloudSyncService extends EventEmitter {
     updateAgents(agents: Array<{
         name: string;
         status: string;
+        isHuman?: boolean;
+        avatarUrl?: string;
     }>): void;
     /**
      * Get all remote agents (from other machines)

package/dist/daemon/cloud-sync.js

@@ -175,6 +175,8 @@ export class CloudSyncService extends EventEmitter {
             const agents = Array.from(this.localAgents.entries()).map(([name, info]) => ({
                 name,
                 status: info.status,
+                isHuman: info.isHuman,
+                avatarUrl: info.avatarUrl,
             }));
             const response = await fetch(`${this.config.cloudUrl}/api/daemons/heartbeat`, {
                 method: 'POST',
@@ -224,6 +226,8 @@ export class CloudSyncService extends EventEmitter {
         const agents = Array.from(this.localAgents.entries()).map(([name, info]) => ({
             name,
             status: info.status,
+            isHuman: info.isHuman,
+            avatarUrl: info.avatarUrl,
         }));
         const response = await fetch(`${this.config.cloudUrl}/api/daemons/agents`, {
             method: 'POST',

package/dist/daemon/connection.js

@@ -300,7 +300,8 @@ export class Connection {
      * Returns false if the connection is closed or the queue is full.
      */
     send(envelope) {
-        if (this._state === 'CLOSED' || this._state === 'ERROR') {
+        if (this._state === 'CLOSED' || this._state === 'ERROR' || this._state === 'CLOSING') {
+            console.log(`[connection] Send to ${this._agentName} blocked - state: ${this._state}`);
             return false;
         }
         const maxQueueSize = this.config.maxWriteQueueSize ?? 2000;
@@ -343,7 +344,7 @@ export class Connection {
      */
     drain() {
         while (this.writeQueue.length > 0) {
-            if (this._state === 'CLOSED' || this._state === 'ERROR') {
+            if (this._state === 'CLOSED' || this._state === 'ERROR' || this._state === 'CLOSING') {
                 this.draining = false;
                 return;
             }
@@ -417,13 +418,20 @@ export class Connection {
         if (this._state === 'CLOSED' || this._state === 'CLOSING')
             return;
         this._state = 'CLOSING';
-        this.send({
-            v: PROTOCOL_VERSION,
-            type: 'BYE',
-            id: generateId(),
-            ts: Date.now(),
-            payload: {},
-        });
+        // Write BYE message directly (not via queue) to avoid race with socket.end()
+        try {
+            const byeFrame = encodeFrame({
+                v: PROTOCOL_VERSION,
+                type: 'BYE',
+                id: generateId(),
+                ts: Date.now(),
+                payload: {},
+            });
+            this.socket.write(byeFrame);
+        }
+        catch {
+            // Ignore write errors during close
+        }
         this.socket.end();
     }
 }

package/dist/daemon/router.d.ts

@@ -8,6 +8,7 @@ import type { StorageAdapter } from '../storage/adapter.js';
 import type { AgentRegistry } from './agent-registry.js';
 import { type RateLimitConfig } from './rate-limiter.js';
 import { type DeliveryReliabilityOptions } from './delivery-tracker.js';
+import type { ChannelMembershipStore } from './channel-membership-store.js';
 export interface RoutableConnection {
     id: string;
     agentName?: string;
@@ -40,6 +41,7 @@ interface ShadowRelationship extends ShadowConfig {
 }
 export declare class Router {
     private storage?;
+    private channelMembershipStore?;
     private connections;
     private agents;
     private subscriptions;
@@ -71,7 +73,12 @@ export declare class Router {
         crossMachineHandler?: CrossMachineHandler;
         /** Rate limit configuration. Set to null to disable rate limiting. */
         rateLimit?: Partial<RateLimitConfig> | null;
+        channelMembershipStore?: ChannelMembershipStore;
     });
+    /**
+     * Restore channel memberships from persisted storage.
+     */
+    restoreChannelMemberships(): Promise<void>;
     /**
      * Set or update the cross-machine handler.
      */
@@ -229,11 +236,14 @@ export declare class Router {
     /**
      * Handle a CHANNEL_JOIN message.
      * Adds the member to the channel and notifies existing members.
+     * If payload.member is set, adds that member (admin mode).
+     * Otherwise, adds the connection's agent name.
      */
     handleChannelJoin(connection: RoutableConnection, envelope: Envelope<ChannelJoinPayload>): void;
     /**
      * Handle a CHANNEL_LEAVE message.
      * Removes the member from the channel and notifies remaining members.
+     * If payload.member is provided, removes that member instead (admin mode).
      */
     handleChannelLeave(connection: RoutableConnection, envelope: Envelope<ChannelLeavePayload>): void;
     /**
@@ -244,6 +254,7 @@ export declare class Router {
      * Persist a channel message to storage.
      */
     private persistChannelMessage;
+    private persistChannelMembership;
     /**
      * Get all members of a channel.
      */
@@ -270,8 +281,34 @@ export declare class Router {
     getUsers(): string[];
     /**
      * Get a connection by name (checks both agents and users).
+     * Uses case-insensitive lookup to handle mismatched casing.
      */
     private getConnectionByName;
+    /**
+     * Check if a member is in a Set (case-insensitive).
+     * Returns the actual stored name if found, undefined otherwise.
+     */
+    private findMemberInSet;
+    /**
+     * Check if two names match (case-insensitive).
+     */
+    private namesMatch;
+    /**
+     * Auto-join a member to a channel without notifications.
+     * Used for default channel membership (e.g., #general).
+     * @param memberName - The agent or user name to add
+     * @param channel - The channel to join (e.g., '#general')
+     */
+    autoJoinChannel(memberName: string, channel: string, options?: {
+        persist?: boolean;
+    }): void;
+    private addChannelMember;
+    private removeChannelMember;
+    handleMembershipUpdate(update: {
+        channel: string;
+        member: string;
+        action: 'join' | 'leave' | 'invite';
+    }): void;
 }
 export {};
 //# sourceMappingURL=router.d.ts.map