From cc829e7fdbc5279f24e9a1d590ca80ff4af4f0c5 Mon Sep 17 00:00:00 2001
From: versecafe <147033096+versecafe@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:58:35 -0700
Subject: [PATCH] remote: 60 second timeout on initial connection (#41339)

Closes #41316

Release Notes:

- Fixes #41316

> This keeps the 5 second heartbeat behavior for after the connection is
made
---
 crates/remote/src/remote_client.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/remote/src/remote_client.rs b/crates/remote/src/remote_client.rs
index c5f511db5f94421b4e1c2872fdec4222381ba23a..78fed0384ca49fb15af76e9e8878e21d58359131 100644
--- a/crates/remote/src/remote_client.rs
+++ b/crates/remote/src/remote_client.rs
@@ -87,6 +87,7 @@ pub trait RemoteClientDelegate: Send + Sync {
 const MAX_MISSED_HEARTBEATS: usize = 5;
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
 const HEARTBEAT_TIMEOUT: Duration = Duration::from_secs(5);
+const INITIAL_CONNECTION_TIMEOUT: Duration = Duration::from_secs(60);
 
 const MAX_RECONNECT_ATTEMPTS: usize = 3;
 
@@ -350,7 +351,7 @@ impl RemoteClient {
 
                 let ready = client
                     .wait_for_remote_started()
-                    .with_timeout(HEARTBEAT_TIMEOUT, cx.background_executor())
+                    .with_timeout(INITIAL_CONNECTION_TIMEOUT, cx.background_executor())
                     .await;
                 match ready {
                     Ok(Some(_)) => {}