fixup

Author: ethanndickson

Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift

@@ -51,11 +51,15 @@ 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
                                 }
-                                await fileSync.refreshSessions()
                                 selection = nil
                             }
                         } label: {
@@ -66,7 +70,9 @@ struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {
                                 Divider()
                                 Button {
                                     Task {
-                                        // TODO: Support pausing & resuming multiple selections
+                                        // TODO: Support pausing & resuming multiple sessions at once
+                                        loading = true
+                                        defer { loading = false }
                                         switch selectedSession.status {
                                         case .paused:
                                             try await fileSync.resumeSessions(ids: [selectedSession.id])

Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift

@@ -83,7 +83,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(

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 {}

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()
+            }
         }
     }
 

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 {