first pass of merging in warp (doesn't build)

app/src/terminal/shared_session/network/heartbeat.rs

@@ -1,7 +1,13 @@
+// Session sharing now relies on the server sending protocol-level ping frames that the client responds to,
+// and the server initiates disconnect if the client is unresponsive.
+// This module is no longer used, but we keep the code around for now.
+#![allow(dead_code)]
+
+use std::time::Duration;
+
 use futures::stream::AbortHandle;
 use galaxyui::r#async::Timer;
 use galaxyui::{Entity, ModelContext};
-use std::time::Duration;
 
 const DEFAULT_PING_FREQUENCY: Duration = Duration::from_secs(5);
 const DEFAULT_IDLE_TIMEOUT: Duration = Duration::from_secs(30);
@@ -45,9 +51,22 @@ impl Heartbeat {
     /// Starts the periodic ping and the idle timeout tracker.
     pub fn start(&mut self, ctx: &mut ModelContext<Self>) {
         self.reset_idle_timeout(ctx);
+        // Abort any existing ping timer so we don't accumulate chains across reconnects.
+        if let Some(handle) = self.periodic_ping_abort_handle.take() {
+            handle.abort();
+        }
         self.periodic_ping(ctx);
     }
 
+    pub fn stop(&mut self) {
+        if let Some(handle) = self.idle_timeout_abort_handle.take() {
+            handle.abort();
+        }
+        if let Some(handle) = self.periodic_ping_abort_handle.take() {
+            handle.abort();
+        }
+    }
+
     /// Resets the idle timeout to expire after [`Self::idle_timeout`] from now.
     pub fn reset_idle_timeout(&mut self, ctx: &mut ModelContext<Self>) {
         if let Some(handle) = self.idle_timeout_abort_handle.take() {

app/src/terminal/shared_session/network/heartbeat_tests.rs

@@ -1,7 +1,9 @@
-use super::{Event, Heartbeat};
+use std::time::Duration;
+
 use galaxyui::r#async::Timer;
 use galaxyui::App;
-use std::time::Duration;
+
+use super::{Event, Heartbeat};
 
 #[test]
 #[ignore = "Flakes in CI"]