Apr 7, 2025 · Apr 3, 2025 · Apr 4, 2025 · Apr 7, 2025 · Apr 7, 2025 · Apr 3, 2025
diff --git a/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift b/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncConfig.swift
                    // Opens the log file in Console
                    NSWorkspace.shared.open(fileSync.logFile)
                }
            }.task {
                // When the Window is visible, poll for session updates every
                // two seconds.
                while !Task.isCancelled {
                    if !fileSync.state.isFailed {
                        await fileSync.refreshSessions()
                    }
                    try? await Task.sleep(for: .seconds(2))
                }
            }.onAppear {
                isVisible = true
            }.onDisappear {
diff --git a/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift b/Coder-Desktop/Coder-Desktop/Views/FileSync/FileSyncSessionModal.swift
    @EnvironmentObject private var fileSync: FS

    @State private var localPath: String = ""
    @State private varworkspace: Agent?
    @State private varremoteHostname: String?
    @State private var remotePath: String = ""

    @State private var loading: Bool = false
                    }
                }
                Section {
                    Picker("Workspace", selection: $workspace) {
                    Picker("Workspace", selection: $remoteHostname) {
                        ForEach(agents, id: \.id) { agent in
                            Text(agent.primaryHost!).tag(agent)
                            Text(agent.primaryHost!).tag(agent.primaryHost!)
                        }
                        // HACK: Silence error logs for no-selection.
                        Divider().tag(nil asAgent?)
                        Divider().tag(nil asString?)
                    }
                }
                Section {
                Button("Cancel", action: { dismiss() }).keyboardShortcut(.cancelAction)
                Button(existingSession == nil ? "Add" : "Save") { Task { await submit() }}
                    .keyboardShortcut(.defaultAction)
                    .disabled(localPath.isEmpty || remotePath.isEmpty || remoteHostname == nil)
            }.padding(20)
        }.onAppear {
            if let existingSession {
                localPath = existingSession.alphaPath
 workspace = agents.first { $0.primaryHost == existingSession.agentHost }
 remoteHostname = agents.first { $0.primaryHost == existingSession.agentHost }?.primaryHost
                remotePath = existingSession.betaPath
            } else {
                // Set the picker to the first agent by default
 workspace = agents.first
 remoteHostname = agents.first?.primaryHost
            }
        }.disabled(loading)
            .alert("Error", isPresented: Binding(

    func submit() async {
        createError = nil
        guard letworkspace else {
        guard letremoteHostname else {
            return
        }
        loading = true
            }
            try await fileSync.createSession(
                localPath: localPath,
                agentHost:workspace.primaryHost!,
                agentHost:remoteHostname,
                remotePath: remotePath
            )
        } catch {
diff --git a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift
            .environmentObject(vpn)
            .environmentObject(state)
            .onReceive(inspection.notice) { inspection.visit(self, $0) } // ViewInspector
            .task {
                while !Task.isCancelled {
                    await fileSync.refreshSessions()
                    try? await Task.sleep(for: .seconds(2))
                }
            }
    }

    private var vpnDisabled: Bool {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -103,15 +103,6 @@ struct FileSyncConfig<VPN: VPNService, FS: FileSyncDaemon>: View {
		// Opens the log file in Console
		NSWorkspace.shared.open(fileSync.logFile)
		}
		}.task {
		// When the Window is visible, poll for session updates every
		// two seconds.
		while !Task.isCancelled {
		if !fileSync.state.isFailed {
Copy link MemberAuthor ethanndicksonApr 3, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This is already checked in`refreshSessions`.
		await fileSync.refreshSessions()
		}
		try? await Task.sleep(for: .seconds(2))
		}
		}.onAppear {
		isVisible = true
		}.onDisappear {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,7 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
		@EnvironmentObject private var fileSync: FS

		@State private var localPath: String = ""
		@State private varworkspace: Agent?
		@State private varremoteHostname: String?
		@State private var remotePath: String = ""

		@State private var loading: Bool = false
Expand DownExpand Up		@@ -37,12 +37,12 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
		}
		}
		Section {
		Picker("Workspace", selection: $workspace) {
		Picker("Workspace", selection: $remoteHostname) {
		ForEach(agents, id: \.id) { agent in
		Text(agent.primaryHost!).tag(agent)
		Text(agent.primaryHost!).tag(agent.primaryHost!)
		}
		// HACK: Silence error logs for no-selection.
		Divider().tag(nil asAgent?)
		Divider().tag(nil asString?)
		}
		}
		Section {
Expand All		@@ -55,15 +55,16 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
		Button("Cancel", action: { dismiss() }).keyboardShortcut(.cancelAction)
		Button(existingSession == nil ? "Add" : "Save") { Task { await submit() }}
		.keyboardShortcut(.defaultAction)
		.disabled(localPath.isEmpty \|\| remotePath.isEmpty \|\| remoteHostname == nil)
		}.padding(20)
		}.onAppear {
		if let existingSession {
		localPath = existingSession.alphaPath
		workspace = agents.first { $0.primaryHost == existingSession.agentHost }
		remoteHostname = agents.first { $0.primaryHost == existingSession.agentHost }?.primaryHost
		remotePath = existingSession.betaPath
		} else {
		// Set the picker to the first agent by default
		workspace = agents.first
		remoteHostname = agents.first?.primaryHost
		}
		}.disabled(loading)
		.alert("Error", isPresented: Binding(
Expand All		@@ -76,7 +77,7 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {

		func submit() async {
		createError = nil
		guard letworkspace else {
		guard letremoteHostname else {
		return
		}
		loading = true
Expand All		@@ -87,7 +88,7 @@ struct FileSyncSessionModal<VPN: VPNService, FS: FileSyncDaemon>: View {
		}
		try await fileSync.createSession(
		localPath: localPath,
		agentHost:workspace.primaryHost!,
		agentHost:remoteHostname,
		remotePath: remotePath
		)
		} catch {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,6 +116,12 @@ struct VPNMenu<VPN: VPNService, FS: FileSyncDaemon>: View {
		.environmentObject(vpn)
		.environmentObject(state)
		.onReceive(inspection.notice) { inspection.visit(self, $0) } // ViewInspector
		.task {
ethanndickson marked this conversation as resolved. Show resolvedHide resolved
		while !Task.isCancelled {
		await fileSync.refreshSessions()
		try? await Task.sleep(for: .seconds(2))
		}
		}
		}

		private var vpnDisabled: Bool {
Expand Down