From bbc38cb2b9d720f3bba6c4f3b034488cc4d4fecc Mon Sep 17 00:00:00 2001
From: Lachlan Donald <lachlan@ljd.cc>
Date: Mon, 9 Mar 2026 08:50:27 +1100
Subject: [PATCH] fix:ssh improve global connection resilience defaults

Amp-Thread-ID: https://ampcode.com/threads/T-019ccf5c-54e4-70dd-a500-fb75d29a883c
---
 ssh/config | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ssh/config b/ssh/config
index 2f0ac36..b97425d 100644
--- a/ssh/config
+++ b/ssh/config
@@ -8,8 +8,17 @@ Include ~/.ssh/config.private
 
 # Global settings
 Host *
-  ServerAliveInterval 10
-  ServerAliveCountMax 4
+  # Connection resilience
+  ConnectionAttempts 6
+  ConnectTimeout 10
+  ServerAliveInterval 15
+  ServerAliveCountMax 6
+  TCPKeepAlive no
+  ControlMaster auto
+  ControlPersist 15m
+  ControlPath ~/.ssh/cm-%C
+
+  # Security defaults
   ForwardAgent no
   StrictHostKeyChecking=accept-new