fix: preserve SSH profile on sync round-trip and save fallback config (#490)

Author: datlechin

CHANGELOG.md

@@ -9,21 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Nested hierarchical groups for connection list (up to 3 levels deep) with subgroup creation, group reparenting, and recursive delete
+- Nested hierarchical groups for connection list (up to 3 levels deep)
 - Confirmation dialogs for deep link queries, connection imports, and pre-connect scripts
 - JSON fields in Row Details sidebar now display in a scrollable monospaced text area
 
 ### Fixed
 
-- MariaDB JSON columns misdetected as BLOB, showing hex dumps instead of JSON text
-
-### Fixed
-
-- MongoDB Atlas connections failing with "TLS certificate verify failed" due to missing CA bundle
-
-### Fixed
-
-- ENUM/SET dropdown chevron buttons not showing on first table open, requiring a refresh to appear
+- SSH profile lost after app restart when iCloud Sync enabled
+- MariaDB JSON columns showing as hex dumps instead of JSON text
+- MongoDB Atlas TLS certificate verification failure
+- ENUM/SET dropdown chevron buttons not showing on first table open
 
 ## [0.25.0] - 2026-03-27
 

TablePro/Core/Storage/SSHProfileStorage.swift

@@ -14,7 +14,7 @@ final class SSHProfileStorage {
     private let defaults = UserDefaults.standard
     private let encoder = JSONEncoder()
     private let decoder = JSONDecoder()
-    private var lastLoadFailed = false
+    private(set) var lastLoadFailed = false
 
     private init() {}
 

TablePro/Core/Sync/SyncRecordMapper.swift

@@ -83,6 +83,9 @@ struct SyncRecordMapper {
         if let startupCommands = connection.startupCommands {
             record["startupCommands"] = startupCommands as CKRecordValue
         }
+        if let sshProfileId = connection.sshProfileId {
+            record["sshProfileId"] = sshProfileId.uuidString as CKRecordValue
+        }
 
         // Encode complex structs as JSON Data
         do {
@@ -130,6 +133,7 @@ struct SyncRecordMapper {
         let aiPolicyRaw = record["aiPolicy"] as? String
         let redisDatabase = (record["redisDatabase"] as? Int64).map { Int($0) }
         let startupCommands = record["startupCommands"] as? String
+        let sshProfileId = (record["sshProfileId"] as? String).flatMap { UUID(uuidString: $0) }
 
         var sshConfig = SSHConfiguration()
         if let sshData = record["sshConfigJson"] as? Data {
@@ -159,6 +163,7 @@ struct SyncRecordMapper {
             color: ConnectionColor(rawValue: colorRaw) ?? .none,
             tagId: tagId,
             groupId: groupId,
+            sshProfileId: sshProfileId,
             safeModeLevel: SafeModeLevel(rawValue: safeModeLevelRaw) ?? .silent,
             aiPolicy: aiPolicyRaw.flatMap { AIConnectionPolicy(rawValue: $0) },
             redisDatabase: redisDatabase,

TablePro/Models/Connection/ConnectionGroupTree.swift

@@ -5,7 +5,7 @@
 
 import Foundation
 
-enum ConnectionGroupTreeNode: Identifiable, Hashable {
+enum ConnectionGroupTreeNode: Identifiable {
     case group(ConnectionGroup, children: [ConnectionGroupTreeNode])
     case connection(DatabaseConnection)
 
@@ -15,9 +15,6 @@ enum ConnectionGroupTreeNode: Identifiable, Hashable {
         case .connection(let c): "conn-\(c.id)"
         }
     }
-
-    static func == (lhs: Self, rhs: Self) -> Bool { lhs.id == rhs.id }
-    func hash(into hasher: inout Hasher) { hasher.combine(id) }
 }
 
 // MARK: - Tree Building

TablePro/Views/Connection/ConnectionFormView.swift

@@ -613,8 +613,9 @@ struct ConnectionFormView: View { // swiftlint:disable:this type_body_length
 
     private func reloadProfiles() {
         sshProfiles = SSHProfileStorage.shared.loadProfiles()
-        // If the edited/deleted profile no longer exists, clear the selection
-        if let id = sshProfileId, !sshProfiles.contains(where: { $0.id == id }) {
+        if let id = sshProfileId,
+           !SSHProfileStorage.shared.lastLoadFailed,
+           !sshProfiles.contains(where: { $0.id == id }) {
             sshProfileId = nil
         }
     }
@@ -1176,21 +1177,27 @@ struct ConnectionFormView: View { // swiftlint:disable:this type_body_length
     }
 
     private func saveConnection() {
-        let sshConfig = SSHConfiguration(
-            enabled: sshEnabled,
-            host: sshHost,
-            port: Int(sshPort) ?? 22,
-            username: sshUsername,
-            authMethod: sshAuthMethod,
-            privateKeyPath: sshPrivateKeyPath,
-            useSSHConfig: !selectedSSHConfigHost.isEmpty,
-            agentSocketPath: resolvedSSHAgentSocketPath,
-            jumpHosts: jumpHosts,
-            totpMode: totpMode,
-            totpAlgorithm: totpAlgorithm,
-            totpDigits: totpDigits,
-            totpPeriod: totpPeriod
-        )
+        let sshConfig: SSHConfiguration
+        if let profileId = sshProfileId,
+           let profile = sshProfiles.first(where: { $0.id == profileId }) {
+            sshConfig = profile.toSSHConfiguration()
+        } else {
+            sshConfig = SSHConfiguration(
+                enabled: sshEnabled,
+                host: sshHost,
+                port: Int(sshPort) ?? 22,
+                username: sshUsername,
+                authMethod: sshAuthMethod,
+                privateKeyPath: sshPrivateKeyPath,
+                useSSHConfig: !selectedSSHConfigHost.isEmpty,
+                agentSocketPath: resolvedSSHAgentSocketPath,
+                jumpHosts: jumpHosts,
+                totpMode: totpMode,
+                totpAlgorithm: totpAlgorithm,
+                totpDigits: totpDigits,
+                totpPeriod: totpPeriod
+            )
+        }
 
         let sslConfig = SSLConfiguration(
             mode: sslMode,