fixup tests

Author: ethanndickson

Coder-Desktop/Coder-Desktop/Preview Content/PreviewFileSync.swift

@@ -3,7 +3,6 @@ import VPNLib
 @MainActor
 final class PreviewFileSync: FileSyncDaemon {
     var logFile: URL = .init(filePath: "~/log.txt")!
-    var lastPromptMessage: String?
 
     var sessionState: [VPNLib.FileSyncSession] = []
 
@@ -21,7 +20,12 @@ final class PreviewFileSync: FileSyncDaemon {
         state = .stopped
     }
 
-    func createSession(arg _: CreateSyncSessionRequest) async throws(DaemonError) {}
+    func createSession(
+        arg _: CreateSyncSessionRequest,
+        promptCallback _: (
+            @MainActor (String) -> Void
+        )?
+    ) async throws(DaemonError) {}
 
     func deleteSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}
 

Coder-Desktop/Coder-Desktop/VPN/MenuState.swift

@@ -87,7 +87,7 @@ struct VPNMenuState {
             wsName: workspace.name,
             wsID: wsID,
             // Hosts arrive sorted by length, the shortest looks best in the UI.
-            primaryHost: nonEmptyHosts.first!,
+            primaryHost: nonEmptyHosts.first!
         )
     }
 

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

@@ -15,6 +15,8 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
     @State private var createError: DaemonError?
     @State private var pickingRemote: Bool = false
 
+    @State private var lastPromptMessage: String?
+
     var body: some View {
         let agents = vpn.menuState.onlineAgents
         VStack(spacing: 0) {
@@ -62,8 +64,11 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
             Divider()
             HStack {
                 Spacer()
-                if let lastMessage = fileSync.lastPromptMessage {
-                    Text(lastMessage).foregroundStyle(.secondary)
+                if let msg = lastPromptMessage {
+                    Text(msg).foregroundStyle(.secondary)
+                }
+                if loading {
+                    ProgressView().controlSize(.small)
                 }
                 Button("Cancel", action: { dismiss() }).keyboardShortcut(.cancelAction)
                 Button(existingSession == nil ? "Add" : "Save") { Task { await submit() }}
@@ -106,8 +111,10 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
                 arg: .init(
                     alpha: .init(path: localPath, protocolKind: .local),
                     beta: .init(path: remotePath, protocolKind: .ssh(host: remoteHostname))
-                )
+                ),
+                promptCallback: { lastPromptMessage = $0 },
             )
+            lastPromptMessage = nil
         } catch {
             createError = error
             return

Coder-Desktop/Coder-DesktopTests/AgentsTests.swift

@@ -27,7 +27,8 @@ struct AgentsTests {
                 status: status,
                 hosts: ["a\($0).coder"],
                 wsName: "ws\($0)",
-                wsID: UUID()
+                wsID: UUID(),
+                primaryHost: "a\($0).coder",
             )
             return (agent.id, agent)
         })

Coder-Desktop/Coder-DesktopTests/Util.swift

@@ -31,6 +31,8 @@ class MockVPNService: VPNService, ObservableObject {
 class MockFileSyncDaemon: FileSyncDaemon {
     var logFile: URL = .init(filePath: "~/log.txt")
 
+    var lastPromptMessage: String?
+
     var sessionState: [VPNLib.FileSyncSession] = []
 
     func refreshSessions() async {}
@@ -47,7 +49,10 @@ class MockFileSyncDaemon: FileSyncDaemon {
         []
     }
 
-    func createSession(arg _: CreateSyncSessionRequest) async throws(DaemonError) {}
+    func createSession(
+        arg _: CreateSyncSessionRequest,
+        promptCallback _: (@MainActor (String) -> Void)?
+    ) async throws(DaemonError) {}
 
     func pauseSessions(ids _: [String]) async throws(VPNLib.DaemonError) {}
 

Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift

@@ -11,11 +11,13 @@ public protocol FileSyncDaemon: ObservableObject {
     var state: DaemonState { get }
     var sessionState: [FileSyncSession] { get }
     var logFile: URL { get }
-    var lastPromptMessage: String? { get }
     func tryStart() async
     func stop() async
     func refreshSessions() async
-    func createSession(arg: CreateSyncSessionRequest) async throws(DaemonError)
+    func createSession(
+        arg: CreateSyncSessionRequest,
+        promptCallback: (@MainActor (String) -> Void)?
+    ) async throws(DaemonError)
     func deleteSessions(ids: [String]) async throws(DaemonError)
     func pauseSessions(ids: [String]) async throws(DaemonError)
     func resumeSessions(ids: [String]) async throws(DaemonError)
@@ -48,8 +50,6 @@ public class MutagenDaemon: FileSyncDaemon {
 
     public let logFile: URL
 
-    @Published public var lastPromptMessage: String?
-
     // Managing sync sessions could take a while, especially with prompting
     let sessionMgmtReqTimeout: TimeAmount = .seconds(15)
 

Coder-Desktop/VPNLib/FileSync/FileSyncManagement.swift

@@ -17,7 +17,10 @@ public extension MutagenDaemon {
         sessionState = sessions.sessionStates.map { FileSyncSession(state: $0) }
     }
 
-    func createSession(arg: CreateSyncSessionRequest) async throws(DaemonError) {
+    func createSession(
+        arg: CreateSyncSessionRequest,
+        promptCallback: (@MainActor (String) -> Void)? = nil
+    ) async throws(DaemonError) {
         if case .stopped = state {
             do throws(DaemonError) {
                 try await start()
@@ -26,7 +29,7 @@ public extension MutagenDaemon {
                 throw error
             }
         }
-        let (stream, promptID) = try await host()
+        let (stream, promptID) = try await host(promptCallback: promptCallback)
         defer { stream.cancel() }
         let req = Synchronization_CreateRequest.with { req in
             req.prompter = promptID

Coder-Desktop/VPNLib/FileSync/FileSyncPrompting.swift

@@ -3,7 +3,10 @@ import GRPC
 extension MutagenDaemon {
     typealias PromptStream = GRPCAsyncBidirectionalStreamingCall<Prompting_HostRequest, Prompting_HostResponse>
 
-    func host(allowPrompts: Bool = true) async throws(DaemonError) -> (PromptStream, identifier: String) {
+    func host(
+        allowPrompts: Bool = true,
+        promptCallback: (@MainActor (String) -> Void)? = nil
+    ) async throws(DaemonError) -> (PromptStream, identifier: String) {
         let stream = client!.prompt.makeHostCall()
 
         do {
@@ -28,7 +31,6 @@ extension MutagenDaemon {
         try initResp.ensureValid(first: true, allowPrompts: allowPrompts)
 
         Task.detached(priority: .background) {
-            defer { Task { @MainActor in self.lastPromptMessage = nil } }
             do {
                 while let msg = try await iter.next() {
                     try msg.ensureValid(first: false, allowPrompts: allowPrompts)
@@ -41,7 +43,7 @@ extension MutagenDaemon {
                         // Any other messages that require a non-empty response will
                         // cause the create op to fail, showing an error. This is ok for now.
                     } else {
-                        Task { @MainActor in self.lastPromptMessage = msg.message }
+                        Task { @MainActor in promptCallback?(msg.message) }
                     }
                     try await stream.requestStream.send(reply)
                 }