fixup

ethanndickson · ethanndickson · commit 126e84f1474f · 2025-03-25T12:44:34.000+11:00
diff --git a/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift b/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift
@@ -51,7 +51,12 @@ struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {
                                 loading = true
                                 defer { loading = false }
                                 do throws(DaemonError) {
+                                    // TODO: Support selecting & deleting multiple sessions at once
                                     try await fileSync.deleteSessions(ids: [selection!])
+                                    if fileSync.sessionState.isEmpty {
+                                        // Last session was deleted, stop the daemon
+                                        await fileSync.stop()
+                                    }
                                 } catch {
                                     deleteError = error
                                 }
@@ -66,7 +71,7 @@ struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {
                                 Divider()
                                 Button {
                                     Task {
-                                        // TODO: Support pausing & resuming multiple selections
+                                        // TODO: Support pausing & resuming multiple sessions at once
                                         switch selectedSession.status {
                                         case .paused:
                                             try await fileSync.resumeSessions(ids: [selectedSession.id])
diff --git a/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift b/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift
@@ -86,7 +86,6 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
         defer { loading = false }
         do throws(DaemonError) {
             if let existingSession {
-                // TODO: Support selecting & deleting multiple sessions at once
                 try await fileSync.deleteSessions(ids: [existingSession.id])
             }
             try await fileSync.createSession(
diff --git a/Coder-Desktop/Coder-DesktopTests/Util.swift b/Coder-Desktop/Coder-DesktopTests/Util.swift
@@ -48,6 +48,10 @@ class MockFileSyncDaemon: FileSyncDaemon {
     }
 
     func createSession(localPath _: String, agentHost _: String, remotePath _: String) async throws(DaemonError) {}
+
+    func pauseSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}
+
+    func resumeSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}
 }
 
 extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}
diff --git a/Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift b/Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift
@@ -77,6 +77,10 @@ public class MutagenDaemon: FileSyncDaemon {
                 return
             }
             await refreshSessions()
+            if sessionState.isEmpty {
+                logger.info("No sync sessions found on startup, stopping daemon")
+                await stop()
+            }
         }
     }
 
diff --git a/Coder-Desktop/VPNLib/FileSync/FileSyncManagement.swift b/Coder-Desktop/VPNLib/FileSync/FileSyncManagement.swift
@@ -13,10 +13,6 @@ public extension MutagenDaemon {
             return
         }
         sessionState = sessions.sessionStates.map { FileSyncSession(state: $0) }
-        if sessionState.isEmpty {
-            logger.info("No sync sessions found")
-            await stop()
-        }
     }
 
     func createSession(
@@ -61,7 +57,8 @@ public extension MutagenDaemon {
     }
 
     func deleteSessions(ids: [String]) async throws(DaemonError) {
-        // Terminating sessions does not require prompting
+        // Terminating sessions does not require prompting, according to the
+        // Mutagen CLI
         let (stream, promptID) = try await host(allowPrompts: false)
         defer { stream.cancel() }
         guard case .running = state else { return }
@@ -79,7 +76,9 @@ public extension MutagenDaemon {
     }
 
     func pauseSessions(ids: [String]) async throws(DaemonError) {
-        let (stream, promptID) = try await host()
+        // Pausing sessions does not require prompting, according to the
+        // Mutagen CLI
+        let (stream, promptID) = try await host(allowPrompts: false)
         defer { stream.cancel() }
         guard case .running = state else { return }
         do {
@@ -96,7 +95,9 @@ public extension MutagenDaemon {
     }
 
     func resumeSessions(ids: [String]) async throws(DaemonError) {
-        let (stream, promptID) = try await host()
+        // Resuming sessions does not require prompting, according to the
+        // Mutagen CLI
+        let (stream, promptID) = try await host(allowPrompts: false)
         defer { stream.cancel() }
         guard case .running = state else { return }
         do {

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {`
`86`	`86`	`defer { loading = false }`
`87`	`87`	`do throws(DaemonError) {`
`88`	`88`	`if let existingSession {`
`89`		`- // TODO: Support selecting & deleting multiple sessions at once`
`90`	`89`	`try await fileSync.deleteSessions(ids: [existingSession.id])`
`91`	`90`	`}`
`92`	`91`	`try await fileSync.createSession(`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ class MockFileSyncDaemon: FileSyncDaemon {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func createSession(localPath _: String, agentHost _: String, remotePath _: String) async throws(DaemonError) {}`
	`51`	`+`
	`52`	`+ func pauseSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}`
	`53`	`+`
	`54`	`+ func resumeSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,10 @@ public class MutagenDaemon: FileSyncDaemon {`
`77`	`77`	`return`
`78`	`78`	`}`
`79`	`79`	`await refreshSessions()`
	`80`	`+ if sessionState.isEmpty {`
	`81`	`+ logger.info("No sync sessions found on startup, stopping daemon")`
	`82`	`+ await stop()`
	`83`	`+ }`
`80`	`84`	`}`
`81`	`85`	`}`
`82`	`86`