Merge branch 'hotfix/0.33.7'

Author: intitni

Core/Sources/HostApp/DebugView.swift

@@ -29,6 +29,8 @@ final class DebugSettings: ObservableObject {
     var observeToAXNotificationWithDefaultMode
     @AppStorage(\.useCloudflareDomainNameForLicenseCheck)
     var useCloudflareDomainNameForLicenseCheck
+    @AppStorage(\.doNotInstallLaunchAgentAutomatically)
+    var doNotInstallLaunchAgentAutomatically
     init() {}
 }
 
@@ -136,6 +138,12 @@ struct DebugSettingsView: View {
                         Text("Use Cloudflare domain name for license check")
                     }
 
+                    Toggle(
+                        isOn: $settings.doNotInstallLaunchAgentAutomatically
+                    ) {
+                        Text("Don't install launch agent automatically")
+                    }
+                    
                     Button("Reset update cycle") {
                         updateChecker.resetUpdateCycle()
                     }

Core/Sources/HostApp/General.swift

@@ -32,6 +32,9 @@ struct General {
             switch action {
             case .appear:
                 return .run { send in
+                    if UserDefaults.shared.value(for: \.doNotInstallLaunchAgentAutomatically) {
+                        return
+                    }
                     await send(.setupLaunchAgentIfNeeded)
                 }
 

Tool/Sources/Preferences/Keys.swift

@@ -748,5 +748,9 @@ public extension UserDefaultPreferenceKeys {
     var useCloudflareDomainNameForLicenseCheck: FeatureFlag {
         .init(defaultValue: false, key: "FeatureFlag-UseCloudflareDomainNameForLicenseCheck")
     }
+    
+    var doNotInstallLaunchAgentAutomatically: FeatureFlag {
+        .init(defaultValue: false, key: "FeatureFlag-DoNotInstallLaunchAgentAutomatically")
+    }
 }
 

Tool/Sources/XPCShared/XPCService.swift

@@ -17,7 +17,7 @@ class XPCService {
     let interface: NSXPCInterface
     let logger: Logger
     weak var delegate: XPCServiceDelegate?
-    
+
     @XPCServiceActor
     private var isInvalidated = false
 
@@ -101,6 +101,12 @@ private class InvalidatingConnection {
 
 struct NoDataError: Error {}
 
+struct EmptyResponseError: Error, LocalizedError {
+    var errorDescription: String? {
+        "The server is not returning a response. The app may be installed in the wrong directory."
+    }
+}
+
 struct AutoFinishContinuation<T> {
     var continuation: AsyncThrowingStream<T, Error>.Continuation
 
@@ -129,7 +135,10 @@ func withXPCServiceConnected<T, P>(
         } as! P
         fn(service, .init(continuation: continuation))
     }
-    return try await stream.first(where: { _ in true })!
+    guard let result = try await stream.first(where: { _ in true }) else {
+        throw EmptyResponseError()
+    }
+    return result
 }
 
 @XPCServiceActor
@@ -144,9 +153,12 @@ public func testXPCListenerEndpoint(_ endpoint: NSXPCListenerEndpoint) async ->
         continuation.finish()
     }
     do {
-        try await stream.first(where: { _ in true })!
+        guard let _ = try await stream.first(where: { _ in true }) else {
+            throw EmptyResponseError()
+        }
         return true
     } catch {
         return false
     }
 }
+

Version.xcconfig

@@ -1,3 +1,3 @@
 APP_VERSION = 0.33.7
-APP_BUILD = 398
+APP_BUILD = 399