@getpaseo/server 0.1.15 → 0.1.16

package/dist/server/server/websocket-server.d.ts

@@ -16,7 +16,6 @@ import type { VoiceCallerContext, VoiceMcpStdioConfig, VoiceSpeakHandler } from
 export type AgentMcpTransportFactory = () => Promise<Transport>;
 export type ExternalSocketMetadata = {
     transport: "relay";
-    externalSessionKey: string;
 };
 type WebSocketServerConfig = {
     allowedOrigins: Set<string>;
@@ -38,9 +37,9 @@ export declare class MissingDaemonVersionError extends Error {
 export declare class VoiceAssistantWebSocketServer {
     private readonly logger;
     private readonly wss;
+    private readonly pendingConnections;
     private readonly sessions;
     private readonly externalSessionsByKey;
-    private clientIdCounter;
     private readonly serverId;
     private readonly daemonVersion;
     private readonly agentManager;
@@ -82,10 +81,15 @@ export declare class VoiceAssistantWebSocketServer {
     close(): Promise<void>;
     private sendToClient;
     private sendBinaryToClient;
+    private sendToConnection;
+    private sendBinaryToConnection;
     private attachSocket;
+    private createSessionConnection;
+    private clearPendingConnection;
+    private buildWelcomeMessage;
+    private handleHello;
     private buildServerInfoStatusPayload;
-    private broadcastServerInfo;
-    private sendServerInfo;
+    private broadcastCapabilitiesUpdate;
     private bindSocketHandlers;
     resolveVoiceSpeakHandler(callerAgentId: string): VoiceSpeakHandler | null;
     resolveVoiceCallerContext(callerAgentId: string): VoiceCallerContext | null;

package/dist/server/server/websocket-server.d.ts.map

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

package/dist/server/server/websocket-server.js

@@ -68,6 +68,11 @@ function bufferFromWsData(data) {
     return Buffer.from(data);
 }
 const EXTERNAL_SESSION_DISCONNECT_GRACE_MS = 90000;
+const HELLO_TIMEOUT_MS = 15000;
+const WS_CLOSE_HELLO_TIMEOUT = 4001;
+const WS_CLOSE_INVALID_HELLO = 4002;
+const WS_CLOSE_INCOMPATIBLE_PROTOCOL = 4003;
+const WS_PROTOCOL_VERSION = 1;
 export class MissingDaemonVersionError extends Error {
     constructor() {
         super("VoiceAssistantWebSocketServer requires a non-empty daemonVersion.");
@@ -79,9 +84,9 @@ export class MissingDaemonVersionError extends Error {
  */
 export class VoiceAssistantWebSocketServer {
     constructor(server, logger, serverId, agentManager, agentStorage, downloadTokenStore, paseoHome, createAgentMcpTransport, wsConfig, speech, terminalManager, voice, dictation, agentProviderRuntimeSettings, daemonVersion) {
+        this.pendingConnections = new Map();
         this.sessions = new Map();
         this.externalSessionsByKey = new Map();
-        this.clientIdCounter = 0;
         this.voiceSpeakHandlers = new Map();
         this.voiceCallerContexts = new Map();
         this.ACTIVITY_THRESHOLD_MS = 120000;
@@ -159,7 +164,7 @@ export class VoiceAssistantWebSocketServer {
             return;
         }
         this.serverCapabilities = next;
-        this.broadcastServerInfo();
+        this.broadcastCapabilitiesUpdate();
     }
     async attachExternalSocket(ws, metadata) {
         await this.attachSocket(ws, undefined, metadata);
@@ -169,16 +174,34 @@ export class VoiceAssistantWebSocketServer {
             ...this.sessions.values(),
             ...this.externalSessionsByKey.values(),
         ]);
+        const pendingSockets = new Set(this.pendingConnections.keys());
+        for (const pending of this.pendingConnections.values()) {
+            if (pending.helloTimeout) {
+                clearTimeout(pending.helloTimeout);
+                pending.helloTimeout = null;
+            }
+        }
         const cleanupPromises = [];
         for (const connection of uniqueConnections) {
             if (connection.externalDisconnectCleanupTimeout) {
                 clearTimeout(connection.externalDisconnectCleanupTimeout);
                 connection.externalDisconnectCleanupTimeout = null;
             }
-            const ws = connection.socketRef.current;
             cleanupPromises.push(connection.session.cleanup());
+            for (const ws of connection.sockets) {
+                cleanupPromises.push(new Promise((resolve) => {
+                    // WebSocket.CLOSED = 3
+                    if (ws.readyState === 3) {
+                        resolve();
+                        return;
+                    }
+                    ws.once("close", () => resolve());
+                    ws.close();
+                }));
+            }
+        }
+        for (const ws of pendingSockets) {
             cleanupPromises.push(new Promise((resolve) => {
-                // WebSocket.CLOSED = 3
                 if (ws.readyState === 3) {
                     resolve();
                     return;
@@ -188,6 +211,7 @@ export class VoiceAssistantWebSocketServer {
             }));
         }
         await Promise.all(cleanupPromises);
+        this.pendingConnections.clear();
         this.sessions.clear();
         this.externalSessionsByKey.clear();
         this.wss.close();
@@ -204,38 +228,20 @@ export class VoiceAssistantWebSocketServer {
         }
         ws.send(encodeBinaryMuxFrame(frame));
     }
-    async attachSocket(ws, request, metadata) {
-        const externalSessionKey = metadata?.transport === "relay" && metadata.externalSessionKey.trim().length > 0
-            ? metadata.externalSessionKey
-            : null;
-        if (externalSessionKey) {
-            const existing = this.externalSessionsByKey.get(externalSessionKey);
-            if (existing) {
-                if (existing.externalDisconnectCleanupTimeout) {
-                    clearTimeout(existing.externalDisconnectCleanupTimeout);
-                    existing.externalDisconnectCleanupTimeout = null;
-                }
-                const previousSocket = existing.socketRef.current;
-                if (previousSocket !== ws) {
-                    this.sessions.delete(previousSocket);
-                    existing.socketRef.current = ws;
-                }
-                this.sessions.set(ws, existing);
-                this.sendServerInfo(ws);
-                existing.connectionLogger.trace({
-                    clientId: existing.clientId,
-                    externalSessionKey,
-                    totalSessions: this.sessions.size,
-                }, "Client reconnected");
-                this.bindSocketHandlers(ws, existing);
-                return;
-            }
+    sendToConnection(connection, message) {
+        for (const ws of connection.sockets) {
+            this.sendToClient(ws, message);
         }
-        const clientId = `client-${++this.clientIdCounter}`;
+    }
+    sendBinaryToConnection(connection, frame) {
+        for (const ws of connection.sockets) {
+            this.sendBinaryToClient(ws, frame);
+        }
+    }
+    async attachSocket(ws, request, metadata) {
         const requestMetadata = extractSocketRequestMetadata(request);
         const connectionLoggerFields = {
-            clientId,
-            transport: externalSessionKey ? "relay" : "direct",
+            transport: metadata?.transport === "relay" ? "relay" : "direct",
         };
         if (requestMetadata.host) {
             connectionLoggerFields.host = requestMetadata.host;
@@ -250,14 +256,48 @@ export class VoiceAssistantWebSocketServer {
             connectionLoggerFields.remoteAddress = requestMetadata.remoteAddress;
         }
         const connectionLogger = this.logger.child(connectionLoggerFields);
-        const socketRef = { current: ws };
+        const pending = {
+            connectionLogger,
+            helloTimeout: null,
+        };
+        const timeout = setTimeout(() => {
+            if (this.pendingConnections.get(ws) !== pending) {
+                return;
+            }
+            pending.helloTimeout = null;
+            this.pendingConnections.delete(ws);
+            pending.connectionLogger.warn({ timeoutMs: HELLO_TIMEOUT_MS }, "Closing connection due to missing hello");
+            try {
+                ws.close(WS_CLOSE_HELLO_TIMEOUT, "Hello timeout");
+            }
+            catch {
+                // ignore close errors
+            }
+        }, HELLO_TIMEOUT_MS);
+        pending.helloTimeout = timeout;
+        timeout.unref?.();
+        this.pendingConnections.set(ws, pending);
+        this.bindSocketHandlers(ws);
+        pending.connectionLogger.trace({
+            totalPendingConnections: this.pendingConnections.size,
+        }, "Client connected; awaiting hello");
+    }
+    createSessionConnection(params) {
+        const { ws, clientId, connectionLogger } = params;
+        let connection = null;
         const session = new Session({
             clientId,
             onMessage: (msg) => {
-                this.sendToClient(socketRef.current, wrapSessionMessage(msg));
+                if (!connection) {
+                    return;
+                }
+                this.sendToConnection(connection, wrapSessionMessage(msg));
             },
             onBinaryMessage: (frame) => {
-                this.sendBinaryToClient(socketRef.current, frame);
+                if (!connection) {
+                    return;
+                }
+                this.sendBinaryToConnection(connection, frame);
             },
             logger: connectionLogger.child({ module: "session" }),
             downloadTokenStore: this.downloadTokenStore,
@@ -289,21 +329,96 @@ export class VoiceAssistantWebSocketServer {
             dictation: this.dictation ?? undefined,
             agentProviderRuntimeSettings: this.agentProviderRuntimeSettings,
         });
-        const connection = {
+        connection = {
             session,
             clientId,
             connectionLogger,
-            socketRef,
-            externalSessionKey,
+            sockets: new Set([ws]),
             externalDisconnectCleanupTimeout: null,
         };
-        this.sessions.set(ws, connection);
-        if (externalSessionKey) {
-            this.externalSessionsByKey.set(externalSessionKey, connection);
+        return connection;
+    }
+    clearPendingConnection(ws) {
+        const pending = this.pendingConnections.get(ws);
+        if (!pending) {
+            return null;
+        }
+        if (pending.helloTimeout) {
+            clearTimeout(pending.helloTimeout);
+            pending.helloTimeout = null;
+        }
+        this.pendingConnections.delete(ws);
+        return pending;
+    }
+    buildWelcomeMessage(params) {
+        return {
+            type: "welcome",
+            serverId: this.serverId,
+            hostname: getHostname(),
+            version: this.daemonVersion,
+            resumed: params.resumed,
+            ...(this.serverCapabilities ? { capabilities: this.serverCapabilities } : {}),
+        };
+    }
+    handleHello(params) {
+        const { ws, message, pending } = params;
+        if (message.protocolVersion !== WS_PROTOCOL_VERSION) {
+            this.clearPendingConnection(ws);
+            pending.connectionLogger.warn({
+                receivedProtocolVersion: message.protocolVersion,
+                expectedProtocolVersion: WS_PROTOCOL_VERSION,
+            }, "Rejected hello due to protocol version mismatch");
+            try {
+                ws.close(WS_CLOSE_INCOMPATIBLE_PROTOCOL, "Incompatible protocol version");
+            }
+            catch {
+                // ignore close errors
+            }
+            return;
+        }
+        const clientId = message.clientId.trim();
+        if (clientId.length === 0) {
+            this.clearPendingConnection(ws);
+            pending.connectionLogger.warn("Rejected hello with empty clientId");
+            try {
+                ws.close(WS_CLOSE_INVALID_HELLO, "Invalid hello");
+            }
+            catch {
+                // ignore close errors
+            }
+            return;
+        }
+        this.clearPendingConnection(ws);
+        const existing = this.externalSessionsByKey.get(clientId);
+        if (existing) {
+            if (existing.externalDisconnectCleanupTimeout) {
+                clearTimeout(existing.externalDisconnectCleanupTimeout);
+                existing.externalDisconnectCleanupTimeout = null;
+            }
+            existing.sockets.add(ws);
+            this.sessions.set(ws, existing);
+            this.sendToClient(ws, this.buildWelcomeMessage({ resumed: true }));
+            existing.connectionLogger.trace({
+                clientId,
+                resumed: true,
+                totalSessions: this.sessions.size,
+            }, "Client connected via hello");
+            return;
         }
-        this.sendServerInfo(ws);
-        connectionLogger.trace({ clientId, externalSessionKey, totalSessions: this.sessions.size }, "Client connected");
-        this.bindSocketHandlers(ws, connection);
+        const connectionLogger = pending.connectionLogger.child({ clientId });
+        const connection = this.createSessionConnection({
+            ws,
+            clientId,
+            connectionLogger,
+        });
+        this.sessions.set(ws, connection);
+        this.externalSessionsByKey.set(clientId, connection);
+        this.sendToClient(ws, this.buildWelcomeMessage({ resumed: false }));
+        connection.connectionLogger.trace({
+            clientId,
+            resumed: false,
+            totalSessions: this.sessions.size,
+        }, "Client connected via hello");
     }
     buildServerInfoStatusPayload() {
         return {
@@ -314,33 +429,29 @@ export class VoiceAssistantWebSocketServer {
             ...(this.serverCapabilities ? { capabilities: this.serverCapabilities } : {}),
         };
     }
-    broadcastServerInfo() {
+    broadcastCapabilitiesUpdate() {
         this.broadcast(wrapSessionMessage({
             type: "status",
             payload: this.buildServerInfoStatusPayload(),
         }));
     }
-    sendServerInfo(ws) {
-        // Advertise stable server identity immediately on connect (used for URL/shareable IDs).
-        this.sendToClient(ws, wrapSessionMessage({
-            type: "status",
-            payload: this.buildServerInfoStatusPayload(),
-        }));
-    }
-    bindSocketHandlers(ws, connection) {
+    bindSocketHandlers(ws) {
         ws.on("message", (data) => {
             void this.handleRawMessage(ws, data);
         });
         ws.on("close", async (code, reason) => {
-            await this.detachSocket(ws, connection, {
+            await this.detachSocket(ws, {
                 code: typeof code === "number" ? code : undefined,
                 reason,
             });
         });
         ws.on("error", async (error) => {
             const err = error instanceof Error ? error : new Error(String(error));
-            connection.connectionLogger.error({ err }, "Client error");
-            await this.detachSocket(ws, connection, { error: err });
+            const active = this.sessions.get(ws);
+            const pending = this.pendingConnections.get(ws);
+            const log = active?.connectionLogger ?? pending?.connectionLogger ?? this.logger;
+            log.error({ err }, "Client error");
+            await this.detachSocket(ws, { error: err });
         });
     }
     resolveVoiceSpeakHandler(callerAgentId) {
@@ -349,13 +460,22 @@ export class VoiceAssistantWebSocketServer {
     resolveVoiceCallerContext(callerAgentId) {
         return this.voiceCallerContexts.get(callerAgentId) ?? null;
     }
-    async detachSocket(ws, connection, details) {
-        const activeConnection = this.sessions.get(ws);
-        if (activeConnection !== connection)
+    async detachSocket(ws, details) {
+        const pending = this.clearPendingConnection(ws);
+        if (pending) {
+            pending.connectionLogger.trace({
+                code: details.code,
+                reason: stringifyCloseReason(details.reason),
+            }, "Pending client disconnected");
             return;
+        }
+        const connection = this.sessions.get(ws);
+        if (!connection) {
+            return;
+        }
         this.sessions.delete(ws);
-        if (connection.externalSessionKey &&
-            connection.socketRef.current === ws) {
+        connection.sockets.delete(ws);
+        if (connection.sockets.size === 0) {
             if (connection.externalDisconnectCleanupTimeout) {
                 clearTimeout(connection.externalDisconnectCleanupTimeout);
             }
@@ -369,13 +489,21 @@ export class VoiceAssistantWebSocketServer {
             connection.externalDisconnectCleanupTimeout = timeout;
             connection.connectionLogger.trace({
                 clientId: connection.clientId,
-                externalSessionKey: connection.externalSessionKey,
                 code: details.code,
                 reason: stringifyCloseReason(details.reason),
                 reconnectGraceMs: EXTERNAL_SESSION_DISCONNECT_GRACE_MS,
             }, "Client disconnected; waiting for reconnect");
             return;
         }
+        if (connection.sockets.size > 0) {
+            connection.connectionLogger.trace({
+                clientId: connection.clientId,
+                remainingSockets: connection.sockets.size,
+                code: details.code,
+                reason: stringifyCloseReason(details.reason),
+            }, "Client socket disconnected; session remains attached");
+            return;
+        }
         await this.cleanupConnection(connection, "Client disconnected");
     }
     async cleanupConnection(connection, logMessage) {
@@ -383,27 +511,36 @@ export class VoiceAssistantWebSocketServer {
             clearTimeout(connection.externalDisconnectCleanupTimeout);
             connection.externalDisconnectCleanupTimeout = null;
         }
-        const currentSocket = connection.socketRef.current;
-        this.sessions.delete(currentSocket);
-        if (connection.externalSessionKey) {
-            const existing = this.externalSessionsByKey.get(connection.externalSessionKey);
-            if (existing === connection) {
-                this.externalSessionsByKey.delete(connection.externalSessionKey);
-            }
+        for (const socket of connection.sockets) {
+            this.sessions.delete(socket);
+        }
+        connection.sockets.clear();
+        const existing = this.externalSessionsByKey.get(connection.clientId);
+        if (existing === connection) {
+            this.externalSessionsByKey.delete(connection.clientId);
         }
         connection.connectionLogger.trace({ clientId: connection.clientId, totalSessions: this.sessions.size }, logMessage);
         await connection.session.cleanup();
     }
     async handleRawMessage(ws, data) {
+        const activeConnection = this.sessions.get(ws);
+        const pendingConnection = this.pendingConnections.get(ws);
+        const log = activeConnection?.connectionLogger ?? pendingConnection?.connectionLogger ?? this.logger;
         try {
-            const activeConnection = this.sessions.get(ws);
             const buffer = bufferFromWsData(data);
             const asBytes = asUint8Array(buffer);
             if (asBytes) {
                 const frame = decodeBinaryMuxFrame(asBytes);
                 if (frame) {
                     if (!activeConnection) {
-                        this.logger.error("No session found for client");
+                        log.warn("Rejected binary frame before hello");
+                        this.clearPendingConnection(ws);
+                        try {
+                            ws.close(WS_CLOSE_INVALID_HELLO, "Session message before hello");
+                        }
+                        catch {
+                            // ignore close errors
+                        }
                         return;
                     }
                     activeConnection.session.handleBinaryFrame(frame);
@@ -413,13 +550,25 @@ export class VoiceAssistantWebSocketServer {
             const parsed = JSON.parse(buffer.toString());
             const parsedMessage = WSInboundMessageSchema.safeParse(parsed);
             if (!parsedMessage.success) {
+                if (pendingConnection) {
+                    pendingConnection.connectionLogger.warn({
+                        error: parsedMessage.error.message,
+                    }, "Rejected pending message before hello");
+                    this.clearPendingConnection(ws);
+                    try {
+                        ws.close(WS_CLOSE_INVALID_HELLO, "Invalid hello");
+                    }
+                    catch {
+                        // ignore close errors
+                    }
+                    return;
+                }
                 const requestInfo = extractRequestInfoFromUnknownWsInbound(parsed);
                 const isUnknownSchema = requestInfo?.requestId != null &&
                     typeof parsed === "object" &&
                     parsed != null &&
                     "type" in parsed &&
                     parsed.type === "session";
-                const log = activeConnection?.connectionLogger ?? this.logger;
                 log.warn({
                     clientId: activeConnection?.clientId,
                     requestId: requestInfo?.requestId,
@@ -456,8 +605,39 @@ export class VoiceAssistantWebSocketServer {
             if (message.type === "recording_state") {
                 return;
             }
+            if (pendingConnection) {
+                if (message.type === "hello") {
+                    this.handleHello({
+                        ws,
+                        message,
+                        pending: pendingConnection,
+                    });
+                    return;
+                }
+                pendingConnection.connectionLogger.warn({
+                    messageType: message.type,
+                }, "Rejected pending message before hello");
+                this.clearPendingConnection(ws);
+                try {
+                    ws.close(WS_CLOSE_INVALID_HELLO, "Session message before hello");
+                }
+                catch {
+                    // ignore close errors
+                }
+                return;
+            }
             if (!activeConnection) {
-                this.logger.error("No session found for client");
+                this.logger.error("No connection found for websocket");
+                return;
+            }
+            if (message.type === "hello") {
+                activeConnection.connectionLogger.warn("Received hello on active connection");
+                try {
+                    ws.close(WS_CLOSE_INVALID_HELLO, "Unexpected hello");
+                }
+                catch {
+                    // ignore close errors
+                }
                 return;
             }
             if (message.type === "session") {
@@ -482,11 +662,21 @@ export class VoiceAssistantWebSocketServer {
             const trimmedRawPayload = typeof rawPayload === "string" && rawPayload.length > 2000
                 ? `${rawPayload.slice(0, 2000)}... (truncated)`
                 : rawPayload;
-            this.logger.error({
+            log.error({
                 err,
                 rawPayload: trimmedRawPayload,
                 parsedPayload,
             }, "Failed to parse/handle message");
+            if (this.pendingConnections.has(ws)) {
+                this.clearPendingConnection(ws);
+                try {
+                    ws.close(WS_CLOSE_INVALID_HELLO, "Invalid hello");
+                }
+                catch {
+                    // ignore close errors
+                }
+                return;
+            }
             const requestInfo = extractRequestInfoFromUnknownWsInbound(parsedPayload);
             if (requestInfo) {
                 this.sendToClient(ws, wrapSessionMessage({
@@ -534,6 +724,13 @@ export class VoiceAssistantWebSocketServer {
         }
         const allStates = clientEntries.map((e) => e.state);
         const agent = this.agentManager.getAgent(params.agentId);
+        if (agent?.labels?.ui !== "true") {
+            this.logger.debug({
+                agentId: params.agentId,
+                labels: agent?.labels ?? null,
+            }, "Skipping attention notification for non-UI agent");
+            return;
+        }
         const notification = buildAgentAttentionNotificationPayload({
             reason: params.reason,
             serverId: this.serverId,