From 64de57bc2295d701eaf3a3995baf02247a898c9c Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 15 Mar 2026 13:52:06 +0000
Subject: [PATCH] fix(gateway): restore handshake timeout to 10s to fix devices
 list on slow systems (#47103)

Co-authored-by: 0x4C33 <haoruilee@users.noreply.github.com>
---
 src/gateway/server-constants.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gateway/server-constants.ts b/src/gateway/server-constants.ts
index 54dc3f794b6..da215d2a525 100644
--- a/src/gateway/server-constants.ts
+++ b/src/gateway/server-constants.ts
@@ -21,6 +21,8 @@ export const __setMaxChatHistoryMessagesBytesForTest = (value?: number) => {
     maxChatHistoryMessagesBytes = value;
   }
 };
+// Restore 10s timeout: 3s (from #44089) was too aggressive for CLI on slow systems
+// (e.g. device identity load + signature, disk I/O). Fixes #47103.
 export const DEFAULT_HANDSHAKE_TIMEOUT_MS = 10_000;
 export const getHandshakeTimeoutMs = () => {
   // User-facing env var (works in all environments); test-only var gated behind VITEST