feat: allow custom cloudflared binary path (#96)

Follows the existing pattern used for kubectl and socat custom paths.
Users can now specify a custom cloudflared path in Settings when it's
installed via MacPorts or other non-Homebrew package managers.

Fixes #90

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: productdevbook

platforms/macos/Sources/Managers/PortForwardManager.swift

@@ -9,6 +9,7 @@ extension Defaults.Keys {
     static let portForwardShowNotifications = Key<Bool>("portForwardShowNotifications", default: true)
     static let customKubectlPath = Key<String?>("customKubectlPath", default: nil)
     static let customSocatPath = Key<String?>("customSocatPath", default: nil)
+    static let customCloudflaredPath = Key<String?>("customCloudflaredPath", default: nil)
 }
 
 // MARK: - Port Forward Manager

platforms/macos/Sources/Services/CloudflaredService.swift

@@ -14,6 +14,12 @@ actor CloudflaredService {
     // MARK: - Dependency Check
 
     nonisolated var cloudflaredPath: String? {
+        // Check custom path first
+        if let custom = Defaults[.customCloudflaredPath],
+           !custom.isEmpty,
+           FileManager.default.fileExists(atPath: custom) {
+            return custom
+        }
         let paths = [
             "/opt/homebrew/bin/cloudflared",
             "/usr/local/bin/cloudflared"
@@ -25,6 +31,23 @@ actor CloudflaredService {
         cloudflaredPath != nil
     }
 
+    nonisolated var isUsingCustomPath: Bool {
+        if let custom = Defaults[.customCloudflaredPath],
+           !custom.isEmpty,
+           FileManager.default.fileExists(atPath: custom) {
+            return true
+        }
+        return false
+    }
+
+    nonisolated var autoDetectedPath: String? {
+        let paths = [
+            "/opt/homebrew/bin/cloudflared",
+            "/usr/local/bin/cloudflared"
+        ]
+        return paths.first { FileManager.default.fileExists(atPath: $0) }
+    }
+
     // MARK: - Handler Management
 
     func setURLHandler(for id: UUID, handler: @escaping @Sendable (String) -> Void) {

platforms/macos/Sources/Views/Settings/CloudflaredSettingsSection.swift

@@ -8,29 +8,112 @@ import Defaults
 
 struct CloudflaredSettingsSection: View {
     @Default(.cloudflaredProtocol) private var protocolSelection
+    @Default(.customCloudflaredPath) private var customPath
+    @State private var pathInput = ""
+
+    private let service = CloudflaredService()
+
+    private var effectivePath: String? {
+        if let custom = customPath, !custom.isEmpty, FileManager.default.fileExists(atPath: custom) {
+            return custom
+        }
+        return service.autoDetectedPath
+    }
 
     var body: some View {
         SettingsGroup("Cloudflare Tunnels", icon: "cloud.fill") {
-            SettingsRowContainer {
-                HStack {
-                    VStack(alignment: .leading, spacing: 2) {
-                        Text("Tunnel protocol")
-                            .fontWeight(.medium)
-                        Text("Choose how cloudflared connects to Cloudflare (applies to new tunnels)")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
+            VStack(spacing: 0) {
+                SettingsRowContainer {
+                    HStack {
+                        VStack(alignment: .leading, spacing: 2) {
+                            Text("Tunnel protocol")
+                                .fontWeight(.medium)
+                            Text("Choose how cloudflared connects to Cloudflare (applies to new tunnels)")
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                        }
+
+                        Spacer()
+
+                        Picker("", selection: $protocolSelection) {
+                            ForEach(CloudflaredProtocol.allCases, id: \.self) { option in
+                                Text(option.displayName).tag(option)
+                            }
+                        }
+                        .labelsHidden()
+                        .pickerStyle(.segmented)
+                        .frame(width: 160)
                     }
+                }
+
+                SettingsDivider()
+
+                SettingsRowContainer {
+                    VStack(alignment: .leading, spacing: 10) {
+                        HStack {
+                            Text("cloudflared path")
+                                .fontWeight(.medium)
+
+                            Spacer()
 
-                    Spacer()
+                            if effectivePath != nil {
+                                HStack(spacing: 4) {
+                                    Image(systemName: "checkmark.circle.fill")
+                                        .foregroundStyle(.green)
+                                    Text("Installed")
+                                        .font(.caption)
+                                        .foregroundStyle(.secondary)
+                                }
+                            } else {
+                                HStack(spacing: 4) {
+                                    Image(systemName: "xmark.circle.fill")
+                                        .foregroundStyle(.red)
+                                    Text("Not found")
+                                        .font(.caption)
+                                        .foregroundStyle(.secondary)
+                                }
+                            }
+                        }
+
+                        HStack(spacing: 8) {
+                            TextField("Custom path (leave empty for auto)", text: $pathInput)
+                                .textFieldStyle(.roundedBorder)
+                                .font(.system(.caption, design: .monospaced))
+                                .onAppear {
+                                    pathInput = customPath ?? ""
+                                }
+                                .onChange(of: pathInput) { _, newValue in
+                                    if newValue.isEmpty {
+                                        Defaults[.customCloudflaredPath] = nil
+                                    } else {
+                                        Defaults[.customCloudflaredPath] = newValue
+                                    }
+                                }
+
+                            if !pathInput.isEmpty {
+                                Button("Clear") {
+                                    pathInput = ""
+                                    Defaults[.customCloudflaredPath] = nil
+                                }
+                                .buttonStyle(.bordered)
+                                .controlSize(.small)
+                            }
+                        }
 
-                    Picker("", selection: $protocolSelection) {
-                        ForEach(CloudflaredProtocol.allCases, id: \.self) { option in
-                            Text(option.displayName).tag(option)
+                        if let path = effectivePath {
+                            HStack(spacing: 4) {
+                                Text("Using:")
+                                    .font(.caption)
+                                    .foregroundStyle(.tertiary)
+                                Text(path)
+                                    .font(.system(.caption, design: .monospaced))
+                                    .foregroundStyle(.secondary)
+                                Text(service.isUsingCustomPath ? "(custom)" : "(auto)")
+                                    .font(.caption2)
+                                    .foregroundStyle(service.isUsingCustomPath ? Color.orange : Color.gray)
+                            }
                         }
                     }
-                    .labelsHidden()
-                    .pickerStyle(.segmented)
-                    .frame(width: 160)
                 }
             }
         }