Fix first host selection

Author: itsdodobitch

Sources/HermesDesktop/App/AppState.swift

@@ -159,7 +159,8 @@ final class AppState: ObservableObject {
             }
             .store(in: &cancellables)
 
-        self.activeConnectionID = connectionStore.lastConnectionID
+        self.activeConnectionID = resolvedActiveConnectionID(preferred: connectionStore.lastConnectionID)
+        persistActiveConnectionSelectionIfNeeded()
 
         selectedSection = .connections
     }
@@ -474,6 +475,7 @@ final class AppState: ObservableObject {
         let normalized = profile.updated()
         let previous = connectionStore.connections.first(where: { $0.id == normalized.id })
         let isActiveConnection = activeConnectionID == normalized.id
+        let shouldActivateSavedConnection = activeConnection == nil
         let isChangingWorkspaceScope = previous?.workspaceScopeFingerprint != normalized.workspaceScopeFingerprint
 
         if isActiveConnection && isChangingWorkspaceScope && hasUnsavedFileChanges {
@@ -486,6 +488,11 @@ final class AppState: ObservableObject {
 
         connectionStore.upsert(normalized)
 
+        if shouldActivateSavedConnection {
+            activeConnectionID = normalized.id
+            connectionStore.lastConnectionID = normalized.id
+        }
+
         guard isActiveConnection else { return }
         guard isChangingWorkspaceScope else { return }
 
@@ -2321,10 +2328,12 @@ final class AppState: ObservableObject {
     }
 
     func deleteConnection(_ profile: ConnectionProfile) {
+        let isDeletingActiveConnection = activeConnectionID == profile.id
         connectionStore.delete(profile)
         terminalWorkspace.closeTabs(forConnectionID: profile.id)
-        if activeConnectionID == profile.id {
-            activeConnectionID = nil
+        if isDeletingActiveConnection {
+            activeConnectionID = resolvedActiveConnectionID(preferred: connectionStore.lastConnectionID)
+            persistActiveConnectionSelectionIfNeeded()
             resetWorkspaceStateForConnectionChange(closeTerminalTabs: false)
             selectedSection = .connections
         }
@@ -2342,6 +2351,20 @@ final class AppState: ObservableObject {
         setStatusMessage(L10n.string("New Terminal tab opened"))
     }
 
+    private func resolvedActiveConnectionID(preferred preferredID: UUID?) -> UUID? {
+        if let preferredID,
+           connectionStore.connections.contains(where: { $0.id == preferredID }) {
+            return preferredID
+        }
+
+        return connectionStore.connections.first?.id
+    }
+
+    private func persistActiveConnectionSelectionIfNeeded() {
+        guard connectionStore.lastConnectionID != activeConnectionID else { return }
+        connectionStore.lastConnectionID = activeConnectionID
+    }
+
     func resumeSessionInTerminal(_ session: SessionSummary) {
         guard let profile = activeConnection else {
             sessionsError = L10n.string("Select a connection before resuming a session in Terminal.")

Tests/HermesDesktopTests/AppStateConnectionSelectionTests.swift

@@ -0,0 +1,90 @@
+import Foundation
+import Testing
+
+@testable import HermesDesktop
+
+@MainActor
+struct AppStateConnectionSelectionTests {
+    @Test
+    func launchSelectsSavedHostWhenPreferenceIsMissing() throws {
+        let root = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let paths = makeTestAppPaths(root: root)
+        let savedConnection = ConnectionProfile(
+            label: "Prod",
+            sshHost: "example.com"
+        )
+        let store = ConnectionStore(paths: paths)
+        store.upsert(savedConnection)
+
+        let appState = AppState(paths: paths)
+
+        #expect(appState.activeConnectionID == savedConnection.id)
+        #expect(appState.activeConnection?.id == savedConnection.id)
+        #expect(appState.connectionStore.lastConnectionID == savedConnection.id)
+    }
+
+    @Test
+    func launchReplacesStalePreferenceWithSavedHost() throws {
+        let root = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let paths = makeTestAppPaths(root: root)
+        let savedConnection = ConnectionProfile(
+            label: "Prod",
+            sshHost: "example.com"
+        )
+        let store = ConnectionStore(paths: paths)
+        store.upsert(savedConnection)
+        store.lastConnectionID = UUID()
+
+        let appState = AppState(paths: paths)
+
+        #expect(appState.activeConnectionID == savedConnection.id)
+        #expect(appState.activeConnection?.id == savedConnection.id)
+        #expect(appState.connectionStore.lastConnectionID == savedConnection.id)
+    }
+
+    @Test
+    func savingFirstHostMakesItActive() throws {
+        let root = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let appState = AppState(paths: makeTestAppPaths(root: root))
+        let savedConnection = ConnectionProfile(
+            label: "Prod",
+            sshHost: "example.com"
+        )
+
+        appState.saveConnection(savedConnection)
+
+        #expect(appState.activeConnectionID == savedConnection.id)
+        #expect(appState.activeConnection?.id == savedConnection.id)
+        #expect(appState.connectionStore.lastConnectionID == savedConnection.id)
+    }
+
+    @Test
+    func deletingActiveHostSelectsRemainingHost() throws {
+        let root = try makeTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: root) }
+
+        let appState = AppState(paths: makeTestAppPaths(root: root))
+        let firstConnection = ConnectionProfile(
+            label: "Alpha",
+            sshHost: "alpha.example.com"
+        )
+        let secondConnection = ConnectionProfile(
+            label: "Beta",
+            sshHost: "beta.example.com"
+        )
+        appState.saveConnection(firstConnection)
+        appState.saveConnection(secondConnection)
+
+        appState.deleteConnection(firstConnection)
+
+        #expect(appState.activeConnectionID == secondConnection.id)
+        #expect(appState.activeConnection?.id == secondConnection.id)
+        #expect(appState.connectionStore.lastConnectionID == secondConnection.id)
+    }
+}

docs/releases/RELEASE-v1.0.1.md

@@ -0,0 +1,21 @@
+# Hermes Desktop v1.0.1
+
+Hermes Desktop 1.0.1 fixes a host selection regression introduced in the
+v1.0.0 Settings refresh.
+
+On a fresh install, saving the first host could write `connections.json`
+successfully but leave `preferences.json` without an active `lastConnectionID`.
+The host was saved locally, but the Settings UI still behaved as if no host was
+available.
+
+Fixes:
+
+- select the first saved host automatically when no active host preference
+  exists
+- repair stale active-host preferences on launch
+- make a newly saved first host active immediately
+- select the next available host after deleting the active host
+
+This release keeps the same distribution model as v1.0.0: a universal macOS app
+bundle, ad-hoc signed, not notarized by Apple, with zip checksum and release
+manifest assets.