echoclaw-relay-agent 0.19.2 → 0.19.3

package/dist/cli.js

@@ -326,6 +326,25 @@ async function runSetup(code, relay, bridgePort) {
     const pairInfo = await pairPromise;
     printOk(`Paired with desktop client`);
     console.log(`        ${DIM}Session: ${pairInfo.sessionId.slice(0, 8)}...${RESET}`);
+    // Wait for identity exchange to complete (or timeout gracefully)
+    // Identity exchange starts inside onPaired() — give it time before stopping.
+    await new Promise((resolve) => {
+        const onIdentity = () => { cleanup(); resolve(); };
+        const onError = (err) => {
+            if (err.constructor?.name === 'IdentityExchangeError') {
+                cleanup();
+                resolve();
+            }
+        };
+        const timer = setTimeout(() => { cleanup(); resolve(); }, 12000); // 12s > 10s identity timeout
+        const cleanup = () => {
+            clearTimeout(timer);
+            agent.removeListener('identity_exchanged', onIdentity);
+            agent.removeListener('error', onError);
+        };
+        agent.on('identity_exchanged', onIdentity);
+        agent.on('error', onError);
+    });
     console.log();
     // Step 2: Stop the foreground agent (service will take over)
     await agent.stop();

package/dist/relay/PairingProtocol.js

@@ -174,18 +174,18 @@ export class PairingProtocol extends EventEmitter {
                         code = msg.payload;
                         this.emit('pairing_code', code);
                     }
-                    // In initiator mode, send pubkey after receiving server HELLO
-                    if (isInitiator) {
-                        sendPubkey();
-                    }
+                    // Do NOT send pubkey here in initiator mode — agent hasn't connected yet.
+                    // Wait for agent's HELLO with pubkey first (see below).
                 }
                 // Track session_id from any message
                 if (msg.session_id && !sessionId) {
                     sessionId = msg.session_id;
                 }
-                // Agent sends their public key — complete ECDH
+                // Agent sends their public key — send ours back, then complete ECDH
                 if (msg.type === 'HELLO' && msg.pubkey && msg.sender_role === 'agent') {
                     try {
+                        // Send our pubkey AFTER receiving agent's (so agent WS is guaranteed connected)
+                        sendPubkey();
                         const theirPub = fromBase64(msg.pubkey);
                         const sessionKey = await completeHandshake(this.keyPair.privateKey, theirPub, code || undefined);
                         cleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoclaw-relay-agent",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "description": "EchoClaw Relay Connection — E2E encrypted relay transport, pairing, and session management",
   "type": "module",
   "main": "./dist/index.js",